From ce226e9d8d52d2530f057f2000d36c0d55380ade Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sat, 14 Mar 2020 13:02:23 +0100 Subject: gnu: Add superfamiconv * gnu/packages/graphics.scm (superfamiconv): New variable. --- gnu/packages/graphics.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 7414edb4fe..f5ebfaacaa 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2019 Tanguy Le Carrour +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -1075,3 +1076,37 @@ interaction library, written in C++, which has become the de facto standard graphics library for 3D visualization and visual simulation software in the scientific and engineering community.") (license license:bsd-3)))) + +(define-public superfamiconv + (package + (name "superfamiconv") + (version "0.8.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Optiroc/SuperFamiconv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0848szv6a2b8wdganh6mw5i8vn8cqvn1kbwzx7mb9wlrf5wzqn37")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((outdir (assoc-ref outputs "out")) + (bindir (string-append outdir "/bin"))) + (install-file "bin/superfamiconv" bindir) + #t)))))) + (home-page "https://github.com/Optiroc/SuperFamiconv") + (synopsis "Tile graphics converter supporting SNES, Game Boy Color +and PC Engine formats") + (description "SuperFamiconv is a converter for tiled graphics, supporting +the graphics formats of the SNES, Game Boy Color and PC Engine game consoles. +Automated palette selection is supported.") + (license license:expat))) -- cgit v1.2.3 From 59d10c31128ca59b458015f652bb8d3325479a28 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 14 Mar 2020 17:30:00 +0100 Subject: gnu: Add guile3.0-sdl2. * gnu/packages/sdl.scm (guile3.0-sdl2): New variable. --- gnu/packages/sdl.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 90719f7e5e..25b0bdba2b 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice -;;; Copyright © 2018, 2019 Ricardo Wurmus +;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2019, 2020 Nicolas Goaziou ;;; Copyright © 2019 Marius Bakke @@ -659,6 +659,14 @@ The bindings are written in pure Scheme using Guile's foreign function interface.") (license lgpl3+))) +(define-public guile3.0-sdl2 + (package + (inherit guile-sdl2) + (name "guile3.0-sdl2") + (native-inputs + `(("guile" ,guile-3.0) + ("pkg-config" ,pkg-config))))) + (define-public sdl2-cs (let ((commit "1a3556441e1394eb0b5d46aeb514b8d1090b93f8")) (package -- cgit v1.2.3 From ad1edd03adb1f4412cc50563c8b8530031c65ed7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 14 Mar 2020 17:30:19 +0100 Subject: gnu: Add guile3.0-opengl. * gnu/packages/gl.scm (guile3.0-opengl): New variable. --- gnu/packages/gl.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b863283606..ea9b2c579e 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2016 David Thompson ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver ;;; Copyright © 2016 ng0 -;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus +;;; Copyright © 2016, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2016 David Thompson ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017 Arun Isaac @@ -603,6 +603,26 @@ extension functionality is exposed in a single header file.") OpenGL graphics API.") (license license:lgpl3+))) +(define-public guile3.0-opengl + (package + (inherit guile-opengl) + (name "guile3.0-opengl") + (arguments + (substitute-keyword-arguments (package-arguments guile-opengl) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'build-with-guile-3.0 + (lambda _ + (substitute* "configure" + (("_guile_versions_to_search=\"") + "_guile_versions_to_search=\"3.0 ")) + #t)))))) + (inputs + `(("guile" ,guile-3.0) + ("mesa" ,mesa) + ("glu" ,glu) + ("freeglut" ,freeglut))))) + (define-public libepoxy (package (name "libepoxy") -- cgit v1.2.3 From abb0ff45487a280d3ab171460b5448620de4b358 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 14 Mar 2020 17:30:33 +0100 Subject: gnu: Add guile3.0-chickadee. * gnu/packages/game-development.scm (guile3.0-chickadee): New variable. --- gnu/packages/game-development.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 7638a545ca..bf3b12ffd3 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1766,6 +1766,42 @@ built on top of SDL2 and OpenGL. Chickadee aims to provide all the features that parenthetically inclined game developers need to make 2D (and eventually 3D) games in Scheme, such as: +@enumerate +@item extensible, fixed-timestep game loop +@item OpenGL-based rendering engine +@item keyboard, mouse, controller input +@item REPL-driven development model +@end enumerate\n") + (license license:gpl3+))) + +(define-public guile3.0-chickadee + (package + (inherit guile-chickadee) + (name "guile-chickadee") + (version "0.4.0") + (source (origin + (method url-fetch) + (uri (string-append "https://files.dthompson.us/chickadee/" + "chickadee-" version ".tar.gz")) + (sha256 + (base32 + "1fdicsgls5cp0yffcm5vjmav67gv9bxhz1s3jvdvinspxb485x7l")))) + (build-system gnu-build-system) + (propagated-inputs + `(("guile-opengl" ,guile3.0-opengl) + ("guile-sdl2" ,guile3.0-sdl2))) + (inputs + `(("guile" ,guile-3.0))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) + (home-page "https://dthompson.us/projects/chickadee.html") + (synopsis "Game development toolkit for Guile Scheme with SDL2 and OpenGL") + (description "Chickadee is a game development toolkit for Guile Scheme +built on top of SDL2 and OpenGL. Chickadee aims to provide all the features +that parenthetically inclined game developers need to make 2D (and eventually +3D) games in Scheme, such as: + @enumerate @item extensible, fixed-timestep game loop @item OpenGL-based rendering engine -- cgit v1.2.3 From 3dade1d59e7b4caa641670a76c0c48b4c90f6b3c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 14 Mar 2020 18:52:41 +0200 Subject: gnu: gcc-9: Update to 9.3.0. * gnu/packages/gcc.scm (gcc-9): Update to 9.3.0. --- gnu/packages/gcc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index ead50bb1dc..1f10ae5119 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -523,14 +523,14 @@ It also includes runtime support libraries for these languages."))) (define-public gcc-9 (package (inherit gcc-8) - (version "9.2.0") + (version "9.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-" version "/gcc-" version ".tar.xz")) (sha256 (base32 - "01mj3yk7z49i49168hg2cg7qs4bsccrrnv7pjmbdlf8j2a7z0vpa")) + "1la2yy27ziasyf0jvzk58y1i5b5bq2h176qil550bxhifs39gqbi")) (patches (search-patches "gcc-9-strmov-store-file-names.patch" "gcc-9-asan-fix-limits-include.patch" "gcc-5.0-libvtv-runpath.patch")))))) -- cgit v1.2.3 From 393dc1cc0bc4677bfa7929db9b83cf94849dcc21 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Fri, 13 Mar 2020 18:30:37 +0100 Subject: gnu: dune-*: remove openmpi dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (dune-*)[inputs]: Remove openmpi dependency. [arguments]: remove code to setup openmpi for tests. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 499fdb06f7..0e2e6b0ac4 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4592,13 +4592,10 @@ linear algebra primitives specifically targeting graph analytics.") (modify-phases %standard-phases (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags))) - (add-before 'check 'mpi-setup - ,%openmpi-setup)))) + (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("gmp" ,gmp) ("metis" ,metis) - ("openmpi" ,openmpi) ("openblas" ,openblas) ("python" ,python) ("superlu" ,superlu))) @@ -4636,7 +4633,6 @@ Differences} (FD).") (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) - ("openmpi" ,openmpi) ;; Optional ("openblas" ,openblas) ("gmp" ,gmp) @@ -4676,8 +4672,7 @@ This package contains the basic DUNE geometry classes.") (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "build_tests" make-flags)))))) (inputs - `(("dune-common" ,dune-common) - ("openmpi" ,openmpi))) + `(("dune-common" ,dune-common))) (native-inputs `(("gfortran" ,gfortran) ("pkg-config" ,pkg-config))) @@ -4710,16 +4705,13 @@ This package contains the DUNE UG grid classes.") (modify-phases %standard-phases (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags))) - (add-before 'check 'mpi-setup - ,%openmpi-setup)))) + (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) ("dune-geometry" ,dune-geometry) ("gmp" ,gmp) ("metis" ,metis) ("openblas" ,openblas) - ("openmpi" ,openmpi) ("python" ,python))) (propagated-inputs `(("dune-uggrid" ,dune-uggrid))) @@ -4756,12 +4748,9 @@ This package contains the basic DUNE grid classes.") (modify-phases %standard-phases (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags))) - (add-before 'check 'mpi-setup - ,%openmpi-setup)))) + (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) - ("openmpi" ,openmpi) ;; Optional ("metis" ,metis) ("suitesparse" ,suitesparse) @@ -4809,7 +4798,6 @@ aggregation-based algebraic multigrid.") (inputs `(("dune-common" ,dune-common) ("dune-geometry" ,dune-geometry) - ("openmpi" ,openmpi) ;; Optional ("metis" ,metis) ("superlu" ,superlu) @@ -4857,14 +4845,11 @@ assemble global function spaces on finite-element grids.") (lambda* (#:key inputs make-flags #:allow-other-keys) (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "dune-grid") "/share")) - (apply invoke "make" "build_tests" make-flags))) - (add-before 'check 'mpi-setup - ,%openmpi-setup)))) + (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) ("dune-geometry" ,dune-geometry) ("dune-grid" ,dune-grid) - ("openmpi" ,openmpi) ;; Optional ("metis" ,metis) ("openblas" ,openblas) @@ -4902,14 +4887,11 @@ cubes.") (modify-phases %standard-phases (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags))) - (add-before 'check 'mpi-setup - ,%openmpi-setup)))) + (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) ("dune-geometry" ,dune-geometry) ("dune-grid" ,dune-grid) - ("openmpi" ,openmpi) ;; Optional ("metis" ,metis) ("openblas" ,openblas) @@ -4948,7 +4930,6 @@ provides the full grid interface including adaptive mesh refinement.") (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) - ("openmpi" ,openmpi) ;; Optional ("openblas" ,openblas) ("python" ,python) @@ -4991,9 +4972,7 @@ operating on statically typed trees of objects.") #t)) (add-after 'build 'build-tests (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags))) - (add-before 'check 'mpi-setup - ,%openmpi-setup)))) + (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) ("dune-istl" ,dune-istl) @@ -5001,7 +4980,6 @@ operating on statically typed trees of objects.") ("dune-grid" ,dune-grid) ("dune-geometry" ,dune-geometry) ("dune-typetree" ,dune-typetree) - ("openmpi" ,openmpi) ("openblas" ,openblas) ("metis" ,metis) ("python" ,python) @@ -5042,7 +5020,6 @@ implemented as callable objects, and bases of finite element spaces.") ("dune-grid" ,dune-grid) ("dune-typetree" ,dune-typetree) ("dune-functions" ,dune-functions) - ("openmpi" ,openmpi) ;; Optional ("openblas" ,openblas) ("eigen" ,eigen) -- cgit v1.2.3 From 6ceb771657bdc3516c6c22f43532ff67d75465f6 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Fri, 13 Mar 2020 18:30:38 +0100 Subject: gnu: define dune-*-openmpi packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (dune-common-openmpi, dune-geometry-openmpi, dune-istl-openmpi, dune-typetree-openmpi, dune-uggrid-openmpi, dune-grid-openmpi, dune-alugrid-openmpi, dune-subgrid-openmpi, dune-localfunctions-openmpi, dune-functions-openmpi, dune-pdelab-openmpi): New variables. (add-openmpi-to-dune-package): New function to add openmpi to the inputs of a dune-* package and replace all dune-* packages in its input with the corresponding dune-*-openmpi package. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0e2e6b0ac4..6d9fd54e75 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5037,6 +5037,59 @@ built on top of DUNE, the Distributed and Unified Numerics Environment.") ;; Either GPL version 2 with "runtime exception" or LGPLv3+. (license (list license:lgpl3+ license:gpl2)))) +(define add-openmpi-to-dune-package + (let ((dune-package? + (lambda (p) (string-prefix? "dune-" (package-name p))))) + (package-mapping + (lambda (p) + (if (dune-package? p) + (package (inherit p) + (name (string-append (package-name p) "-openmpi")) + (inputs `(,@(package-inputs p) + ("openmpi" ,openmpi))) + (arguments + (substitute-keyword-arguments (package-arguments p) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'check 'mpi-setup + ,%openmpi-setup))))) + (synopsis (string-append (package-synopsis p) " (with MPI support)"))) + p)) + (negate dune-package?)))) + +(define-public dune-common-openmpi + (add-openmpi-to-dune-package dune-common)) + +(define-public dune-geometry-openmpi + (add-openmpi-to-dune-package dune-geometry)) + +(define-public dune-istl-openmpi + (add-openmpi-to-dune-package dune-istl)) + +(define-public dune-typetree-openmpi + (add-openmpi-to-dune-package dune-typetree)) + +(define-public dune-uggrid-openmpi + (add-openmpi-to-dune-package dune-uggrid)) + +(define-public dune-grid-openmpi + (add-openmpi-to-dune-package dune-grid)) + +(define-public dune-alugrid-openmpi + (add-openmpi-to-dune-package dune-alugrid)) + +(define-public dune-subgrid-openmpi + (add-openmpi-to-dune-package dune-subgrid)) + +(define-public dune-localfunctions-openmpi + (add-openmpi-to-dune-package dune-localfunctions)) + +(define-public dune-functions-openmpi + (add-openmpi-to-dune-package dune-functions)) + +(define-public dune-pdelab-openmpi + (add-openmpi-to-dune-package dune-pdelab)) + (define-public mlucas (package (name "mlucas") -- cgit v1.2.3 From d3be522036d251729f61c39079d9e1d08667067f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:13:57 +0100 Subject: gnu: openlibm: Use HTTPS home page. * gnu/packages/maths.scm (openlibm)[home-page]: Use HTTPS. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6d9fd54e75..847cc4a14e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3357,7 +3357,7 @@ access to BLIS implementations via traditional BLAS routine calls.") ;; no configure script (modify-phases %standard-phases (delete 'configure)) #:tests? #f)) ;the tests are part of the default target - (home-page "http://openlibm.org/") + (home-page "https://openlibm.org/") (synopsis "Portable C mathematical library (libm)") (description "OpenLibm is an effort to have a high quality, portable, standalone C -- cgit v1.2.3 From edd3a25606db598209599151482df4d96593ceae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Mar 2020 21:22:15 +0100 Subject: gnu: hyperrogue: Update to 11.3a. * gnu/packages/games.scm (hyperrogue): Update to 11.3a. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2791b18dca..df1b31d544 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4105,7 +4105,7 @@ throwing people around in pseudo-randomly generated buildings.") (define-public hyperrogue (package (name "hyperrogue") - (version "11.2q") + (version "11.3a") ;; When updating this package, be sure to update the "hyperrogue-data" ;; origin in native-inputs. (source (origin @@ -4116,7 +4116,7 @@ throwing people around in pseudo-randomly generated buildings.") "-src.tgz")) (sha256 (base32 - "1w4khi2limxhgiq7xnz0rc9nzbk86bhbyzrcd5hdghnhsviaiggq")))) + "1yxabbswq02fc5frigvs43f83m5vlxybc7n5mynkwzj2c70lfp2k")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -4194,7 +4194,7 @@ throwing people around in pseudo-randomly generated buildings.") "-win.zip")) (sha256 (base32 - "1k81zrbq5gmrccjac1i5c6v8j2iilfg2vwrnm8snjmmcnh5z1fgj")))) + "11yhbia45f1w9z0j67h9nynwjqmvakr9l6rnrmdrdkzin6lvzzj4")))) ("unzip" ,unzip))) (inputs `(("font-dejavu" ,font-dejavu) -- cgit v1.2.3 From 189c0b33ba47f42d96d68822c5a277cfc47d1e76 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Mar 2020 21:22:32 +0100 Subject: gnu: talkfilters: Don't use NAME in source URI. * gnu/packages/games.scm (talkfilters)[source]: Hard-code NAME. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index df1b31d544..44f59d7260 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1688,8 +1688,8 @@ level's exit. The game is presented in a 2D side view.") (source (origin (method url-fetch) - (uri (string-append "http://www.hyperrealm.com/" name "/" - name "-" version ".tar.gz")) + (uri (string-append "http://www.hyperrealm.com/talkfilters/" + "talkfilters-" version ".tar.gz")) (sha256 (base32 "19nc5vq4bnkjvhk8srqddzhcs93jyvpm9r6lzjzwc1mgf08yg0a6")))) (build-system gnu-build-system) -- cgit v1.2.3 From 20035fa7d7eb06ee06dbc03ecc215a59ace51ad1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:31:20 +0100 Subject: gnu: cube: Use HTTPS home page. * gnu/packages/profiling.scm (cube)[home-page]: Use HTTPS. --- gnu/packages/profiling.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/profiling.scm b/gnu/packages/profiling.scm index 5cc9113ffe..4d3c3faca0 100644 --- a/gnu/packages/profiling.scm +++ b/gnu/packages/profiling.scm @@ -311,7 +311,7 @@ with calls to the POMP2 measurement interface.") (("^source .*frontend.*$") "") (((assoc-ref outputs "out")) lib)) #t)))))) - (home-page "http://www.scalasca.org/software/cube-4.x/download.html") + (home-page "https://www.scalasca.org/software/cube-4.x/download.html") (synopsis "Performance report explorer for parallel programs") (description "CUBE (CUBE Uniform Behavioral Encoding) is a tool to display a variety -- cgit v1.2.3 From a489466b95c5ad39db6a045c65056447617a910d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Mar 2020 16:14:48 +0100 Subject: gnu: fio: Update to 3.19. * gnu/packages/benchmark.scm (fio): Update to 3.19. --- gnu/packages/benchmark.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 9ae30eefc8..4e6c416518 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Marius Bakke ;;; Copyright © 2017 Dave Love -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Eric Bavier ;;; Copyright © 2019 Gábor Boskovits @@ -46,14 +46,14 @@ (define-public fio (package (name "fio") - (version "3.18") + (version "3.19") (source (origin (method url-fetch) (uri (string-append "https://brick.kernel.dk/snaps/" "fio-" version ".tar.bz2")) (sha256 (base32 - "12wzi40hn0ylkdiqwjjljdjmiq78nhwsv3qqa0fad7h3x08w6w6b")))) + "01nc7igmcc6hda32d1y8vidd9x9pdlxvf3i1pwrzvmi6xvmbfvab")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From 0b1d71b2187bdb12e5b7f2770edb5a7b81d97625 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:30:21 +0100 Subject: gnu: ant: Use HTTPS home page. * gnu/packages/java.scm (ant)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index da0f3bfa5b..7cd0ab9e2a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -330,7 +330,7 @@ JNI.") ("jamvm" ,jamvm-1-bootstrap) ("unzip" ,unzip) ("zip" ,zip))) - (home-page "http://ant.apache.org") + (home-page "https://ant.apache.org") (synopsis "Build tool for Java") (description "Ant is a platform-independent build tool for Java. It is similar to -- cgit v1.2.3 From 1a04595498ff2b26048005bca6dcff783149e9ff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Mar 2020 19:06:08 +0100 Subject: gnu: giblib: Add mirror URL. * gnu/packages/image.scm (giblib)[source]: Add another URL. --- gnu/packages/image.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 101fe0dc2a..aaa2a6e2d0 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -903,6 +903,10 @@ more modular, simple, and flexible.") (string-append "http://linuxbrit.co.uk/downloads/giblib-" version ".tar.gz") + (string-append + "https://src.fedoraproject.org/repo/pkgs/giblib/giblib-" + version ".tar.gz/c810ef5389baf24882a1caca2954385e/giblib-" + version ".tar.gz") (string-append "https://sourceforge.net/projects/slackbuildsdirectlinks/" "files/giblib/giblib-" version ".tar.gz"))) -- cgit v1.2.3 From 30e8cf5f22ca148f345abcc6bdcf4c550192e891 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:31:00 +0100 Subject: gnu: giblib: Use archived home page. * gnu/packages/image.scm (giblib)[home-page]: Use Web Archive snapshot. --- gnu/packages/image.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index aaa2a6e2d0..fffc1e0cec 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -917,7 +917,11 @@ more modular, simple, and flexible.") (inputs `(("libx11" ,libx11) ("imlib2" ,imlib2))) - (home-page "http://linuxbrit.co.uk/software/") ; no real home-page + (home-page + ;; This vanished page is universally accepted as giblib's home despite not + ;; mentioning the package once. + (string-append "https://web.archive.org/web/20140907071208" + "https://linuxbrit.co.uk/software/")) (synopsis "Wrapper library for imlib2") (description "Giblib is a simple library which wraps imlib2's context API, avoiding -- cgit v1.2.3 From 5acaec829fc10a2075dba39f0af8e49e93a4edd4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:06:51 +0100 Subject: gnu: pangomm: Update home page. * gnu/packages/gtk.scm (pangomm)[home-page]: Follow (HTTPS) redirection. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 670a943a1b..d9bd15824b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1113,7 +1113,7 @@ library.") ("cairomm" ,cairomm) ("glibmm" ,glibmm) ("pango" ,pango))) - (home-page "http://www.pango.org/") + (home-page "https://pango.gnome.org//") (synopsis "C++ interface to the Pango text rendering library") (description "Pangomm provides a C++ programming interface to the Pango text rendering -- cgit v1.2.3 From 3344bc495d13315f652eabef4549cdf2e08ef1c2 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sat, 14 Mar 2020 22:51:49 +0100 Subject: gnu: java-qdox-1.12: Update source and home-page URI. * gnu/packages/java.scm (java-qdox-1.12)[source]: Update URI. [home-page]: Update URI. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7cd0ab9e2a..42ea3799a1 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3301,7 +3301,7 @@ decompression and random access decompression have been fully implemented.") (version "1.12.1") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/" + (uri (string-append "https://repo1.maven.org/maven2/" "com/thoughtworks/qdox/qdox/" version "/qdox-" version "-sources.jar")) (sha256 @@ -3325,7 +3325,7 @@ decompression and random access decompression have been fully implemented.") (lambda _ (delete-file-recursively "src/com/thoughtworks/qdox/junit") #t))))) - (home-page "http://qdox.codehaus.org/") + (home-page "https://github.com/codehaus/qdox") (synopsis "Parse definitions from Java source files") (description "QDox is a high speed, small footprint parser for extracting -- cgit v1.2.3 From 7779ad5038716e504a53eae7b01a2a7ef77e3a09 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sat, 14 Mar 2020 23:01:29 +0100 Subject: gnu: java-osgi-cmpn: Update source URI. * gnu/packages/java.scm (java-osgi-cmpn)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 42ea3799a1..ab9427aa23 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7361,7 +7361,7 @@ used to generate this API.") (version "6.0.0") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/" + (uri (string-append "https://repo1.maven.org/maven2/" "org/osgi/osgi.cmpn/" version "/osgi.cmpn-" version "-sources.jar")) (sha256 -- cgit v1.2.3 From 8031a55a23216b9056263aeafeb1839d7e6b9327 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Mar 2020 23:46:37 +0100 Subject: gnu: sudo: Update to 1.8.31p1. * gnu/packages/admin.scm (sudo): Update to 1.8.31p1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5ec34864e2..0862000dd2 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1199,7 +1199,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.8.31") + (version "1.8.31p1") (source (origin (method url-fetch) (uri @@ -1209,7 +1209,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "0ks5mm9hda5idivncyfpiz4lrd8fv0dpmsl711788k7f7ixdka3y")) + "1n0mdmgcs92af34xxsnsh1arrngymhdmwd9srjgjbk65q7xzsg67")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 416d098a0e496935d851db472a6d891eb6bb2bad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 14 Mar 2020 23:43:52 +0100 Subject: gnu: librep: Don't use NAME in source URI. * gnu/packages/sawfish.scm (librep)[source]: Hard-code NAME. --- gnu/packages/sawfish.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sawfish.scm b/gnu/packages/sawfish.scm index 98b0cc7044..6df9417c64 100644 --- a/gnu/packages/sawfish.scm +++ b/gnu/packages/sawfish.scm @@ -43,8 +43,8 @@ (version "0.92.7") (source (origin (method url-fetch) - (uri (string-append "http://download.tuxfamily.org/" name "/" - name "_" version ".tar.xz")) + (uri (string-append "http://download.tuxfamily.org/librep/" + "librep_" version ".tar.xz")) (sha256 (base32 "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8")))) -- cgit v1.2.3 From 131f0f853e5ea6c4effe18fbd1a4e68a6c78624d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:24:13 +0100 Subject: gnu: librep: Update home page. * gnu/packages/sawfish.scm (librep)[home-page]: Follow (HTTPS) redirection. --- gnu/packages/sawfish.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/sawfish.scm b/gnu/packages/sawfish.scm index 6df9417c64..26d8eba3b6 100644 --- a/gnu/packages/sawfish.scm +++ b/gnu/packages/sawfish.scm @@ -65,7 +65,7 @@ (list (search-path-specification (variable "REP_DL_LOAD_PATH") (files '("lib/rep"))))) - (home-page "http://sawfish.wikia.com/wiki/Librep") + (home-page "https://sawfish.fandom.com/wiki/Librep") (synopsis "Lisp system for sawfish") (description "Librep is a dialect of Lisp, designed to be used both as an extension -- cgit v1.2.3 From 77386648da9c6bd0601d389ddb94ddba088d8b87 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:06:36 +0100 Subject: gnu: gauche: Use HTTPS home page. * gnu/packages/scheme.scm (gauche)[home-page]: Use HTTPS. --- gnu/packages/scheme.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index d8a1a04ba4..e36564f030 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -1008,7 +1008,7 @@ The core is 12 builtin special forms and 33 builtin functions.") (package (name "gauche") (version "0.9.9") - (home-page "http://practical-scheme.net/gauche/index.html") + (home-page "https://practical-scheme.net/gauche/index.html") (source (origin (method url-fetch) -- cgit v1.2.3 From 183f258ea809c7e93a02b87568dcaf62625e8c93 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 14 Mar 2020 14:14:58 -0400 Subject: Revert "gnu: VIGRA: Try to fix a build failure on the build farm." This doesn't have any effect on our build farm, because Cuirass does not honor the 'timeout' and 'max-silent-time' properties: https://lists.gnu.org/archive/html/guix-devel/2020-03/msg00209.html This reverts commit 9e89b4196605457cff6ca14b21f86c7b25a22671. * gnu/packages/image.scm (vigra)[properties]: Remove field. --- gnu/packages/image.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index fffc1e0cec..38a8b2ed42 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1020,9 +1020,6 @@ graphics image formats like PNG, BMP, JPEG, TIFF and others.") (sha256 (base32 "1bqs8vx5i1bzamvv563i24gx2xxdidqyxh9iaj46mbznhc84wmm5")))) (build-system cmake-build-system) - ;; Otherwise it fails on in the check phase after 3600 - ;; seconds of silence. - (properties '((max-silent-time . 7200))) (inputs `(("boost" ,boost) ("fftw" ,fftw) -- cgit v1.2.3 From 90beb0ed457a1b2a1724ff03371b8a3ddcf59929 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 14 Mar 2020 14:17:21 -0400 Subject: gnu: LibreOffice: Update to 6.4.1.2. * gnu/packages/libreoffice.scm (libreoffice): Update to 6.4.1.2. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index e7878ea014..2ef813907d 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -987,7 +987,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (define-public libreoffice (package (name "libreoffice") - (version "6.4.0.3") + (version "6.4.1.2") (source (origin (method url-fetch) @@ -997,7 +997,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "09ra8a3ylb08xhy8wy233fs0f87klkpsbi9n3zss0c688afxjcf5")))) + "02iz94flpxgkvlipk3psddzw2gdq2j4nv7z01kphs5107sfs0r0d")))) (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) -- cgit v1.2.3 From b5ffcbe1af01544cac31f056a700f5382f3e6b14 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 20:59:48 +0200 Subject: gnu: Add bidiv. * gnu/packages/fribidi.scm (bidiv): New variable. * gnu/packages/patches/bidiv-update-fribidi.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/fribidi.scm | 54 ++++++++++++++++++++++++- gnu/packages/patches/bidiv-update-fribidi.patch | 50 +++++++++++++++++++++++ 3 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/bidiv-update-fribidi.patch diff --git a/gnu/local.mk b/gnu/local.mk index 610c81ec97..73fc219383 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -759,6 +759,7 @@ dist_patch_DATA = \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/benchmark-unbundle-googletest.patch \ %D%/packages/patches/biber-fix-encoding-write.patch \ + %D%/packages/patches/bidiv-update-fribidi.patch \ %D%/packages/patches/binutils-boot-2.20.1a.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm index 61aa6fd726..345529b73a 100644 --- a/gnu/packages/fribidi.scm +++ b/gnu/packages/fribidi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Marek Benc -;;; Copyright © 2016, 2019 Efraim Flashner +;;; Copyright © 2016, 2019, 2020 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -54,3 +54,55 @@ or right-to-left ordering as necessary.") (source (origin (inherit (package-source fribidi)) (patches (search-patches "fribidi-CVE-2019-18397.patch")))))) + +(define-public bidiv + (package + (name "bidiv") + (version "1.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://debian/pool/main/b/bidiv/bidiv_" + version ".orig.tar.gz")) + (sha256 + (base32 + "05p5m2ihxbmc1qsgs8rjlww08fy9859fhl7xf196p8g5qygqd7cv")) + (patches (search-patches "bidiv-update-fribidi.patch")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure + (add-after 'unpack 'misc-fixes + (lambda _ + (substitute* "bidiv.c" + (("FriBidiCharType") "FriBidiParType") + (("&c") "(char *)&c")) + #t)) + ;; We don't want to use the handwritten makefile + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (let ((fribidi (assoc-ref inputs "fribidi"))) + (invoke "gcc" "-o" "bidiv" "bidiv.c" + ;; pkg-config --cflags fribidi + (string-append "-I" fribidi "/include/fribidi") + ;; pkg-config --libs fribidi + (string-append "-L" fribidi "/lib") "-lfribidi")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man1"))) + (install-file "bidiv" bin) + (install-file "bidiv.1" man)) + #t))) + #:tests? #f)) ; no tests + (inputs + `(("fribidi" ,fribidi))) + (home-page "https://tracker.debian.org/pkg/bidiv") + (synopsis "BiDi viewer - command-line tool displaying logical Hebrew/Arabic") + (description "bidiv is a simple utility for converting logical-Hebrew input +to visual-Hebrew output. This is useful for reading Hebrew mail messages, +viewing Hebrew texts, etc. It was written for Hebrew but Arabic (or other BiDi +languages) should work equally well.") + (license gpl2+))) diff --git a/gnu/packages/patches/bidiv-update-fribidi.patch b/gnu/packages/patches/bidiv-update-fribidi.patch new file mode 100644 index 0000000000..d000cfeda4 --- /dev/null +++ b/gnu/packages/patches/bidiv-update-fribidi.patch @@ -0,0 +1,50 @@ +https://sources.debian.org/data/main/b/bidiv/1.5-6/debian/patches/fribidi_019 + +Description: Fix building with fribidi 1.9 +Author: أحمد المحمودي +Bug-Debian: http://bugs.debian.org/568130 + +--- a/bidiv.c ++++ b/bidiv.c +@@ -141,8 +141,9 @@ bidiv(FILE *fp) + */ + if(c1<0x80||c1>0xbf){ + ungetc(c1, fp); +- unicode_in[len]= +- fribidi_iso8859_8_to_unicode_c(c); ++ fribidi_charset_to_unicode( ++ FRIBIDI_CHAR_SET_ISO8859_8, ++ &c, 1, &unicode_in[len]); + } else + unicode_in[len]=((c & 037) << 6) + (c1 & 077); + newline=0; +@@ -153,8 +154,9 @@ bidiv(FILE *fp) + In the future we will have a language + option, which will control this (as well + as the output encoding). */ +- unicode_in[len]= +- fribidi_iso8859_8_to_unicode_c(c); ++ fribidi_charset_to_unicode( ++ FRIBIDI_CHAR_SET_ISO8859_8, ++ &c, 1, &unicode_in[len]); + #else + in[len]=c; + #endif +@@ -206,11 +208,11 @@ bidiv(FILE *fp) + rtl_line=0; + + if(out_utf8) +- fribidi_unicode_to_utf8(unicode_out, len, +- out); ++ fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, ++ unicode_out, len, out); + else +- fribidi_unicode_to_iso8859_8(unicode_out, len, +- out); ++ fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_ISO8859_8, ++ unicode_out, len, out); + /* if rtl_line (i.e., base_dir is RL), and we didn't fill the + entire width, we need to pad with spaces. Maybe in the + future this should be an option. +-- + -- cgit v1.2.3 From 3eca7ff9681b68d19016737dacc0d7a0572af3e6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 21:37:21 +0200 Subject: gnu: Add python-blurhash. * gnu/packages/python-crypto.scm (python-blurhash): New variable. --- gnu/packages/python-crypto.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 9eee75cbfb..23c06267a7 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -788,6 +788,40 @@ key), SSH public key, ASC-encoded OpenPGP key, APK Android application, LDIFF file, and more.") (license license:gpl3))) +(define-public python-blurhash + (package + (name "python-blurhash") + (version "1.1.4") + (source + (origin + ;; Tests not included in pypi release and releases not tagged in git repo. + (method git-fetch) + (uri (git-reference + (url "https://github.com/halcy/blurhash-python") + (commit "22e081ef1c24da1bb5c5eaa2c1d6649724deaef8"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qq6mhydlp7q3na4kmaq3871h43wh3pyfyxr4b79bia73wjdylxf")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (delete-file "setup.cfg") + (invoke "pytest")))))) + (native-inputs + `(("python-numpy" ,python-numpy) + ("python-pillow" ,python-pillow) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/halcy/blurhash-python") + (synopsis + "Pure-Python implementation of the blurhash algorithm") + (description + "Pure-Python implementation of the blurhash algorithm.") + (license license:expat))) + (define-public python-ecpy (package (name "python-ecpy") -- cgit v1.2.3 From 6e003bd4ccd7470247b1fdbee3a6c6a0ad8054ac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Mar 2020 21:13:55 +0200 Subject: gnu: Add python-pytest-vcr. * gnu/packages/python-check.scm (python-pytest-vcr): New variable. --- gnu/packages/python-check.scm | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index a69619b96a..70a5b1e452 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2019 Tobias Geerinckx-Rice -;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019, 2020 Efraim Flashner ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2020 Julien Lepiller @@ -30,6 +30,7 @@ #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix git-download) #:use-module (guix download) #:use-module (guix build-system python)) @@ -109,6 +110,37 @@ detect the absence of a cassette file and once again record all HTTP interactions, which will update them to correspond to the new API.") (license license:expat))) +(define-public python-pytest-vcr + (package + (name "python-pytest-vcr") + (version "1.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ktosiek/pytest-vcr") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1i6fin91mklvbi8jzfiswvwf1m91f43smpj36a17xrzk4gisfs6i")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "tests/")))))) + (propagated-inputs + `(("python-pytest" ,python-pytest) + ("python-vcrpy" ,python-vcrpy))) + (home-page "https://github.com/ktosiek/pytest-vcr") + (synopsis "Plugin for managing VCR.py cassettes") + (description + "Plugin for managing VCR.py cassettes.") + (license license:expat))) + (define-public python-pytest-checkdocs (package (name "python-pytest-checkdocs") -- cgit v1.2.3 From 995b391013aa61c6e7d8d6b89d822542e155286b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 15 Mar 2020 12:03:19 +0100 Subject: services/web: Remove empty events directive from default-nginx-config. * gnu/services/web.scm (default-nginx-config): Remove empty events directive. --- gnu/services/web.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index d093f60c8d..e2178faeb8 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -657,8 +657,7 @@ of index files." (map emit-nginx-upstream-config upstream-blocks) (map emit-nginx-server-config server-blocks) extra-content - "\n}\n" - "events {}\n")))) + "\n}\n")))) (define %nginx-accounts (list (user-group (name "nginx") (system? #t)) -- cgit v1.2.3 From b420e6deb96e0760f12e3d941b76e690c4235e47 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 15 Mar 2020 12:03:57 +0100 Subject: services/web: nginx-configuration: Add support for global directives. * gnu/services/web.scm ()[global-directives]: Add field. (emit-global-directive): New procedure. (default-nginx-config): Use it. * doc/guix.texi (Web Services): Document it. --- doc/guix.texi | 11 +++++++++++ gnu/services/web.scm | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 4658c6f5eb..28808b0cd5 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20272,6 +20272,17 @@ names of loadable modules, as in this example: /etc/nginx/modules/ngx_http_accept_language_module.so"))) @end lisp +@item @code{global-directives} (default: @code{'()}) +Association list of global directives for the top level of the nginx +configuration. Values may themselves be association lists. + +@lisp +(global-directives + `((worker_processes . 16) + (pcre_jit . on) + (events . ((worker_connections . 1024))))) +@end lisp + @item @code{extra-content} (default: @code{""}) Extra content for the @code{http} block. Should be string or a string valued G-expression. diff --git a/gnu/services/web.scm b/gnu/services/web.scm index e2178faeb8..3edc751ea2 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -529,6 +529,7 @@ (server-names-hash-bucket-max-size nginx-configuration-server-names-hash-bucket-max-size (default #f)) (modules nginx-configuration-modules (default '())) + (global-directives nginx-configuration-global-directives (default '())) (extra-content nginx-configuration-extra-content (default "")) (file nginx-configuration-file ;#f | string | file-like @@ -552,6 +553,13 @@ of index files." (define (emit-load-module module) (list "load_module " module ";\n")) +(define emit-global-directive + (match-lambda + ((key . (? list? alist)) + (format #f "~a { ~{~a~}}~%" key (map emit-global-directive alist))) + ((key . value) + (format #f "~a ~a;~%" key value)))) + (define emit-nginx-location-config (match-lambda (($ uri body) @@ -626,12 +634,14 @@ of index files." server-names-hash-bucket-size server-names-hash-bucket-max-size modules + global-directives extra-content) (apply mixed-text-file "nginx.conf" (flatten "user nginx nginx;\n" "pid " run-directory "/pid;\n" "error_log " log-directory "/error.log info;\n" + (map emit-global-directive global-directives) (map emit-load-module modules) "http {\n" " client_body_temp_path " run-directory "/client_body_temp;\n" -- cgit v1.2.3 From a431a63537c8103b2a58c9a55d90184fb5c90361 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 15 Mar 2020 14:17:26 +0100 Subject: gnu: guile-gi: Embed absolute file name of extension library. * gnu/packages/guile-xyz.scm (guile-gi)[arguments]: Add phase patch-references-to-extension. --- gnu/packages/guile-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 9f8173657e..8ada9c50e6 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2504,8 +2504,35 @@ list of components. This module takes care of that for you.") (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-gnu-filesystem-hierarchy") + #:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 popen) + (ice-9 rdelim)) #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-references-to-extension + (lambda* (#:key outputs #:allow-other-keys) + (let ((effective (read-line + (open-pipe* OPEN_READ + "guile" "-c" + "(display (effective-version))")))) + (substitute* '("module/gi.scm" + "module/gi/oop.scm" + "module/gi/documentation.scm" + "module/gi/types.scm" + "module/gi/repository.scm") + (("\\(load-extension \"libguile-gi\" \"(.*)\"\\)" m arg) + (format #f "~s" + `(load-extension + (format #f "~alibguile-gi" + (if (getenv "GUILE_GI_UNINSTALLED") + "" + ,(format #f "~a/lib/guile/~a/" + (assoc-ref outputs "out") + effective))) + ,arg))))) + (setenv "GUILE_GI_UNINSTALLED" "1") + #t)) (add-before 'check 'start-xorg-server (lambda* (#:key inputs #:allow-other-keys) ;; The init_check test requires a running X server. -- cgit v1.2.3 From 0b6de85a4abc30fe0fedc3acccf67ac8735ae197 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 15 Mar 2020 15:07:14 +0100 Subject: gnu: zabbix-agentd: Update to 4.4.6. * gnu/packages/monitoring.scm (zabbix-agentd): Update to 4.4.6. --- gnu/packages/monitoring.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 1eb095ce50..bcb8df24d0 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ludovic Courtès ;;; Copyright © 2018 Sou Bunnbu -;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018, 2019 Oleg Pykhalov @@ -152,7 +152,7 @@ etc. via a Web interface. Features include: (define-public zabbix-agentd (package (name "zabbix-agentd") - (version "4.4.1") + (version "4.4.6") (source (origin (method url-fetch) @@ -161,7 +161,7 @@ etc. via a Web interface. Features include: "/zabbix-" version ".tar.gz")) (sha256 (base32 - "0jjn2przn9s25slrcxmq8iqdgqkgxnqs45zy0n1ma6nlgmclxxqb")))) + "03mf4sklnw1x0ixp41vnibkz0794yi9jhws7ixld8jj2czk2ifr2")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 76e0b5ba2611c626f0591c0f0cef1609a4d32210 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 13:27:53 +0100 Subject: gnu: python-pyside: Update to 5.12.6. * gnu/packages/qt.scm (python-shiboken-2): Update to 5.12.6. [source]: Download tarball release instead of git repository. [arguments]: Add phase to make files writable and update timestamps. (python-pyside-2): Inherit version and source from PYTHON-SHIBOKEN-2. [native-inputs]: Remove LIBCXX-6. Rename "python-wrapper" input to "python". Change from CMAKE to CMAKE-MINIMAL. [arguments]: Remove libcxx substitution. Add "-DPYTHON_EXECUTABLE" in #:configure-flags. (python-pyside-2-tools)[native-inputs]: Add PYTHON-WRAPPER. [arguments]: Set "-DPYTHON_EXECUTABLE" in #:configure-flags. Add phase 'go-to-source-dir'. --- gnu/packages/qt.scm | 301 +++++++++++++++++++++++++--------------------------- 1 file changed, 145 insertions(+), 156 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6642ed6e77..6ca052c31a 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2515,168 +2515,157 @@ color-related widgets.") (license license:lgpl3+)))) (define-public python-shiboken-2 - (let ((revision "1") - ;; Pinned to branches with support for qt 5.11.3 - (commit "4018787a3cc01d632fdca7891ac8aa9487110c26")) - (package - (name "python-shiboken-2") - (version (git-version "v5.11.3" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - ;; The latest versions of Shiboken live in the pyside repo. - ;; There is another standalone repo only for Shiboken - ;; but it is outdated - (url "https://code.qt.io/pyside/pyside-setup") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0g8jacm2iqd7lw2m7f1dp1nnrsk38bl3m8pihm8zz9gxs8d31sf5")))) - (build-system cmake-build-system) - (inputs - `(("clang-toolchain" ,clang-toolchain-6) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("python-wrapper" ,python-wrapper) - ("qtbase" ,qtbase) - ("qtxmlpatterns" ,qtxmlpatterns))) - (arguments - `(#:tests? #f - ;; FIXME: Building tests fails - #:configure-flags '("-DBUILD_TESTS=off") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-shiboken-dir-only - (lambda _ (chdir "sources/shiboken2") #t)) - (add-before 'configure 'set-build-env - (lambda* (#:key inputs #:allow-other-keys) - (let ((llvm (assoc-ref inputs "clang-toolchain"))) - (setenv "CLANG_INSTALL_DIR" llvm) - #t)))))) - (home-page "https://wiki.qt.io/Qt_for_Python") - (synopsis - "Shiboken generates bindings for C++ libraries using CPython source code") - (description - "Shiboken generates bindings for C++ libraries using CPython source code") - (license - (list - ;; The main code is GPL3 or LGPL3. - ;; Examples are BSD-3. - license:gpl3 - license:lgpl3 - license:bsd-3))))) + (package + (name "python-shiboken-2") + (version "5.12.6") + (source (origin + (method url-fetch) + (uri (string-append "https://download.qt.io/official_releases" + "/QtForPython/pyside2/PySide2-" version + "-src/pyside-setup-everywhere-src-" + version ".tar.xz")) + (sha256 + (base32 + "1n45l6xxyxs6cfp2l4rp8qs1c2fyfwyrdxa4qcpwfsqsi51rydsk")))) + (build-system cmake-build-system) + (inputs + `(("clang-toolchain" ,clang-toolchain-6) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("python-wrapper" ,python-wrapper) + ("qtbase" ,qtbase) + ("qtxmlpatterns" ,qtxmlpatterns))) + (arguments + `(#:tests? #f + ;; FIXME: Building tests fails + #:configure-flags '("-DBUILD_TESTS=off") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-shiboken-dir-only + (lambda _ (chdir "sources/shiboken2") #t)) + (add-before 'configure 'make-files-writable-and-update-timestamps + (lambda _ + ;; The build scripts need to modify some files in + ;; the read-only source directory, and also attempts + ;; to create Zip files which fails because the Zip + ;; format does not support timestamps before 1980. + (let ((circa-1980 (* 10 366 24 60 60))) + (for-each (lambda (file) + (make-file-writable file) + (utime file circa-1980 circa-1980)) + (find-files "."))) + #t)) + (add-before 'configure 'set-build-env + (lambda* (#:key inputs #:allow-other-keys) + (let ((llvm (assoc-ref inputs "clang-toolchain"))) + (setenv "CLANG_INSTALL_DIR" llvm) + #t)))))) + (home-page "https://wiki.qt.io/Qt_for_Python") + (synopsis + "Shiboken generates bindings for C++ libraries using CPython source code") + (description + "Shiboken generates bindings for C++ libraries using CPython source code") + (license + (list + ;; The main code is GPL3 or LGPL3. + ;; Examples are BSD-3. + license:gpl3 + license:lgpl3 + license:bsd-3)))) (define-public python-pyside-2 - (let ((revision "1") - ;; Pinned to branches with support for qt 5.11.3 - (commit "4018787a3cc01d632fdca7891ac8aa9487110c26")) - (package - (name "python-pyside-2") - (version (git-version "v5.11.3" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://code.qt.io/pyside/pyside-setup") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0g8jacm2iqd7lw2m7f1dp1nnrsk38bl3m8pihm8zz9gxs8d31sf5")))) - (build-system cmake-build-system) - (inputs - `(("libcxx" ,libcxx-6) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("clang-toolchain" ,clang-toolchain-6) - ("qtbase" ,qtbase) - ("qtdatavis3d" ,qtdatavis3d) - ("qtlocation" ,qtlocation) - ("qtmultimedia" ,qtmultimedia) - ("qtquickcontrols" ,qtquickcontrols) - ("qtscript" ,qtscript) - ("qtscxml" ,qtscxml) - ("qtsensors" ,qtsensors) - ("qtspeech" ,qtspeech) - ("qtsvg" ,qtsvg) - ("qtwebchannel" ,qtwebchannel) - ("qtwebsockets" ,qtwebsockets) - ("qtx11extras" ,qtx11extras) - ("qtxmlpatterns" ,qtxmlpatterns))) - (native-inputs - `(("cmake" ,cmake) - ("python-shiboken-2" ,python-shiboken-2) - ("python-wrapper" ,python-wrapper) - ("qttools" ,qttools) - ("which" ,which))) - (arguments - `(#:tests? #f - ;; FIXME: Building tests fail. - #:configure-flags '("-DBUILD_TESTS=FALSE") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'go-to-source-dir - (lambda _ (chdir "sources/pyside2") #t)) - (add-before 'configure 'set-clang-dir - (lambda* (#:key inputs #:allow-other-keys) - (let ((clang (assoc-ref inputs "clang-toolchain")) - (libcxx (assoc-ref inputs "libcxx"))) - (setenv "CLANG_INSTALL_DIR" clang) - (substitute* "cmake/Macros/PySideModules.cmake" - (("--include-paths=") - (string-append "--include-paths=" libcxx "/include/c++/v1:"))) - #t)))))) - (home-page "https://wiki.qt.io/Qt_for_Python") - (synopsis - "The Qt for Python product enables the use of Qt5 APIs in Python applications") - (description - "The Qt for Python product enables the use of Qt5 APIs in Python + (package + (name "python-pyside-2") + (version (package-version python-shiboken-2)) + (source (package-source python-shiboken-2)) + (build-system cmake-build-system) + (inputs + `(("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("clang-toolchain" ,clang-toolchain-6) + ("qtbase" ,qtbase) + ("qtdatavis3d" ,qtdatavis3d) + ("qtlocation" ,qtlocation) + ("qtmultimedia" ,qtmultimedia) + ("qtquickcontrols" ,qtquickcontrols) + ("qtscript" ,qtscript) + ("qtscxml" ,qtscxml) + ("qtsensors" ,qtsensors) + ("qtspeech" ,qtspeech) + ("qtsvg" ,qtsvg) + ("qtwebchannel" ,qtwebchannel) + ("qtwebsockets" ,qtwebsockets) + ("qtx11extras" ,qtx11extras) + ("qtxmlpatterns" ,qtxmlpatterns))) + (native-inputs + `(("cmake" ,cmake-minimal) + ("python-shiboken-2" ,python-shiboken-2) + ("python" ,python-wrapper) + ("qttools" ,qttools) + ("which" ,which))) + (arguments + `(#:tests? #f + ;; FIXME: Building tests fail. + #:configure-flags + (list "-DBUILD_TESTS=FALSE" + (string-append "-DPYTHON_EXECUTABLE=" + (assoc-ref %build-inputs "python") + "/bin/python")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'go-to-source-dir + (lambda _ (chdir "sources/pyside2") #t)) + (add-before 'configure 'set-clang-dir + (lambda* (#:key inputs #:allow-other-keys) + (let ((clang (assoc-ref inputs "clang-toolchain"))) + (setenv "CLANG_INSTALL_DIR" clang) + #t)))))) + (home-page "https://wiki.qt.io/Qt_for_Python") + (synopsis + "The Qt for Python product enables the use of Qt5 APIs in Python applications") + (description + "The Qt for Python product enables the use of Qt5 APIs in Python applications. It lets Python developers utilize the full potential of Qt, using the PySide2 module. The PySide2 module provides access to the individual Qt modules such as QtCore, QtGui,and so on. Qt for Python also comes with the Shiboken2 CPython binding code generator, which can be used to generate Python bindings for your C or C++ code.") - (license (list - license:lgpl3 - ;;They state that: - ;; this file may be used under the terms of the GNU General - ;; Public License version 2.0 or (at your option) the GNU - ;; General Public license version 3 or any later version - ;; approved by the KDE Free Qt Foundation. - ;; Thus, it is currently v2 or v3, but no "+". - license:gpl3 - license:gpl2))))) + (license (list + license:lgpl3 + ;;They state that: + ;; this file may be used under the terms of the GNU General + ;; Public License version 2.0 or (at your option) the GNU + ;; General Public license version 3 or any later version + ;; approved by the KDE Free Qt Foundation. + ;; Thus, it is currently v2 or v3, but no "+". + license:gpl3 + license:gpl2)))) (define-public python-pyside-2-tools - (let ((revision "1") - ;; Pinned to branches with support for qt 5.11.3 - (commit "f1b775537e7fbd718516749583b2abf1cb6adbce")) - (package - (name "python-pyside-2-tools") - (version (git-version "v5.11.2" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://code.qt.io/pyside/pyside-tools") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1w2g5afvww9r89wmdm9jx8sz67x4bzy9difkh72n4c73ya1n91ry")))) - (build-system cmake-build-system) - (inputs - `(("python-pyside-2" ,python-pyside-2) - ("python-shiboken-2" ,python-shiboken-2) - ("qtbase" ,qtbase))) - (arguments - `(#:tests? #f - #:configure-flags '("-DBUILD_TESTS=off"))) - (home-page "https://wiki.qt.io/Qt_for_Python") - (synopsis - "Contains command line tools for PySide2") - (description - "Contains lupdate, rcc and uic tools for PySide2") - (license license:gpl2)))) + (package + (name "python-pyside-2-tools") + (version (package-version python-shiboken-2)) + (source (package-source python-shiboken-2)) + (build-system cmake-build-system) + (inputs + `(("python-pyside-2" ,python-pyside-2) + ("python-shiboken-2" ,python-shiboken-2) + ("qtbase" ,qtbase))) + (native-inputs + `(("python" ,python-wrapper))) + (arguments + `(#:tests? #f + #:configure-flags + (list "-DBUILD_TESTS=off" + (string-append "-DPYTHON_EXECUTABLE=" + (assoc-ref %build-inputs "python") + "/bin/python")) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'go-to-source-dir + (lambda _ (chdir "sources/pyside2-tools") #t))))) + (home-page "https://wiki.qt.io/Qt_for_Python") + (synopsis + "Contains command line tools for PySide2") + (description + "Contains lupdate, rcc and uic tools for PySide2") + (license license:gpl2))) -- cgit v1.2.3 From c085742e07aab494c9c7f7e00fd6ff4e25eb0568 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 13:28:27 +0100 Subject: gnu: libarea: Build with cmake-minimal. * gnu/packages/engineering.scm (libarea)[native-inputs]: Change from CMAKE to CMAKE-MINIMAL. --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f3469b1815..361d4d54a6 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2432,7 +2432,7 @@ interpolation toolkit.") (inputs `(("boost" ,boost) ("python-wrapper" ,python-wrapper))) (native-inputs - `(("cmake" ,cmake))) + `(("cmake" ,cmake-minimal))) (arguments `(#:tests? #f #:phases -- cgit v1.2.3 From 382550f0be8f0023068dbd7005f0a29efeeea455 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 13:29:17 +0100 Subject: gnu: python2-scikit-learn: Downgrade to 0.20.4. This is a follow-up to commit 546893c2965c8114e4d7cfe1de46c46664ec4b9e. * gnu/packages/machine-learning.scm (python-scikit-learn)[properties]: New field. (python2-scikit-learn)[version, source]: New fields. --- gnu/packages/machine-learning.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 52e639723b..62ef7b84e4 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2020 Efraim Flashner -;;; Copyright © 2016, 2017 Marius Bakke +;;; Copyright © 2016, 2017, 2020 Marius Bakke ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Kei Kebreau @@ -847,10 +847,25 @@ computing environments.") (description "Scikit-learn provides simple and efficient tools for data mining and data analysis.") + (properties `((python2-variant . ,(delay python2-scikit-learn)))) (license license:bsd-3))) +;; scikit-learn 0.22 and later only supports Python 3, so we stick with +;; an older version here. (define-public python2-scikit-learn - (package-with-python2 python-scikit-learn)) + (let ((base (package-with-python2 (strip-python2-variant python-scikit-learn)))) + (package + (inherit base) + (version "0.20.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/scikit-learn/scikit-learn.git") + (commit version))) + (file-name (git-file-name "python-scikit-learn" version)) + (sha256 + (base32 + "08zbzi8yx5wdlxfx9jap61vg1malc9ajf576w7a0liv6jvvrxlpj"))))))) (define-public python-autograd (let* ((commit "442205dfefe407beffb33550846434baa90c4de7") -- cgit v1.2.3 From 3987715415532aea14c179650bac331ec436882c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 13:30:11 +0100 Subject: gnu: python2-pandas: Fix build with Python 2.7.17. While at it, fix the inheritance. * gnu/packages/python-science.scm (python2-pandas): Use INHERIT instead of PACKAGE/INHERIT. [source](modules, snippet): New fields. --- gnu/packages/python-science.scm | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 8dcc6e77e6..4b3db6d5e0 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Giacomo Leidi @@ -277,12 +277,21 @@ doing practical, real world data analysis in Python.") (define-public python2-pandas (let ((pandas (package-with-python2 (strip-python2-variant python-pandas)))) - (package/inherit - pandas - (version "0.24.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "pandas" version)) - (sha256 - (base32 - "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag"))))))) + (package + (inherit pandas) + (version "0.24.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "pandas" version)) + (sha256 + (base32 + "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Adjust for renamed error message in Python 2.7.17. Taken + ;; from . + (substitute* "pandas/io/parsers.py" + (("if 'NULL byte' in msg:") + "if 'NULL byte' in msg or 'line contains NUL' in msg:")) + #t))))))) -- cgit v1.2.3 From c19930dc6bb60fce283ae00ae21d063780922fc2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 13:31:03 +0100 Subject: gnu: python-pyrsistent: Update to 0.15.7. * gnu/packages/python-xyz.scm (python-pyrsistent): Update to 0.15.7. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b010f42647..d444e6ed75 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1819,14 +1819,14 @@ from git information. (define-public python-pyrsistent (package (name "python-pyrsistent") - (version "0.14.11") + (version "0.15.7") (home-page "https://github.com/tobgu/pyrsistent") (source (origin (method url-fetch) (uri (pypi-uri "pyrsistent" version)) (sha256 (base32 - "1qkh74bm296mp5g3r11lgsksr6bh4w1bf8pji4nmxdlfj542ga1w")))) + "103j63g6lb5dfspph96zxjdpnq9h991kazd4f09ddgkpxpivbiyd")))) (build-system python-build-system) (native-inputs `(("python-hypothesis" ,python-hypothesis) -- cgit v1.2.3 From 5a9980d55eb1afe5c5bc2561a7cba16b0c16fe7e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 13:32:12 +0100 Subject: gnu: python-networkx: Update to 2.4. * gnu/packages/python-xyz.scm (python-networkx): Update to 2.4. [source](uri): Download tarball instead of zipball. [arguments]: New field. [native-inputs]: Remove PYTHON-NOSE and UNZIP. Add PYTHON-PYTEST. [properties]: New field. (python2-networkx): Stick with version 2.2. --- gnu/packages/python-xyz.scm | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d444e6ed75..1942a9505d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6118,29 +6118,52 @@ interfaces in an easy and portable manner.") (define-public python-networkx (package (name "python-networkx") - (version "2.2") + (version "2.4") (source (origin (method url-fetch) - (uri (pypi-uri "networkx" version ".zip")) + (uri (pypi-uri "networkx" version)) (sha256 - (base32 "12swxb15299v9vqjsq4z8rgh5sdhvpx497xwnhpnb0gynrx6zra5")))) + (base32 "0r2wr7aqay9fwjrgk35fkjzk8lvvb4i4df7ndaqzkr4ndw5zzx7q")))) (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "pytest" "-vv" "--pyargs" "networkx") + (format #t "test suite not run~%")) + #t))))) ;; python-decorator is needed at runtime. (propagated-inputs `(("python-decorator" ,python-decorator))) (native-inputs - `(("python-nose" ,python-nose) - ("unzip" ,unzip))) + `(("python-pytest" ,python-pytest))) (home-page "https://networkx.github.io/") (synopsis "Python module for creating and manipulating graphs and networks") (description "NetworkX is a Python package for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks.") + (properties `((python2-variant . ,(delay python2-networkx)))) (license license:bsd-3))) +;; NetworkX 2.2 is the last version with support for Python 2. (define-public python2-networkx - (package-with-python2 python-networkx)) + (let ((base (package-with-python2 (strip-python2-variant python-networkx)))) + (package + (inherit base) + (version "2.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "networkx" version ".zip")) + (sha256 + (base32 + "12swxb15299v9vqjsq4z8rgh5sdhvpx497xwnhpnb0gynrx6zra5")))) + (arguments + `(#:python ,python-2)) + (native-inputs + `(("python-nose" ,python2-nose) + ("unzip" ,unzip)))))) (define-public python-datrie (package -- cgit v1.2.3 From 23bc9a35862a5ecfc9f409b61b0d1c6b3818db11 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 13:32:40 +0100 Subject: gnu: python-joblib: Update to 0.14.1. * gnu/packages/python-xyz.scm (python-joblib): Update to 0.14.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1942a9505d..4d07d5283d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2596,13 +2596,13 @@ logic-free templating system Mustache.") (define-public python-joblib (package (name "python-joblib") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (pypi-uri "joblib" version)) (sha256 (base32 - "0612nazad8dxmn3xghfrmjax6456l4xy6hn9cngs7vydi14ds7v5")))) + "1j464w137w6s367gl697j1l63g52akydrxgv4czlck36ynjfwc06")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 0731f943e354a7a62e0dee7d85f47503cab62a94 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 13:33:37 +0100 Subject: gnu: Update python-seaborn to 0.10.0, python2-seaborn to 0.9.1. * gnu/packages/python-xyz.scm (python-seaborn): Update to 0.9.0. [source](patches): Remove. [arguments]: Remove obsolete phase. [properties]: New field. (python2-seaborn): Update to 0.9.1. --- gnu/packages/python-xyz.scm | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4d07d5283d..461f574c74 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6260,25 +6260,13 @@ SVG, EPS, PNG and terminal output.") (define-public python-seaborn (package (name "python-seaborn") - (version "0.9.0") + (version "0.10.0") (source (origin (method url-fetch) (uri (pypi-uri "seaborn" version)) (sha256 - (base32 "0bqysi3fxfjl1866m5jq8z7mynhqbqnikim74dmzn8539iwkzj3n")) - (patches - (list (origin - (method url-fetch) - ;; This has already been merged, but there is no new - ;; release including this patch. It fixes problems - ;; with axis rotation that would lead to test - ;; failures. - (uri "https://patch-diff.githubusercontent.com/raw/mwaskom/seaborn/pull/1716.diff") - (sha256 - (base32 - "1lm870z316n9ivsyr86hpk1gxaraw0mrjvq42lqsm0znhjdp9q9w")) - (file-name "seaborn-0.9.0-axis-rotation.patch")))))) + (base32 "1ffbms4kllihfycf6j57dziq4imgdjw03sqgifh5wzcd2d743zjr")))) (build-system python-build-system) (arguments `(#:phases @@ -6291,12 +6279,6 @@ SVG, EPS, PNG and terminal output.") (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) (setenv "DISPLAY" ":1") #t))) - (add-after 'unpack 'fix-tests - (lambda _ - ;; test_cbar_ticks fails probably because of matplotlib's - ;; expectation of using an older version of FreeType. - (delete-file "seaborn/tests/test_matrix.py") - #t)) (replace 'check (lambda _ (invoke "pytest" "seaborn") #t))))) (propagated-inputs `(("python-pandas" ,python-pandas) @@ -6313,10 +6295,21 @@ SVG, EPS, PNG and terminal output.") graphics in Python. It is built on top of matplotlib and tightly integrated with the PyData stack, including support for numpy and pandas data structures and statistical routines from scipy and statsmodels.") + (properties `((python2-variant . ,(delay python2-seaborn)))) (license license:bsd-3))) +;; 0.9.1 is the last release with support for Python 2. (define-public python2-seaborn - (package-with-python2 python-seaborn)) + (let ((base (package-with-python2 (strip-python2-variant python-seaborn)))) + (package + (inherit base) + (version "0.9.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "seaborn" version)) + (sha256 + (base32 + "1bjnshjz4d6z3vrwfwall1a3yh8h3a1h47c3fg7458x9426alcys"))))))) (define-public python-mpmath (package -- cgit v1.2.3 From e3da9b2e554cf283509c9dfbb89dbb9090c44f48 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 13:34:20 +0100 Subject: gnu: Update python-natsort to 7.0.1, python2-natsort to 6.2.1. * gnu/packages/python-xyz.scm (python-natsort): Update to 7.0.1. (python2-natsort): Update to 6.2.1. --- gnu/packages/python-xyz.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 461f574c74..da7bbdcf77 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11621,13 +11621,13 @@ Python to manipulate OpenDocument 1.2 files.") (define-public python-natsort (package (name "python-natsort") - (version "5.4.1") + (version "7.0.1") (source (origin (method url-fetch) (uri (pypi-uri "natsort" version)) (sha256 (base32 - "0i732amg6yzkx4g4c9j09jmqq39q377x9cl2nbkm5hax2c2v0wxf")))) + "1ksqfai72dbcfbwx43pxl658j59mx2rvqypjy1fk0ax2qd6lccx6")))) (build-system python-build-system) (arguments `(#:modules ((guix build utils) @@ -11672,9 +11672,17 @@ command @command{natsort} that exposes this functionality in the command line.") (license license:expat) (properties `((python2-variant . ,(delay python2-natsort)))))) +;; Natsort 6.x are the last versions with support for Python 2. (define-public python2-natsort (let ((base (package-with-python2 (strip-python2-variant python-natsort)))) (package (inherit base) + (version "6.2.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "natsort" version)) + (sha256 + (base32 + "1mc9hbh6fv76xyz13frm7dgi05cf74f9j5wvcyjiy5234gylz565")))) (native-inputs `(("python2-pathlib" ,python2-pathlib) ,@(package-native-inputs base)))))) -- cgit v1.2.3 From a4abed71ae629166a91e5e4e2c6a4d4498c55933 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 13:34:43 +0100 Subject: gnu: python-parso: Update to 0.6.2. * gnu/packages/python-xyz.scm (python-parso): Update to 0.6.2. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index da7bbdcf77..d2bf1c57e7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15490,14 +15490,14 @@ time-based (TOTP) passwords.") (define-public python-parso (package (name "python-parso") - (version "0.5.2") + (version "0.6.2") (source (origin (method url-fetch) (uri (pypi-uri "parso" version)) (sha256 (base32 - "1qgvrkpma7vylrk047mxxvqd66nwqk978n3ig2w8iz9m3bgjbksm")))) + "0mr1j4ijqnrihz1yap34g6i8vjldg5lz814sz4v0d8pbqvh5jmhc")))) (native-inputs `(("python-pytest" ,python-pytest))) (build-system python-build-system) -- cgit v1.2.3 From 7d5f0795c194c515056907c48f31b2f22e62b1ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 13:35:13 +0100 Subject: gnu: python-sqlalchemy: Update to 1.3.15. * gnu/packages/databases.scm (python-sqlalchemy): Update to 1.3.15. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9681be8b4b..d26f1ef139 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2530,13 +2530,13 @@ Database API 2.0T.") (define-public python-sqlalchemy (package (name "python-sqlalchemy") - (version "1.3.3") + (version "1.3.15") (source (origin (method url-fetch) (uri (pypi-uri "SQLAlchemy" version)) (sha256 - (base32 "06c3lcv7nijsgqsjaaa4djrwlzgh9f910zlqxkmgq22h6jl4rici")))) + (base32 "0iglkvymfp35zm5pxy5kzqvcv96kkas0chqdx7xpla86sspa9k64")))) (build-system python-build-system) (native-inputs `(("python-cython" ,python-cython) ; for C extensions -- cgit v1.2.3 From ab6e4ab8c3412e28cf75f758da757da843ace902 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 13:35:46 +0100 Subject: gnu: python-psycopg2: Update to 2.8.4. * gnu/packages/databases.scm (python-psycopg2): Update to 2.8.4. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d26f1ef139..a4854580e8 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2768,13 +2768,13 @@ designed to be easy and intuitive to use.") (define-public python-psycopg2 (package (name "python-psycopg2") - (version "2.7.7") + (version "2.8.4") (source (origin (method url-fetch) (uri (pypi-uri "psycopg2" version)) (sha256 - (base32 "0zjbabb4qjx9dm07imhf8y5a9rpa06d5zah80myiimgdi83nslpl")))) + (base32 "1djvh98pi4hjd8rxbq8qzc63bg8v78k33yg6pl99wak61b6fb67q")))) (build-system python-build-system) (arguments ;; Tests would require a postgresql database "psycopg2_test" -- cgit v1.2.3 From 745041b59ff90195c5d5aad98310f5ad1a34a693 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 14:23:51 +0100 Subject: gnu: python-jedi: Update to 0.16. * gnu/packages/patches/python-jedi-deleted-variables.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-xyz.scm (python-jedi): Update to 0.16. [source](patches): New field. --- gnu/local.mk | 1 + .../patches/python-jedi-deleted-variables.patch | 38 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 12 ++----- 3 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/python-jedi-deleted-variables.patch diff --git a/gnu/local.mk b/gnu/local.mk index 73fc219383..29ca54a0ca 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1330,6 +1330,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-flint-includes.patch \ + %D%/packages/patches/python-jedi-deleted-variables.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ diff --git a/gnu/packages/patches/python-jedi-deleted-variables.patch b/gnu/packages/patches/python-jedi-deleted-variables.patch new file mode 100644 index 0000000000..53bdc05cde --- /dev/null +++ b/gnu/packages/patches/python-jedi-deleted-variables.patch @@ -0,0 +1,38 @@ +Fix test failure in some environments, including Guix. + +Taken from upstream: +https://github.com/davidhalter/jedi/commit/bec87f7ff82b0731713c6520a14c213341b4cecf + +diff --git a/test/completion/basic.py b/test/completion/basic.py +index b40068179..3ff919ca6 100644 +--- a/test/completion/basic.py ++++ b/test/completion/basic.py +@@ -209,11 +209,11 @@ def global_as_import(): + + deleted_var = 3 + del deleted_var +-#? int() ++#? + deleted_var +-#? ['deleted_var'] ++#? [] + deleted_var +-#! ['deleted_var = 3'] ++#! [] + deleted_var + + # ----------------- +diff --git a/test/test_api/test_full_name.py b/test/test_api/test_full_name.py +index 4fdb861b0..6858b6ca8 100644 +--- a/test/test_api/test_full_name.py ++++ b/test/test_api/test_full_name.py +@@ -112,7 +112,8 @@ def test_os_path(Script): + + def test_os_issues(Script): + """Issue #873""" +- assert [c.name for c in Script('import os\nos.nt''').complete()] == ['nt'] ++ # nt is not found, because it's deleted ++ assert [c.name for c in Script('import os\nos.nt''').complete()] == [] + + + def test_param_name(Script): diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d2bf1c57e7..902a197fbb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11217,25 +11217,19 @@ characters, mouse support, and auto suggestions.") (define-public python-jedi (package (name "python-jedi") - (version "0.15.1") + (version "0.16.0") (source (origin (method url-fetch) (uri (pypi-uri "jedi" version)) + (patches (search-patches "python-jedi-deleted-variables.patch")) (sha256 (base32 - "0bp4pxhsynaarbvzblsn5x32lzp29svy3sxfy8i6m5iwz9s9r1ds")))) + "1mb5kmrk9bkc3kwzx02j62cdan1jqd92q1z7h7wi9d30jg5p3j6m")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-file-completion-test - ;; A single parameterized test currently fail (see: - ;; https://github.com/davidhalter/jedi/issues/1395). Remove it. - (lambda _ - (substitute* "test/test_api/test_completion.py" - ((".*'example.py', 'rb\"' \\+ join\\('\\.\\.'.*") "")) - #t)) (replace 'check (lambda _ (setenv "HOME" "/tmp") -- cgit v1.2.3 From baea210c04fd9e36340379b580331c9aeea6378b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 14:54:01 +0100 Subject: gnu: python-editor: Update to 1.0.4. * gnu/packages/python-xyz.scm (python-editor): Update to 1.0.4. [arguments]: New field. [home-page, synopsis]: Adjust indentation. --- gnu/packages/python-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 902a197fbb..1d99832772 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9631,19 +9631,19 @@ ISO 8859, etc.).") (define-public python-editor (package (name "python-editor") - (version "0.5") + (version "1.0.4") (source (origin (method url-fetch) (uri (pypi-uri "python-editor" version)) (sha256 (base32 - "1ypnpgvzpkbwsg4rdvy4sy51j28b5xq9v8pnkwxncn07vqz06p7n")))) + "0yrjh8w72ivqxi4i7xsg5b1vz15x8fg51xra7c3bgfyxqnyadzai")))) (build-system python-build-system) - (home-page - "https://github.com/fmoo/python-editor") - (synopsis - "Programmatically open an editor, capture the result") + (arguments + '(#:tests? #f)) ;XXX: needs a TTY and an editor + (home-page "https://github.com/fmoo/python-editor") + (synopsis "Programmatically open an editor, capture the result") (description "python-editor is a library that provides the editor module for programmatically interfacing with your system's $EDITOR.") -- cgit v1.2.3 From 45ebd90c186558556f2fe28ff2eb0cd424768b55 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 15:03:33 +0100 Subject: gnu: python-alembic: Update to 1.4.1. * gnu/packages/patches/python-alembic-exceptions-cause.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/databases.scm (python-alembic): Update to 1.4.1. [source](patches): New field. [arguments]: New field, override check phase. --- gnu/local.mk | 1 + gnu/packages/databases.scm | 10 +++- .../patches/python-alembic-exceptions-cause.patch | 69 ++++++++++++++++++++++ 3 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/python-alembic-exceptions-cause.patch diff --git a/gnu/local.mk b/gnu/local.mk index 29ca54a0ca..3be54b2627 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1320,6 +1320,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-3.8-search-paths.patch \ %D%/packages/patches/python-3.8-fix-tests.patch \ %D%/packages/patches/python-CVE-2018-14647.patch \ + %D%/packages/patches/python-alembic-exceptions-cause.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ %D%/packages/patches/python-cffi-x87-stack-clean.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a4854580e8..be4db42332 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2613,15 +2613,21 @@ You might also want to install the following optional dependencies: (define-public python-alembic (package (name "python-alembic") - (version "1.0.11") + (version "1.4.1") (source (origin (method url-fetch) (uri (pypi-uri "alembic" version)) + (patches (search-patches "python-alembic-exceptions-cause.patch")) (sha256 (base32 - "1k5hag0vahd5vrf9abx8fdj2whrwaw2iq2yp736mmxnbsn5xkdyd")))) + "0a4hzn76csgbf1px4f5vfm256byvjrqkgi9869nkcjrwjn35c6kr")))) (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "pytest" "-vv")))))) (native-inputs `(("python-mock" ,python-mock) ("python-pytest-cov" ,python-pytest-cov))) diff --git a/gnu/packages/patches/python-alembic-exceptions-cause.patch b/gnu/packages/patches/python-alembic-exceptions-cause.patch new file mode 100644 index 0000000000..b9844e5ad0 --- /dev/null +++ b/gnu/packages/patches/python-alembic-exceptions-cause.patch @@ -0,0 +1,69 @@ +Fix a test failure with newer versions of SQLalchemy due to missing +"causes" for some exceptions. + +diff --git a/alembic/operations/ops.py b/alembic/operations/ops.py +index 5ec2762..7129472 100644 +--- a/alembic/operations/ops.py ++++ b/alembic/operations/ops.py +@@ -108,6 +108,7 @@ def from_constraint(cls, constraint): + "primary_key_constraint": "primary", + "check_constraint": "check", + "column_check_constraint": "check", ++ "table_or_column_check_constraint": "check", + } + + constraint_table = sqla_compat._table_for_constraint(constraint) +@@ -707,6 +708,7 @@ def batch_create_foreign_key( + "create_check_constraint", "batch_create_check_constraint" + ) + @AddConstraintOp.register_add_constraint("check_constraint") ++@AddConstraintOp.register_add_constraint("table_or_column_check_constraint") + @AddConstraintOp.register_add_constraint("column_check_constraint") + class CreateCheckConstraintOp(AddConstraintOp): + """Represent a create check constraint operation.""" +diff --git a/alembic/testing/assertions.py b/alembic/testing/assertions.py +index 3dc08f0..a78e5e8 100644 +--- a/alembic/testing/assertions.py ++++ b/alembic/testing/assertions.py +@@ -2,10 +2,9 @@ + + import re + ++from sqlalchemy import util + from sqlalchemy.engine import default + from sqlalchemy.testing.assertions import _expect_warnings +-from sqlalchemy.testing.assertions import assert_raises # noqa +-from sqlalchemy.testing.assertions import assert_raises_message # noqa + from sqlalchemy.testing.assertions import eq_ # noqa + from sqlalchemy.testing.assertions import is_ # noqa + from sqlalchemy.testing.assertions import is_false # noqa +@@ -17,6 +16,29 @@ + from ..util.compat import py3k + + ++def assert_raises(except_cls, callable_, *args, **kw): ++ try: ++ callable_(*args, **kw) ++ success = False ++ except except_cls: ++ success = True ++ ++ # assert outside the block so it works for AssertionError too ! ++ assert success, "Callable did not raise an exception" ++ ++ ++def assert_raises_message(except_cls, msg, callable_, *args, **kwargs): ++ try: ++ callable_(*args, **kwargs) ++ assert False, "Callable did not raise an exception" ++ except except_cls as e: ++ assert re.search(msg, util.text_type(e), re.UNICODE), "%r !~ %s" % ( ++ msg, ++ e, ++ ) ++ print(util.text_type(e).encode("utf-8")) ++ ++ + def eq_ignore_whitespace(a, b, msg=None): + # sqlalchemy.testing.assertion has this function + # but not with the special "!U" detection part -- cgit v1.2.3 From 4fc26c659297b3ae3b4b00a979b2db1682d1d131 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 15:47:17 +0100 Subject: gnu: python-tblib: Update to 1.6.0. * gnu/packages/python-xyz.scm (python-tblib): Update to 1.6.0. --- gnu/packages/python-xyz.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1d99832772..c3cf14476c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10254,24 +10254,17 @@ own code, responding to click events and updating clock every second.") (define-public python-tblib (package (name "python-tblib") - (version "1.3.2") + (version "1.6.0") (source (origin (method url-fetch) (uri (pypi-uri "tblib" version)) - (sha256 (base32 - "1rsg8h069kqgncyv8fgzyj6qflk6j10cb78pa5jk34ixwq044vj3")))) + (sha256 + (base32 + "0i136n5pydmd202254wzrdbspkw0br0c9mbxhfs9hpfbahvyx6r2")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'adjust-tests - (lambda _ - (when (which "python3") - ;; Adjust the example output to match that of Python 3.7: - ;; . - (substitute* "README.rst" - (("Exception\\('fail',") "Exception('fail'")) - #t))) (replace 'check (lambda _ ;; Upstream runs tests after installation and the package itself -- cgit v1.2.3 From f5eb13b21126375ef3aab00c514aab204309d147 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Mar 2020 15:49:05 +0100 Subject: gnu: mesa-opencl: Build with clang@9. This is a follow-up to commit cf4fdbcb0bf8ef4639dc162e09d152666fc6b89e. * gnu/packages/gl.scm (mesa-opencl)[native-inputs]: Change from CLANG-8 to CLANG-9. (mesa)[inputs]: Add reminder. --- gnu/packages/gl.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index ea9b2c579e..c82d33037e 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -268,6 +268,7 @@ also known as DXTn or DXTC) for Mesa.") ("libxvmc" ,libxvmc) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") + ;; Note: update the 'clang' input of mesa-opencl when bumping this. `(("llvm" ,llvm-9))) (_ `())) @@ -435,7 +436,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") `(("libclc" ,libclc) ,@(package-inputs mesa))) (native-inputs - `(("clang" ,clang-8) + `(("clang" ,clang-9) ,@(package-native-inputs mesa))))) (define-public mesa-opencl-icd -- cgit v1.2.3 From 244a527d445c48bc7a1d7f78abc9ebdccb0d7bed Mon Sep 17 00:00:00 2001 From: Sebastian Schott Date: Sat, 7 Mar 2020 16:11:37 +0100 Subject: gnu: Add python-pymediainfo * gnu/packages/python-xyz.scm (python-pymediainfo): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c3cf14476c..419b2a26fc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -69,6 +69,7 @@ ;;; Copyright © 2019 Mădălin Ionel Patrașcu ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 sirgazil +;;; Copyright © 2020 Sebastian Schott ;;; ;;; This file is part of GNU Guix. ;;; @@ -169,6 +170,51 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-pymediainfo + (package + (name "python-pymediainfo") + (version "4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pymediainfo" version)) + (sha256 + (base32 + "0mhpxs7vlqx8w75z93dy7nnvx89kwfdjkla03l19an15rlyqyspd")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm) + ("python-pytest" ,python-pytest))) + (inputs + `(("libmediainfo" ,libmediainfo))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-libmediainfo + (lambda _ + (substitute* "pymediainfo/__init__.py" + (("libmediainfo.so.0") + (string-append (assoc-ref %build-inputs "libmediainfo") + "/lib/libmediainfo.so.0"))) + #t)) + (replace 'check + (lambda _ + ;; Extend PYTHONPATH so the built package will be found. + (setenv "PYTHONPATH" + (string-append (getcwd) "/build/lib:" + (getenv "PYTHONPATH"))) + ;; Skip the only failing test "test_parse_url" + (invoke "pytest" "-vv" "-k" "not test_parse_url") + #t))))) + (home-page + "https://github.com/sbraz/pymediainfo") + (synopsis + "Python wrapper for the mediainfo library") + (description + "Python wrapper for the mediainfo library to access the technical and tag +data for video and audio files.") + (license license:expat))) + (define-public python-psutil (package (name "python-psutil") -- cgit v1.2.3 From 1b9c1fdb426dc0474482c2970faf219c85d5475a Mon Sep 17 00:00:00 2001 From: Sebastian Schott Date: Sat, 7 Mar 2020 16:11:38 +0100 Subject: gnu: Add python-easygui * gnu/packages/python-xyz.scm (python-easygui): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 419b2a26fc..0a590ab2cf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -170,6 +170,27 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-easygui + (package + (name "python-easygui") + (version "0.98.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "easygui" version)) + (sha256 + (base32 + "1zmvmwgxyzvm83818skhn8b4wrci4kmnixaax8q3ia5cn7xrmj6v")))) + (build-system python-build-system) + (propagated-inputs + `(("python-tkinter" ,python "tk"))) + (home-page "https://github.com/robertlugg/easygui") + (synopsis "GUI programming module for Python") + (description "EasyGUI is a module for very simple, very easy GUI +programming in Python. EasyGUI is different from other GUI generators in that +EasyGUI is NOT event-driven. Instead, all GUI interactions are invoked by +simple function calls.") + (license license:bsd-3))) + (define-public python-pymediainfo (package (name "python-pymediainfo") -- cgit v1.2.3 From a5e76112b61be33bf3e3ba697148e2465983eeb0 Mon Sep 17 00:00:00 2001 From: Sebastian Schott Date: Sat, 7 Mar 2020 16:11:39 +0100 Subject: gnu: Add python-rawkit * gnu/packages/python-xyz.scm (python-rawkit): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0a590ab2cf..a4774be53c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -129,6 +129,7 @@ #:use-module (gnu packages openstack) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) + #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-check) @@ -170,6 +171,30 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-rawkit + (package + (name "python-rawkit") + (version "0.6.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "rawkit" version)) + (sha256 + (base32 + "0vrhrpr70i61y5q5ysk341x1539ff1q1k82g59zq69lv16s0f76s")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-mock" ,python-mock))) + (inputs + `(("libraw" ,libraw))) + (home-page "https://rawkit.readthedocs.io") + (synopsis "Ctypes-based LibRaw binding for Python") + (description "The rawkit package provides two modules: rawkit and libraw. +The rawkit module provides a high-level Pythonic interface for developing raw +photos, while the libraw module provides a CTypes based interface for +interacting with the low-level LibRaw C APIs.") + (license license:expat))) + (define-public python-easygui (package (name "python-easygui") -- cgit v1.2.3 From 5164a92eaa290ba801c079796c05220027f4842b Mon Sep 17 00:00:00 2001 From: Sebastian Schott Date: Sat, 7 Mar 2020 16:11:40 +0100 Subject: gnu: Add python-d2to1 * gnu/packages/python-xyz.scm (python-d2to1): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a4774be53c..b11eb18542 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -171,6 +171,27 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-d2to1 + (package + (name "python-d2to1") + (version "0.2.12.post1") + (source (origin + (method url-fetch) + (uri (pypi-uri "d2to1" version)) + (sha256 + (base32 + "09fq7pq1z8d006xh5z75rm2lk61v6yn2xhy53z4gsgibhqb2vvs9")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/embray/d2to1") + (synopsis "Allows for distutils2-like setup.cfg files as package metadata +in python") + (description "The python package d2to1 (the d is for distutils) allows +using distutils2-like setup.cfg files for a package's metadata with a +distribute/setuptools setup.py script.") + (license license:bsd-2))) + (define-public python-rawkit (package (name "python-rawkit") -- cgit v1.2.3 From 2763f0de41c62623622d2eb9d4c17c04d62afcbd Mon Sep 17 00:00:00 2001 From: Sebastian Schott Date: Sat, 7 Mar 2020 16:11:41 +0100 Subject: gnu: Add python-colour * gnu/packages/python-xyz.scm (python-colour): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b11eb18542..4de78fdf27 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -171,6 +171,25 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-colour + (package + (name "python-colour") + (version "0.1.5") + (source (origin + (method url-fetch) + (uri (pypi-uri "colour" version)) + (sha256 + (base32 + "1visbisfini5j14bdzgs95yssw6sm4pfzyq1n3lfvbyjxw7i485g")))) + (build-system python-build-system) + (native-inputs + `(("python-d2to1" ,python-d2to1))) + (home-page "https://github.com/vaab/colour") + (synopsis "Convert and manipulate various color representations") + (description "Pythonic way to manipulate color representations (HSL, RVB, +web, X11, ...).") + (license license:expat))) + (define-public python-d2to1 (package (name "python-d2to1") -- cgit v1.2.3 From f3465dee986ffab4bba27839b2d1d5d4a050d835 Mon Sep 17 00:00:00 2001 From: Sebastian Schott Date: Sat, 7 Mar 2020 16:11:42 +0100 Subject: gnu: Add python-gphoto2 * gnu/packages/python-xyz.scm (python-gphoto2): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4de78fdf27..3ff7bc45a5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -171,6 +171,28 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-gphoto2 + (package + (name "python-gphoto2") + (version "2.2.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "gphoto2" version)) + (sha256 + (base32 + "118zm25c8mlajfl0pzssnwz4b8lamj9dgymla9rn4nla7l244a0r")))) + (build-system python-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libgphoto2" ,libgphoto2))) + (home-page "https://github.com/jim-easterbrook/python-gphoto2") + (synopsis "Python interface to libgphoto2") + (description "@code{python-gphoto2} is a comprehensive Python interface +(or binding) to @code{libgphoto2}. It is built using @code{SWIG} to +automatically generate the interface code.") + (license license:gpl3+))) + (define-public python-colour (package (name "python-colour") -- cgit v1.2.3 From 23fde56b330c0d27f6cff161ab16d857d8975303 Mon Sep 17 00:00:00 2001 From: Sebastian Schott Date: Sat, 7 Mar 2020 16:11:43 +0100 Subject: gnu: Add python-pyprind * gnu/packages/python-xyz.scm (python-pyprind): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3ff7bc45a5..26e1927cb9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -171,6 +171,26 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-pyprind + (package + (name "python-pyprind") + (version "2.11.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "PyPrind" version)) + (sha256 + (base32 + "0xg6m5hr33h9bdlrr42kc58jm2m87a9zsagy7n2m4n407d2snv64")))) + (build-system python-build-system) + (propagated-inputs + `(("python-psutil" ,python-psutil))) + (home-page "https://github.com/rasbt/pyprind") + (synopsis "Python Progress Bar and Percent Indicator Utility") + (description "The PyPrind (Python Progress Indicator) module provides a +progress bar and a percentage indicator object that let you track the progress +of a loop structure or other iterative computation.") + (license license:bsd-3))) + (define-public python-gphoto2 (package (name "python-gphoto2") -- cgit v1.2.3 From dcf953299505274e542ea8c79141b21f1f18277d Mon Sep 17 00:00:00 2001 From: Sebastian Schott Date: Sat, 7 Mar 2020 16:11:44 +0100 Subject: gnu: Add python-colorlog * gnu/packages/python-xyz.scm (python-colorlog): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 26e1927cb9..2dd3d04706 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -171,6 +171,35 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-colorlog + (package + (name "python-colorlog") + (version "4.1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "colorlog" version)) + (sha256 + (base32 + "1lpk8zmfv8vz090h5d0hzb4n39wgasxdd3x3bpn3v1x1n9dfzaih")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; Extend PYTHONPATH so the built package will be found. + (setenv "PYTHONPATH" + (string-append (getcwd) "/build/lib:" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-p" "no:logging") + #t))))) + (home-page "https://github.com/borntyping/python-colorlog") + (synopsis "Log formatting with colors for python") + (description "The @code{colorlog.ColoredFormatter} is a formatter for use +with Python's logging module that outputs records using terminal colors.") + (license license:expat))) + (define-public python-pyprind (package (name "python-pyprind") -- cgit v1.2.3 From 2f12e6608b8dd071e37264c63ea86dcdfb8aaa84 Mon Sep 17 00:00:00 2001 From: Sebastian Schott Date: Sat, 7 Mar 2020 16:11:45 +0100 Subject: gnu: Add python-tenacity * gnu/packages/python-xyz.scm (python-tenacity): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2dd3d04706..2718e9b236 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -171,6 +171,36 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-tenacity + (package + (name "python-tenacity") + (version "6.1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "tenacity" version)) + (sha256 + (base32 + "1j36v9fcpmmd4985ix0cwnvcq71rkrn5cjiiv0id9vkl4kpxh0gv")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm) + ("python-sphinx" ,python-sphinx) + ("python-tornado" ,python-tornado) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-six" ,python-six))) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "pytest") + #t))))) + (home-page "https://github.com/jd/tenacity") + (synopsis "Retrying library for python") + (description "Tenacity is a general-purpose python library to simplify the +task of adding retry behavior to just about anything.") + (license license:asl2.0))) + (define-public python-colorlog (package (name "python-colorlog") -- cgit v1.2.3 From 39af91db7943700b723c96ce1fc100f110aa88d1 Mon Sep 17 00:00:00 2001 From: Sebastian Schott Date: Sat, 7 Mar 2020 16:11:46 +0100 Subject: gnu: Add rapid-photo-downloader * gnu/packages/photo.scm (rapid-photo-downloader): New variable. Signed-off-by: Christopher Baines --- gnu/packages/photo.scm | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 069767e414..585289daf1 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Leo Famulari +;;; Copyright © 2020 Sebastian Schott ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) + #:use-module (guix build-system python) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -37,12 +39,15 @@ #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages curl) + #:use-module (gnu packages file) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages gnome) #:use-module (gnu packages glib) #:use-module (gnu packages graphics) + #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) @@ -56,9 +61,13 @@ #:use-module (gnu packages popt) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages python-web) + #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages sqlite) #:use-module (gnu packages tex) + #:use-module (gnu packages time) + #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xfig) @@ -67,6 +76,91 @@ #:use-module ((srfi srfi-1) #:hide (zip)) #:use-module (srfi srfi-26)) +(define-public rapid-photo-downloader + (package + (name "rapid-photo-downloader") + (version "0.9.18") + (source (origin + (method url-fetch) + (uri (string-append "https://launchpad.net/rapid/pyqt/" + version "/+download/" name "-" + version ".tar.gz")) + (sha256 + (base32 + "15p7sssg6vmqbm5xnc4j5dr89d7gl7y5qyq44a240yl5aqkjnybw")))) + (build-system python-build-system) + (native-inputs + `(("file" ,file) + ("intltool" ,intltool) + ("gobject-introspection" ,gobject-introspection))) + (inputs + `(("gdk-pixbuf" ,gdk-pixbuf) + ("gexiv2" ,gexiv2) + ("gst-libav" ,gst-libav) + ("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-good" ,gst-plugins-good) + ("gstreamer" ,gstreamer) + ("libgudev" ,libgudev) + ("libnotify" ,libnotify) + ("libmediainfo" ,libmediainfo) + ("usdisks" ,udisks) + ("python-pyqt" ,python-pyqt) + ("python-pygobject" ,python-pygobject) + ("python-gphoto2" ,python-gphoto2) + ("python-pyzmq" ,python-pyzmq) + ("python-tornado" ,python-tornado) + ("python-psutil" ,python-psutil) + ("python-pyxdg" ,python-pyxdg) + ("python-arrow" ,python-arrow) + ("python-dateutil" ,python-dateutil) + ("python-easygui" ,python-easygui) + ("python-colour" ,python-colour) + ("python-pymediainfo" ,python-pymediainfo) + ("python-sortedcontainers" ,python-sortedcontainers) + ("python-rawkit" ,python-rawkit) + ("python-requests" ,python-requests) + ("python-colorlog" ,python-colorlog) + ("python-pyprind" ,python-pyprind) + ("python-tenacity" ,python-tenacity) + ("perl-image-exiftool" ,perl-image-exiftool))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-libmediainfo + (lambda _ + (substitute* "raphodo/metadatavideo.py" + (("pymedia_library_file = 'libmediainfo.so.0'") + (string-append "pymedia_library_file = '" + (assoc-ref %build-inputs "libmediainfo") + "/lib/libmediainfo.so.0'"))) + #t)) + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (path (string-join + (list (string-append + (assoc-ref inputs "perl-image-exiftool") + "/bin")) + ":")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (python-path (getenv "PYTHONPATH"))) + (for-each + (lambda (program) + (wrap-program program + `("PATH" ":" prefix (,path)) + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) + `("PYTHONPATH" ":" prefix (,python-path)))) + (map (lambda (name) + (string-append out "/bin/" name)) + '("analyze-pv-structure" + "rapid-photo-downloader")))) + #t))))) + (home-page "https://www.damonlynch.net/rapid/") + (synopsis "Import photos and videos from cameras, phones and memory cards") + (description "Import photos and videos from cameras, phones and memory +cards and generate meaningful file and folder names.") + (license license:gpl2+))) + (define-public libraw (package (name "libraw") -- cgit v1.2.3 From ed78340438b7ac58187b78216c48abe002873795 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 15 Mar 2020 17:59:35 +0100 Subject: gnu: eolie: Update to 0.9.98.1. * gnu/packages/gnome.scm (eolie): Update to 0.9.98.1. --- gnu/packages/gnome.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a08cd00d72..a80bce9332 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2015, 2017 Andy Wingo ;;; Copyright © 2015 David Hashe -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner @@ -5424,15 +5424,14 @@ almost all of them.") (define-public eolie (package (name "eolie") - (version "0.9.63") + (version "0.9.98.1") (source (origin (method url-fetch) - (uri (string-append "https://gitlab.gnome.org/World/eolie/" - "uploads/d42b466752729a0d3fa828a721e25043/" - "eolie-" version ".tar.xz")) + (uri (string-append "https://adishatz.org/eolie/eolie-" + version ".tar.xz")) (sha256 (base32 - "11pp8g0w22h1q0bbj9517l5838gcymvvp8fp9kh6h2dmgir2ssih")))) + "1d844zva5w4p9pnp9c2g7zyb4vayr2g2drf78spxsdlc5lbd7lqr")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From cd773f118573aad42c1e10dd77061fd3d1279189 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 15 Mar 2020 17:47:56 +0100 Subject: gnu: nose2: Update to 0.9.2. * gnu/packages/check.scm (python-nose2): Update to 0.9.2. Signed-off-by: Leo Famulari --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 15ab54dd8a..fa14ac1544 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -706,14 +706,14 @@ have been used.") (define-public python-nose2 (package (name "python-nose2") - (version "0.6.5") + (version "0.9.2") (source (origin (method url-fetch) (uri (pypi-uri "nose2" version)) (sha256 (base32 - "1x4zjq1zlyrh8b9ba0cmafd3w94pxhid408kibyjd3s6h1lap6s7")))) + "0pmbb6nk31yhgh4zkcblzxsznml7f7pf5q1ihgrwvbxv4mwzfql7")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; 'module' object has no attribute 'collector' (propagated-inputs -- cgit v1.2.3 From 323841bda4e5b8f9b30626ab768aaf711ee6aabf Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Thu, 12 Mar 2020 01:51:12 +0100 Subject: gnu: Add nvme-cli * gnu/packages/linux.scm (nvme-cli): New variable. Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 688d9eefaf..f1bc5798ab 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3577,6 +3577,36 @@ IDE driver subsystem. Many external USB drive enclosures with SCSI-ATA Command Translation (@dfn{SAT}) are also supported.") (license (license:non-copyleft "file://LICENSE.TXT")))) +(define-public nvme-cli + (package + (name "nvme-cli") + (version "1.10.1") + (home-page "https://github.com/linux-nvme/nvme-cli") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (sha256 + (base32 "12wp2wxmsw2v8m9bhvwvdbhdgx1md8iilhbl19sfzz2araiwi2x8")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list "CC=gcc") + #:phases (modify-phases %standard-phases + (delete 'configure) ; No ./configure script + (replace 'install + (lambda _ + (invoke "make" "install-spec" "PREFIX=" + (string-append "DESTDIR=" %output))))) + #:tests? #f)) ; The tests require sysfs, which is not accessible from + ; the build environment + (synopsis "NVM-Express user space tooling for Linux") + (description "Nvme-cli is a utility to provide standards compliant tooling +for NVM-Express drives. It was made specifically for Linux as it relies on the +IOCTLs defined by the mainline kernel driver.") + (license license:gpl2+))) + (define-public rfkill (package (name "rfkill") -- cgit v1.2.3 From f24aaa81de8c709adfda2e89271c562a5ca8d959 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 15 Mar 2020 19:07:57 +0100 Subject: gnu: BlueZ: Update to 5.54. * gnu/packages/linux.scm (bluez): Update to 5.54. [replacement]: Remove field. (bluez/fixed): Remove variable. * gnu/packages/patches/bluez-CVE-2020-0556.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Leo Famulari --- gnu/local.mk | 1 - gnu/packages/linux.scm | 13 +- gnu/packages/patches/bluez-CVE-2020-0556.patch | 180 ------------------------- 3 files changed, 2 insertions(+), 192 deletions(-) delete mode 100644 gnu/packages/patches/bluez-CVE-2020-0556.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3be54b2627..b628bbee0c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -764,7 +764,6 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ - %D%/packages/patches/bluez-CVE-2020-0556.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-bs4.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f1bc5798ab..fda7570d89 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4039,8 +4039,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") - (replacement bluez/fixed) - (version "5.53") + (version "5.54") (source (origin (method url-fetch) (uri (string-append @@ -4048,7 +4047,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") version ".tar.xz")) (sha256 (base32 - "1g1qg6dz6hl3csrmz75ixr12lwv836hq3ckb259svvrg62l2vaiq")))) + "1p2ncvjz6alr9n3l5wvq2arqgc7xjs6dqyar1l9jp0z8cfgapkb8")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -4105,14 +4104,6 @@ Bluetooth audio output devices like headphones or loudspeakers.") is flexible, efficient and uses a modular implementation.") (license license:gpl2+))) -(define bluez/fixed - (package - (inherit bluez) - (source (origin - (inherit (package-source bluez)) - (patches (append (origin-patches (package-source bluez)) - (search-patches "bluez-CVE-2020-0556.patch"))))))) - (define-public fuse-exfat (package (name "fuse-exfat") diff --git a/gnu/packages/patches/bluez-CVE-2020-0556.patch b/gnu/packages/patches/bluez-CVE-2020-0556.patch deleted file mode 100644 index 7c34459a3a..0000000000 --- a/gnu/packages/patches/bluez-CVE-2020-0556.patch +++ /dev/null @@ -1,180 +0,0 @@ -Fix CVE-2020-0556: - -https://lore.kernel.org/linux-bluetooth/20200310023516.209146-1-alainm@chromium.org/ -https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.html -http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-0556 - -Patches copied from upstream source repository: - -https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=3cccdbab2324086588df4ccf5f892fb3ce1f1787 -https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=8cdbd3b09f29da29374e2f83369df24228da0ad1 - -From 3cccdbab2324086588df4ccf5f892fb3ce1f1787 Mon Sep 17 00:00:00 2001 -From: Alain Michaud -Date: Tue, 10 Mar 2020 02:35:18 +0000 -Subject: [PATCH] HID accepts bonded device connections only. - -This change adds a configuration for platforms to choose a more secure -posture for the HID profile. While some older mice are known to not -support pairing or encryption, some platform may choose a more secure -posture by requiring the device to be bonded and require the -connection to be encrypted when bonding is required. - -Reference: -https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.html ---- - profiles/input/device.c | 23 ++++++++++++++++++++++- - profiles/input/device.h | 1 + - profiles/input/input.conf | 8 ++++++++ - profiles/input/manager.c | 13 ++++++++++++- - 4 files changed, 43 insertions(+), 2 deletions(-) - -diff --git a/profiles/input/device.c b/profiles/input/device.c -index 2cb3811c8..d89da2d7c 100644 ---- a/profiles/input/device.c -+++ b/profiles/input/device.c -@@ -92,6 +92,7 @@ struct input_device { - - static int idle_timeout = 0; - static bool uhid_enabled = false; -+static bool classic_bonded_only = false; - - void input_set_idle_timeout(int timeout) - { -@@ -103,6 +104,11 @@ void input_enable_userspace_hid(bool state) - uhid_enabled = state; - } - -+void input_set_classic_bonded_only(bool state) -+{ -+ classic_bonded_only = state; -+} -+ - static void input_device_enter_reconnect_mode(struct input_device *idev); - static int connection_disconnect(struct input_device *idev, uint32_t flags); - -@@ -970,8 +976,18 @@ static int hidp_add_connection(struct input_device *idev) - if (device_name_known(idev->device)) - device_get_name(idev->device, req->name, sizeof(req->name)); - -+ /* Make sure the device is bonded if required */ -+ if (classic_bonded_only && !device_is_bonded(idev->device, -+ btd_device_get_bdaddr_type(idev->device))) { -+ error("Rejected connection from !bonded device %s", dst_addr); -+ goto cleanup; -+ } -+ - /* Encryption is mandatory for keyboards */ -- if (req->subclass & 0x40) { -+ /* Some platforms may choose to require encryption for all devices */ -+ /* Note that this only matters for pre 2.1 devices as otherwise the */ -+ /* device is encrypted by default by the lower layers */ -+ if (classic_bonded_only || req->subclass & 0x40) { - if (!bt_io_set(idev->intr_io, &gerr, - BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM, - BT_IO_OPT_INVALID)) { -@@ -1203,6 +1219,11 @@ static void input_device_enter_reconnect_mode(struct input_device *idev) - DBG("path=%s reconnect_mode=%s", idev->path, - reconnect_mode_to_string(idev->reconnect_mode)); - -+ /* Make sure the device is bonded if required */ -+ if (classic_bonded_only && !device_is_bonded(idev->device, -+ btd_device_get_bdaddr_type(idev->device))) -+ return; -+ - /* Only attempt an auto-reconnect when the device is required to - * accept reconnections from the host. - */ -diff --git a/profiles/input/device.h b/profiles/input/device.h -index 51a9aee18..3044db673 100644 ---- a/profiles/input/device.h -+++ b/profiles/input/device.h -@@ -29,6 +29,7 @@ struct input_conn; - - void input_set_idle_timeout(int timeout); - void input_enable_userspace_hid(bool state); -+void input_set_classic_bonded_only(bool state); - - int input_device_register(struct btd_service *service); - void input_device_unregister(struct btd_service *service); -diff --git a/profiles/input/input.conf b/profiles/input/input.conf -index 3e1d65aae..166aff4a4 100644 ---- a/profiles/input/input.conf -+++ b/profiles/input/input.conf -@@ -11,3 +11,11 @@ - # Enable HID protocol handling in userspace input profile - # Defaults to false (HIDP handled in HIDP kernel module) - #UserspaceHID=true -+ -+# Limit HID connections to bonded devices -+# The HID Profile does not specify that devices must be bonded, however some -+# platforms may want to make sure that input connections only come from bonded -+# device connections. Several older mice have been known for not supporting -+# pairing/encryption. -+# Defaults to false to maximize device compatibility. -+#ClassicBondedOnly=true -diff --git a/profiles/input/manager.c b/profiles/input/manager.c -index 1d31b0652..5cd27b839 100644 ---- a/profiles/input/manager.c -+++ b/profiles/input/manager.c -@@ -96,7 +96,7 @@ static int input_init(void) - config = load_config_file(CONFIGDIR "/input.conf"); - if (config) { - int idle_timeout; -- gboolean uhid_enabled; -+ gboolean uhid_enabled, classic_bonded_only; - - idle_timeout = g_key_file_get_integer(config, "General", - "IdleTimeout", &err); -@@ -114,6 +114,17 @@ static int input_init(void) - input_enable_userspace_hid(uhid_enabled); - } else - g_clear_error(&err); -+ -+ classic_bonded_only = g_key_file_get_boolean(config, "General", -+ "ClassicBondedOnly", &err); -+ -+ if (!err) { -+ DBG("input.conf: ClassicBondedOnly=%s", -+ classic_bonded_only ? "true" : "false"); -+ input_set_classic_bonded_only(classic_bonded_only); -+ } else -+ g_clear_error(&err); -+ - } - - btd_profile_register(&input_profile); --- -2.25.1 - -From 8cdbd3b09f29da29374e2f83369df24228da0ad1 Mon Sep 17 00:00:00 2001 -From: Alain Michaud -Date: Tue, 10 Mar 2020 02:35:16 +0000 -Subject: [PATCH] HOGP must only accept data from bonded devices. - -HOGP 1.0 Section 6.1 establishes that the HOGP must require bonding. - -Reference: -https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.htm ---- - profiles/input/hog.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/profiles/input/hog.c b/profiles/input/hog.c -index 83c017dcb..dfac68921 100644 ---- a/profiles/input/hog.c -+++ b/profiles/input/hog.c -@@ -186,6 +186,10 @@ static int hog_accept(struct btd_service *service) - return -EINVAL; - } - -+ /* HOGP 1.0 Section 6.1 requires bonding */ -+ if (!device_is_bonded(device, btd_device_get_bdaddr_type(device))) -+ return -ECONNREFUSED; -+ - /* TODO: Replace GAttrib with bt_gatt_client */ - bt_hog_attach(dev->hog, attrib); - --- -2.25.1 - -- cgit v1.2.3 From e2c7dbbf98bfd1b73fa3067d92f2924a135f287a Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 15 Mar 2020 18:42:44 +0100 Subject: gnu: emacs-debbugs: update to 0.22 * gnu/packages/emacs-xyz.scm (emacs-debbugs): Update to 0.22. Signed-off-by: Leo Famulari --- gnu/packages/emacs-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d45814379b..a821bc7776 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -62,6 +62,7 @@ ;;; Copyright © 2020 Evan Straw ;;; Copyright © 2020 Masaya Tojo ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -3606,14 +3607,14 @@ source code using IPython.") (define-public emacs-debbugs (package (name "emacs-debbugs") - (version "0.21") + (version "0.22") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/debbugs-" version ".tar")) (sha256 (base32 - "1xx1wjfpsnwx2fpydqhwy9k1b5kjk8dqbkzf8lqaj9c4rvjbn50a")))) + "05ik9qv539b5c1nzxkk3lk23bqj4vqgmfmd8x367abhb7c9gix2z")))) (build-system emacs-build-system) (arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$"))) (propagated-inputs -- cgit v1.2.3 From eea58169fb519c392ff3ba4a1ad5730e3be9ff39 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Tue, 4 Feb 2020 15:59:03 +0200 Subject: gnu: Add ghcid. * gnu/packages/haskell-apps.scm (ghcid): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-apps.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 6005816260..f5b45d0bfb 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2015 John Soo ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. ;;; @@ -266,6 +267,40 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. @end enumerate") (license license:gpl2))) +(define-public ghcid + (package + (name "ghcid") + (version "0.8.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/ghcid/" + "ghcid-" version ".tar.gz")) + (sha256 + (base32 + "0wpm4ikrm1krz1ckzwk0srng091yh2skjal4fh95iz1hq3dw6qlw")))) + (build-system haskell-build-system) + (inputs + `(("ghc-extra" ,ghc-extra) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-cmdargs" ,ghc-cmdargs) + ("ghc-fsnotify" ,ghc-fsnotify) + ("ghc-terminal-size" ,ghc-terminal-size))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page + "https://github.com/ndmitchell/ghcid#readme") + (synopsis "GHCi based bare bones IDE") + (description + "Either \"GHCi as a daemon\" or \"GHC + a bit of an IDE\". A very simple Haskell +development tool which shows you the errors in your project and updates them whenever +you save. Run @code{ghcid --topmost --command=ghci}, where @code{--topmost} makes the +window on top of all others (Windows only) and @code{--command} is the command to start +GHCi on your project (defaults to @code{ghci} if you have a @file{.ghci} file, or else +to @code{cabal repl}).") + (license license:bsd-3))) + (define-public git-annex (package (name "git-annex") -- cgit v1.2.3 From 70d9ef51392e9f8b33af4a7dea459eedd2ca738b Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Tue, 25 Feb 2020 15:11:29 +0000 Subject: gnu: Add lv2lint. * gnu/packages/audio.scm (lv2lint): New variable. Signed-off-by: Leo Famulari --- gnu/packages/audio.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 758c87cb2c..b429aeb107 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -58,6 +58,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages dbm) #:use-module (gnu packages documentation) + #:use-module (gnu packages elf) #:use-module (gnu packages emacs) #:use-module (gnu packages file) #:use-module (gnu packages flex) @@ -4051,3 +4052,35 @@ libsamplerate for reading and resampling audio files, based on Robin Gareus' @code{audio_decoder} code.") (home-page "https://git.zrythm.org/cgit/libaudec") (license license:agpl3+))) + +(define-public lv2lint + (package + (name "lv2lint") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.open-music-kontrollers.ch/lv2/lv2lint") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pspwqpzl2dw1hd9ra9yr53arqbbqjn7d7j0f7p9g3iqa76vblpi")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags + `("-Delf-tests=true" ; for checking symbol visibility + "-Donline-tests=true"))) ; for checking URI existence + (inputs + `(("curl", curl) + ("libelf", libelf) + ("lilv", lilv))) + (native-inputs + `(("pkg-config", pkg-config))) + (synopsis "LV2 plugin lint tool") + (description "lv2lint is an LV2 lint-like tool that checks whether a +given plugin and its UI(s) match up with the provided metadata and adhere +to well-known best practices.") + (home-page "https://open-music-kontrollers.ch/lv2/lv2lint/") + (license license:artistic2.0))) -- cgit v1.2.3 From fa315559a651469c4e29eb88d22c5dbd1cd29794 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 00:51:47 +0100 Subject: gnu: java-osgi-service-component-annotations: Update source URI. * gnu/packages/java.scm (java-osgi-service-component-annotations)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ab9427aa23..e8b8cb1610 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7392,7 +7392,7 @@ in compiling bundles.") (version "1.3.0") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.service.component.annotations/" version "/org.osgi.service.component.annotations-" version "-sources.jar")) -- cgit v1.2.3 From fc1c5dbde514b34dcfcbc4e7c59b6b07d85c8f80 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 00:53:34 +0100 Subject: gnu: java-osgi-dto: Update source URI. * gnu/packages/java.scm (java-osgi-dto)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e8b8cb1610..411c9b268a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7419,7 +7419,7 @@ the support annotations for osgi-service-component.") (version "1.0.0") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.dto/" version "/org.osgi.dto-" version "-sources.jar")) (sha256 -- cgit v1.2.3 From 1f2643faa3a3c5199532192565f00b8a151900ba Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 00:54:59 +0100 Subject: gnu: java-osgi-resource: Update source URI. * gnu/packages/java.scm (java-osgi-resource)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 411c9b268a..8656beb195 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7448,7 +7448,7 @@ objects of the listed types or aggregates.") (version "1.0.0") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.resource/" version "/org.osgi.resource-" version "-sources.jar")) -- cgit v1.2.3 From fccce6616b9824679ab9dedaf1a702da2700d6af Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 00:56:17 +0100 Subject: gnu: java-osgi-namespace-extender: Update source URI. * gnu/packages/java.scm (java-osgi-namespace-extender)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8656beb195..48f6754aeb 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7504,7 +7504,7 @@ the names for the attributes and directives for a namespace with contracts.") (version "1.0.1") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.namespace.extender/" version "/org.osgi.namespace.extender-" version "-sources.jar")) -- cgit v1.2.3 From ec4ba4178b198b10e606480794de0cdcba78ec6e Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 00:57:43 +0100 Subject: gnu: java-osgi-namespace-service: Update source URI. * gnu/packages/java.scm (java-osgi-namespace-service)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 48f6754aeb..b682061755 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7532,7 +7532,7 @@ the names for the attributes and directives for an extender namespace.") (version "1.0.0") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.namespace.service/" version "/org.osgi.namespace.service-" version "-sources.jar")) -- cgit v1.2.3 From 43be029996192dd3d8819234b803a2988e3490fb Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 00:59:09 +0100 Subject: gnu: java-osgi-util-function: Update source URI. * gnu/packages/java.scm (java-osgi-util-function)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b682061755..4c9a27c758 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7560,7 +7560,7 @@ the names for the attributes and directives for a service namespace.") (version "1.0.0") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.util.function/" version "/org.osgi.util.function-" version "-sources.jar")) -- cgit v1.2.3 From c962e6c414ed97996431b5f3f62c5243bc89e8ba Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 01:00:50 +0100 Subject: gnu: java-osgi-util-promise: Update source URI. * gnu/packages/java.scm (java-osgi-util-promise)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 4c9a27c758..f01a10f1db 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7587,7 +7587,7 @@ an interface for a function that accepts a single argument and produces a result (version "1.0.0") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.util.promise/" version "/org.osgi.util.promise-" version "-sources.jar")) -- cgit v1.2.3 From 98b1985fdc1489e4329d097affc376ea27541e0b Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 01:03:10 +0100 Subject: gnu: java-osgi-service-metatype-annotations: Update source URI. * gnu/packages/java.scm (java-osgi-service-metatype-annotations)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f01a10f1db..f762ea8e52 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7616,7 +7616,7 @@ value. It handles the interactions for asynchronous processing.") (version "1.3.0") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.service.metatype.annotations/" version "/org.osgi.service.metatype.annotations-" version "-sources.jar")) -- cgit v1.2.3 From 7a5c5017d3ad362feedad0d058242492f9c61c4b Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 01:05:16 +0100 Subject: gnu: java-osgi-service-repository: Update source URI. * gnu/packages/java.scm (java-osgi-service-repository)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f762ea8e52..c8de7ec305 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7643,7 +7643,7 @@ the support annotations for metatype.") (version "1.1.0") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.service.repository/" version "/org.osgi.service.repository-" version "-sources.jar")) -- cgit v1.2.3 From 05662561f4f0362a1c174bb56052588fce0b8933 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 01:06:55 +0100 Subject: gnu: java-osgi-framework: Update source URI. * gnu/packages/java.scm (java-osgi-framework)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c8de7ec305..9246f63550 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7672,7 +7672,7 @@ a repository service that contains resources.") (version "1.8.0") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.framework/" version "/org.osgi.framework-" version "-sources.jar")) (sha256 -- cgit v1.2.3 From 9b0bf25c578fa3fef466d82a4ba71c8a34048355 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 01:08:04 +0100 Subject: gnu: java-osgi-service-log: Update source URI. * gnu/packages/java.scm (java-osgi-service-log)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9246f63550..91da54c04c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7699,7 +7699,7 @@ and service platform for the Java programming language.") (version "1.3.0") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.service.log/" version "/org.osgi.service.log-" version "-sources.jar")) -- cgit v1.2.3 From 4a6a7b2d0c0cbbe160c2dbf524cac897a7c04368 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 01:09:22 +0100 Subject: gnu: java-osgi-service-jdbc: Update source URI. * gnu/packages/java.scm (java-osgi-service-jdbc)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 91da54c04c..15473a28c2 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7726,7 +7726,7 @@ the log service.") (version "1.0.0") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.service.jdbc/" version "/org.osgi.service.jdbc-" version "-sources.jar")) -- cgit v1.2.3 From b787534b7bdb304e084383f8bf4a845578c74c97 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 01:10:42 +0100 Subject: gnu: java-osgi-service-resolver: Update source URI. * gnu/packages/java.scm (java-osgi-service-resolver)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 15473a28c2..a644ee889a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7758,7 +7758,7 @@ factories for getting JDBC connections: (version "1.0.1") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.service.resolver/" version "/org.osgi.service.resolver-" version "-sources.jar")) -- cgit v1.2.3 From e0695da9168d3b522712b4ae789e9ce4ac2f465c Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 19:45:56 +0100 Subject: gnu: java-osgi-util-tracker: Update source URI. * gnu/packages/java.scm (java-osgi-util-tracker)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a644ee889a..2f20e17b5e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7787,7 +7787,7 @@ by the caller.") (version "1.5.1") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.util.tracker/" version "/org.osgi.util.tracker-" version "-sources.jar")) -- cgit v1.2.3 From f8f2fefbac7ed5247d5c84dd253996d2b784e3d0 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 19:54:06 +0100 Subject: gnu: java-osgi-service-cm: Update source URI. * gnu/packages/java.scm (java-osgi-service-cm)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2f20e17b5e..5dffd394b5 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7815,7 +7815,7 @@ bundle tracking utility classes.") (version "1.5.0") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.service.cm/" version "/org.osgi.service.cm-" version "-sources.jar")) -- cgit v1.2.3 From 839e3e89deb0da1d477ff236204526724f64b5c1 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 19:55:49 +0100 Subject: gnu: java-osgi-service-packageadmin: Update source URI. * gnu/packages/java.scm (java-osgi-service-packageadmin)[source]: Update URI. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5dffd394b5..c7dd87cb6e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -7843,7 +7843,7 @@ utility classes for the configuration of services.") (version "1.2.0") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/org/osgi/" + (uri (string-append "https://repo1.maven.org/maven2/org/osgi/" "org.osgi.service.packageadmin/" version "/org.osgi.service.packageadmin-" version "-sources.jar")) -- cgit v1.2.3 From 3e550fc8357f5fe3ecafcc712ddfdc02deb41a8b Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 20:07:05 +0100 Subject: gnu: java-qdox: Update source and home-page URI. * gnu/packages/java.scm (java-qdox)[source]: Update URI. [home-page]: Update URI. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c7dd87cb6e..79bf20dd1d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11395,7 +11395,7 @@ such as log4j or @code{java.util.logging} (JUL)."))) ;; Older releases at https://github.com/codehaus/qdox/ ;; Note: The release at maven is pre-generated. The release at ;; github requires jflex. - (uri (string-append "http://central.maven.org/maven2/" + (uri (string-append "https://repo1.maven.org/maven2/" "com/thoughtworks/qdox/qdox/" version "/qdox-" version "-sources.jar")) (sha256 @@ -11405,7 +11405,7 @@ such as log4j or @code{java.util.logging} (JUL)."))) (arguments `(#:jar-name "qdox.jar" #:tests? #f)); no tests - (home-page "http://qdox.codehaus.org/") + (home-page "https://github.com/codehaus/qdox") (synopsis "Parse definitions from Java source files") (description "QDox is a high speed, small footprint parser for extracting class/interface/method definitions from source files complete with JavaDoc -- cgit v1.2.3 From 5281ba175b4deb33971d8bfc33b8d5f17d1f61de Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 20:09:29 +0100 Subject: gnu: java-qdox: Move version 2.0-M2 side by side with version 1.12.1. * gnu/packages/java.scm (java-qdox): Move package definition up, such that it is side by side with version 1.12.1. --- gnu/packages/java.scm | 58 +++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 79bf20dd1d..03ed0c6534 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3334,6 +3334,35 @@ class/interface/method definitions from source files complete with JavaDoc documentation tools.") (license license:asl2.0))) +(define-public java-qdox + (package + (name "java-qdox") + ; Newer version exists, but this version is required by java-plexus-component-metadata + (version "2.0-M2") + (source (origin + (method url-fetch) + ;; 2.0-M4, -M5 at https://github.com/paul-hammant/qdox + ;; Older releases at https://github.com/codehaus/qdox/ + ;; Note: The release at maven is pre-generated. The release at + ;; github requires jflex. + (uri (string-append "https://repo1.maven.org/maven2/" + "com/thoughtworks/qdox/qdox/" version + "/qdox-" version "-sources.jar")) + (sha256 + (base32 + "10xxrcaicq6axszcr2jpygisa4ch4sinyx5q7kqqxv4lknrmxp5x")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "qdox.jar" + #:tests? #f)); no tests + (home-page "https://github.com/codehaus/qdox") + (synopsis "Parse definitions from Java source files") + (description "QDox is a high speed, small footprint parser for extracting +class/interface/method definitions from source files complete with JavaDoc +@code{@@tags}. It is designed to be used by active code generators or +documentation tools.") + (license license:asl2.0))) + (define-public java-jarjar (package (name "java-jarjar") @@ -11384,35 +11413,6 @@ Moreover, @code{logback-classic} natively implements the slf4j API so that you can readily switch back and forth between logback and other logging frameworks such as log4j or @code{java.util.logging} (JUL)."))) -(define-public java-qdox - (package - (name "java-qdox") - ; Newer version exists, but this version is required by java-plexus-component-metadata - (version "2.0-M2") - (source (origin - (method url-fetch) - ;; 2.0-M4, -M5 at https://github.com/paul-hammant/qdox - ;; Older releases at https://github.com/codehaus/qdox/ - ;; Note: The release at maven is pre-generated. The release at - ;; github requires jflex. - (uri (string-append "https://repo1.maven.org/maven2/" - "com/thoughtworks/qdox/qdox/" version - "/qdox-" version "-sources.jar")) - (sha256 - (base32 - "10xxrcaicq6axszcr2jpygisa4ch4sinyx5q7kqqxv4lknrmxp5x")))) - (build-system ant-build-system) - (arguments - `(#:jar-name "qdox.jar" - #:tests? #f)); no tests - (home-page "https://github.com/codehaus/qdox") - (synopsis "Parse definitions from Java source files") - (description "QDox is a high speed, small footprint parser for extracting -class/interface/method definitions from source files complete with JavaDoc -@code{@@tags}. It is designed to be used by active code generators or -documentation tools.") - (license license:asl2.0))) - (define-public java-jgit (package (name "java-jgit") -- cgit v1.2.3 From c3d56df50b96e884be57d95e20717e440b8bcfe4 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 22:18:16 +0100 Subject: gnu: java-xsdlib: Use archived home page URI, update source URI. * gnu/packages/xml.scm (java-xsdlib)[home-page]: Use archived URI. [source]: Update URI. --- gnu/packages/xml.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 76fb3ea072..32696e30ee 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1683,7 +1683,7 @@ that strives for correctness and simplicity.") (version "2013.2") (source (origin (method url-fetch) - (uri (string-append "http://central.maven.org/maven2/com/sun/msv/" + (uri (string-append "https://repo1.maven.org/maven2/com/sun/msv/" "datatype/xsd/xsdlib/" version "/xsdlib-" version "-sources.jar")) (sha256 @@ -1696,7 +1696,8 @@ that strives for correctness and simplicity.") #:jdk ,icedtea-8)) (inputs `(("java-xerces" ,java-xerces))) - (home-page "http://central.maven.org/maven2/com/sun/msv/datatype/xsd/xsdlib/") + (home-page (string-append "https://web.archive.org/web/20161127144537/" + "https://msv.java.net//")) (synopsis "Sun Multi-Schema Validator") (description "Xsdlib contains an implementation of sun.com.msv, an XML validator.") -- cgit v1.2.3 From b19f155cf842b5ed6f7ae9c94ef7389e20c10e0f Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Mar 2020 22:23:42 +0100 Subject: gnu: java-snakeyaml: Update hash. Compared to the the old tarfile available on ci.guix.gnu.org, only the file '.hg_archival.txt' was removed. * gnu/packages/java.scm (java-snakeyaml)[source]: Update hash. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 03ed0c6534..76a0c6234c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -8532,7 +8532,7 @@ of deserialization.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0rf5ha6w0waz50jz2479jsrbgmd0dnx0gs337m126j5z7zlmg7mg")))) + "0474cqcv46zgv9bhms2vgawakq1vyj0hp3h3f1bfys46msia90bh")))) (build-system ant-build-system) (arguments `(#:jar-name "java-snakeyaml.jar" -- cgit v1.2.3 From 8bbbbb39350eb559951972abae2622195393b51e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 Mar 2020 21:03:39 -0400 Subject: Revert "gnu: BlueZ: Update to 5.54." This reverts commit f24aaa81de8c709adfda2e89271c562a5ca8d959. This change caused too many rebuilds for the master branch. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 13 +- gnu/packages/patches/bluez-CVE-2020-0556.patch | 180 +++++++++++++++++++++++++ 3 files changed, 192 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/bluez-CVE-2020-0556.patch diff --git a/gnu/local.mk b/gnu/local.mk index b628bbee0c..3be54b2627 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -764,6 +764,7 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ + %D%/packages/patches/bluez-CVE-2020-0556.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-bs4.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fda7570d89..f1bc5798ab 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4039,7 +4039,8 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") - (version "5.54") + (replacement bluez/fixed) + (version "5.53") (source (origin (method url-fetch) (uri (string-append @@ -4047,7 +4048,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") version ".tar.xz")) (sha256 (base32 - "1p2ncvjz6alr9n3l5wvq2arqgc7xjs6dqyar1l9jp0z8cfgapkb8")))) + "1g1qg6dz6hl3csrmz75ixr12lwv836hq3ckb259svvrg62l2vaiq")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -4104,6 +4105,14 @@ Bluetooth audio output devices like headphones or loudspeakers.") is flexible, efficient and uses a modular implementation.") (license license:gpl2+))) +(define bluez/fixed + (package + (inherit bluez) + (source (origin + (inherit (package-source bluez)) + (patches (append (origin-patches (package-source bluez)) + (search-patches "bluez-CVE-2020-0556.patch"))))))) + (define-public fuse-exfat (package (name "fuse-exfat") diff --git a/gnu/packages/patches/bluez-CVE-2020-0556.patch b/gnu/packages/patches/bluez-CVE-2020-0556.patch new file mode 100644 index 0000000000..7c34459a3a --- /dev/null +++ b/gnu/packages/patches/bluez-CVE-2020-0556.patch @@ -0,0 +1,180 @@ +Fix CVE-2020-0556: + +https://lore.kernel.org/linux-bluetooth/20200310023516.209146-1-alainm@chromium.org/ +https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.html +http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-0556 + +Patches copied from upstream source repository: + +https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=3cccdbab2324086588df4ccf5f892fb3ce1f1787 +https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=8cdbd3b09f29da29374e2f83369df24228da0ad1 + +From 3cccdbab2324086588df4ccf5f892fb3ce1f1787 Mon Sep 17 00:00:00 2001 +From: Alain Michaud +Date: Tue, 10 Mar 2020 02:35:18 +0000 +Subject: [PATCH] HID accepts bonded device connections only. + +This change adds a configuration for platforms to choose a more secure +posture for the HID profile. While some older mice are known to not +support pairing or encryption, some platform may choose a more secure +posture by requiring the device to be bonded and require the +connection to be encrypted when bonding is required. + +Reference: +https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.html +--- + profiles/input/device.c | 23 ++++++++++++++++++++++- + profiles/input/device.h | 1 + + profiles/input/input.conf | 8 ++++++++ + profiles/input/manager.c | 13 ++++++++++++- + 4 files changed, 43 insertions(+), 2 deletions(-) + +diff --git a/profiles/input/device.c b/profiles/input/device.c +index 2cb3811c8..d89da2d7c 100644 +--- a/profiles/input/device.c ++++ b/profiles/input/device.c +@@ -92,6 +92,7 @@ struct input_device { + + static int idle_timeout = 0; + static bool uhid_enabled = false; ++static bool classic_bonded_only = false; + + void input_set_idle_timeout(int timeout) + { +@@ -103,6 +104,11 @@ void input_enable_userspace_hid(bool state) + uhid_enabled = state; + } + ++void input_set_classic_bonded_only(bool state) ++{ ++ classic_bonded_only = state; ++} ++ + static void input_device_enter_reconnect_mode(struct input_device *idev); + static int connection_disconnect(struct input_device *idev, uint32_t flags); + +@@ -970,8 +976,18 @@ static int hidp_add_connection(struct input_device *idev) + if (device_name_known(idev->device)) + device_get_name(idev->device, req->name, sizeof(req->name)); + ++ /* Make sure the device is bonded if required */ ++ if (classic_bonded_only && !device_is_bonded(idev->device, ++ btd_device_get_bdaddr_type(idev->device))) { ++ error("Rejected connection from !bonded device %s", dst_addr); ++ goto cleanup; ++ } ++ + /* Encryption is mandatory for keyboards */ +- if (req->subclass & 0x40) { ++ /* Some platforms may choose to require encryption for all devices */ ++ /* Note that this only matters for pre 2.1 devices as otherwise the */ ++ /* device is encrypted by default by the lower layers */ ++ if (classic_bonded_only || req->subclass & 0x40) { + if (!bt_io_set(idev->intr_io, &gerr, + BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM, + BT_IO_OPT_INVALID)) { +@@ -1203,6 +1219,11 @@ static void input_device_enter_reconnect_mode(struct input_device *idev) + DBG("path=%s reconnect_mode=%s", idev->path, + reconnect_mode_to_string(idev->reconnect_mode)); + ++ /* Make sure the device is bonded if required */ ++ if (classic_bonded_only && !device_is_bonded(idev->device, ++ btd_device_get_bdaddr_type(idev->device))) ++ return; ++ + /* Only attempt an auto-reconnect when the device is required to + * accept reconnections from the host. + */ +diff --git a/profiles/input/device.h b/profiles/input/device.h +index 51a9aee18..3044db673 100644 +--- a/profiles/input/device.h ++++ b/profiles/input/device.h +@@ -29,6 +29,7 @@ struct input_conn; + + void input_set_idle_timeout(int timeout); + void input_enable_userspace_hid(bool state); ++void input_set_classic_bonded_only(bool state); + + int input_device_register(struct btd_service *service); + void input_device_unregister(struct btd_service *service); +diff --git a/profiles/input/input.conf b/profiles/input/input.conf +index 3e1d65aae..166aff4a4 100644 +--- a/profiles/input/input.conf ++++ b/profiles/input/input.conf +@@ -11,3 +11,11 @@ + # Enable HID protocol handling in userspace input profile + # Defaults to false (HIDP handled in HIDP kernel module) + #UserspaceHID=true ++ ++# Limit HID connections to bonded devices ++# The HID Profile does not specify that devices must be bonded, however some ++# platforms may want to make sure that input connections only come from bonded ++# device connections. Several older mice have been known for not supporting ++# pairing/encryption. ++# Defaults to false to maximize device compatibility. ++#ClassicBondedOnly=true +diff --git a/profiles/input/manager.c b/profiles/input/manager.c +index 1d31b0652..5cd27b839 100644 +--- a/profiles/input/manager.c ++++ b/profiles/input/manager.c +@@ -96,7 +96,7 @@ static int input_init(void) + config = load_config_file(CONFIGDIR "/input.conf"); + if (config) { + int idle_timeout; +- gboolean uhid_enabled; ++ gboolean uhid_enabled, classic_bonded_only; + + idle_timeout = g_key_file_get_integer(config, "General", + "IdleTimeout", &err); +@@ -114,6 +114,17 @@ static int input_init(void) + input_enable_userspace_hid(uhid_enabled); + } else + g_clear_error(&err); ++ ++ classic_bonded_only = g_key_file_get_boolean(config, "General", ++ "ClassicBondedOnly", &err); ++ ++ if (!err) { ++ DBG("input.conf: ClassicBondedOnly=%s", ++ classic_bonded_only ? "true" : "false"); ++ input_set_classic_bonded_only(classic_bonded_only); ++ } else ++ g_clear_error(&err); ++ + } + + btd_profile_register(&input_profile); +-- +2.25.1 + +From 8cdbd3b09f29da29374e2f83369df24228da0ad1 Mon Sep 17 00:00:00 2001 +From: Alain Michaud +Date: Tue, 10 Mar 2020 02:35:16 +0000 +Subject: [PATCH] HOGP must only accept data from bonded devices. + +HOGP 1.0 Section 6.1 establishes that the HOGP must require bonding. + +Reference: +https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.htm +--- + profiles/input/hog.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/profiles/input/hog.c b/profiles/input/hog.c +index 83c017dcb..dfac68921 100644 +--- a/profiles/input/hog.c ++++ b/profiles/input/hog.c +@@ -186,6 +186,10 @@ static int hog_accept(struct btd_service *service) + return -EINVAL; + } + ++ /* HOGP 1.0 Section 6.1 requires bonding */ ++ if (!device_is_bonded(device, btd_device_get_bdaddr_type(device))) ++ return -ECONNREFUSED; ++ + /* TODO: Replace GAttrib with bt_gatt_client */ + bt_hog_attach(dev->hog, attrib); + +-- +2.25.1 + -- cgit v1.2.3 From 34ad1a550c935e98aac2588f02dbfbfb7b5fad0c Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 15 Mar 2020 19:07:57 +0100 Subject: gnu: BlueZ: Update to 5.54. * gnu/packages/linux.scm (bluez): Update to 5.54. [replacement]: Remove field. (bluez/fixed): Remove variable. * gnu/packages/patches/bluez-CVE-2020-0556.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Leo Famulari --- gnu/local.mk | 1 - gnu/packages/linux.scm | 13 +- gnu/packages/patches/bluez-CVE-2020-0556.patch | 180 ------------------------- 3 files changed, 2 insertions(+), 192 deletions(-) delete mode 100644 gnu/packages/patches/bluez-CVE-2020-0556.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3be54b2627..b628bbee0c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -764,7 +764,6 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ - %D%/packages/patches/bluez-CVE-2020-0556.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-bs4.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f1bc5798ab..fda7570d89 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4039,8 +4039,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") (define-public bluez (package (name "bluez") - (replacement bluez/fixed) - (version "5.53") + (version "5.54") (source (origin (method url-fetch) (uri (string-append @@ -4048,7 +4047,7 @@ Bluetooth audio output devices like headphones or loudspeakers.") version ".tar.xz")) (sha256 (base32 - "1g1qg6dz6hl3csrmz75ixr12lwv836hq3ckb259svvrg62l2vaiq")))) + "1p2ncvjz6alr9n3l5wvq2arqgc7xjs6dqyar1l9jp0z8cfgapkb8")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -4105,14 +4104,6 @@ Bluetooth audio output devices like headphones or loudspeakers.") is flexible, efficient and uses a modular implementation.") (license license:gpl2+))) -(define bluez/fixed - (package - (inherit bluez) - (source (origin - (inherit (package-source bluez)) - (patches (append (origin-patches (package-source bluez)) - (search-patches "bluez-CVE-2020-0556.patch"))))))) - (define-public fuse-exfat (package (name "fuse-exfat") diff --git a/gnu/packages/patches/bluez-CVE-2020-0556.patch b/gnu/packages/patches/bluez-CVE-2020-0556.patch deleted file mode 100644 index 7c34459a3a..0000000000 --- a/gnu/packages/patches/bluez-CVE-2020-0556.patch +++ /dev/null @@ -1,180 +0,0 @@ -Fix CVE-2020-0556: - -https://lore.kernel.org/linux-bluetooth/20200310023516.209146-1-alainm@chromium.org/ -https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.html -http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-0556 - -Patches copied from upstream source repository: - -https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=3cccdbab2324086588df4ccf5f892fb3ce1f1787 -https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=8cdbd3b09f29da29374e2f83369df24228da0ad1 - -From 3cccdbab2324086588df4ccf5f892fb3ce1f1787 Mon Sep 17 00:00:00 2001 -From: Alain Michaud -Date: Tue, 10 Mar 2020 02:35:18 +0000 -Subject: [PATCH] HID accepts bonded device connections only. - -This change adds a configuration for platforms to choose a more secure -posture for the HID profile. While some older mice are known to not -support pairing or encryption, some platform may choose a more secure -posture by requiring the device to be bonded and require the -connection to be encrypted when bonding is required. - -Reference: -https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.html ---- - profiles/input/device.c | 23 ++++++++++++++++++++++- - profiles/input/device.h | 1 + - profiles/input/input.conf | 8 ++++++++ - profiles/input/manager.c | 13 ++++++++++++- - 4 files changed, 43 insertions(+), 2 deletions(-) - -diff --git a/profiles/input/device.c b/profiles/input/device.c -index 2cb3811c8..d89da2d7c 100644 ---- a/profiles/input/device.c -+++ b/profiles/input/device.c -@@ -92,6 +92,7 @@ struct input_device { - - static int idle_timeout = 0; - static bool uhid_enabled = false; -+static bool classic_bonded_only = false; - - void input_set_idle_timeout(int timeout) - { -@@ -103,6 +104,11 @@ void input_enable_userspace_hid(bool state) - uhid_enabled = state; - } - -+void input_set_classic_bonded_only(bool state) -+{ -+ classic_bonded_only = state; -+} -+ - static void input_device_enter_reconnect_mode(struct input_device *idev); - static int connection_disconnect(struct input_device *idev, uint32_t flags); - -@@ -970,8 +976,18 @@ static int hidp_add_connection(struct input_device *idev) - if (device_name_known(idev->device)) - device_get_name(idev->device, req->name, sizeof(req->name)); - -+ /* Make sure the device is bonded if required */ -+ if (classic_bonded_only && !device_is_bonded(idev->device, -+ btd_device_get_bdaddr_type(idev->device))) { -+ error("Rejected connection from !bonded device %s", dst_addr); -+ goto cleanup; -+ } -+ - /* Encryption is mandatory for keyboards */ -- if (req->subclass & 0x40) { -+ /* Some platforms may choose to require encryption for all devices */ -+ /* Note that this only matters for pre 2.1 devices as otherwise the */ -+ /* device is encrypted by default by the lower layers */ -+ if (classic_bonded_only || req->subclass & 0x40) { - if (!bt_io_set(idev->intr_io, &gerr, - BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM, - BT_IO_OPT_INVALID)) { -@@ -1203,6 +1219,11 @@ static void input_device_enter_reconnect_mode(struct input_device *idev) - DBG("path=%s reconnect_mode=%s", idev->path, - reconnect_mode_to_string(idev->reconnect_mode)); - -+ /* Make sure the device is bonded if required */ -+ if (classic_bonded_only && !device_is_bonded(idev->device, -+ btd_device_get_bdaddr_type(idev->device))) -+ return; -+ - /* Only attempt an auto-reconnect when the device is required to - * accept reconnections from the host. - */ -diff --git a/profiles/input/device.h b/profiles/input/device.h -index 51a9aee18..3044db673 100644 ---- a/profiles/input/device.h -+++ b/profiles/input/device.h -@@ -29,6 +29,7 @@ struct input_conn; - - void input_set_idle_timeout(int timeout); - void input_enable_userspace_hid(bool state); -+void input_set_classic_bonded_only(bool state); - - int input_device_register(struct btd_service *service); - void input_device_unregister(struct btd_service *service); -diff --git a/profiles/input/input.conf b/profiles/input/input.conf -index 3e1d65aae..166aff4a4 100644 ---- a/profiles/input/input.conf -+++ b/profiles/input/input.conf -@@ -11,3 +11,11 @@ - # Enable HID protocol handling in userspace input profile - # Defaults to false (HIDP handled in HIDP kernel module) - #UserspaceHID=true -+ -+# Limit HID connections to bonded devices -+# The HID Profile does not specify that devices must be bonded, however some -+# platforms may want to make sure that input connections only come from bonded -+# device connections. Several older mice have been known for not supporting -+# pairing/encryption. -+# Defaults to false to maximize device compatibility. -+#ClassicBondedOnly=true -diff --git a/profiles/input/manager.c b/profiles/input/manager.c -index 1d31b0652..5cd27b839 100644 ---- a/profiles/input/manager.c -+++ b/profiles/input/manager.c -@@ -96,7 +96,7 @@ static int input_init(void) - config = load_config_file(CONFIGDIR "/input.conf"); - if (config) { - int idle_timeout; -- gboolean uhid_enabled; -+ gboolean uhid_enabled, classic_bonded_only; - - idle_timeout = g_key_file_get_integer(config, "General", - "IdleTimeout", &err); -@@ -114,6 +114,17 @@ static int input_init(void) - input_enable_userspace_hid(uhid_enabled); - } else - g_clear_error(&err); -+ -+ classic_bonded_only = g_key_file_get_boolean(config, "General", -+ "ClassicBondedOnly", &err); -+ -+ if (!err) { -+ DBG("input.conf: ClassicBondedOnly=%s", -+ classic_bonded_only ? "true" : "false"); -+ input_set_classic_bonded_only(classic_bonded_only); -+ } else -+ g_clear_error(&err); -+ - } - - btd_profile_register(&input_profile); --- -2.25.1 - -From 8cdbd3b09f29da29374e2f83369df24228da0ad1 Mon Sep 17 00:00:00 2001 -From: Alain Michaud -Date: Tue, 10 Mar 2020 02:35:16 +0000 -Subject: [PATCH] HOGP must only accept data from bonded devices. - -HOGP 1.0 Section 6.1 establishes that the HOGP must require bonding. - -Reference: -https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.htm ---- - profiles/input/hog.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/profiles/input/hog.c b/profiles/input/hog.c -index 83c017dcb..dfac68921 100644 ---- a/profiles/input/hog.c -+++ b/profiles/input/hog.c -@@ -186,6 +186,10 @@ static int hog_accept(struct btd_service *service) - return -EINVAL; - } - -+ /* HOGP 1.0 Section 6.1 requires bonding */ -+ if (!device_is_bonded(device, btd_device_get_bdaddr_type(device))) -+ return -ECONNREFUSED; -+ - /* TODO: Replace GAttrib with bt_gatt_client */ - bt_hog_attach(dev->hog, attrib); - --- -2.25.1 - -- cgit v1.2.3 From 927c2518465579d48315e8e6b5102097c146fece Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 6 Mar 2020 22:34:53 +0100 Subject: cargo-build-system: Accept a #:features argument * guix/build/cargo-build-system.scm (build, install): Pass the features to cargo. (check): Remove indirection layer for consistency with build and install. * guix/build-system/cargo.scm (cargo-build): New argument; pass it into the builder. * gnu/packages/rust-apps.scm (ripgrep): Use the new argument instead of a custom phase. --- gnu/packages/rust-apps.scm | 14 ++------------ guix/build-system/cargo.scm | 3 +++ guix/build/cargo-build-system.scm | 13 +++++++++---- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index af51c0fcfc..2c718a14f5 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -244,18 +244,8 @@ provides defaults for 80% of the use cases.") (install-file manpage (string-append (assoc-ref outputs "out") "/share/man/man1")))) - #t)) - (replace 'install - ;; Adapted from (guix build cargo-build-system). The flags need to - ;; be passed to `cargo install' too, as otherwise it will build - ;; another binary, without the features. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p out) - (setenv "CARGO_TARGET_DIR" "./target") - (invoke "cargo" "install" "--path" "." "--root" out - "--features" "pcre2"))))) - #:cargo-build-flags '("--release" "--features" "pcre2"))) + #t))) + #:features '("pcre2"))) (native-inputs `(("asciidoc" ,asciidoc) ("pcre2" ,pcre2) diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 1e8b3a578e..6c8edf6bac 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2016 David Craven ;;; Copyright © 2019 Ivan Petkov +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,6 +77,7 @@ to NAME and VERSION." (vendor-dir "guix-vendor") (cargo-build-flags ''("--release")) (cargo-test-flags ''("--release")) + (features ''()) (skip-build? #f) (phases '(@ (guix build cargo-build-system) %standard-phases)) @@ -104,6 +106,7 @@ to NAME and VERSION." #:vendor-dir ,vendor-dir #:cargo-build-flags ,cargo-build-flags #:cargo-test-flags ,cargo-test-flags + #:features ,features #:skip-build? ,skip-build? #:tests? ,(and tests? (not skip-build?)) #:phases ,phases diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index 0721989589..95e8dd772a 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2019, 2020 Efraim Flashner +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -140,11 +141,14 @@ directory = '" port) (define* (build #:key skip-build? + features (cargo-build-flags '("--release")) #:allow-other-keys) "Build a given Cargo package." (or skip-build? - (apply invoke `("cargo" "build" ,@cargo-build-flags)))) + (apply invoke "cargo" "build" + "--features" (string-join features) + cargo-build-flags))) (define* (check #:key tests? @@ -152,10 +156,10 @@ directory = '" port) #:allow-other-keys) "Run tests for a given Cargo package." (if tests? - (apply invoke `("cargo" "test" ,@cargo-test-flags)) + (apply invoke "cargo" "test" cargo-test-flags) #t)) -(define* (install #:key inputs outputs skip-build? #:allow-other-keys) +(define* (install #:key inputs outputs skip-build? features #:allow-other-keys) "Install a given Cargo package." (let* ((out (assoc-ref outputs "out"))) (mkdir-p out) @@ -168,7 +172,8 @@ directory = '" port) ;; otherwise cargo will raise an error. (or skip-build? (not (has-executable-target?)) - (invoke "cargo" "install" "--path" "." "--root" out)))) + (invoke "cargo" "install" "--path" "." "--root" out + "--features" (string-join features))))) (define %standard-phases (modify-phases gnu:%standard-phases -- cgit v1.2.3 From 87bc9f022cdd3487e85cf83cf82222315246abf9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Mar 2020 18:21:20 +0100 Subject: gnu: ImageMagick: Build reproducibly. Fixes . * gnu/packages/imagemagick.scm (imagemagick)[arguments]: In #:configure-flags, add "--enable-reproducible-build". --- gnu/packages/imagemagick.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 3c1fe012d0..5287255054 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -58,7 +58,11 @@ "0fcbcad95wn0q0pdfl0qgycm30f3a7xhskc0r5icldq6v6l4b3is")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch") + `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" + + ;; Do not embed the build date in binaries. + "--enable-reproducible-build") + ;; FIXME: The test suite succeeded before version 6.9.6-2. ;; Try enabling it again with newer releases. #:tests? #f -- cgit v1.2.3 From ba65d474d317a966a6a0ec8449334d9dfdf887e5 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 29 Mar 2020 01:42:38 +0100 Subject: gnu: Use rust 1.39 as the default for package builds * gnu/packages/rust.scm (rust): Point to rust-1.39. --- gnu/packages/rust.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 11522b933e..621962b935 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1176,4 +1176,4 @@ move around." (generate-all-checksums "vendor") #t))))))))) -(define-public rust rust-1.37) +(define-public rust rust-1.39) -- cgit v1.2.3 From 39e75fa6929e67ad1424f45923c58a02107f8f22 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Thu, 2 Apr 2020 01:22:22 +0200 Subject: gnu: graphviz: Make some inputs native. * gnu/packages/graphviz.scm (graphviz)[inputs]: Move swig from here... [native-inputs]: ...to here. Signed-off-by: Mathieu Othacehe --- gnu/packages/graphviz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 2d2bb11130..051089881a 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Gábor Boskovits ;;; Copyright © 2018 Mathieu Lirzin ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,7 +98,6 @@ ("gts" ,gts) ("gd" ,gd) ; FIXME: Our GD is too old ("guile" ,guile-2.0) ;Guile bindings - ("swig" ,swig) ("pango" ,pango) ("fontconfig" ,fontconfig) ("freetype" ,freetype) @@ -108,6 +108,7 @@ ("libpng" ,libpng))) (native-inputs `(("bison" ,bison) + ("swig" ,swig) ("pkg-config" ,pkg-config))) (outputs '("out" "doc")) ; 5 MiB of html + pdfs (home-page "http://www.graphviz.org/") -- cgit v1.2.3 From b581dd368a0c83d05b97de1c2e0f2443a7c9706f Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Thu, 2 Apr 2020 20:20:54 +0200 Subject: gnu: gdb: Make some inputs native. * gnu/packages/gdb.scm (gdb)[inputs]: Move dejagnu from here... [native-inputs]: ...to here. Signed-off-by: Mathieu Othacehe --- gnu/packages/gdb.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 01f93f6def..6331bd23f3 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015, 2016, 2019 Efraim Flashner ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; @@ -94,7 +95,6 @@ ("guile" ,guile-2.0) ("python" ,python) ("python-wrapper" ,python-wrapper) - ("dejagnu" ,dejagnu) ("source-highlight" ,source-highlight) ;; Allow use of XML-formatted syscall information. This enables 'catch @@ -102,6 +102,7 @@ ("libxml2" ,libxml2))) (native-inputs `(("texinfo" ,texinfo) + ("dejagnu" ,dejagnu) ("pkg-config" ,pkg-config))) (home-page "https://www.gnu.org/software/gdb/") (synopsis "The GNU debugger") -- cgit v1.2.3 From e89986c8e363740f01d0f68ddf2af5b8d9689f56 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 4 Apr 2020 12:08:07 +0200 Subject: gnu: ibus: Make some inputs native. * gnu/packages/ibus.scm (ibus)[inputs]: Move gettext from here... [native-inputs]: ...to here. Signed-off-by: Mathieu Othacehe --- gnu/packages/ibus.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 12a8d6758f..3782f390de 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Meiyo Peng ;;; Copyright © 2020 kanichos +;;; Copyright © 2020 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; @@ -140,7 +141,6 @@ ("gconf" ,gconf) ("gtk2" ,gtk+-2) ("gtk+" ,gtk+) - ("gettext" ,gnu-gettext) ("json-glib" ,json-glib) ("libnotify" ,libnotify) ("libx11" ,libx11) @@ -152,6 +152,7 @@ ("python" ,python))) (native-inputs `(("glib" ,glib "bin") ; for glib-genmarshal + ("gettext" ,gnu-gettext) ("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler ("ucd" ,ucd) ("unicode-emoji" ,unicode-emoji) -- cgit v1.2.3 From 18705a507da60ad9f9d03d2dbbaa127cedca3716 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 4 Apr 2020 15:50:31 +0200 Subject: gnu: IBus: Build with 'gettext-minimal'. * gnu/packages/ibus.scm (ibus)[native-inputs]: Change from GNU-GETTEXT to GETTEXT-MINIMAL. --- gnu/packages/ibus.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 3782f390de..0793635b7d 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -152,7 +152,7 @@ ("python" ,python))) (native-inputs `(("glib" ,glib "bin") ; for glib-genmarshal - ("gettext" ,gnu-gettext) + ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler ("ucd" ,ucd) ("unicode-emoji" ,unicode-emoji) -- cgit v1.2.3 From 3f3c9fdcd8cff2e761a2768b175b63b3c09ef4e3 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 5 Jan 2020 17:13:20 +0100 Subject: build-system/go: Allow providing additional build flags * guix/build-system/go.scm (build-flags): New argument. * guix/build/go-build-system.scm (build): Use apply to pass the additional arguments to invoke. --- guix/build-system/go.scm | 3 +++ guix/build/go-build-system.scm | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm index 1b916af8f9..f8ebaefb27 100644 --- a/guix/build-system/go.scm +++ b/guix/build-system/go.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Petter ;;; Copyright © 2017 Leo Famulari +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,6 +83,7 @@ (install-source? #t) (import-path "") (unpack-path "") + (build-flags ''()) (tests? #t) (allow-go-reference? #f) (system (%current-system)) @@ -109,6 +111,7 @@ #:install-source? ,install-source? #:import-path ,import-path #:unpack-path ,unpack-path + #:build-flags ,build-flags #:tests? ,tests? #:allow-go-reference? ,allow-go-reference? #:inputs %build-inputs))) diff --git a/guix/build/go-build-system.scm b/guix/build/go-build-system.scm index 0d15f978cd..b9cb2bfd7b 100644 --- a/guix/build/go-build-system.scm +++ b/guix/build/go-build-system.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017, 2019 Leo Famulari ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2020 Jack Hill +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -214,18 +215,18 @@ unpacking." (_ #f)) inputs)))) -(define* (build #:key import-path #:allow-other-keys) +(define* (build #:key import-path build-flags #:allow-other-keys) "Build the package named by IMPORT-PATH." (with-throw-handler #t (lambda _ - (invoke "go" "install" + (apply invoke "go" "install" "-v" ; print the name of packages as they are compiled "-x" ; print each command as it is invoked ;; Respectively, strip the symbol table and debug ;; information, and the DWARF symbol table. "-ldflags=-s -w" - import-path)) + `(,@build-flags ,import-path))) (lambda (key . args) (display (string-append "Building '" import-path "' failed.\n" "Here are the results of `go env`:\n")) -- cgit v1.2.3 From 492b82bd4d592276e65c4b9bfbe1b679a00ff09f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 24 Apr 2020 01:12:46 -0400 Subject: gnu: tzdata: Update to 2020a. * gnu/packages/base.scm (tzdata): Update to 2020a. --- gnu/packages/base.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index a49ea25196..715c4547ad 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1198,7 +1198,7 @@ command.") (define-public tzdata (package (name "tzdata") - (version "2019c") + (version "2020a") (source (origin (method url-fetch) (uri (string-append @@ -1206,7 +1206,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr")))) + "18lrp0zh8m931jjlrv8lvjas4ka5dfkzdbwnbw5lwd2dlbn62wal")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -1256,7 +1256,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn")))))) + "0sfnlqw1p93r7klny69rwr94fh22mz632h52phgzfgg01q9gfakx")))))) (home-page "https://www.iana.org/time-zones") (synopsis "Database of current and historical time zones") (description "The Time Zone Database (often called tz or zoneinfo) -- cgit v1.2.3 From e5f95fd897ad32c93bb48ceae30021976a917979 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 May 2020 17:31:18 +0200 Subject: gnu: w3m: Update to 0.5.3+git20200502. * gnu/packages/w3m.scm (w3m): Update to 0.5.3+git20200502. --- gnu/packages/w3m.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm index 1ec07675ab..934a6d9e38 100644 --- a/gnu/packages/w3m.scm +++ b/gnu/packages/w3m.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2018 Rutger Helling +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,7 +40,7 @@ (define-public w3m (package (name "w3m") - (version "0.5.3+git20190105") + (version "0.5.3+git20200502") (source (origin (method git-fetch) ;; Debian's fork of w3m is the only one that is still maintained. @@ -49,7 +50,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1fbg2p8qh2gvi3g4iz4q6vc0k70pf248r4yndi5lcn2m3mzvjx0i")))) + "0yyfhwcwy1dvdbirj6zqwk4gl8z9npfavs0k7ipcg5fd16vnx7mi")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no check target -- cgit v1.2.3 From b7a1cac603817dce2d717b490d2bff29bee46ac6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 14 May 2020 21:31:42 +0200 Subject: gnu: openjdk9: Simplify snippet. * gnu/packages/java.scm (openjdk9)[source]: Use only one find-files invocation. --- gnu/packages/java.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e2f79c3dc5..d03d783448 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Roel Janssen ;;; Copyright © 2017, 2019 Carlo Zancanaro @@ -1808,9 +1808,8 @@ new Date();")) (modules '((guix build utils))) (snippet `(begin - (for-each delete-file (find-files "." ".*.bin$")) - (for-each delete-file (find-files "." ".*.exe$")) - (for-each delete-file (find-files "." ".*.jar$")) + (for-each delete-file + (find-files "." ".*.(bin|exe|jar)$")) #t)))) (build-system gnu-build-system) (outputs '("out" "jdk" "doc")) -- cgit v1.2.3 From f5789c265de99952ec703c3a5d8a2bfc1d9aa4d2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 14 May 2020 21:32:30 +0200 Subject: gnu: openjdk9: Build in parallel. * gnu/packages/java.scm (openjdk9)[arguments]: Add phase "write-source-revision-file"; replace "build" phase; add make-flags; remove GUIX_LD_WRAPPER_ALLOW_IMPURITIES. --- gnu/packages/java.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d03d783448..ef7796f681 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1815,6 +1815,7 @@ new Date();")) (outputs '("out" "jdk" "doc")) (arguments `(#:tests? #f; require jtreg + #:make-flags '("all") #:imported-modules ((guix build syscalls) ,@%gnu-build-system-modules) @@ -1839,14 +1840,20 @@ new Date();")) "--with-libjpeg=system" (string-append "--prefix=" (assoc-ref outputs "out"))) #t)) - (replace 'build + (add-before 'build 'write-source-revision-file (lambda _ (with-output-to-file ".src-rev" (lambda _ (display ,version))) - (setenv "GUIX_LD_WRAPPER_ALLOW_IMPURITIES" "yes") - (invoke "make" "all") #t)) + (replace 'build + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" + `(,@(if parallel-build? + (list (string-append "JOBS=" + (number->string (parallel-job-count)))) + '()) + ,@make-flags)))) ;; Some of the libraries in the lib/ folder link to libjvm.so. ;; But that shared object is located in the server/ folder, so it ;; cannot be found. This phase creates a symbolic link in the @@ -1919,8 +1926,7 @@ new Date();")) (native-inputs `(("icedtea-8" ,icedtea-8) ("icedtea-8:jdk" ,icedtea-8 "jdk") - ;; XXX: The build system is not particularly parallel safe and - ;; fails with newer versions of GNU Make. + ;; XXX: The build system fails with newer versions of GNU Make. ("make@4.2" ,gnu-make-4.2) ("unzip" ,unzip) ("which" ,which) -- cgit v1.2.3 From 49ad6aec80394379c6b63e8c88608a104e1b5e40 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 14 May 2020 22:07:02 +0200 Subject: gnu: openjdk10: Simplify snippet. * gnu/packages/java.scm (openjdk10)[source]: Use regular expression in find-files. --- gnu/packages/java.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ef7796f681..ba98182ede 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1954,9 +1954,7 @@ new Date();")) (modules '((guix build utils))) (snippet `(begin - (for-each delete-file (find-files "." ".*.bin$")) - (for-each delete-file (find-files "." ".*.exe$")) - (for-each delete-file (find-files "." ".*.jar$")) + (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) #t)))) (arguments (substitute-keyword-arguments (package-arguments openjdk9) -- cgit v1.2.3 From 62d46ad6131b45b07e949808304e5cf15515516e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 May 2020 00:12:49 +0200 Subject: gnu: openjdk11: Simplify snippet. * gnu/packages/java.scm (openjdk11)[source]: Use regular expression in find-files. --- gnu/packages/java.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ba98182ede..f76dfc8681 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2001,9 +2001,7 @@ new Date();")) (modules '((guix build utils))) (snippet `(begin - (for-each delete-file (find-files "." ".*.bin$")) - (for-each delete-file (find-files "." ".*.exe$")) - (for-each delete-file (find-files "." ".*.jar$")) + (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) #t)))) (build-system gnu-build-system) (outputs '("out" "jdk" "doc")) -- cgit v1.2.3 From 7b82e1cdbed4c3a44ecbb99f754580a9e6a1b0ae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 May 2020 00:15:25 +0200 Subject: gnu: openjdk11: Build in parallel. * gnu/packages/java.scm (openjdk11)[arguments]: Remove #:parallel-build?, #:parallel-tests?, and #:make-flags options; add "write-source-revision-file"; replace "build" phase; do not set GUIX_LD_WRAPPER_ALLOW_IMPURITIES; pass JOBS variable to make in "build" and "build-jre" phases. --- gnu/packages/java.scm | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f76dfc8681..d74f0af9d9 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2013,11 +2013,6 @@ new Date();")) ,@%gnu-build-system-modules) #:tests? #f; requires jtreg ;; TODO package jtreg - ;; disable parallel builds, as the openjdk build system does not like -j - #:parallel-build? #f - #:parallel-tests? #f - ;; reenable parallel builds and tests by adding the flags manually - #:make-flags (list (string-append "JOBS=" (number->string (parallel-job-count)))) #:configure-flags `("--disable-option-checking" ; --enable-fast-install default flag errors otherwise "--disable-warnings-as-errors" @@ -2034,7 +2029,6 @@ new Date();")) (assoc-ref %build-inputs "freetype") "/include") ,(string-append "--with-freetype-lib=" (assoc-ref %build-inputs "freetype") "/lib")) - ;; TODO #:phases (modify-phases %standard-phases (add-after 'patch-source-shebangs 'fix-java-shebangs @@ -2044,22 +2038,32 @@ new Date();")) (substitute* "make/data/blacklistedcertsconverter/blacklisted.certs.pem" (("^#!.*") "#! java BlacklistedCertsConverter SHA-256\n")) #t)) - (replace 'build + (add-before 'build 'write-source-revision-file (lambda _ (with-output-to-file ".src-rev" (lambda _ (display ,version))) - (setenv "GUIX_LD_WRAPPER_ALLOW_IMPURITIES" "yes") - (invoke "make" "all") #t)) + (replace 'build + (lambda* (#:key parallel-build? make-flags #:allow-other-keys) + (apply invoke "make" "all" + `(,@(if parallel-build? + (list (string-append "JOBS=" + (number->string (parallel-job-count)))) + '()) + ,@make-flags)))) ;; jdk 11 does not build jre by default any more ;; building it anyways ;; for further information see: ;; https://github.com/AdoptOpenJDK/openjdk-build/issues/356 (add-after 'build 'build-jre - (lambda _ - (invoke "make" "legacy-jre-image") - #t)) + (lambda* (#:key parallel-build? make-flags #:allow-other-keys) + (apply invoke "make" "legacy-jre-image" + `(,@(if parallel-build? + (list (string-append "JOBS=" + (number->string (parallel-job-count)))) + '()) + ,@make-flags)))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From c7c9370dd7c5d2dfc038cbbec802f0f001af158f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 May 2020 00:32:05 +0200 Subject: gnu: openjdk12: Simplify snippet. * gnu/packages/java.scm (openjdk12)[source]: Use regular expression in find-files. --- gnu/packages/java.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d74f0af9d9..c0ec683ebe 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2231,9 +2231,7 @@ new Date();")) (modules '((guix build utils))) (snippet `(begin - (for-each delete-file (find-files "." ".*.bin$")) - (for-each delete-file (find-files "." ".*.exe$")) - (for-each delete-file (find-files "." ".*.jar$")) + (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) #t)))) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From ef9652ef4e6556fd85bc84dca53dfe97f518b060 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 15 May 2020 13:36:45 +0200 Subject: gnu: rottlog: Fix aarch64 cross-compilation. * gnu/packages/admin.scm (rottlog)[arguments]: Add a 'fix-configure phase to replace outdated config.sub and config.guess, without aarch64 support, [native-inputs]: add "automake". --- gnu/packages/admin.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6083691e19..9822ba8a9b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1229,7 +1229,7 @@ at once based on a Perl regular expression.") #t)))) (build-system gnu-build-system) (arguments - '(#:configure-flags (list "ROTT_ETCDIR=/etc/rottlog" ;rc file location + `(#:configure-flags (list "ROTT_ETCDIR=/etc/rottlog" ;rc file location "--localstatedir=/var") ;; Install example config files in OUT/etc. @@ -1243,6 +1243,20 @@ at once based on a Perl regular expression.") (substitute* "rc/rc" (("/usr/sbin/sendmail") "sendmail")) #t)) + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (for-each (lambda (file) + (install-file + (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess")) + #t)) (add-after 'build 'set-packdir (lambda _ ;; Set a default location for archived logs. @@ -1263,6 +1277,7 @@ at once based on a Perl regular expression.") (lambda _ (invoke "make" "install-info")))))) (native-inputs `(("texinfo" ,texinfo) + ("automake" ,automake) ("util-linux" ,util-linux))) ; for 'cal' (home-page "https://www.gnu.org/software/rottlog/") (synopsis "Log rotation and management") -- cgit v1.2.3 From 68f3ba37db8e60b3c43dbd8060275b6a8293ba78 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Fri, 15 May 2020 14:09:12 +0200 Subject: news: Add ‘de’ translation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/news.scm: Add a ‘de’ translation. --- etc/news.scm | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/etc/news.scm b/etc/news.scm index c6e4e7d089..898f07a45c 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -13,7 +13,9 @@ (entry (commit "6456232164890dbf5aa20394ee24637feb4b7b9e") (title (en "@command{guix pack -RR} introduces a new execution -engine")) +engine") + (de "@command{guix pack -RR} führt neuen Ausführungstreiber +ein")) (body (en "The @command{guix pack -RR} command allows you to create a tarball containing @dfn{relocatable binaries}. Until now, those would rely @@ -31,7 +33,28 @@ GUIX_EXECUTION_ENGINE=performance export GUIX_EXECUTION_ENGINE @end example -Run @command{info \"(guix) Invoking guix pack\"} for more information."))) +Run @command{info \"(guix) Invoking guix pack\"} for more information.") + (de "Mit dem Befehl @command{guix pack -RR} können Sie einen Tarball +mit @dfn{verschieblichen Binärdateien} erzeugen (englisch „Relocatable +Binaries“). Bisher wurden diese entweder in „unprivilegierten +Benutzernamensräumen“ ohne Berechtigungen ausgeführt, oder in PRoot, wenn +keine unprivilegierten Benutzernamensräume unterstützt wurden. Allerdings +fällt bei der Ausführung mit PRoot bei manchen Anwendungen deutlich mehr +Rechenaufwand an. + +Um dem entgegenzuwirken, stellt @command{guix pack -RR} nun eine dritte Option +zur Verfügung, die sich eine Erweiterung des GNU-Laufzeit-Binders („Run-Time +Linker“, ld.so) und Fakechroot zu Nutze macht. Dadurch entsteht fast kein +Mehraufwand. Sie können sich die schnellste Option aussuchen, wenn Sie eine +verschiebliche Binärdatei ausführen, zum Beispiel so: + +@example +GUIX_EXECUTION_ENGINE=performance +export GUIX_EXECUTION_ENGINE +@end example + +Führen Sie @command{info \"(guix.de) Aufruf von guix pack\"} aus, wenn Sie +mehr wissen wollen."))) (entry (commit "88a96c568c47c97d05d883ada5afbc4e1200b10f") (title (en "New @option{--path} option for @command{guix graph}") -- cgit v1.2.3 From 89651117686da547ac6b1a97dbfeee601dd06934 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 15 May 2020 14:44:28 +0200 Subject: gnu: ocaml-octavius: Update to 1.2.2. * gnu/packages/ocaml.scm (ocaml-octavius): Update to 1.2.2. --- gnu/packages/ocaml.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 525854676f..39d56e9fe0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4429,7 +4429,7 @@ storage of large amounts of data.") (define-public ocaml-octavius (package (name "ocaml-octavius") - (version "1.2.1") + (version "1.2.2") (source (origin (method git-fetch) (uri (git-reference @@ -4438,8 +4438,17 @@ storage of large amounts of data.") (file-name (git-file-name name version)) (sha256 (base32 - "1ck6yj6z5rvqyl39rz87ca1bnk0f1dpgvlk115631hjh8bwpfvfq")))) + "1c5m51xcn2jv42kjjpklr6g63sgx1k885wfdp1yr4wrmiaj9cbpx")))) (build-system dune-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'make-writable + (lambda _ + (for-each (lambda (file) + (chmod file #o644)) + (find-files "." ".")) + #t))))) (properties `((upstream-name . "octavius"))) (home-page "https://github.com/ocaml-doc/octavius") (synopsis "Ocamldoc comment syntax parser") -- cgit v1.2.3 From bee8c8acd7a6c79a7786cec0400d83a2bd8819b4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 15 May 2020 14:48:46 +0200 Subject: gnu: ocaml-fileutils: Update to 0.6.2. * gnu/packages/ocaml.scm (ocaml-fileutils): Update to 0.6.2. --- gnu/packages/ocaml.scm | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 39d56e9fe0..beb5258b32 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2453,7 +2453,7 @@ compatibility with older compiler to use these new features in their code.") (define-public ocaml-fileutils (package (name "ocaml-fileutils") - (version "0.6.0") + (version "0.6.2") (source (origin (method git-fetch) (uri (git-reference @@ -2462,29 +2462,12 @@ compatibility with older compiler to use these new features in their code.") (file-name (git-file-name name version)) (sha256 (base32 - "06gxbqfssl16xc8y4d34wpm0mwfr0jgph4lmlwfmgazyggnmvc7m")))) - (build-system ocaml-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'configure 'set-topfind - (lambda* (#:key inputs #:allow-other-keys) - ;; add the line #directory ".." at the top of each file - ;; using #use "topfind";; to be able to find topfind - (let* ((findlib-path (assoc-ref inputs "findlib")) - (findlib-libdir - (string-append findlib-path "/lib/ocaml/site-lib"))) - (substitute* "setup.ml" - (("#use \"topfind\";;" all) - (string-append "#directory \"" findlib-libdir "\"\n" - all)))) - #t))))) + "01qf51b8pb7vyfba7y0kb7ajwj1950im25d7f59821zwsibns3d9")))) + (build-system dune-build-system) (propagated-inputs `(("ocaml-stdlib-shims" ,ocaml-stdlib-shims))) (native-inputs - `(("ocamlbuild" ,ocamlbuild) - ("ocaml-oasis" ,ocaml-oasis) - ("ocaml-ounit" ,ocaml-ounit))) + `(("ocaml-ounit" ,ocaml-ounit))) (home-page "http://ocaml-fileutils.forge.ocamlcore.org") (synopsis "Pure OCaml functions to manipulate real file and filename") (description "Library to provide pure OCaml functions to manipulate real -- cgit v1.2.3 From 1ac2bf05c810917b4c1f9a96402550a6ad104278 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 15 May 2020 15:56:33 +0200 Subject: gnu: ocaml-ocurl: Update to 0.9.1. * gnu/packages/ocaml.scm (ocaml-ocurl): Update to 0.9.1. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index beb5258b32..c5ec3174ed 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2192,14 +2192,14 @@ without a complete in-memory representation of the data.") (define-public ocaml-ocurl (package (name "ocaml-ocurl") - (version "0.8.2") + (version "0.9.1") (source (origin (method url-fetch) (uri (string-append "http://ygrek.org.ua/p/release/ocurl/ocurl-" version ".tar.gz")) (sha256 (base32 - "1ax3xdlzgb1zg7d0wr9nwgmh6a45a764m0wk8p6mx07ad94hz0q9")))) + "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6")))) (build-system ocaml-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6207d749493dafc28d42944fdab5b8ae05cf39eb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 15 May 2020 17:12:26 +0200 Subject: gnu: emacs-flycheck: Update to 31-2.9bcf6b6. * gnu/packages/emacs-xyz.scm (emacs-flycheck): Update to 31-2.9bcf6b6. --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 015bb06e4a..1eb31e74a9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -881,21 +881,21 @@ supports type hints, definition-jumping, completion, and more.") (license license:gpl3+)))) (define-public emacs-flycheck - ;; last release version was more than 300 commits ago - (let ((commit "0006a59259ebd02c9199ddc87f0e3ce22793a2ea") - (revision "1")) + ;; Last release version was more than 500 commits ago. + (let ((commit "9bcf6b665e15db94870bebc81dc8248c3eec20d3") + (revision "2")) (package (name "emacs-flycheck") (version (git-version "31" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/flycheck/flycheck/") - (commit commit))) - (sha256 - (base32 - "09q3h6ldpg528cfbmsbb1x2vf5hmzgm3fshqn6kdy144jxcdjlf1")) - (file-name (git-file-name name version)))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/flycheck/flycheck/") + (commit commit))) + (sha256 + (base32 "015ixss5bjr7gvhj8mkw5x2x1hy6fvvsjarr2xpv0gskkkngs7pg")) + (file-name (git-file-name name version)))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash))) -- cgit v1.2.3 From 89c5b924e17ea43d0dd01eb78c198b72c19635aa Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 15 May 2020 15:51:48 +0200 Subject: gnu: bitcoin-unlimited: Update to 1.8.0.0. * gnu/packages/finance.scm (bitcoin-unlimited): Update to 1.8.0.0. [arguments]: Add 'fix-build' phase, update 'fix-tests' phase. --- gnu/packages/finance.scm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 7018479665..6dd6049ced 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1368,16 +1368,16 @@ entity management.") (define-public bitcoin-unlimited (package (name "bitcoin-unlimited") - (version "1.7.0.0") + (version "1.8.0.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/BitcoinUnlimited/BitcoinUnlimited.git") - (commit (string-append "bucash" version)))) + (commit (string-append "BCHunlimited" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "05rcd73mg2fb2zb6b1imzspck6jhcy3xymrr7n24kwjrzmvihdpx")))) + (base32 "1ivkig6q7i4n389dg1zv06cmfki20bjq0slmshx0p5a1aavkqj7k")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -1415,12 +1415,23 @@ entity management.") "/bin/lupdate")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-build + (lambda _ + ;; The 'stack' header was not included in unlimited.cpp, which + ;; caused the build to fail. + (substitute* "src/unlimited.cpp" + (("#include " all) + (string-append all "\n#include "))) + #t)) (add-after 'unpack 'fix-tests (lambda _ - ;; TODO: Find why utilprocess_tests never ends. Disable for now. - (substitute* "src/test/utilprocess_tests.cpp" - (("#if \\(BOOST_OS_LINUX && \\(BOOST_VERSION >= 106500\\)\\)") - "#if 0")) + ;; TODO: Find why txvalidationcache_tests fails and + ;; utilprocess_tests never ends. Disable for now. + (substitute* "src/Makefile.test.include" + (("test/txvalidationcache_tests.cpp") + "") + (("test/utilprocess_tests.cpp") + "")) #t)) (add-before 'configure 'make-qt-deterministic (lambda _ -- cgit v1.2.3 From f7237a2e393a3fe034622c69d4a73362203fdf4b Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 15 May 2020 17:29:05 +0200 Subject: gnu: bitcoin-abc: Update to 0.21.6. * gnu/packages/finance.scm (bitcoin-abc): Update to 0.21.6. [build-system]: Use cmake-build-system. [native-inputs]: Remove autoconf, automake and libtool. [inputs]: Add zeromq. [arguments]: Drop inheritance from bitcoin-core and use explicit 'make-qt-deterministic', 'set-home' and 'check-functional' phases. --- gnu/packages/finance.scm | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 6dd6049ced..7d7b2e20bd 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1227,9 +1227,8 @@ Trezor wallet.") (define-public bitcoin-abc (package - (inherit bitcoin-core) (name "bitcoin-abc") - (version "0.20.7") + (version "0.21.6") (source (origin (method url-fetch) (uri (string-append "https://download.bitcoinabc.org/" @@ -1237,12 +1236,10 @@ Trezor wallet.") version ".tar.gz")) (sha256 (base32 - "0py5ilfi4r8qh5r9637vwch27sqrrn0dg9rz8bccnj3lp2xpzw27")))) + "1w3c397h2mxsi9471fwyc3yjxw7s4jgvr4q3w2qfh49bhr4wygqj")))) + (build-system cmake-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) + `(("pkg-config" ,pkg-config) ("python" ,python) ; for the tests ("util-linux" ,util-linux) ; provides the hexdump command for tests ("qttools" ,qttools))) @@ -1255,7 +1252,28 @@ Trezor wallet.") ("protobuf" ,protobuf) ("qrencode" ,qrencode) ("qtbase" ,qtbase) + ("zeromq" ,zeromq) ("zlib" ,zlib))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'make-qt-deterministic + (lambda _ + ;; Make Qt deterministic. + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t)) + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getenv "TMPDIR")) ; tests write to $HOME + #t)) + (add-after 'check 'check-functional + (lambda _ + (invoke + "python3" "./test/functional/test_runner.py" + (string-append "--jobs=" (number->string (parallel-job-count))) + ;; TODO: find why the abc-miner-fund test fails. + "--exclude=abc-miner-fund") + #t))))) (home-page "https://www.bitcoinabc.org/") (synopsis "Bitcoin ABC peer-to-peer full node for the Bitcoin Cash protocol") (description @@ -1269,7 +1287,8 @@ As a fork it implemented changes lowering the time between blocks and now offers confimations after less than 5 seconds and have significantly lower fees that BTC. Bitcoin ABC is the reference implementation of the Bitcoin Cash protocol. This package provides the Bitcoin Cash command line client and -a client based on Qt. This is a fork of Bitcoin Core."))) +a client based on Qt. This is a fork of Bitcoin Core.") + (license license:expat))) (define-public libofx (package -- cgit v1.2.3 From 28740402b21f2aaef540df7e6ec8d8e22ae59495 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 17:49:18 +0200 Subject: gnu: tor: Update to 0.4.3.5. * gnu/packages/tor.scm (tor): Update to 0.4.3.5. [arguments]: Enable compression features that aren't auto-detected. [native-inputs]: Use the default Python (3). [inputs]: Order alphabetically. --- gnu/packages/tor.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 4ec503d2ed..2f2623b0e6 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -51,24 +51,28 @@ (define-public tor (package (name "tor") - (version "0.4.2.7") + (version "0.4.3.5") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "0v82ngwwmmcb7i9563bgsmrjy6xp83xyhqhaljygd0pkvlsxi886")))) + "0s6qspi102drn1nk3gfxs51x992xarc44gkfsi8y3l48wr50wsk1")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--enable-lzma" + "--enable-zstd"))) (native-inputs `(("pkg-config" ,pkg-config) - ("python" ,python-2))) ; for tests + ("python" ,python))) ; for tests (inputs - `(("zlib" ,zlib) - ("openssl" ,openssl) - ("libevent" ,libevent) + `(("libevent" ,libevent) ("libseccomp" ,libseccomp) + ("openssl" ,openssl) ("xz" ,xz) + ("zlib" ,zlib) ("zstd" ,zstd "lib"))) (home-page "https://www.torproject.org/") (synopsis "Anonymous network router to improve privacy on the Internet") -- cgit v1.2.3 From dfc414c48937c063918bce0061f8e85ac1722ff8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 15 May 2020 17:56:48 +0200 Subject: gnu: emacs-flycheck-grammalecte: Update to 1.2. * gnu/packages/emacs-xyz.scm (emacs-flycheck-grammalecte): Update to 1.2. [arguments]: Exclude "test-profile.el", build with full Emacs for libxml support. [inputs]: Remove curl as dependency. --- gnu/packages/emacs-xyz.scm | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1eb31e74a9..45ccced99e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3759,7 +3759,7 @@ for Flow files.") (define-public emacs-flycheck-grammalecte (package (name "emacs-flycheck-grammalecte") - (version "1.0") + (version "1.2") (source (origin (method url-fetch) @@ -3767,30 +3767,31 @@ for Flow files.") "flycheck-grammalecte/snapshot/" "flycheck-grammalecte-" version ".tar.xz")) (sha256 - (base32 "02wxaw228dia8cps0v02327hrrribfqb4601qggjpi4l4ms1lf8b")))) + (base32 "1mzmzyik843r4j0ibpwqrxmb0g4xmirrf3lxr010bddkmmxf749a")))) (build-system emacs-build-system) (arguments `(#:include '("\\.(el|py)$") + #:exclude '("^test-profile.el$") + #:emacs ,emacs ;need libxml support #:phases (modify-phases %standard-phases - (add-after 'unpack 'set-external-executables - ;; Hardcode python3 and curl executables in the Emacs library. + (add-after 'unpack 'fix-python-executable + ;; Hardcode python3 executable in the Emacs library. (lambda* (#:key inputs #:allow-other-keys) (let ((python3 (string-append (assoc-ref inputs "python") - "/bin/python3")) - (curl (string-append (assoc-ref inputs "curl") - "/bin/curl"))) + "/bin/python3"))) (substitute* "flycheck-grammalecte.el" - (("\"python3?") (string-append "\"" python3)) - (("\"curl") (string-append "\"" curl))) + (("\"python3") (string-append "\"" python3))) #t))) - (add-after 'install 'link-to-grammalecte - ;; The package expects grammalecte to be in a sub-directory. - ;; Symlink it there from the store. + (add-before 'build 'link-to-grammalecte + ;; XXX: The Python part of the package requires grammalecte, but + ;; the library is not specified in PYTHONPATH, since we're not + ;; using Python build system. As a workaround, we symlink + ;; grammalecte libraries here. (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((grammalecte (assoc-ref inputs "grammalecte")) - (out (assoc-ref outputs "out")) - (version ,(version-major+minor (package-version python)))) + (let* ((out (assoc-ref outputs "out")) + (grammalecte (assoc-ref inputs "grammalecte")) + (version ,(version-major+minor (package-version python)))) (with-directory-excursion (string-append out "/share/emacs/site-lisp") (symlink (string-append grammalecte "/lib/" @@ -3799,17 +3800,17 @@ for Flow files.") "grammalecte")) #t)))))) (inputs - `(("curl" ,curl) - ("grammalecte" ,grammalecte) + `(("grammalecte" ,grammalecte) ("python" ,python))) (propagated-inputs `(("emacs-flycheck" ,emacs-flycheck))) (home-page "https://git.deparis.io/flycheck-grammalecte/") (synopsis "Integrate Grammalecte with Flycheck") - (description "Integrate the French grammar and typography checker -Grammalecte with Flycheck to automatically look for mistakes in your writings. -It also provides an easy way to find synonyms and antonyms for a given -word (to avoid repetitions for example).") + (description + "Integrate the French grammar and typography checker Grammalecte with +Flycheck to automatically look for mistakes in your writings. It also +provides an easy way to find synonyms and antonyms for a given word (to avoid +repetitions for example).") (license license:gpl3+))) (define-public emacs-flycheck-rust -- cgit v1.2.3 From 57b13d1cc0c28ffd597de651a6187e22ac211e82 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 18:10:17 +0200 Subject: gnu: openconnect: Update to 8.10 [fixes CVE-2020-12823]. * gnu/packages/vpn.scm (openconnect): Update to 8.10. --- gnu/packages/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 369d3200c1..e06a83bbd5 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -247,13 +247,13 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer (define-public openconnect (package (name "openconnect") - (version "8.09") + (version "8.10") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.infradead.org/pub/openconnect/" "openconnect-" version ".tar.gz")) (sha256 - (base32 "19p91hs6j348qp0v9c7abl3rb8d9ncc37k743qhrn29s9jz0567k")))) + (base32 "1cdsx4nsrwawbsisfkldfc9i4qn60g03vxb13nzppr2br9p4rrih")))) (build-system gnu-build-system) (propagated-inputs `(("libxml2" ,libxml2) -- cgit v1.2.3 From 1d8d90a82d6a1d61ea126f0a5456f382f941d529 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 18:42:15 +0200 Subject: gnu: ethtool: Update to 5.6. * gnu/packages/networking.scm (ethtool): Update to 5.6. [native-inputs]: Add pkg-config. [inputs]: Add libmnl. --- gnu/packages/networking.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 42a3609ac2..54e71638cb 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -588,15 +588,19 @@ receiving NDP messages.") (define-public ethtool (package (name "ethtool") - (version "5.4") + (version "5.6") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/network/" "ethtool/ethtool-" version ".tar.xz")) (sha256 (base32 - "0srbqp4a3x9ryrbm5q854375y04ni8j0bmsrl89nmsyn4x4ixy12")))) + "159r0hwax0qs5diayw2glxshqxrigk0v67hgmbq56ldddm91n3ya")))) (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libmnl" ,libmnl))) (home-page "https://www.kernel.org/pub/software/network/ethtool/") (synopsis "Display or change Ethernet device settings") (description -- cgit v1.2.3 From d2e438d3e2fb7ba24213dccd7ee04a9dbbca96c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 18:42:34 +0200 Subject: gnu: clamav: Update to 0.102.3. * gnu/packages/antivirus.scm (clamav): Update to 0.102.3. --- gnu/packages/antivirus.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/antivirus.scm b/gnu/packages/antivirus.scm index dc4cc111e1..0491861afd 100644 --- a/gnu/packages/antivirus.scm +++ b/gnu/packages/antivirus.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Eric Bavier ;;; Copyright © 2018 Christopher Baines -;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,14 +44,14 @@ (define-public clamav (package (name "clamav") - (version "0.102.2") + (version "0.102.3") (source (origin (method url-fetch) (uri (string-append "https://www.clamav.net/downloads/production/" "clamav-" version ".tar.gz")) (sha256 (base32 - "1lq7r6r2yl8pp3fkn32b0bsmbbl9pg90kpvhsa2clad3xg0drz49")) + "14q6vi178ih60yz4ja33b6181va1dcj8fyscnmxfx2crav250c7d")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 6e9ffc3f778b43aa42c2142ec9ebbe3be4bf47cc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 18:43:17 +0200 Subject: gnu: clamav: End snippet in truth. * gnu/packages/antivirus.scm (clamav)[source]: Return #t from snippet. --- gnu/packages/antivirus.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/antivirus.scm b/gnu/packages/antivirus.scm index 0491861afd..367ebe70dd 100644 --- a/gnu/packages/antivirus.scm +++ b/gnu/packages/antivirus.scm @@ -59,7 +59,8 @@ '("win32" ; unnecessary "libclamav/c++/llvm" ; use system llvm "libclamav/tomsfastmath" ; use system tomsfastmath - "libclamunrar")))) ; non-free license + "libclamunrar")) ; non-free license + #t)) (patches (search-patches "clamav-system-tomsfastmath.patch" "clamav-config-llvm-libs.patch")))) -- cgit v1.2.3 From 5225626ffcdc29a62e8e089abcbb3d304febd2f2 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Fri, 1 May 2020 14:47:20 -0500 Subject: gnu: oil-shell: Rename to "oil". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/shells.scm (oil): Rename variable from… (oil-shell): …this. Redefine using DEPRECATED-PACKAGE. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/shells.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index b752fb4a90..5c8c4b5d8a 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -780,9 +780,9 @@ Shell (pdksh).") (license (list miros isc)))) ; strlcpy.c -(define-public oil-shell +(define-public oil (package - (name "oil-shell") + (name "oil") (version "0.7.0") (source (origin (method url-fetch) @@ -826,6 +826,9 @@ is commonly written.") (license (list psfl ; The Oil sources include a patched Python 2 source tree asl2.0)))) +(define-public oil-shell + (deprecated-package "oil-shell" oil)) + (define-public gash (package (name "gash") -- cgit v1.2.3 From cb014f64a50c3c832858b8927de334740f83b8a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 19:11:47 +0200 Subject: gnu: kicad-i18l: Fix typo in… name. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (kicad-i18n): New old variable previously… (kicad-i18l): …this. Redefine using DEPRECATED-PACKAGE. (kicad)[arguments, native-inputs]: Adjust accordingly. --- gnu/packages/engineering.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 190632436b..f80ea02e30 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -823,7 +823,7 @@ language.") (modify-phases %standard-phases (add-after 'install 'install-translations (lambda* (#:key inputs outputs #:allow-other-keys) - (copy-recursively (assoc-ref inputs "kicad-i18l") + (copy-recursively (assoc-ref inputs "kicad-i18n") (assoc-ref outputs "out")) #t)) (add-after 'install 'wrap-program @@ -861,7 +861,7 @@ language.") `(("boost" ,boost) ("desktop-file-utils" ,desktop-file-utils) ("gettext" ,gettext-minimal) - ("kicad-i18l" ,kicad-i18l) + ("kicad-i18n" ,kicad-i18n) ("pkg-config" ,pkg-config) ("swig" ,swig) ("zlib" ,zlib))) @@ -887,9 +887,9 @@ perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing electrical diagrams), gerbview (viewing Gerber files) and others.") (license license:gpl3+))) -(define kicad-i18l +(define kicad-i18n (package - (name "kicad-i18l") + (name "kicad-i18n") (version "5.1.5") (source (origin (method git-fetch) @@ -914,6 +914,9 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") translations for KiCad.") (license license:gpl3+))) +(define-public kicad-i18l + (deprecated-package "kicad-i18l" kicad-i18n)) + (define-public kicad-symbols (package (name "kicad-symbols") -- cgit v1.2.3 From 0094c4fa9116817865fccc5c3618f13dd380fa54 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 21:50:30 +0200 Subject: gnu: kicad: Update to 5.1.6. * gnu/packages/engineering.scm (kicad): Update to 5.1.6. [source]: Use GIT-FETCH & GIT-FILE-NAME. --- gnu/packages/engineering.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f80ea02e30..fd85c4f20a 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -800,16 +800,16 @@ language.") (define-public kicad (package (name "kicad") - (version "5.1.5") + (version "5.1.6") (source (origin - (method url-fetch) - (file-name (string-append name "-" version ".tar.xz")) - (uri (string-append - "https://launchpad.net/kicad/" (version-major version) - ".0/" version "/+download/kicad-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/kicad/code/kicad.git") + (commit version))) (sha256 - (base32 "0x3417f2pa7p65s9f7l49rqbnrzy8gz6i0n07mlbxqbnm0fmlql0")))) + (base32 "1pa3z0h0679jmgxlzc833h6q85b5paxdp69kf2h93vkaryj58622")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments `(#:out-of-source? #t -- cgit v1.2.3 From 02d1bc6b58bb0df5ac14f5042063b629992b6cd9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 21:50:43 +0200 Subject: gnu: kicad-i18n: Update to 5.1.6. * gnu/packages/engineering.scm (kicad-i18n): Update to 5.1.6. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index fd85c4f20a..8db87b2d5a 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -890,7 +890,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (define kicad-i18n (package (name "kicad-i18n") - (version "5.1.5") + (version "5.1.6") (source (origin (method git-fetch) (uri (git-reference @@ -899,7 +899,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (file-name (git-file-name name version)) (sha256 (base32 - "1rfpifl8vky1gba2angizlb2n7mwmsiai3r6ip6qma60wdj8sbd3")))) + "0qryi8xjm23ka363zfl7bbga0v5c31fr3d4nyxp3m168vkv9zhha")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From 3ef7c588dff8ac1edc22d2e07558c2795a20bdf9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 21:50:49 +0200 Subject: gnu: kicad-symbols: Update to 5.1.6. * gnu/packages/engineering.scm (kicad-symbols): Update to 5.1.6. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 8db87b2d5a..f350551f98 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -920,7 +920,7 @@ translations for KiCad.") (define-public kicad-symbols (package (name "kicad-symbols") - (version "5.1.5") + (version "5.1.6") (source (origin (method git-fetch) (uri (git-reference @@ -929,7 +929,7 @@ translations for KiCad.") (file-name (git-file-name name version)) (sha256 (base32 - "048b07ffsaav1ssrchw2p870lvb4rsyb5vnniy670k7q9p16qq6h")))) + "12w3rdy085drlikkpb27n9ni7cyg9l0pqy7hnr86cxjcw3l5wcx6")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests exist -- cgit v1.2.3 From 47711ec9782653b1e20ca774f0bba1cbfbdf79ef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 21:54:35 +0200 Subject: gnu: kicad-footprints: Update to 5.1.6. * gnu/packages/engineering.scm (kicad-footprints): Update to 5.1.6. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f350551f98..a88c3e4a62 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -949,7 +949,7 @@ libraries.") (package (inherit kicad-symbols) (name "kicad-footprints") - (version "5.1.5") + (version "5.1.6") (source (origin (method git-fetch) (uri (git-reference @@ -958,7 +958,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "1c4whgn14qhz4yqkl46w13p6rpv1k0hsc9s9h9368fxfcz9knb2j")))) + "1kmf91a5mmvj9izrv40mkaw1w36yjgn8daczd9rq2wlmd0rdp1zx")))) (synopsis "Official KiCad footprint libraries") (description "This package contains the official KiCad footprint libraries."))) -- cgit v1.2.3 From 57b90a5dae77bf110f204d6b3109fe1d95dfa458 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 21:54:43 +0200 Subject: gnu: kicad-packages3d: Update to 5.1.6. * gnu/packages/engineering.scm (kicad-packages3d): Update to 5.1.6. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index a88c3e4a62..ce781644c4 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -966,7 +966,7 @@ libraries.") (package (inherit kicad-symbols) (name "kicad-packages3d") - (version "5.1.5") + (version "5.1.6") (source (origin (method git-fetch) (uri (git-reference @@ -975,7 +975,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "0cff2ms1bsw530kqb1fr1m2pjixyxzwa81mxgac3qpbcf8fnpvaz")))) + "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1")))) (synopsis "Official KiCad 3D model libraries") (description "This package contains the official KiCad 3D model libraries."))) -- cgit v1.2.3 From fbfaafae27893f74f47188ecd0bce54df38981bd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 21:54:48 +0200 Subject: gnu: kicad-templates: Update to 5.1.6. * gnu/packages/engineering.scm (kicad-templates): Update to 5.1.6. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index ce781644c4..fce76a7189 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -983,7 +983,7 @@ libraries.") (package (inherit kicad-symbols) (name "kicad-templates") - (version "5.1.5") + (version "5.1.6") (source (origin (method git-fetch) (uri (git-reference @@ -992,7 +992,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g")))) + "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg")))) (synopsis "Official KiCad project and worksheet templates") (description "This package contains the official KiCad project and worksheet templates."))) -- cgit v1.2.3 From 1c9403f6a6f5d544cda63c6cb81446c63f72321c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 22:22:09 +0200 Subject: gnu: kicad: Re-use common fields in add-ons. * gnu/packages/engineering.scm (kicad-i18n, kicad-symbols): Re-use kicad's VERSION and HOME-PAGE. (kicad-symbols, kicad-footprints, kicad-packages3d, kicad-templates): Re-use kicad's VERSION. --- gnu/packages/engineering.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index fce76a7189..aec692174a 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -890,7 +890,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (define kicad-i18n (package (name "kicad-i18n") - (version "5.1.6") + (version (package-version kicad)) (source (origin (method git-fetch) (uri (git-reference @@ -908,7 +908,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (delete 'check)))) (native-inputs `(("gettext" ,gettext-minimal))) - (home-page "https://kicad-pcb.org/") + (home-page (package-home-page kicad)) (synopsis "KiCad GUI translations") (description "This package contains the po files that are used for the GUI translations for KiCad.") @@ -920,7 +920,7 @@ translations for KiCad.") (define-public kicad-symbols (package (name "kicad-symbols") - (version "5.1.6") + (version (package-version kicad)) (source (origin (method git-fetch) (uri (git-reference @@ -933,7 +933,7 @@ translations for KiCad.") (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests exist - (home-page "https://kicad-pcb.org/") + (home-page (package-home-page kicad)) (synopsis "Official KiCad schematic symbol libraries") (description "This package contains the official KiCad schematic symbol libraries.") @@ -949,7 +949,7 @@ libraries.") (package (inherit kicad-symbols) (name "kicad-footprints") - (version "5.1.6") + (version (package-version kicad)) (source (origin (method git-fetch) (uri (git-reference @@ -966,7 +966,7 @@ libraries.") (package (inherit kicad-symbols) (name "kicad-packages3d") - (version "5.1.6") + (version (package-version kicad)) (source (origin (method git-fetch) (uri (git-reference @@ -983,7 +983,7 @@ libraries.") (package (inherit kicad-symbols) (name "kicad-templates") - (version "5.1.6") + (version (package-version kicad)) (source (origin (method git-fetch) (uri (git-reference -- cgit v1.2.3 From a7b20226b2bf1a73b8f0f6536e7fa43326f35e33 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 15 May 2020 22:54:33 +0200 Subject: gnu: python-libmpsse: Update to 1.4.1. * gnu/packages/embedded.scm (python-libmpsse): Update to 1.4.1. [arguments]<#:phases>[set-environment-up]: Fix build with Python 3.8. --- gnu/packages/embedded.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 6ac1a2d7f3..8b40990ec1 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1073,8 +1073,7 @@ the Raspberry Pi chip.")))) (chdir "src") (setenv "PYDEV" (string-append python "/include/python" - ,(version-major+minor (package-version python)) - "m")) + ,(version-major+minor (package-version python)))) #t))) (replace 'install (lambda* (#:key inputs outputs make-flags #:allow-other-keys #:rest args) -- cgit v1.2.3 From 8cf7dd24ab035ee6a9d2a4f667ba139f888639e5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 15 May 2020 16:01:20 +0200 Subject: bootloader: grub: Refer to the native 'grub-mklayout' and font file. * gnu/bootloader/grub.scm (eye-candy): Refer to the native FONT-FILE. (keyboard-layout-file): Refer to the native 'grub-mklayout'. --- gnu/bootloader/grub.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 3f61b4a963..8c5b5eac0c 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -176,7 +176,7 @@ system string---e.g., \"x86_64-linux\"." (if (memq 'gfxterm (bootloader-configuration-terminal-outputs config)) #~(format #f "if loadfont ~a; then setup_gfxterm -fi~%" #$font-file) +fi~%" #+font-file) "")) (define (theme-colors type) @@ -237,7 +237,7 @@ the 'share/X11/xkb/symbols/' directory of 'xkeyboard-config'." ;; 'grub-kbdcomp' passes all its arguments but '-o' to 'ckbcomp' ;; (from the 'console-setup' package). - (invoke #$(file-append grub "/bin/grub-mklayout") + (invoke #+(file-append grub "/bin/grub-mklayout") "-i" #+(keyboard-layout->console-keymap layout) "-o" #$output)))) -- cgit v1.2.3 From d03001a31a6d460b712825640dba11e3f1a53a14 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 14 Nov 2017 17:10:17 +0100 Subject: gexp: Compilers can now return lowerable objects. * guix/gexp.scm (lower-object): Iterate if LOWERED is a struct. (lower+expand-object): New procedure. (gexp->sexp): Use it. (define-gexp-compiler): Adjust docstring. --- guix/gexp.scm | 74 ++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 23 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index 2a4b36519c..5c614f3e12 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -226,32 +226,62 @@ procedure to expand it; otherwise return #f." corresponding to OBJ for SYSTEM, cross-compiling for TARGET if TARGET is true. OBJ must be an object that has an associated gexp compiler, such as a ." - (match (lookup-compiler obj) - (#f - (raise (condition (&gexp-input-error (input obj))))) - (lower - ;; Cache in STORE the result of lowering OBJ. - (mlet %store-monad ((target (if (eq? target 'current) - (current-target-system) - (return target))) - (graft? (grafting?))) - (mcached (let ((lower (lookup-compiler obj))) - (lower obj system target)) - obj - system target graft?))))) + (mlet %store-monad ((target (if (eq? target 'current) + (current-target-system) + (return target))) + (graft? (grafting?))) + (let loop ((obj obj)) + (match (lookup-compiler obj) + (#f + (raise (condition (&gexp-input-error (input obj))))) + (lower + ;; Cache in STORE the result of lowering OBJ. + (mcached (mlet %store-monad ((lowered (lower obj system target))) + (if (and (struct? lowered) + (not (derivation? lowered))) + (loop lowered) + (return lowered))) + obj + system target graft?)))))) + +(define* (lower+expand-object obj + #:optional (system (%current-system)) + #:key target (output "out")) + "Return as a value in %STORE-MONAD the output of object OBJ expands to for +SYSTEM and TARGET. Object such as , , or +expand to file names, but it's possible to expand to a plain data type." + (let loop ((obj obj) + (expand (and (struct? obj) (lookup-expander obj)))) + (match (lookup-compiler obj) + (#f + (raise (condition (&gexp-input-error (input obj))))) + (lower + (mlet* %store-monad ((graft? (grafting?)) + (lowered (mcached (lower obj system target) + obj + system target graft?))) + ;; LOWER might return something that needs to be further + ;; lowered. + (if (struct? lowered) + ;; If we lack an expander, delegate to that of LOWERED. + (if (not expand) + (loop lowered (lookup-expander lowered)) + (return (expand obj lowered output))) + (return lowered))))))) ;self-quoting (define-syntax define-gexp-compiler (syntax-rules (=> compiler expander) "Define NAME as a compiler for objects matching PREDICATE encountered in gexps. -In the simplest form of the macro, BODY must return a derivation for PARAM, an -object that matches PREDICATE, for SYSTEM and TARGET (the latter of which is -#f except when cross-compiling.) +In the simplest form of the macro, BODY must return (1) a derivation for +a record of the specified type, for SYSTEM and TARGET (the latter of which is +#f except when cross-compiling), (2) another record that can itself be +compiled down to a derivation, or (3) an object of a primitive data type. The more elaborate form allows you to specify an expander: - (define-gexp-compiler something something? + (define-gexp-compiler something-compiler compiler => (lambda (param system target) ...) expander => (lambda (param drv output) ...)) @@ -1148,12 +1178,10 @@ and in the current monad setting (system type, etc.)" (or n? native?))) refs)) (($ (? struct? thing) output n?) - (let ((target (if (or n? native?) #f target)) - (expand (lookup-expander thing))) - (mlet %store-monad ((obj (lower-object thing system - #:target target))) - ;; OBJ must be either a derivation or a store file name. - (return (expand thing obj output))))) + (let ((target (if (or n? native?) #f target))) + (lower+expand-object thing system + #:target target + #:output output))) (($ (? self-quoting? x)) (return x)) (($ x) -- cgit v1.2.3 From 644cb40cd83eff8a5bcdbd2d63887daa18228f41 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 14 Nov 2017 10:16:22 +0100 Subject: gexp: Add 'let-system'. * guix/gexp.scm (): New record type. (let-system): New macro. (system-binding-compiler): New procedure. (default-expander): Add 'self-quoting?' case. (self-quoting?): New procedure. (lower-inputs): Add 'filterm'. Pass the result of 'mapm/accumulate-builds' through FILTERM. (gexp->sexp)[self-quoting?]: Remove. * tests/gexp.scm ("let-system", "let-system, target") ("let-system, ungexp-native, target") ("let-system, nested"): New tests. * doc/guix.texi (G-Expressions): Document it. --- .dir-locals.el | 1 + doc/guix.texi | 26 ++++++++++++++ guix/gexp.scm | 110 +++++++++++++++++++++++++++++++++++++++++++-------------- tests/gexp.scm | 54 ++++++++++++++++++++++++++++ 4 files changed, 165 insertions(+), 26 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index ce305602f2..fcde914e60 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -85,6 +85,7 @@ (eval . (put 'with-imported-modules 'scheme-indent-function 1)) (eval . (put 'with-extensions 'scheme-indent-function 1)) (eval . (put 'with-parameters 'scheme-indent-function 1)) + (eval . (put 'let-system 'scheme-indent-function 1)) (eval . (put 'with-database 'scheme-indent-function 2)) (eval . (put 'call-with-transaction 'scheme-indent-function 2)) diff --git a/doc/guix.texi b/doc/guix.texi index a36b9691fb..d043852ac3 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8123,6 +8123,32 @@ the second case, the resulting script contains a @code{(string-append @dots{})} expression to construct the file name @emph{at run time}. @end deffn +@deffn {Scheme Syntax} let-system @var{system} @var{body}@dots{} +@deffnx {Scheme Syntax} let-system (@var{system} @var{target}) @var{body}@dots{} +Bind @var{system} to the currently targeted system---e.g., +@code{"x86_64-linux"}---within @var{body}. + +In the second case, additionally bind @var{target} to the current +cross-compilation target---a GNU triplet such as +@code{"arm-linux-gnueabihf"}---or @code{#f} if we are not +cross-compiling. + +@code{let-system} is useful in the occasional case where the object +spliced into the gexp depends on the target system, as in this example: + +@example +#~(system* + #+(let-system system + (cond ((string-prefix? "armhf-" system) + (file-append qemu "/bin/qemu-system-arm")) + ((string-prefix? "x86_64-" system) + (file-append qemu "/bin/qemu-system-x86_64")) + (else + (error "dunno!")))) + "-net" "user" #$image) +@end example +@end deffn + @deffn {Scheme Syntax} with-parameters ((@var{parameter} @var{value}) @dots{}) @var{exp} This macro is similar to the @code{parameterize} form for dynamically-bound @dfn{parameters} (@pxref{Parameters,,, guile, GNU diff --git a/guix/gexp.scm b/guix/gexp.scm index 5c614f3e12..78b8af6fbc 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -37,6 +37,7 @@ gexp? with-imported-modules with-extensions + let-system gexp-input gexp-input? @@ -195,7 +196,9 @@ returns its output file name of OBJ's OUTPUT." ((? derivation? drv) (derivation->output-path drv output)) ((? string? file) - file))) + file) + ((? self-quoting? obj) + obj))) (define (register-compiler! compiler) "Register COMPILER as a gexp compiler." @@ -327,6 +330,52 @@ The expander specifies how an object is converted to its sexp representation." (derivation-file-name lowered) lowered))) + +;;; +;;; System dependencies. +;;; + +;; Binding form for the current system and cross-compilation target. +(define-record-type + (system-binding proc) + system-binding? + (proc system-binding-proc)) + +(define-syntax let-system + (syntax-rules () + "Introduce a system binding in a gexp. The simplest form is: + + (let-system system + (cond ((string=? system \"x86_64-linux\") ...) + (else ...))) + +which binds SYSTEM to the currently targeted system. The second form is +similar, but it also shows the cross-compilation target: + + (let-system (system target) + ...) + +Here TARGET is bound to the cross-compilation triplet or #f." + ((_ (system target) exp0 exp ...) + (system-binding (lambda (system target) + exp0 exp ...))) + ((_ system exp0 exp ...) + (system-binding (lambda (system target) + exp0 exp ...))))) + +(define-gexp-compiler system-binding-compiler + compiler => (lambda (binding system target) + (match binding + (($ proc) + (with-monad %store-monad + ;; PROC is expected to return a lowerable object. + ;; 'lower-object' takes care of residualizing it to a + ;; derivation or similar. + (return (proc system target)))))) + + ;; Delegate to the expander of the object returned by PROC. + expander => #f) + ;;; ;;; File declarations. @@ -706,6 +755,15 @@ GEXP) is false, meaning that GEXP is a plain Scheme object, return the empty list." (gexp-attribute gexp gexp-self-extensions)) +(define (self-quoting? x) + (letrec-syntax ((one-of (syntax-rules () + ((_) #f) + ((_ pred rest ...) + (or (pred x) + (one-of rest ...)))))) + (one-of symbol? string? keyword? pair? null? array? + number? boolean? char?))) + (define* (lower-inputs inputs #:key system target) "Turn any object from INPUTS into a derivation input for SYSTEM or a store @@ -714,23 +772,32 @@ When TARGET is true, use it as the cross-compilation target triplet." (define (store-item? obj) (and (string? obj) (store-path? obj))) + (define filterm + (lift1 (cut filter ->bool <>) %store-monad)) + (with-monad %store-monad - (mapm/accumulate-builds - (match-lambda - (((? struct? thing) sub-drv ...) - (mlet %store-monad ((obj (lower-object - thing system #:target target))) - (return (match obj - ((? derivation? drv) - (let ((outputs (if (null? sub-drv) - '("out") - sub-drv))) - (derivation-input drv outputs))) - ((? store-item? item) - item))))) - (((? store-item? item)) - (return item))) - inputs))) + (>>= (mapm/accumulate-builds + (match-lambda + (((? struct? thing) sub-drv ...) + (mlet %store-monad ((obj (lower-object + thing system #:target target))) + (return (match obj + ((? derivation? drv) + (let ((outputs (if (null? sub-drv) + '("out") + sub-drv))) + (derivation-input drv outputs))) + ((? store-item? item) + item) + ((? self-quoting?) + ;; Some inputs such as can lower to + ;; a self-quoting object that FILTERM will filter + ;; out. + #f))))) + (((? store-item? item)) + (return item))) + inputs) + filterm))) (define* (lower-reference-graphs graphs #:key system target) "Given GRAPHS, a list of (FILE-NAME INPUT ...) lists for use as a @@ -1146,15 +1213,6 @@ references; otherwise, return only non-native references." (target (%current-target-system))) "Return (monadically) the sexp corresponding to EXP for the given OUTPUT, and in the current monad setting (system type, etc.)" - (define (self-quoting? x) - (letrec-syntax ((one-of (syntax-rules () - ((_) #f) - ((_ pred rest ...) - (or (pred x) - (one-of rest ...)))))) - (one-of symbol? string? keyword? pair? null? array? - number? boolean? char?))) - (define* (reference->sexp ref #:optional native?) (with-monad %store-monad (match ref diff --git a/tests/gexp.scm b/tests/gexp.scm index 6a42d3eb57..e073a7b816 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -321,6 +321,60 @@ (string=? result (string-append (derivation->output-path drv) "/bin/touch")))))) +(test-equal "let-system" + (list `(begin ,(%current-system) #t) '(system-binding) '() + 'low '() '()) + (let* ((exp #~(begin + #$(let-system system system) + #t)) + (low (run-with-store %store (lower-gexp exp)))) + (list (lowered-gexp-sexp low) + (match (gexp-inputs exp) + (((($ (@@ (guix gexp) )) "out")) + '(system-binding)) + (x x)) + (gexp-native-inputs exp) + 'low + (lowered-gexp-inputs low) + (lowered-gexp-sources low)))) + +(test-equal "let-system, target" + (list `(list ,(%current-system) #f) + `(list ,(%current-system) "aarch64-linux-gnu")) + (let ((exp #~(list #$@(let-system (system target) + (list system target))))) + (list (gexp->sexp* exp) + (gexp->sexp* exp "aarch64-linux-gnu")))) + +(test-equal "let-system, ungexp-native, target" + `(here it is: ,(%current-system) #f) + (let ((exp #~(here it is: #+@(let-system (system target) + (list system target))))) + (gexp->sexp* exp "aarch64-linux-gnu"))) + +(test-equal "let-system, nested" + (list `(system* ,(string-append "qemu-system-" (%current-system)) + "-m" "256") + '() + '(system-binding)) + (let ((exp #~(system* + #+(let-system (system target) + (file-append (@@ (gnu packages virtualization) + qemu) + "/bin/qemu-system-" + system)) + "-m" "256"))) + (list (match (gexp->sexp* exp) + (('system* command rest ...) + `(system* ,(and (string-prefix? (%store-prefix) command) + (basename command)) + ,@rest)) + (x x)) + (gexp-inputs exp) + (match (gexp-native-inputs exp) + (((($ (@@ (guix gexp) )) "out")) + '(system-binding)) + (x x))))) (test-assert "ungexp + ungexp-native" (let* ((exp (gexp (list (ungexp-native %bootstrap-guile) -- cgit v1.2.3 From 300a54bb984b92a36b68d7a672f2e11aa3dd2af1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 15 May 2020 22:22:03 +0200 Subject: utils: 'target-arm32?' & co. take an optional parameter. * guix/utils.scm (target-arm32?, target-aarch64?) (target-arm?, target-64bit?): Make 'target' an optional parameter. --- guix/utils.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/guix/utils.scm b/guix/utils.scm index 3e8e59b8dc..d7b197fa44 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -490,18 +490,21 @@ a character other than '@'." (and target (string-suffix? "-mingw32" target))) -(define (target-arm32?) - (string-prefix? "arm" (or (%current-target-system) (%current-system)))) +(define* (target-arm32? #:optional (target (or (%current-target-system) + (%current-system)))) + (string-prefix? "arm" target)) -(define (target-aarch64?) - (string-prefix? "aarch64" (or (%current-target-system) (%current-system)))) +(define* (target-aarch64? #:optional (target (or (%current-target-system) + (%current-system)))) + (string-prefix? "aarch64" target)) -(define (target-arm?) - (or (target-arm32?) (target-aarch64?))) +(define* (target-arm? #:optional (target (or (%current-target-system) + (%current-system)))) + (or (target-arm32? target) (target-aarch64? target))) -(define (target-64bit?) - (let ((system (or (%current-target-system) (%current-system)))) - (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "ppc64")))) +(define* (target-64bit? #:optional (system (or (%current-target-system) + (%current-system)))) + (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "ppc64"))) (define version-compare (let ((strverscmp -- cgit v1.2.3 From 502f609d0527d07e3289ba38a087d8fc856382fe Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 15 May 2020 22:23:21 +0200 Subject: vm: Use 'let-system'. * gnu/system/vm.scm (expression->derivation-in-linux-vm)[check]: New macro. [builder]: Use 'let-system' and 'check' instead of referencing '%current-system' and '%current-target-system'. --- gnu/system/vm.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 163e8b4e9c..3e483fd86c 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -199,6 +199,10 @@ substitutable." (sync) (reboot)))) + (define-syntax-rule (check predicate) + (let-system (system target) + (predicate (or target system)))) + (let ((initrd (or initrd (base-initrd file-systems #:on-error 'backtrace @@ -229,7 +233,8 @@ substitutable." (graphs '#$(match references-graphs (((graph-files . _) ...) graph-files) (_ #f))) - (target #$(or (%current-target-system) (%current-system))) + (target #$(let-system (system target) + (or target system))) (size #$(if (eq? 'guess disk-image-size) #~(+ (* 70 (expt 2 20)) ;ESP (estimated-partition-size graphs)) @@ -244,12 +249,8 @@ substitutable." #:memory-size #$memory-size #:make-disk-image? #$make-disk-image? #:single-file-output? #$single-file-output? - ;; FIXME: ‘target-arm32?’ and - ;; ‘target-aarch64?’ may not operate on the - ;; right system/target values. Rewrite - ;; using ‘let-system’ when available. - #:target-arm32? #$(target-arm32?) - #:target-aarch64? #$(target-aarch64?) + #:target-arm32? #$(check target-arm32?) + #:target-aarch64? #$(check target-aarch64?) #:disk-image-format #$disk-image-format #:disk-image-size size #:references-graphs graphs)))))) -- cgit v1.2.3 From 12adffd43efe381e9d634d01242ba1988c65ce5c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 15 May 2020 22:34:14 +0200 Subject: linux-initrd: Silence Guile warnings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, since the switch to Guile 3, we'd see this warning repeated several times at boot time: WARNING: …: imported module (guix build utils) overrides core binding `delete' * gnu/system/linux-initrd.scm (raw-initrd): In gexp, #:hide 'delete' from (guix build utils). Wrap 'boot-system' in 'parameterize'. --- gnu/system/linux-initrd.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index c43d53a210..0971ec29e2 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017, 2019 Mathieu Othacehe @@ -197,7 +197,7 @@ upon error." #~(begin (use-modules (gnu build linux-boot) (gnu system file-systems) - (guix build utils) + ((guix build utils) #:hide (delete)) (guix build bournish) ;add the 'bournish' meta-command (srfi srfi-26) @@ -213,18 +213,19 @@ upon error." (set-path-environment-variable "PATH" '("bin" "sbin") '#$helper-packages))) - (boot-system #:mounts - (map spec->file-system - '#$(map file-system->spec file-systems)) - #:pre-mount (lambda () - (and #$@device-mapping-commands)) - #:linux-modules '#$linux-modules - #:linux-module-directory '#$kodir - #:keymap-file #+(and=> keyboard-layout - keyboard-layout->console-keymap) - #:qemu-guest-networking? #$qemu-networking? - #:volatile-root? '#$volatile-root? - #:on-error '#$on-error))) + (parameterize ((current-warning-port (%make-void-port "w"))) + (boot-system #:mounts + (map spec->file-system + '#$(map file-system->spec file-systems)) + #:pre-mount (lambda () + (and #$@device-mapping-commands)) + #:linux-modules '#$linux-modules + #:linux-module-directory '#$kodir + #:keymap-file #+(and=> keyboard-layout + keyboard-layout->console-keymap) + #:qemu-guest-networking? #$qemu-networking? + #:volatile-root? '#$volatile-root? + #:on-error '#$on-error)))) #:name "raw-initrd")) (define* (file-system-packages file-systems #:key (volatile-root? #f)) -- cgit v1.2.3 From 408ae72cd1f519bfb4c10da7eb93466642660312 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 15 May 2020 22:37:39 +0200 Subject: services: shepherd: Silence Guile warnings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This avoids: WARNING: …: imported module (guix build utils) overrides core binding `delete' * gnu/services/shepherd.scm (%default-modules): #:hide 'delete' from (guix build utils). (shepherd-configuration-file)[config]: Wrap calls to 'load-compiled' in 'parameterize'. --- gnu/services/shepherd.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 826a3c2215..77c4d0a8be 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -146,7 +146,7 @@ DEFAULT is given, use it as the service's default value." ;; Default set of modules visible in a service's file. `((shepherd service) (oop goops) - (guix build utils) + ((guix build utils) #:hide (delete)) (guix build syscalls))) (define-record-type* @@ -315,7 +315,9 @@ and return the resulting '.go' file." (call-with-error-handling (lambda () (apply register-services - (map load-compiled '#$(map scm->go files))))) + (parameterize ((current-warning-port + (%make-void-port "w"))) + (map load-compiled '#$(map scm->go files)))))) (format #t "starting services...~%") (for-each (lambda (service) -- cgit v1.2.3 From b050e205dccb79e6026cc6a756e89545a2f3d0d3 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sat, 16 May 2020 15:50:25 +0800 Subject: gnu: matcha-theme: Update to 2020-05-09. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome-xyz.scm (matcha-theme): Update to 2020-05-09. [source]: Update URL. [arguments]: Update build script. Signed-off-by: 宋文武 --- gnu/packages/gnome-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 673b8cf1d7..0997edb0e1 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -46,18 +46,18 @@ (define-public matcha-theme (package (name "matcha-theme") - (version "2019-11-02") + (version "2020-05-09") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/vinceliuice/matcha") + (url "https://github.com/vinceliuice/Matcha-gtk-theme") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0wci9ahap8kynq8cbyxr7aba9ndb1d4kiq42xvzr34vw1rhcahrr")))) + "0fp3ijynyvncy2byjjyba573p81x2pl2hdzv17mg40r8d5mjlkww")))) (build-system trivial-build-system) (arguments '(#:modules ((guix build utils)) @@ -73,9 +73,9 @@ (string-append coreutils "/bin:" (string-append bash "/bin:"))) (copy-recursively source (getcwd)) - (patch-shebang "Install") + (patch-shebang "install.sh") (mkdir-p themesdir) - (invoke "./Install" "-d" themesdir) + (invoke "./install.sh" "-d" themesdir) #t)))) (inputs `(("gtk-engines" ,gtk-engines))) -- cgit v1.2.3 From 9d681f1bc921711c1dff498b9950090e85585d11 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sat, 16 May 2020 16:23:45 +0800 Subject: gnu: papirus-icon-theme: Update to 20200430. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome-xyz.scm (papirus-icon-theme): Update to 20200430. Signed-off-by: 宋文武 --- gnu/packages/gnome-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 0997edb0e1..ec3c622e0f 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -554,8 +554,8 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.") (define-public papirus-icon-theme (let ((version "0.0.0") ;; The package does not use semver - (revision "0") - (tag "20191201")) + (revision "1") + (tag "20200430")) (package (name "papirus-icon-theme") (version (git-version version revision tag)) @@ -567,7 +567,7 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.") (commit tag))) (sha256 (base32 - "0lnz1kmz28xh1f4slbsx7ycji5hgszyiyprbf5w5fbjhvi5gzw1h")) + "19dfiifc7cjwy0nb1hgzryzaijszsyix303xsgk5xbmhpwrv92hq")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 8da0f5048f52d0a461b12e4f4b1c598812eca0b2 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sat, 16 May 2020 16:30:45 +0800 Subject: gnu: delft-icon-theme: Update to 1.12. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome-xyz.scm (delft-icon-theme): Update to 1.12. Signed-off-by: 宋文武 --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index ec3c622e0f..a60b5dbb61 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -92,7 +92,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.") (define-public delft-icon-theme (package (name "delft-icon-theme") - (version "1.11") + (version "1.12") (source (origin (method git-fetch) @@ -101,7 +101,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.") (commit (string-append "v" version)))) (sha256 (base32 - "1m3r4i4m3y3xsjb5f4bik0ylmi64amkfyr0y8pjbvv6gyj492mi6")) + "1r6b6jf793jxz15ljniwbqy3vcvsl2712qiigfrfrm46fdxlshjd")) (file-name (git-file-name name version)))) (build-system copy-build-system) (arguments -- cgit v1.2.3 From a23cd8d9c3bb9b1e7e5fa4558b9d2ef116b193e7 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 16 May 2020 17:24:16 +0800 Subject: gnu: Add python-pytidylib. * gnu/packages/python-xyz.scm (python-pytidylib, python2-pytidylib): New variables. --- gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 657ebabe93..c26a766d64 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19862,3 +19862,36 @@ module. @code{cmd2} provides a wealth of features on top of @code{cmd} to make your life easier and eliminates much of the boilerplate code which would be necessary when using @code{cmd}.") (license license:expat))) + +(define-public python-pytidylib + (package + (name "python-pytidylib") + (version "0.3.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytidylib" version)) + (sha256 + (base32 + "1wqa9dv5d7swka14rnky862hc7dgk2g3dhlrz57hdn3hb7bwic92")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'build 'qualify-libtidy + (lambda* (#:key inputs #:allow-other-keys) + (let ((libtidy (string-append (assoc-ref inputs "tidy") + "/lib/libtidy.so"))) + (substitute* "tidylib/tidy.py" + (("ctypes\\.util\\.find_library\\('tidy'\\)") + (format #f "'~a'" libtidy))) + #t)))))) + (inputs `(("tidy" ,tidy))) + (home-page "https://github.com/countergram/pytidylib") + (synopsis "Python wrapper for HTML Tidy library") + (description + "PyTidyLib is a Python package that wraps the HTML Tidy library. This +allows you, from Python code, to “fix” invalid (X)HTML markup.") + (license license:expat))) + +(define-public python2-pytidylib + (package-with-python2 python-pytidylib)) -- cgit v1.2.3 From c58274133676e429bfc1486e3b58762ff8659131 Mon Sep 17 00:00:00 2001 From: raingloom Date: Tue, 12 May 2020 01:50:30 +0200 Subject: gnu: Add rawdog. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/syndication.scm (rawdog): New variable. Signed-off-by: 宋文武 --- gnu/packages/syndication.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 5bc3d19a92..acd7b63ef7 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -30,6 +30,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages python-check) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-web) @@ -169,3 +170,29 @@ file system, and many more features.") "Tuir provides a simple terminal viewer for Reddit (Terminal UI for Reddit).") (license (list license:expat license:gpl3+)))) ; tuir/packages/praw + +(define-public rawdog + (package + (name "rawdog") + (version "2.23") + (source + (origin + (method url-fetch) + (uri (string-append "https://offog.org/files/rawdog-" + version ".tar.gz")) + (sha256 + (base32 + "18nyg19mwxyqdnykplkqmzb4n27vvrhvp639zai8f81gg9vdbsjp")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2.7)) + (inputs + `(("python2-feedparser" ,python2-feedparser) + ("python2-pytidylib" ,python2-pytidylib))) + (home-page "https://offog.org/code/rawdog/") + (synopsis "RSS Aggregator Without Delusions Of Grandeur") + (description + "@command{rawdog} is a feed aggregator, capable of producing a personal +\"river of news\" or a public \"planet\" page. It supports all common feed +formats, including all versions of RSS and Atom.") + (license license:gpl2+))) -- cgit v1.2.3 From c4618174ecb6375849529f1d1026585817bb139e Mon Sep 17 00:00:00 2001 From: Not Zed Date: Tue, 28 Apr 2020 10:33:46 +0930 Subject: gnu: Add openjdk13. * gnu/packages/java.scm (openjdk13): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/java.scm | 42 ++++++++++++++++++++++++++ gnu/packages/patches/openjdk-14-builtins.patch | 11 +++++++ 2 files changed, 53 insertions(+) create mode 100644 gnu/packages/patches/openjdk-14-builtins.patch diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c0ec683ebe..2519b4780b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2259,6 +2259,48 @@ new Date();")) ("zip" ,zip))) (home-page "https://openjdk.java.net/projects/jdk/12"))) +(define-public openjdk13 + (package + (inherit openjdk12) + (name "openjdk") + (version "13.0") + (source (origin + (method url-fetch) + (uri "http://hg.openjdk.java.net/jdk/jdk13/archive/9c250a7600e1.tar.bz2") + (file-name (string-append name "-" version ".tar.bz2")) + (sha256 + (base32 + "0v0ljvx5dyzp96dw4z4ksw3pvasil7783mgnmd1wk9gads5ab8iq")) + (modules '((guix build utils))) + (snippet + `(begin + (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) + #t)))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("cups" ,cups) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("giflib" ,giflib) + ("lcms" ,lcms) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxt" ,libxt) + ("libxtst" ,libxtst))) + (native-inputs + `(("autoconf" ,autoconf) + ("openjdk12:jdk" ,openjdk12 "jdk") + ("make@4.2" ,gnu-make-4.2) + ("pkg-config" ,pkg-config) + ("unzip" ,unzip) + ("which" ,which) + ("zip" ,zip))) + (home-page "https://openjdk.java.net/projects/jdk/13"))) + (define-public icedtea icedtea-8) diff --git a/gnu/packages/patches/openjdk-14-builtins.patch b/gnu/packages/patches/openjdk-14-builtins.patch new file mode 100644 index 0000000000..0e7e3dcaa9 --- /dev/null +++ b/gnu/packages/patches/openjdk-14-builtins.patch @@ -0,0 +1,11 @@ +--- jdk14-bc54620a3848/make/autoconf/basics.m4 2020-02-07 04:40:54.000000000 +1030 ++++ jdk14-bc54620a3848-new/make/autoconf/basics.m4 2020-04-24 10:59:33.056098506 +0930 +@@ -583,7 +583,7 @@ + BASIC_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2, , $3)]) + if test "x[$]$1" = x; then + AC_MSG_NOTICE([Required tool $2 not found in PATH, checking built-in]) +- if help $2 > /dev/null 2>&1; then ++ if command -v $2 > /dev/null 2>&1; then + AC_MSG_NOTICE([Found $2 as shell built-in. Using it]) + $1="$2" + else -- cgit v1.2.3 From 65a11a59de86fa759f2ffbb7db53430a6727c2ea Mon Sep 17 00:00:00 2001 From: Not Zed Date: Sat, 16 May 2020 10:26:06 +0200 Subject: gnu: Add openjdk14. * gnu/packages/java.scm (openjdk14): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/java.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2519b4780b..071b97582d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2301,6 +2301,52 @@ new Date();")) ("zip" ,zip))) (home-page "https://openjdk.java.net/projects/jdk/13"))) +(define-public openjdk14 + (package + (inherit openjdk13) + (name "openjdk") + (version "14.0") + (source (origin + (method url-fetch) + (uri "http://hg.openjdk.java.net/jdk/jdk14/archive/bc54620a3848.tar.bz2") + (file-name (string-append name "-" version ".tar.bz2")) + (sha256 + (base32 + "0z485pk7r1xpw8004g4nrwrzj17sabgx8yfdbxwfvzkjp8qyajch")) + (modules '((guix build utils))) + (snippet + `(begin + ;; The m4 macro uses 'help' to search for builtins, which is + ;; not available in bash-minimal + (substitute* "make/autoconf/basics.m4" + (("if help") "if command -v")) + (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) + #t)))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("cups" ,cups) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("giflib" ,giflib) + ("lcms" ,lcms) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxt" ,libxt) + ("libxtst" ,libxtst))) + (native-inputs + `(("autoconf" ,autoconf) + ("make@4.2" ,gnu-make-4.2) + ("openjdk13:jdk" ,openjdk13 "jdk") + ("pkg-config" ,pkg-config) + ("unzip" ,unzip) + ("which" ,which) + ("zip" ,zip))) + (home-page "https://openjdk.java.net/projects/jdk/14"))) + (define-public icedtea icedtea-8) -- cgit v1.2.3 From dcaa156111c5f41ea2937612d7374115cd7bab3a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 16 May 2020 10:28:20 +0200 Subject: gnu: Add lldpd. * gnu/packages/networking.scm (lldpd): New variable. --- gnu/packages/networking.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 54e71638cb..65a94178c9 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2017, 2018 Ludovic Courtès -;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015, 2016, 2017 Stefan Reichör ;;; Copyright © 2016 Raimon Grau @@ -94,6 +94,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) #:use-module (gnu packages linux) #:use-module (gnu packages lua) @@ -3137,3 +3138,50 @@ thousands of connections is clearly realistic with today's hardware.") (license (list license:gpl2+ license:lgpl2.1 license:lgpl2.1+)))) + +(define-public lldpd + (package + (name "lldpd") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://media.luffy.cx/files/lldpd/lldpd-" + version ".tar.gz")) + (sha256 + (base32 + "16fbqrs3l976gdslx647nds8x7sz4h5h3h4l4yxzrayvyh9b5lrd")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Drop bundled library. + (delete-file-recursively "libevent") + #t)))) + (arguments + `(#:configure-flags + (list + "--with-privsep-user=nobody" + "--with-privsep-group=nogroup" + "--localstatedir=/var" + "--enable-pie" + "--without-embedded-libevent" + (string-append "--with-systemdsystemunitdir=" + (assoc-ref %outputs "out") + "/lib/systemd/system")))) + (build-system gnu-build-system) + (inputs + `(("libevent" ,libevent) + ("libxml2" ,libxml2) + ("openssl" ,openssl) + ("readline" ,readline))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://vincentbernat.github.io/lldpd/") + (synopsis "Locate neighbors of your network equipment") + (description + "The @dfn{Link Layer Discovery Protocol} (LLDP) is an industry standard +protocol designed to supplant proprietary Link-Layer protocols such as EDP or +CDP. The goal of LLDP is to provide an inter-vendor compatible mechanism to +deliver Link-Layer notifications to adjacent network devices. @code{lldpd} is +an implementation of LLDP. It also supports some proprietary protocols.") + (license license:isc))) -- cgit v1.2.3 From 737b87cec8f8f2c27e287690d45ebf1fd57d08ae Mon Sep 17 00:00:00 2001 From: Tom Zander via Guix-patches via Date: Fri, 15 May 2020 17:53:42 +0200 Subject: gnu: fulcrum: Update to 1.1.1. * gnu/packages/finance.scm (fulcrum): Update to 1.1.1. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 7d7b2e20bd..0eaca8895d 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1472,14 +1472,14 @@ a Qt GUI.") (define-public fulcrum (package (name "fulcrum") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append "https://gitlab.com/FloweeTheHub/fulcrum/-/archive/v" version "/fulcrum-v" version ".tar.gz")) (sha256 - (base32 "1xywwgsdhkiblv6la0pfhvn2s9q8vnz6pjg35647rlwzi6ybf0ak")))) + (base32 "04w5gw02d39caa8a0l6wkn87kc43zzad2prqsyrcq97vlbkdx6x6")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From cbba85ebaf0ace51b0396b09540dbbc4264c436d Mon Sep 17 00:00:00 2001 From: Tom Zander via Guix-patches via Date: Fri, 15 May 2020 17:53:42 +0200 Subject: gnu: flowee: Update to 2020.03.3. * gnu/packages/finance.scm (flowee): Update to 2020.03.3. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 0eaca8895d..92a00240f3 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1510,14 +1510,14 @@ like Flowee the Hub, which Fulcrum connects to over RPC.") (define-public flowee (package (name "flowee") - (version "2020.03.2") + (version "2020.03.3") (source (origin (method url-fetch) (uri (string-append "https://gitlab.com/FloweeTheHub/thehub/-/archive/" version "/thehub-" version ".tar.gz")) (sha256 - (base32 "1m8wfwxljvd2gqpfj1w37xky4isa3h9a7g57cnf3l4r90r4bxj47")))) + (base32 "0ksyh7ll3v9p8f5y15vcb2vkrpzb4h0ricag9j90ad4b4rfsnpjw")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF") -- cgit v1.2.3 From ec16aaff5da9eb52b9d762531660f02e785d72de Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 04:26:33 +0200 Subject: gnu: wine-staging-patchset-data: Update to 5.8. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 5.8. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 86e0337884..aeec63a1b9 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -328,7 +328,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "5.6") + (version "5.8") (source (origin (method git-fetch) @@ -337,7 +337,7 @@ integrate Windows applications into your desktop.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1i9yiwbyxl0vshc4gbgnhp53m1ray8pkiii876gbiaf93k1irk0d")))) + (base32 "07i11alcymkfj1vgadcxd6khvjk1ay0x2dddwrvnc4gag9lvkddr")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -387,7 +387,7 @@ integrate Windows applications into your desktop.") "/wine-" version ".tar.xz"))) (file-name (string-append name "-" version ".tar.xz")) (sha256 - (base32 "1rh0pk8mbi3bb0di13swzxn7nwnrbfsfizdv472vv3ymf5z8l6ah")))) + (base32 "1krk68lsfvisi0zpx7890cz0z5bp7jl7rka5d70vwyj3c7109bfb")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("ffmpeg" ,ffmpeg) ("gtk+" ,gtk+) -- cgit v1.2.3 From 23e89f915e6111fa9ba330bfa317da82e292d50d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 04:41:31 +0200 Subject: gnu: zsh-autosuggestions: Update to 0.6.4. * gnu/packages/shellutils.scm (zsh-autosuggestions): Update to 0.6.4. --- gnu/packages/shellutils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 7496dd12dc..29e288a402 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017 Alex Griffin ;;; Copyright © 2016 Christopher Baines ;;; Copyright © 2017 Stefan Reichör -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2019 Collin J. Doering ;;; Copyright © 2020 Michael Rohleder @@ -46,7 +46,7 @@ (define-public zsh-autosuggestions (package (name "zsh-autosuggestions") - (version "0.6.3") + (version "0.6.4") (source (origin (method git-fetch) (uri (git-reference @@ -55,7 +55,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1h8h2mz9wpjpymgl2p7pc146c1jgb3dggpvzwm9ln3in336wl95c")))) + "0h52p2waggzfshvy1wvhj4hf06fmzd44bv6j18k3l9rcx6aixzn6")))) (build-system gnu-build-system) (native-inputs `(("ruby" ,ruby) -- cgit v1.2.3 From be55f23475f545759d1c196d04ee982bed55e366 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 23:29:37 +0200 Subject: gnu: lchat: Update to 0.0.0-4.e3b64e6. * gnu/packages/suckless.scm (lchat): Update to 0.0.0-4.e3b64e6. [source]: Use GIT-VERSION and GIT-FILE-NAME. --- gnu/packages/suckless.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 0cf334d7e0..f5e30c4131 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015 Leo Famulari ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2017 Alex Griffin -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -677,21 +677,20 @@ as -1, to be used instead of U+FFFD. ;; No release tarballs so far. (define-public lchat - (let ((revision "3") - (commit "f95191970fd59c52a8b09cff32bd8d2135cbfc6b")) + (let ((revision "4") + (commit "e3b64e67b9b9d832462382246474ce1e7d92217c")) (package (name "lchat") - (version (string-append "0.0.0-" revision "." (string-take commit 7))) + (version (git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/younix/lchat") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 - (base32 - "07pxzziczhzprmjy61k7nl9i1kxpgnad37qkjf5fn4wf06nqdxpl")))) + (base32 "1qcjqbgmsskc04j2r6xl3amkwj05n520sq1wv2mqyqncz42qrxm0")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 5e1cc6685c1f911a2a05a792a50e1b8472e47303 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 23:34:42 +0200 Subject: gnu: Don't use NAME in (gnu packages suckless) URIs. * gnu/packages/suckless.scm (spoon, xbattmon, wificurse, skroll, sbm) (prout, fortify-headers, colors, scron)[source]: Hard-code NAME. --- gnu/packages/suckless.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index f5e30c4131..f1f7989f63 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -175,7 +175,7 @@ numbers of user-defined menu items efficiently.") (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "spoon-" version ".tar.gz")) (sha256 (base32 "1jpmg9k9f4f3lpz0k3cphqjswlyf8lz2sm8ccifiip93kd4rrdj0")))) @@ -356,7 +356,7 @@ few minutes.") (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "xbattmon-" version ".tar.gz")) (sha256 (base32 "1zr6y8lml9xkx0a3dbbsds2qz1bjxvskp7wsckkf8mlsqrbb3xsg")))) @@ -381,7 +381,7 @@ few minutes.") (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "wificurse-" version ".tar.gz")) (sha256 (base32 "067ghr1xly5ca41kc83xila1p5hpq0bxfcmc8jvxi2ggm6wrhavn")))) @@ -414,7 +414,7 @@ drivers capable of injecting packets in wireless networks.") (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "skroll-" version ".tar.gz")) (sha256 (base32 "0km6bjfz4ssb1z0xwld6iiixnn7d255ax8yjs3zkdm42z8q9yl0f")))) @@ -442,7 +442,7 @@ left.") (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "sbm-" version ".tar.gz")) (sha256 (base32 "1nks5mkh5wn30kyjzlkjlgi31bv1wq52kbp0r6nzbyfnvfdlywik")))) @@ -468,7 +468,7 @@ left.") (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "prout-" version ".tar.gz")) (sha256 (base32 "1s6c3ygg1h1fyxkh8gd7nzjk6qhnwsb4535d2k780kxnwns5fzas")))) @@ -564,7 +564,7 @@ environment variable.") (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "fortify-headers-" version ".tar.gz")) (sha256 (base32 "0nvplfg4y4a10x2j12qwmxzlk2q4j6287j0v5f9bfsdayb04qvh2")))) @@ -605,7 +605,7 @@ initially intended to be used on musl-based Linux distributions. (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "colors-" version ".tar.gz")) (sha256 (base32 "1lckmqpgj89841splng0sszbls2ag71ggkgr1wsv9y3v6y87589z")))) @@ -732,7 +732,7 @@ chat output in the background.") (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + "scron-" version ".tar.gz")) (sha256 (base32 "066fwa55kqcgfrsqgxh94sqbkxfsr691360xg4ljxr4i75d25s2a")))) -- cgit v1.2.3 From dd3f0680c71a557e863cb0a08054c7e168115957 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 23:36:01 +0200 Subject: gnu: st: Update to 0.8.3. * gnu/packages/suckless.scm (st): Update to 0.8.3. --- gnu/packages/suckless.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index f1f7989f63..95933e4f39 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -226,14 +226,14 @@ numbers of user-defined menu items efficiently.") (define-public st (package (name "st") - (version "0.8.2") + (version "0.8.3") (source (origin (method url-fetch) (uri (string-append "https://dl.suckless.org/st/st-" version ".tar.gz")) (sha256 - (base32 "0ddz2mdp1c7q67rd5vrvws9r0493ln0mlqyc3d73dv8im884xdxf")))) + (base32 "0ll5wbw1szs70wdf8zy1y2ig5mfbqw2w4ls8d64r8z3y4gdf76lk")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests -- cgit v1.2.3 From ca39ee94dcddfabf9c407765397a76b7b1d45f6e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 23:36:10 +0200 Subject: gnu: fortify-headers: Update to 1.1. * gnu/packages/suckless.scm (fortify-headers): Update to 1.1. --- gnu/packages/suckless.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 95933e4f39..69177f4e00 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -559,15 +559,14 @@ environment variable.") (define-public fortify-headers (package (name "fortify-headers") - (version "1.0") + (version "1.1") (source (origin (method url-fetch) (uri (string-append "https://dl.2f30.org/releases/" "fortify-headers-" version ".tar.gz")) (sha256 - (base32 - "0nvplfg4y4a10x2j12qwmxzlk2q4j6287j0v5f9bfsdayb04qvh2")))) + (base32 "1dhz41jq1azcf7rbvga8w6pnx19l1j9r6jwj8qrlrfnjl9hdi9bb")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 259da514950405492714e6c0f246af1dc832caf5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 May 2020 23:36:59 +0200 Subject: gnu: libutf: Use GIT- helpers. * gnu/packages/suckless (libutf)[source]: Use GIT-VERSION and GIT-FILE-NAME. --- gnu/packages/suckless.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 69177f4e00..bff7fc493b 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -634,14 +634,14 @@ colormap to stdout.") (commit "ff4c60635e1f455b0a0b4200f8183fbd5a88225b")) (package (name "libutf") - (version (string-append "0.0.0-" revision "." (string-take commit 7))) + (version (git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/cls/libutf") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1ih5vjavilzggyr1j1z6w1z12c2fs5fg77cfnv7ami5ivsy3kg3d")))) -- cgit v1.2.3 From 211dc8cdd881b6a56ef40529bcaf6d5518c119c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 01:42:26 +0200 Subject: gnu: Support cross-gccs in (gnu packages suckless). * gnu/packages/suckless.scm (blind, dmenu, spoon, slock, st, surf, sent) (xbattmon, skroll, sbm, prout, noice, human, fortify-headers, colors) (libutf, lchat, scron)[arguments]: Use ${target}-gcc when cross-compiling. --- gnu/packages/suckless.scm | 200 +++++++++++++++++++++++++++++++--------------- 1 file changed, 135 insertions(+), 65 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index bff7fc493b..2a476dc31c 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -61,10 +61,13 @@ "0nncvzyipvkkd7zlgzwbjygp82frzs2hvbnk71gxf671np607y94")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no check target - #:make-flags (list - "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no check target + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -147,12 +150,16 @@ optimising the environment for the application in use and the task performed.") "0ia9nqr83bv6x247q30bal0v42chcj9qcjgv59xs6xj46m7iz5xk")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output) - (string-append "FREETYPEINC=" - (assoc-ref %build-inputs "freetype") - "/include/freetype2")) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output) + (string-append "FREETYPEINC=" + (assoc-ref %build-inputs "freetype") + "/include/freetype2"))) #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs @@ -182,8 +189,12 @@ numbers of user-defined menu items efficiently.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)))) + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))))) (inputs `(("libx11" ,libx11) ("libxkbfile" ,libxkbfile) @@ -208,9 +219,13 @@ numbers of user-defined menu items efficiently.") "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs `(("libx11" ,libx11) @@ -236,9 +251,13 @@ numbers of user-defined menu items efficiently.") (base32 "0ll5wbw1szs70wdf8zy1y2ig5mfbqw2w4ls8d64r8z3y4gdf76lk")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases (delete 'configure) @@ -277,9 +296,13 @@ drawing.") "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps")))) (build-system glib-or-gtk-build-system) (arguments - '(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases (delete 'configure) @@ -323,15 +346,18 @@ point surf to another URI by setting its XProperties.") `(#:phases (modify-phases %standard-phases (delete 'configure)) ; no configuration #:tests? #f ; no test suite - #:make-flags (let ((pkg-config (lambda (flag) - (string-append - "$(shell pkg-config " flag " " - "xft fontconfig x11 libpng)")))) - (list - "CC=gcc" - (string-append "PREFIX=" %output) - (string-append "INCS=-I. " (pkg-config "--cflags")) - (string-append "LIBS=" (pkg-config "--libs") " -lm"))))) + #:make-flags + (let ((target ,(%current-target-system)) + (pkg-config (lambda (flag) + (string-append + "$(shell pkg-config " flag " " + "xft fontconfig x11 libpng)")))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output) + (string-append "INCS=-I. " (pkg-config "--cflags")) + (string-append "LIBS=" (pkg-config "--libs") " -lm"))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -362,9 +388,13 @@ few minutes.") "1zr6y8lml9xkx0a3dbbsds2qz1bjxvskp7wsckkf8mlsqrbb3xsg")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)))) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))))) (inputs `(("libx11" ,libx11))) (home-page "https://git.2f30.org/xbattmon/") @@ -420,12 +450,16 @@ drivers capable of injecting packets in wireless networks.") "0km6bjfz4ssb1z0xwld6iiixnn7d255ax8yjs3zkdm42z8q9yl0f")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No configure script + (delete 'configure)))) ; no configure script (home-page "https://2f30.org/") (synopsis "Commandline utility which scrolls text") (description @@ -448,12 +482,16 @@ left.") "1nks5mkh5wn30kyjzlkjlgi31bv1wq52kbp0r6nzbyfnvfdlywik")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No configure script + (delete 'configure)))) ; no configure script (home-page "https://git.2f30.org/sbm/") (synopsis "Simple bandwidth monitor") (description @@ -474,12 +512,16 @@ left.") "1s6c3ygg1h1fyxkh8gd7nzjk6qhnwsb4535d2k780kxnwns5fzas")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No configure script + (delete 'configure)))) ; no configure script (inputs `(("cups-minimal" ,cups-minimal) ("zlib" ,zlib))) @@ -507,8 +549,12 @@ cups server to be installed.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script @@ -541,8 +587,12 @@ cups server to be installed.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -570,8 +620,12 @@ environment variable.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -610,12 +664,16 @@ initially intended to be used on musl-based Linux distributions. "1lckmqpgj89841splng0sszbls2ag71ggkgr1wsv9y3v6y87589z")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No configure script + (delete 'configure)))) ; no configure script (inputs `(("libpng" ,libpng))) (home-page "https://git.2f30.org/colors/") @@ -647,12 +705,16 @@ colormap to stdout.") "1ih5vjavilzggyr1j1z6w1z12c2fs5fg77cfnv7ami5ivsy3kg3d")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No configure script + (delete 'configure)))) ; no configure script (inputs `(("gawk" ,gawk))) (home-page "https://github.com/cls/libutf") @@ -693,8 +755,12 @@ as -1, to be used instead of U+FFFD. (build-system gnu-build-system) (arguments `(#:test-target "test" - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script @@ -737,12 +803,16 @@ chat output in the background.") "066fwa55kqcgfrsqgxh94sqbkxfsr691360xg4ljxr4i75d25s2a")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no tests + #:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "PREFIX=" %output))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No configure script + (delete 'configure)))) ; no configure script (home-page "https://git.2f30.org/scron/") (synopsis "Simple cron daemon") (description -- cgit v1.2.3 From b273158bb41e3e4b5e5ccf1077bab852e9df4b5d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 01:45:50 +0200 Subject: gnu: Order (gnu packase suckless) module imports. * gnu/packages/suckless.scm: Order module imports alphabetically. --- gnu/packages/suckless.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 2a476dc31c..5cabb40eb0 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -25,28 +25,28 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages suckless) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module (guix build-system glib-or-gtk) #:use-module (gnu packages) - #:use-module (gnu packages gnome) - #:use-module (gnu packages image) - #:use-module (gnu packages xorg) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) + #:use-module (gnu packages cups) #:use-module (gnu packages fonts) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages webkit) #:use-module (gnu packages fontutils) - #:use-module (gnu packages mpd) + #:use-module (gnu packages gawk) + #:use-module (gnu packages gnome) + #:use-module (gnu packages image) + #:use-module (gnu packages libbsd) #:use-module (gnu packages linux) - #:use-module (gnu packages compression) - #:use-module (gnu packages cups) + #:use-module (gnu packages mpd) #:use-module (gnu packages ncurses) - #:use-module (gnu packages gawk) - #:use-module (gnu packages base) - #:use-module (gnu packages libbsd)) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages webkit) + #:use-module (gnu packages xorg) + #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) (define-public blind (package -- cgit v1.2.3 From 63f2de031c7ddbfb0697cccc8f916bd29eaa85de Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 01:57:24 +0200 Subject: gnu: utf8proc: Factor out UNICODE_VERSION. * gnu/packages/textutils.scm (utf8proc)[native-inputs]: Use a single UNICODE_VERSION. --- gnu/packages/textutils.scm | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index c2184de46b..54267bfe9b 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -151,24 +151,27 @@ libenca and several charset conversion libraries and tools.") (sha256 (base32 "1i42hqwc8znqii9brangwkxk5cyc2lk95ip405fg88zr7z2ncr34")))) (build-system gnu-build-system) - (native-inputs ;test data that is otherwise downloaded with curl - `(("NormalizationTest.txt" - ,(origin - (method url-fetch) - (uri (string-append "https://www.unicode.org/Public/12.1.0/ucd/" - "NormalizationTest.txt")) - (sha256 - (base32 "0hb97k9xv1lr847hwz0719ksqy39s47xw6k01dgs1368jdibvawc")))) - ("GraphemeBreakTest.txt" - ,(origin - (method url-fetch) - (uri (string-append "https://www.unicode.org/Public/12.1.0/ucd/" - "auxiliary/GraphemeBreakTest.txt")) - (sha256 - (base32 "0qc90ppmrwfn3y9cdn8jcjrn7qpdf0fhxkwh945yp4rvh37mbgcm")))) + (native-inputs + (let ((UNICODE_VERSION "12.1.0")) ; defined in data/Makefile + ;; Test data that is otherwise downloaded with curl. + `(("NormalizationTest.txt" + ,(origin + (method url-fetch) + (uri (string-append "https://www.unicode.org/Public/" + UNICODE_VERSION "/ucd/NormalizationTest.txt")) + (sha256 + (base32 "0hb97k9xv1lr847hwz0719ksqy39s47xw6k01dgs1368jdibvawc")))) + ("GraphemeBreakTest.txt" + ,(origin + (method url-fetch) + (uri (string-append "https://www.unicode.org/Public/" + UNICODE_VERSION + "/ucd/auxiliary/GraphemeBreakTest.txt")) + (sha256 + (base32 "0qc90ppmrwfn3y9cdn8jcjrn7qpdf0fhxkwh945yp4rvh37mbgcm")))) - ;; For tests. - ("perl" ,perl))) + ;; For tests. + ("perl" ,perl)))) (arguments '(#:make-flags (list "CC=gcc" (string-append "prefix=" (assoc-ref %outputs "out"))) -- cgit v1.2.3 From cbae20494624fc69442d9437302a6f4a38c1b083 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 04:12:56 +0200 Subject: gnu: utf8proc: Update to 2.5.0. * gnu/packages/textutils.scm (utf8proc): Update to 2.5.0. [native-inputs]: Update test data UNICODE_VERSION. --- gnu/packages/textutils.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 54267bfe9b..6fdcfd227e 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -140,7 +140,7 @@ libenca and several charset conversion libraries and tools.") (define-public utf8proc (package (name "utf8proc") - (version "2.4.0") + (version "2.5.0") (source (origin (method git-fetch) @@ -149,10 +149,10 @@ libenca and several charset conversion libraries and tools.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1i42hqwc8znqii9brangwkxk5cyc2lk95ip405fg88zr7z2ncr34")))) + (base32 "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq")))) (build-system gnu-build-system) (native-inputs - (let ((UNICODE_VERSION "12.1.0")) ; defined in data/Makefile + (let ((UNICODE_VERSION "13.0.0")) ; defined in data/Makefile ;; Test data that is otherwise downloaded with curl. `(("NormalizationTest.txt" ,(origin @@ -160,7 +160,7 @@ libenca and several charset conversion libraries and tools.") (uri (string-append "https://www.unicode.org/Public/" UNICODE_VERSION "/ucd/NormalizationTest.txt")) (sha256 - (base32 "0hb97k9xv1lr847hwz0719ksqy39s47xw6k01dgs1368jdibvawc")))) + (base32 "07g0ya4f6zfzvpp24ccxkb2yq568kh83gls85rjl950nv5fya3nn")))) ("GraphemeBreakTest.txt" ,(origin (method url-fetch) @@ -168,7 +168,7 @@ libenca and several charset conversion libraries and tools.") UNICODE_VERSION "/ucd/auxiliary/GraphemeBreakTest.txt")) (sha256 - (base32 "0qc90ppmrwfn3y9cdn8jcjrn7qpdf0fhxkwh945yp4rvh37mbgcm")))) + (base32 "07f8rrvcsq4pibdz6zxggxy8w7zjjqyw2ggclqlhalyv45yv7prj")))) ;; For tests. ("perl" ,perl)))) -- cgit v1.2.3 From 13356b22c4e408246b8d809cd6370c6a2bf936b5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 02:31:06 +0200 Subject: gnu: console-setup: Update to 1.195. * gnu/packages/xorg.scm (console-setup): Update to 1.195. --- gnu/packages/xorg.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 25f2793fa1..9a7b856791 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6615,15 +6615,15 @@ output.") (define-public console-setup (package (name "console-setup") - (version "1.194") + (version "1.195") (source (origin (method git-fetch) (uri (git-reference (url "https://salsa.debian.org/installer-team/console-setup.git") - (commit version))) + (commit "38512eb9a97f57ead1f87f6aee6df455f721c645"))) ; no tag (sha256 - (base32 "0fkabv05j5dj10mfrpjyvv7lnxl9qaqkbjhwj72r18i9i4019vgh")) + (base32 "0d0xagigs5k3appzz5lzxdjncvnkgz4amz6ks7imiq8kkjixvmfy")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -6631,7 +6631,7 @@ output.") (let ((bash (assoc-ref %build-inputs "bash")) (out (assoc-ref %outputs "out"))) (list (string-append "SHELL=" bash "/bin/bash"))) - #:tests? #f ;no tests + #:tests? #f ; no tests #:phases (modify-phases %standard-phases (delete 'configure) @@ -6665,10 +6665,10 @@ output.") `(("pkg-config" ,pkg-config) ("bdftopcf" ,bdftopcf) ("bdfresize" ,bdfresize) - ("sharutils" ,sharutils) ;for 'uuencode' + ("sharutils" ,sharutils) ; for 'uuencode' ("perl" ,perl))) (inputs - `(("perl" ,perl))) ;used by 'ckbcomp' + `(("perl" ,perl))) ; used by 'ckbcomp' (synopsis "Set up the Linux console font and keyboard") (description "console-setup provides the console with the same keyboard -- cgit v1.2.3 From eeebf5729213abec5470416f26dd3265abed5c4a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 14:55:41 +0200 Subject: gnu: youtube-dl: Update to 2020.05.08. * gnu/packages/video.scm (youtube-dl): Update to 2020.05.08. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e0eb2db84a..f34da90d5d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1610,7 +1610,7 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2020.05.03") + (version "2020.05.08") (source (origin (method url-fetch) (uri (string-append "https://github.com/ytdl-org/youtube-dl/" @@ -1618,7 +1618,7 @@ To load this plugin, specify the following option when starting mpv: version ".tar.gz")) (sha256 (base32 - "0qigk1bml6vkck4rs0wnmr46j5gkz04zn30jvnw1r4czjs7vnpal")))) + "16zxa8ss2rka7cvkqyi67s8i1h9f4nxx88w9vjbxchbga6w0scc6")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 0fe654ebcdf3399a950da65b50924096c947df42 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 15:04:47 +0200 Subject: gnu: z3: Update to 4.8.8. * gnu/packages/maths.scm (z3): Update to 4.8.8. --- gnu/packages/maths.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d60c033dbc..1821b2b1c7 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -20,7 +20,7 @@ ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017, 2019 Arun Isaac -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018, 2019 Jan Nieuwenhuizen ;;; Copyright © 2018 Joshua Sierles, Nextjournal @@ -4366,7 +4366,7 @@ as equations, scalars, vectors, and matrices.") (define-public z3 (package (name "z3") - (version "4.8.7") + (version "4.8.8") (home-page "https://github.com/Z3Prover/z3") (source (origin (method git-fetch) @@ -4375,7 +4375,7 @@ as equations, scalars, vectors, and matrices.") (file-name (git-file-name name version)) (sha256 (base32 - "0hprcdwhhyjigmhhk6514m71bnmvqci9r8gglrqilgx424r6ff7q")))) + "1rn538ghqwxq0v8i6578j8mflk6fyv0cp4hjfqynzvinjbps56da")))) (build-system gnu-build-system) (arguments `(#:imported-modules ((guix build python-build-system) -- cgit v1.2.3 From 1a1faa78b0498fbb71f1533beb4b65817c1d3f2a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 May 2020 15:13:12 +0200 Subject: etc: Add a systemd unit to bind-mount @storedir@ read-only. * etc/gnu-store.mount.in: New file. * nix/local.mk (nodist_systemdservice_DATA): Add it. (etc/%.mount): New rule for it. * etc/guix-install.sh (sys_enable_guix_daemon): Install it. * doc/guix.texi (Binary Installation): Document it. * .gitignore: Ignore changes to it. --- .gitignore | 1 + doc/guix.texi | 5 +++-- etc/gnu-store.mount.in | 14 ++++++++++++++ etc/guix-install.sh | 12 +++++++++--- nix/local.mk | 12 +++++++++++- 5 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 etc/gnu-store.mount.in diff --git a/.gitignore b/.gitignore index cc5ceb5e10..05a68b69ff 100644 --- a/.gitignore +++ b/.gitignore @@ -66,6 +66,7 @@ /doc/stamp-vti /doc/version.texi /doc/version-*.texi +/etc/gnu-store.mount /etc/guix-daemon.cil /etc/guix-daemon.conf /etc/guix-daemon.service diff --git a/doc/guix.texi b/doc/guix.texi index d043852ac3..90324ce291 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -659,9 +659,10 @@ with these commands: @c https://lists.gnu.org/archive/html/guix-devel/2017-01/msg01199.html @example -# cp ~root/.config/guix/current/lib/systemd/system/guix-daemon.service \ +# cp ~root/.config/guix/current/lib/systemd/system/gnu-store.mount \ + ~root/.config/guix/current/lib/systemd/system/guix-daemon.service \ /etc/systemd/system/ -# systemctl enable --now guix-daemon +# systemctl enable --now gnu-store.mount guix-daemon @end example If your host distro uses the Upstart init system: diff --git a/etc/gnu-store.mount.in b/etc/gnu-store.mount.in new file mode 100644 index 0000000000..c94f2db72b --- /dev/null +++ b/etc/gnu-store.mount.in @@ -0,0 +1,14 @@ +[Unit] +Description=Read-only @storedir@ for GNU Guix +DefaultDependencies=no +ConditionPathExists=@storedir@ +Before=guix-daemon.service + +[Install] +WantedBy=guix-daemon.service + +[Mount] +What=@storedir@ +Where=@storedir@ +Type=none +Options=bind,ro diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 4909d3f162..d252c132fb 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -342,7 +342,13 @@ sys_enable_guix_daemon() _msg "${PAS}enabled Guix daemon via upstart" ;; systemd) - { cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/guix-daemon.service" \ + { # systemd .mount units must be named after the target directory. + # Here we assume a hard-coded name of /gnu/store. + cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/gnu-store.mount" \ + /etc/systemd/system/; + chmod 664 /etc/systemd/system/gnu-store.mount; + + cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/guix-daemon.service" \ /etc/systemd/system/; chmod 664 /etc/systemd/system/guix-daemon.service; @@ -357,8 +363,8 @@ sys_enable_guix_daemon() fi; systemctl daemon-reload && - systemctl start guix-daemon && - systemctl enable guix-daemon; } && + systemctl start gnu-store.mount guix-daemon && + systemctl enable gnu-store.mount guix-daemon; } && _msg "${PAS}enabled Guix daemon via systemd" ;; sysv-init) diff --git a/nix/local.mk b/nix/local.mk index a64bdd2137..435fdd389a 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -155,7 +155,17 @@ noinst_HEADERS = \ # The '.service' files for systemd. systemdservicedir = $(libdir)/systemd/system -nodist_systemdservice_DATA = etc/guix-daemon.service etc/guix-publish.service +nodist_systemdservice_DATA = \ + etc/gnu-store.mount \ + etc/guix-daemon.service \ + etc/guix-publish.service + +etc/%.mount: etc/%.mount.in \ + $(top_builddir)/config.status + $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ + $(SED) -e 's|@''storedir''@|$(storedir)|' < \ + "$<" > "$@.tmp"; \ + mv "$@.tmp" "$@" etc/guix-%.service: etc/guix-%.service.in \ $(top_builddir)/config.status -- cgit v1.2.3 From a3dfe052850257de0a64bec6797f803145903179 Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Sat, 16 May 2020 17:30:35 +0200 Subject: gnu: guile-hall: Update to 0.3.0. * gnu/packages/guile-xyz.scm (guile-hall): Update to 0.3.0. --- gnu/packages/guile-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index d7f52b08f4..a5a4772117 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1397,16 +1397,16 @@ above command-line parameters.") (define-public guile-hall (package (name "guile-hall") - (version "0.2.1") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.com/a-sassmannshausen/guile-hall") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 (base32 - "0dwx5iyg0dmdf64wq0b4w306bapr86jwnw35npgbjq4cqm8qbzqn")))) + (commit version))) + (file-name "guile-hall-0.3.0-checkout") + (sha256 + (base32 "04vi9h1jj6sfdr4ikbvd41ls4rdgfp01x7dvbklb9mmgadzcibhn")))) (build-system gnu-build-system) (arguments `(#:modules -- cgit v1.2.3 From 523cbfbd55fa73d0c31e2ac84008a18fffbd42f5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 16 May 2020 15:16:52 +0200 Subject: gnu: bap: Update to 2.0.0. * gnu/packages/ocaml.scm (bap): Update to 2.0.0. --- gnu/packages/ocaml.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c5ec3174ed..916c7fe292 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2975,7 +2975,7 @@ XML and Protocol Buffers formats.") (define-public bap (package (name "bap") - (version "1.6.0") + (version "2.0.0") (home-page "https://github.com/BinaryAnalysisPlatform/bap") (source (origin (method git-fetch) @@ -2985,7 +2985,7 @@ XML and Protocol Buffers formats.") (file-name (git-file-name name version)) (sha256 (base32 - "0ryf2xb37pj2f9mc3p5prqgqrylph9qgq7q9jnbx8b03nzzpa6h6")))) + "0lb9xkfp67wjjqr75p6krivmjra7l5673236v9ny4gp0xi0755bk")))) (build-system ocaml-build-system) (native-inputs `(("ocaml-oasis" ,(package-with-ocaml4.07 ocaml-oasis)) @@ -3003,16 +3003,23 @@ XML and Protocol Buffers formats.") ("ocaml-ocurl" ,(package-with-ocaml4.07 ocaml-ocurl)) ("ocaml-piqi" ,ocaml4.07-piqi) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) + ("ocaml-utop" ,ocaml4.07-utop) ("ocaml-uuidm" ,(package-with-ocaml4.07 ocaml-uuidm)) ("ocaml-uri" ,ocaml4.07-uri) ("ocaml-zarith" ,(package-with-ocaml4.07 ocaml-zarith)))) (inputs - `(("llvm" ,llvm-3.8) - ("gmp" ,gmp))) + `(("gmp" ,gmp) + ("llvm" ,llvm-3.8) + ("ncurses" ,ncurses))) (arguments `(#:use-make? #t #:phases (modify-phases %standard-phases + (add-before 'configure 'fix-ncurses + (lambda _ + (substitute* "oasis/llvm" + (("-lcurses") "-lncurses")) + #t)) (replace 'configure (lambda* (#:key outputs inputs #:allow-other-keys) ;; add write for user, to prevent a failure in the install phase -- cgit v1.2.3 From 8ba990e69dcf471c3c24964cd8d7438c7fae427c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 16 May 2020 15:59:39 +0200 Subject: gnu: Add java-picocli. gnu/packages/java.scm (java-picocli): New variable. --- gnu/packages/java.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 071b97582d..fc1f7d157a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11943,3 +11943,28 @@ involving one or more shared resources having ACID (Atomicity, Consistency, Isolation and Durability) properties.") ;; either gpl2 only with classpath exception or cddl. (license (list license:gpl2 license:cddl1.0)))) + +(define-public java-picocli + (package + (name "java-picocli") + (version "4.3.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/remkop/picocli") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1sxp6rxjfgjd98ly14b3d15dvxkm5wg4g46w12jyhmr0kmkaca3c")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "picocli.jar" + #:source-dir "src/main/java" + ;; Tests require missing dependencies (junitparams, system-rules) + #:tests? #f)) + (home-page "https://picocli.info") + (synopsis "REPL for the JVM") + (description "Picocli is a framework for building command line applications +for the JVM. It supports colors, autocompletion, subcommands, and more. Written +in Java, usable from Groovy, Kotlin, Scala, etc.") + (license license:asl2.0))) -- cgit v1.2.3 From 3c102716d0926602330d3cf616ec9dd0640b7c81 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 30 Apr 2020 18:19:11 +0200 Subject: gnu: Add font-api-mj-mincho. * gnu/packages/fonts.scm (font-api-mj-mincho): New variable. --- gnu/packages/fonts.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 64d5c17346..f4071f456f 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 John Soo ;;; Copyright © 2020 Raghav Gururajan +;;; Copyright © 2020 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -1737,3 +1738,35 @@ variation Arial. Tamil characters are inherently vertically-elliptical. The orthography of Roman glyphs of Meera Inimai are also based on this characteristic so that they sit smoothly with the Tamil glyphs.") (license license:silofl1.1))) + +(define-public font-ipa-mj-mincho + (package + (name "font-ipa-mj-mincho") + (version "006.01") + (source (origin + (method url-fetch/zipbomb) + (uri (string-append "https://mojikiban.ipa.go.jp/OSCDL/IPAmjMincho" + "/ipamjm" (string-join (string-split version #\.) "") + ".zip")) + (sha256 + (base32 + "0s2vs9p7vd7ajnn6c2icli069sjwi4d45a39fczqpwwn507lwj9m")))) + (build-system font-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((doc-dir (string-append (assoc-ref outputs "out") + "/share/doc/font-ipa-mj-mincho"))) + (mkdir-p doc-dir) + (copy-file "Readme.txt" (string-append doc-dir "/README")) + (copy-file "IPA_Font_License_Agreement_v1.0.txt" + (string-append doc-dir "/LICENSE")) + #t)))))) + (home-page "https://mojikiban.ipa.go.jp/1300.html") + (synopsis "Japanese font from the Information-technology Promotion Agency") + (description "MJM Mincho is a font that aims at, for example, allowing you +to write people's name, or for formal business situations where it is necessary +to have a detailed and proper character style.") + (license license:ipa))) -- cgit v1.2.3 From d952eebd4689e06fec617047cf913bf0d40e8f83 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 16 May 2020 17:14:02 +0200 Subject: gnu: emacs-pass: Update to 2.0. * gnu/packages/emacs-xyz.scm (emacs-pass): Update to 2.0. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 45ccced99e..4bbd482409 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12691,7 +12691,7 @@ standard Unix password manager\").") (define-public emacs-pass (package (name "emacs-pass") - (version "1.8") + (version "2.0") (source (origin (method git-fetch) @@ -12700,7 +12700,7 @@ standard Unix password manager\").") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "05h4hacv3yygyjcjj004qbyqjpkl4pyhwgp25gsz8mw5c66l70cx")))) + (base32 "0jc8j421mlflspg24jvrqc2n3y5n3cpk3hjy560il8g36xi1049p")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-password-store" ,emacs-password-store) -- cgit v1.2.3 From 6d8594515628c06748ca61dbaa51914df069d759 Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 6 May 2020 19:26:05 +0200 Subject: doc: Reword "The GCC toolchain". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix commit 1f14e25c1969a93908288cb302a572f3cbbaa478 as discussed in . * doc/guix.texi (Packages for C Development): Rename to... (The GCC toolchain): ...this. Add gfortran-toolchain. (Invoking guix package): Add guix-search anchor. (Application Setup)[The GCC toolchain]: Remove. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 90324ce291..22bf6bd224 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -228,6 +228,7 @@ Development * Invoking guix environment:: Setting up development environments. * Invoking guix pack:: Creating software bundles. +* The GCC toolchain:: Working with languages supported by GCC. Programming Interface @@ -1773,13 +1774,6 @@ want to avoid auto-loading the Emacs packages installed with Guix, you can do so by running Emacs with the @option{--no-site-file} option (@pxref{Init File,,, emacs, The GNU Emacs Manual}). -@subsection The GCC toolchain - -@c XXX: The contents of this section were moved under -@c ``Development'', since it makes more sense there and is not specific -@c foreign distros. Remove it from here eventually? -@xref{Packages for C Development}, for information on packages for C/C++ -development. @node Upgrading Guix @section Upgrading Guix @@ -3045,6 +3039,7 @@ availability of packages: @item --search=@var{regexp} @itemx -s @var{regexp} +@anchor{guix-search} @cindex searching for packages List the available packages whose name, synopsis, or description matches @var{regexp} (in a case-insensitive fashion), sorted by relevance. @@ -4675,9 +4670,9 @@ pack} command allows you to create @dfn{application bundles} that can be easily distributed to users who do not run Guix. @menu -* Invoking guix environment:: Setting up development environments. -* Invoking guix pack:: Creating software bundles. -* Packages for C Development:: Working with C code with Guix. +* Invoking guix environment:: Setting up development environments. +* Invoking guix pack:: Creating software bundles. +* The GCC toolchain:: Working with languages supported by GCC. @end menu @node Invoking guix environment @@ -5388,13 +5383,15 @@ In addition, @command{guix pack} supports all the common build options (@pxref{Common Build Options}) and all the package transformation options (@pxref{Package Transformation Options}). -@node Packages for C Development -@section Packages for C Development + +@node The GCC toolchain +@section The GCC toolchain @cindex GCC @cindex ld-wrapper @cindex linker wrapper @cindex toolchain, for C development +@cindex toolchain, for Fortran development If you need a complete toolchain for compiling and linking C or C++ source code, use the @code{gcc-toolchain} package. This package @@ -5408,7 +5405,9 @@ invoke the actual linker with this new set of arguments. You can instruct the wrapper to refuse to link against libraries not in the store by setting the @env{GUIX_LD_WRAPPER_ALLOW_IMPURITIES} environment variable to @code{no}. - +The package @code{gfortran-toolchain} provides a complete GCC toolchain +for Fortran development. For other languages, please use +@samp{guix search gcc toolchain} (@pxref{guix-search,, Invoking guix package}). @c ********************************************************************* @node Programming Interface -- cgit v1.2.3 From 525fd26deb7051ece34aada91609e314f8d997bb Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Sat, 16 May 2020 10:24:47 +0000 Subject: gnu: openctm: Correct inputs vs native-inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (openctm): Move mesa, glu, glut and gtk+-2 to inputs Signed-off-by: Ludovic Courtès --- gnu/packages/engineering.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index aec692174a..aab414bf0e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2557,11 +2557,12 @@ official SDK.") (base32 "01wb70m48xh5gwhv60a5brv4sxl0i0rh038w32cgnlxn5x86s9f1")))) (build-system gnu-build-system) (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa) ("glu" ,glu) ("glut" ,freeglut) - ("gtk" ,gtk+-2) - ("pkg-config" ,pkg-config))) + ("gtk" ,gtk+-2))) (arguments `(#:tests? #f ;no tests #:phases -- cgit v1.2.3 From 1c85ecec8e8337ee99c7e3a59587afd6512db425 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Fri, 15 May 2020 16:05:11 +0200 Subject: gnu: Add lib3ds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (lib3ds): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/engineering.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index aab414bf0e..37b42ca3f5 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2595,3 +2595,25 @@ fraction of comparable file formats (3DS, STL, COLLADA...), and the format is accessible through a simple API") (license license:zlib) (home-page "http://openctm.sourceforge.net/")))) + +(define-public lib3ds + (package + (name "lib3ds") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://storage.googleapis.com/google-code-archive-downloads" + "/v2/code.google.com/lib3ds/lib3ds-" version ".zip")) + (sha256 + (base32 "1qr9arfdkjf7q11xhvxwzmhxqz3nhcjkyb8zzfjpz9jm54q0rc7m")))) + (build-system gnu-build-system) + (native-inputs + `(("unzip" ,unzip))) + (home-page "https://code.google.com/archive/p/lib3ds") + (synopsis "3DS format file toolkit") + (description "Lib3ds is a toolkit for handling the 3DS format for 3D +model files. Its main goal is to simplify the creation of 3DS import and +export filters.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 7e6bbd8b09b090ba1c1d156caed859901757396e Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sat, 9 May 2020 15:02:59 +0200 Subject: gnu: gnome-shell-extension-dash-to-dock: Update to 67. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome-xyz.scm (gnome-shell-extension-dash-to-dock): Update to 67. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index a60b5dbb61..83e37f97b0 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Leo Prikler +;;; Copyright © 2019, 2020 Leo Prikler ;;; Copyright © 2019 Alexandros Theodotou ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2020 Alex Griffin @@ -239,7 +239,7 @@ easier to keep track of apps running in the backround.") (define-public gnome-shell-extension-dash-to-dock (package (name "gnome-shell-extension-dash-to-dock") - (version "66") + (version "67") (source (origin (method git-fetch) (uri (git-reference @@ -248,7 +248,7 @@ easier to keep track of apps running in the backround.") version)))) (sha256 (base32 - "04krl6rxlp1qc97psraf2kwin7h0mx4c7pnfpi7vhplmvasrwkfh")) + "1746xm0iyvyzj6m3pvjx11smh9w1s7naz426ki0dlr5l7jh3mpy5")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 70d1e9714c2a3f2041731f79c7c9ab05a045752d Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Fri, 8 May 2020 14:51:43 +0200 Subject: gnu: tinyxml2: Update to 8.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xml.scm (tinyxml2): Update to 8.0.0. Signed-off-by: Ludovic Courtès --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 03daebb4a7..51ac6d44d1 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1101,7 +1101,7 @@ C++ programming language.") (define-public tinyxml2 (package (name "tinyxml2") - (version "7.0.1") + (version "8.0.0") (source (origin (method git-fetch) @@ -1110,7 +1110,7 @@ C++ programming language.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1sf6sch1kawrna2f9dc8f4xl836acqcddkghzdib0s7dl48m9r7m")))) + (base32 "0raa8r2hsagk7gjlqjwax95ib8d47ba79n91r4aws2zg8y6ssv1d")))) (build-system cmake-build-system) (synopsis "Small XML parser for C++") (description "TinyXML2 is a small and simple XML parsing library for the -- cgit v1.2.3 From 1f595f3cf46943f31b5cc96e5fd16c8264d0db52 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 May 2020 11:48:44 +0200 Subject: gnu: xdot: Fix typo in description. * gnu/packages/graphviz.scm (xdot)[description]: Add space after comma, capitalize 'Python'. --- gnu/packages/graphviz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index b887da1076..6e91d45503 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -315,8 +315,8 @@ structure and layout algorithms.") (synopsis "Interactive viewer for graphviz dot files") (description "Xdot is an interactive viewer for graphs written in @code{graphviz}’s dot language. Internally, it uses the xdot output format as -an intermediate format,and @code{gtk} and @code{cairo} for rendering. Xdot can -be used either as a standalone application, or as a python library.") +an intermediate format, and @code{gtk} and @code{cairo} for rendering. Xdot +can be used either as a standalone application, or as a Python library.") (license license:lgpl3+))) (define-public python-pydot -- cgit v1.2.3 From d1ed1d7560d454e271f682728a3dcaa76032077f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 16 May 2020 18:08:27 +0200 Subject: gnu: multipath-tools: Fetch with git. * gnu/packages/linux.scm (multipath-tools)[source]: Change to GIT-FETCH. --- gnu/packages/linux.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bfee4374bd..793036a3ff 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4184,13 +4184,14 @@ arrays when needed.") (name "multipath-tools") (version "0.8.3") (source (origin - (method url-fetch) - (uri (string-append "https://git.opensvc.com/?p=multipath-tools/" - ".git;a=snapshot;h=" version ";sf=tgz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://git.opensvc.com/multipath-tools/.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1c6ay97wlfv1fl0y8hcfpxhkps14hlnw9gzmj7884micsp7pa9yv")) + "02kdbk3gv3fx5dg445scz3l4lg0sznlv037qkjgpw9xkw4l50cfd")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From cfdd023bed634040ab3256680aebc8e06c134bd1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 16 May 2020 18:13:35 +0200 Subject: gnu: multipath-tools: Update to 0.8.4. * gnu/packages/patches/multipath-tools-sans-systemd.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/linux.scm (multipath-tools): Update to 0.8.4. [source](patches): New field. [arguments]: Add #:parallel-build?. Add phase to fix erroneous compiler warning. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 17 ++++- .../patches/multipath-tools-sans-systemd.patch | 83 ++++++++++++++++++++++ 3 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/multipath-tools-sans-systemd.patch diff --git a/gnu/local.mk b/gnu/local.mk index ab2bac9bc5..025dfe114b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1275,6 +1275,7 @@ dist_patch_DATA = \ %D%/packages/patches/mozjs38-version-detection.patch \ %D%/packages/patches/mrrescue-support-love-11.patch \ %D%/packages/patches/mtools-mformat-uninitialized.patch \ + %D%/packages/patches/multipath-tools-sans-systemd.patch \ %D%/packages/patches/mumps-build-parallelism.patch \ %D%/packages/patches/mumps-shared-libseq.patch \ %D%/packages/patches/mumps-shared-mumps.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 793036a3ff..2d8acea0e3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4182,7 +4182,7 @@ arrays when needed.") (define-public multipath-tools (package (name "multipath-tools") - (version "0.8.3") + (version "0.8.4") (source (origin (method git-fetch) (uri (git-reference @@ -4191,7 +4191,8 @@ arrays when needed.") (file-name (git-file-name name version)) (sha256 (base32 - "02kdbk3gv3fx5dg445scz3l4lg0sznlv037qkjgpw9xkw4l50cfd")) + "14n8pcgnliicqxzc40xvjxk4cafm4qx7a3rsx5qva74r3ydzx8rn")) + (patches (search-patches "multipath-tools-sans-systemd.patch")) (modules '((guix build utils))) (snippet '(begin @@ -4205,9 +4206,12 @@ arrays when needed.") (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests + #:parallel-build? #f ;XXX: broken in 0.8.4 #:make-flags (list "CC=gcc" (string-append "DESTDIR=" (assoc-ref %outputs "out")) + ;; Install Udev rules below this directory, relative + ;; to the prefix. "SYSTEMDPATH=lib" (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") @@ -4229,6 +4233,15 @@ arrays when needed.") (("/usr/include/libudev.h") (string-append udev "/include/libudev.h"))) #t))) + (add-after 'unpack 'fix-maybe-uninitialized-variable + (lambda _ + ;; This variable gets initialized later if needed, but GCC 7 + ;; fails to notice. Should be fixed for > 0.8.4. + ;; https://www.redhat.com/archives/dm-devel/2020-March/msg00137.html + (substitute* "libmultipath/structs_vec.c" + (("bool is_queueing;") + "bool is_queueing = false;")) + #t)) (delete 'configure)))) ; no configure script (native-inputs `(("perl" ,perl) diff --git a/gnu/packages/patches/multipath-tools-sans-systemd.patch b/gnu/packages/patches/multipath-tools-sans-systemd.patch new file mode 100644 index 0000000000..8f3144718c --- /dev/null +++ b/gnu/packages/patches/multipath-tools-sans-systemd.patch @@ -0,0 +1,83 @@ +Fix various compiler warnings when built without systemd. + +Submitted upstream at . + +diff --git a/libmultipath/config.c b/libmultipath/config.c +--- a/libmultipath/config.c ++++ b/libmultipath/config.c +@@ -696,7 +696,7 @@ process_config_dir(struct config *conf, char *dir) + pthread_cleanup_pop(1); + } + +-static void set_max_checkint_from_watchdog(struct config *conf) ++static void set_max_checkint_from_watchdog(__attribute__((unused)) struct config *conf) + { + #ifdef USE_SYSTEMD + char *envp = getenv("WATCHDOG_USEC"); +diff --git a/multipathd/main.c b/multipathd/main.c +--- a/multipathd/main.c ++++ b/multipathd/main.c +@@ -176,6 +176,7 @@ daemon_status(void) + /* + * I love you too, systemd ... + */ ++#ifdef USE_SYSTEMD + static const char * + sd_notify_status(enum daemon_status state) + { +@@ -195,7 +196,6 @@ sd_notify_status(enum daemon_status state) + return NULL; + } + +-#ifdef USE_SYSTEMD + static void do_sd_notify(enum daemon_status old_state, + enum daemon_status new_state) + { +@@ -247,7 +247,9 @@ enum daemon_status wait_for_state_change_if(enum daemon_status oldstate, + static void __post_config_state(enum daemon_status state) + { + if (state != running_state && running_state != DAEMON_SHUTDOWN) { +- enum daemon_status old_state = running_state; ++ /* save state for sd_notify */ ++ enum daemon_status ++ __attribute__((unused)) old_state = running_state; + + running_state = state; + pthread_cond_broadcast(&config_cond); +@@ -272,7 +274,9 @@ int set_config_state(enum daemon_status state) + pthread_cleanup_push(config_cleanup, NULL); + pthread_mutex_lock(&config_lock); + if (running_state != state) { +- enum daemon_status old_state = running_state; ++ /* save state for sd_notify */ ++ enum daemon_status ++ __attribute__((unused)) old_state = running_state; + + if (running_state == DAEMON_SHUTDOWN) + rc = EINVAL; +@@ -2280,7 +2284,6 @@ checkerloop (void *ap) + struct timespec last_time; + struct config *conf; + int foreign_tick = 0; +- bool use_watchdog; + + pthread_cleanup_push(rcu_unregister, NULL); + rcu_register_thread(); +@@ -2292,11 +2295,15 @@ checkerloop (void *ap) + get_monotonic_time(&last_time); + last_time.tv_sec -= 1; + +- /* use_watchdog is set from process environment and never changes */ + conf = get_multipath_config(); +- use_watchdog = conf->use_watchdog; + put_multipath_config(conf); + ++#ifdef USE_SYSTEMD ++ /* use_watchdog is set from process environment and never changes */ ++ bool use_watchdog; ++ use_watchdog = conf->use_watchdog; ++#endif ++ + while (1) { + struct timespec diff_time, start_time, end_time; + int num_paths = 0, strict_timing, rc = 0; -- cgit v1.2.3 From 834c8684a274f72c0bbfab744177c3f0a16d12af Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 16 May 2020 19:59:27 +0200 Subject: gnu: gajim: Adapt search path for Python 3.8. Fixes . Reported by Raghav Gururajan . * gnu/packages/messaging.scm (gajim)[native-search-paths]: Update the PYTHONPATH variable to search for Python 3.8 packages. --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 7e30eeae75..57ff0835d1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -704,7 +704,7 @@ else [])")) ;; FIXME: Cannot use this expression as it would ;; introduce a circular dependency at the top level. ;; (version-major+minor (package-version python)) - "3.7" + "3.8" "/site-packages")))))) (native-inputs -- cgit v1.2.3 From 5c4aa84e4ab891ae2cfc10b8601113887550c070 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 16 May 2020 14:32:37 -0400 Subject: gnu: heimdal: Update to 7.7.0. And fix the test suite failures as a side effect. * gnu/packages/kerberos.scm (heimdal): Update to 7.7.0. --- gnu/packages/kerberos.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 896d15f485..20ed94b33b 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -170,7 +170,7 @@ After installation, the system administrator should generate keys using (define-public heimdal (package (name "heimdal") - (version "7.5.0") + (version "7.7.0") (source (origin (method url-fetch) (uri (string-append @@ -178,14 +178,14 @@ After installation, the system administrator should generate keys using "heimdal-" version "/" "heimdal-" version ".tar.gz")) (sha256 (base32 - "1bdc682in55ygrxmhncs7cf4s239apcblci3z8i80wnc1w1s18n5")) + "06vx3cb01s4lv3lpv0qzbbj97cln1np1wjphkkmmbk1lsqa36bgh")) (modules '((guix build utils))) (snippet '(begin (substitute* "configure" (("User=.*$") "User=Guix\n") (("Host=.*$") "Host=GNU") - (("Date=.*$") "Date=2017\n")) + (("Date=.*$") "Date=2019\n")) #t)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From a43fe7acd1bbe9dd5118d7bff823f4730153cc48 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 16 May 2020 20:56:20 +0200 Subject: gnu: multipath-tools: Enable tests. * gnu/packages/linux.scm (multipath-tools)[arguments]: Remove #:tests?. Add #:test-target. Add phase to add missing linker flag. [native-inputs]: Add CMOCKA. --- gnu/packages/linux.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2d8acea0e3..aa52068794 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4205,7 +4205,7 @@ arrays when needed.") #t)))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests + '(#:test-target "test" #:parallel-build? #f ;XXX: broken in 0.8.4 #:make-flags (list "CC=gcc" (string-append "DESTDIR=" @@ -4242,11 +4242,22 @@ arrays when needed.") (("bool is_queueing;") "bool is_queueing = false;")) #t)) + (add-after 'unpack 'fix-linking-tests + (lambda _ + ;; Add missing linker flag for -lmpathcmd. This should be fixed + ;; for versions > 0.8.4. + (substitute* "tests/Makefile" + (("-lmultipath -lcmocka") + "-lmultipath -L$(mpathcmddir) -lmpathcmd -lcmocka")) + #t)) (delete 'configure)))) ; no configure script (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) - ("valgrind" ,valgrind))) + ("valgrind" ,valgrind) + + ;; For tests. + ("cmocka" ,cmocka))) (inputs `(("json-c" ,json-c) ("libaio" ,libaio) -- cgit v1.2.3 From 63fe1dc0b019eac616dfbbaa19c90874be545b00 Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Sat, 16 May 2020 22:54:45 +0200 Subject: gnu: guile-hall: Update to 0.3.1. * gnu/packages/guile-xyz.scm (guile-hall): Update to 0.3.1. --- gnu/packages/guile-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index a5a4772117..fb56fb25e5 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1397,16 +1397,16 @@ above command-line parameters.") (define-public guile-hall (package (name "guile-hall") - (version "0.3.0") + (version "0.3.1") (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.com/a-sassmannshausen/guile-hall") (commit version))) - (file-name "guile-hall-0.3.0-checkout") + (file-name "guile-hall-0.3.1-checkout") (sha256 - (base32 "04vi9h1jj6sfdr4ikbvd41ls4rdgfp01x7dvbklb9mmgadzcibhn")))) + (base32 "1s24nigdra6rvclvy15l2aw00c3aq9vv8qwxylzs60darbl36206")))) (build-system gnu-build-system) (arguments `(#:modules -- cgit v1.2.3 From d5c0a835964e4990a7016f8d12c602c3ccb2bb9b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 00:26:40 +0200 Subject: gnu: synthv1: Update to 0.9.14. * gnu/packages/music.scm (synthv1): Update to 0.9.14. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 9a55f0db3a..b8752cea48 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1436,7 +1436,7 @@ users to select LV2 plugins and run them with jalv.") (define-public synthv1 (package (name "synthv1") - (version "0.9.13") + (version "0.9.14") (source (origin (method url-fetch) (uri @@ -1444,7 +1444,7 @@ users to select LV2 plugins and run them with jalv.") "/synthv1-" version ".tar.gz")) (sha256 (base32 - "0bb48myvgvqcibwm68qhd4852pjr2g19rasf059a799d1hzgfq3l")))) + "08n83krkak20924flb9azhm9hn40lyfvn29m63zs3lw3wajf0b40")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From 1c822d526a178bf464cce328266a64cfb152e14c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 00:26:45 +0200 Subject: gnu: drumkv1: Update to 0.9.14. * gnu/packages/music.scm (drumkv1): Update to 0.9.14. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b8752cea48..162bea9b87 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1468,7 +1468,7 @@ oscillators and stereo effects.") (define-public drumkv1 (package (name "drumkv1") - (version "0.9.13") + (version "0.9.14") (source (origin (method url-fetch) (uri @@ -1476,7 +1476,7 @@ oscillators and stereo effects.") "/drumkv1-" version ".tar.gz")) (sha256 (base32 - "1h88sakxs0b20k8v2sh14y05fin1zqmhnid6h9mk9c37ixxg58ia")))) + "0fr7pkp55zvjxf7p22drs93fsjgvqhbd55vxi0srhp2s2wzz5qak")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From f5479ddf3dafa7ed0ddb1e535c219ab3e457ffc3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 00:26:51 +0200 Subject: gnu: samplv1: Update to 0.9.14. * gnu/packages/music.scm (samplv1): Update to 0.9.14. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 162bea9b87..1520daf1be 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1501,7 +1501,7 @@ effects.") (define-public samplv1 (package (name "samplv1") - (version "0.9.13") + (version "0.9.14") (source (origin (method url-fetch) (uri @@ -1509,7 +1509,7 @@ effects.") "/samplv1-" version ".tar.gz")) (sha256 (base32 - "0clsp6s5qfnh0xaxbd35vq2ppi72q9dfayrzlgl73800a8p7gh9m")))) + "0p3f9wsn1nz93szcl60yxhxdr554zm2z2jlbniwwify765lvasxc")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From d393e113228304407e69c677335c8dd0e6aaa1fd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 00:26:55 +0200 Subject: gnu: padthv1: Update to 0.9.14. * gnu/packages/music.scm (padthv1): Update to 0.9.14. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 1520daf1be..3736abb353 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1534,7 +1534,7 @@ effects.") (define-public padthv1 (package (name "padthv1") - (version "0.9.13") + (version "0.9.14") (source (origin (method url-fetch) (uri @@ -1542,7 +1542,7 @@ effects.") "/padthv1-" version ".tar.gz")) (sha256 (base32 - "1c1zllph86qswcxddz4vpsj6r9w21hbv4gkba0pyd3q7pbfqr7nz")))) + "079iwwlkl1gscyv70v9ambad8shxbs0ixdfp0vsl6dbh87b09qzh")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit v1.2.3 From f2e99d989931846a4ffae9e8e42006b16e5df923 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 16 May 2020 22:32:38 +0200 Subject: gnu: supertux: Update to 0.6.2. * gnu/packages/games.scm (supertux): Update to 0.6.2. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f7b21ce44f..afc8b372a7 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4132,7 +4132,7 @@ with the \"Stamp\" tool within Tux Paint.") (define-public supertux (package (name "supertux") - (version "0.6.1.1") + (version "0.6.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/SuperTux/supertux/" @@ -4141,7 +4141,7 @@ with the \"Stamp\" tool within Tux Paint.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0n36qxwjlkdlksximz4s729az6pry2sdjavwgm7m65vfgdiz139f")) + "167m3z4m8n76dvbv42m1fnvabpbpsxvr28zk9641916jl9pfba96")) (patches (search-patches "supertux-unbundle-squirrel.patch")))) (arguments -- cgit v1.2.3 From 54cc2b4e068675206fe1bb8615857b7dc71a168a Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Thu, 14 May 2020 14:07:53 +0200 Subject: gnu: java-jmapviewer: Return #t from all phases. * gnu/packages/geo.scm (java-jmapviewer)[arguments]: Return #t from install phase. --- gnu/packages/geo.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 3c76b01c63..dc40974381 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1151,7 +1151,8 @@ persisted. (lambda* (#:key outputs #:allow-other-keys) (let ((dir (string-append (assoc-ref outputs "out") "/share/java/"))) (mkdir-p dir) - (copy-file "JMapViewer.jar" (string-append dir "JMapViewer.jar")))))))) + (copy-file "JMapViewer.jar" (string-append dir "JMapViewer.jar")) + #t)))))) (home-page "https://wiki.openstreetmap.org/wiki/JMapViewer") (synopsis "OSM map integration in Java") (description "JMapViewer is a Java component which easily -- cgit v1.2.3 From 69a745b735c9110c6146dc2ea26e7ea367440219 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sat, 16 May 2020 23:12:26 +0200 Subject: gnu: mumble: End phase with #t. * gnu/packages/telephony.scm (mumble)[arguments] End install phase with #t. --- gnu/packages/telephony.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 760c1e0727..4c84ddc85a 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -620,7 +620,8 @@ address of one of the participants.") (for-each (lambda (file) (install-file file lib)) (find-files "." "\\.so\\.")) (for-each (lambda (file) (install-file file lib)) - (find-files "release/plugins" "\\.so$")))))))) + (find-files "release/plugins" "\\.so$")) + #t)))))) (inputs `(("avahi" ,avahi) ("boost" ,boost) -- cgit v1.2.3 From 03418561915e54c17f25032e9d7b540279e9f0b1 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 16 May 2020 22:53:16 +0200 Subject: gnu: julius: Update to 1.4.0. * gnu/packages/games.scm (julius): Update to 1.4.0. [inputs]: Add new dependency libpng. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index afc8b372a7..b729dae63e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -978,7 +978,7 @@ automata. The following features are available: (define-public julius (package (name "julius") - (version "1.3.0") + (version "1.4.0") (source (origin (method git-fetch) @@ -987,10 +987,11 @@ automata. The following features are available: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ws5lmwdhla73676fj0w26v859n47s0wyxa0mgd0dmkx0x91qriy")))) + (base32 "01rygr592ar530qv1flmaiq8icl0qdxgc8lhkcdyn1g09941z47v")))) (build-system cmake-build-system) (inputs - `(("sdl2" ,sdl2) + `(("libpng" ,libpng) + ("sdl2" ,sdl2) ("sdl2-mixer" ,sdl2-mixer))) (home-page "https://github.com/bvschaik/julius") (synopsis "Re-implementation of Caesar III game engine") -- cgit v1.2.3 From 527ab3125ae4361b687091c2e528795691f7075f Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 16 May 2020 22:53:17 +0200 Subject: gnu: julius: Remove unused bundled libraries. * gnu/packages/games.scm (julius)[source](snippet): Remove ext/{dirent,png,SDL2,zlib}. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b729dae63e..177436e6ec 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -987,7 +987,14 @@ automata. The following features are available: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "01rygr592ar530qv1flmaiq8icl0qdxgc8lhkcdyn1g09941z47v")))) + (base32 "01rygr592ar530qv1flmaiq8icl0qdxgc8lhkcdyn1g09941z47v")) + ;; Remove unused bundled libraries. + (modules '((guix build utils))) + (snippet + '(begin + (with-directory-excursion "ext" + (for-each delete-file-recursively '("dirent" "png" "SDL2" "zlib"))) + #t)))) (build-system cmake-build-system) (inputs `(("libpng" ,libpng) @@ -1001,7 +1008,6 @@ Julius includes some UI enhancements while preserving the logic (including bugs) of the original game, so that saved games are compatible. This package does not include game data.") (license (list license:agpl3 - license:expat ; ext/dirent license:zlib)))) ; ext/tinyfiledialogs (define-public meandmyshadow -- cgit v1.2.3 From d308bc01e171f327084bfaa9fe79fb31fe662669 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 17 May 2020 01:48:28 +0200 Subject: gnu: java-xz: Remove duplicate definition. * gnu/packages/java.scm (java-xz): Remove duplicate variable. (java-plexus-archiver)[inputs]: Use java-xz. * gnu/packages/java-compression.scm (java-tukaani-xz): Rename to java-xz. --- gnu/packages/java-compression.scm | 4 ++-- gnu/packages/java.scm | 30 +----------------------------- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 536e1e6530..b1d3ae7060 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -282,9 +282,9 @@ It can be used as a replacement for the Apache @code{CBZip2InputStream} / @code{CBZip2OutputStream} classes.") (license license:expat))) -(define-public java-tukaani-xz +(define-public java-xz (package - (name "java-tukaani-xz") + (name "java-xz") (version "1.6") (source (origin (method url-fetch) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index fc1f7d157a..a4659240fc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3403,34 +3403,6 @@ is implemented.") license:mpl2.0 license:lgpl2.1+)))) -(define-public java-xz - (package - (name "java-xz") - (version "1.6") - (source (origin - (method url-fetch) - (uri (string-append "http://tukaani.org/xz/xz-java-" version ".zip")) - (sha256 - (base32 - "1z3p1ri1gvl07inxn0agx44ck8n7wrzfmvkz8nbq3njn8r9wba8x")))) - (build-system ant-build-system) - (arguments - `(#:tests? #f ; There are no tests to run. - #:jar-name ,(string-append "xz-" version ".jar") - #:phases - (modify-phases %standard-phases - ;; The unpack phase enters the "maven" directory by accident. - (add-after 'unpack 'chdir - (lambda _ (chdir "..") #t))))) - (native-inputs - `(("unzip" ,unzip))) - (home-page "https://tukaani.org/xz/java.html") - (synopsis "Implementation of XZ data compression in pure Java") - (description "This library aims to be a complete implementation of XZ data -compression in pure Java. Single-threaded streamed compression and -decompression and random access decompression have been fully implemented.") - (license license:public-domain))) - ;; java-hamcrest-core uses qdox version 1.12. We package this version instead ;; of the latest release. (define-public java-qdox-1.12 @@ -3957,7 +3929,7 @@ reusing it in maven.") ("junit" ,java-junit) ("classworld" ,java-plexus-classworlds) ("xbean" ,java-geronimo-xbean-reflect) - ("xz" ,java-tukaani-xz) + ("xz" ,java-xz) ("guava" ,java-guava))) (home-page "https://github.com/codehaus-plexus/plexus-archiver") (synopsis "Archiver component of the Plexus project") -- cgit v1.2.3 From 5dd8cb2ec3488edd7fcd1371c188403cc28c7d42 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 01:28:09 +0200 Subject: gnu: spiped: Update to 1.6.1. * gnu/packages/networking.scm (spiped): Update to 1.6.1. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 65a94178c9..4a2df4fd5a 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1955,14 +1955,14 @@ returns the user name and other information about the connection.") (define-public spiped (package (name "spiped") - (version "1.6.0") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append "https://www.tarsnap.com/spiped/spiped-" version ".tgz")) (sha256 (base32 - "1r51rdcl7nib1yv3yvgd5alwlkkwmr387brqavaklb0p2bwzixz6")))) + "04rpnc53whfky7pp2m9h35gwzwn6788pnl6c1qd576mpknbqjw4d")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From d28692a7b512d1d0a2e6b48aa83095f373969abd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 02:27:27 +0200 Subject: gnu: alpine: Update to 2.22. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (alpine): Update to 2.22. [arguments]: Add ‘assume-shadow-passwords’ phase. --- gnu/packages/mail.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index ca1828b1b1..6e39dc2d15 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2681,7 +2681,7 @@ operators and scripters.") ;; Upstream doesn't use git tags, but does ‘tag’ their releases in the ;; commit message. Hence the lack of GIT-VERSIONing despite using a commit ;; ID below. Don't forget to update it… - (version "2.21.99999") + (version "2.22") (source (origin (method git-fetch) @@ -2691,10 +2691,10 @@ operators and scripters.") ;; http://alpine.freeiz.com/alpine/readme/README.patches (uri (git-reference (url "http://repo.or.cz/alpine.git") - (commit "abeb2c25935ef8c75f1e5deef0f81276754dc975"))) + (commit "b50297779a4becb9ceca9c6b5b375d526fe3df78"))) (file-name (git-file-name name version)) (sha256 - (base32 "0rqgbw08a5lj41dkp82aq480lqkc4bnxagna7wpqffi821n8gkwz")) + (base32 "06js44fvdl7l33hfd4lsxpcd1cz3c0h796cswyzz0lkrzx89yl48")) (modules '((guix build utils))) (snippet '(begin @@ -2720,6 +2720,13 @@ operators and scripters.") "--with-date-stamp=Thu 1 Jan 01:00:01 CET 1970") #:phases (modify-phases %standard-phases + (add-after 'unpack 'assume-shadow-passwords + ;; Alpine's configure script confuses ‘shadow password support’ with + ;; ‘/etc/shadow exists in the build environment’. It does not. + (lambda _ + (substitute* "configure" + (("test -f /etc/shadow") "true")) + #t)) (add-after 'unpack 'make-reproducible (lambda _ ;; This removes time-dependent code to make alpine reproducible. -- cgit v1.2.3 From aa784dc850fd683ade4dee7f2e2ad630e604b432 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 02:51:04 +0200 Subject: gnu: alpine: Support cross-gcc'ing. * gnu/packages/mail.scm (alpine)[arguments]: Use ${target}-gcc when cross-compiling. --- gnu/packages/mail.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 6e39dc2d15..e6728aae94 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2703,7 +2703,11 @@ operators and scripters.") #t)))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "CC=gcc") + `(#:make-flags + (let ((target ,(%current-target-system))) + (list (string-append "CC=" (if target + (string-append target "-gcc") + "gcc")))) #:configure-flags (list (string-append "--with-ssl-include-dir=" (assoc-ref %build-inputs "openssl") "/include/openssl") -- cgit v1.2.3 From 7f4b45a320d9661881e9cd488507bee2cf84e859 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 01:38:26 +0200 Subject: gnu: soundconverter: Update to 3.0.2. * gnu/packages/gnome.scm (soundconverter): Update to 3.0.2. [source]: Remove upstreamed patch. * gnu/packages/patches/soundconverter-remove-gconf-dependency.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 7 ++---- .../soundconverter-remove-gconf-dependency.patch | 29 ---------------------- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 gnu/packages/patches/soundconverter-remove-gconf-dependency.patch diff --git a/gnu/local.mk b/gnu/local.mk index 025dfe114b..118a9e24eb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1498,7 +1498,6 @@ dist_patch_DATA = \ %D%/packages/patches/slim-display.patch \ %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \ %D%/packages/patches/sooperlooper-build-with-wx-30.patch \ - %D%/packages/patches/soundconverter-remove-gconf-dependency.patch \ %D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/suitesparse-mongoose-cmake.patch \ %D%/packages/patches/superlu-dist-awpm-grid.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e4bb056e4c..fe874100b2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9198,7 +9198,7 @@ mp3, Ogg Vorbis and FLAC") (define-public soundconverter (package (name "soundconverter") - (version "3.0.1") + (version "3.0.2") (source (origin (method url-fetch) @@ -9207,10 +9207,7 @@ mp3, Ogg Vorbis and FLAC") "soundconverter-" version ".tar.xz")) (sha256 - (base32 "1d6x1yf8psqbd9zbybxivfqg55khcnngp2mn92l161dfdk9512c5")) - (patches - (search-patches - "soundconverter-remove-gconf-dependency.patch")))) + (base32 "1jv8m82hi23ilrgdznlc1jhp2jm8bw1yrw0chh3qw2l0sixvkl11")))) (build-system glib-or-gtk-build-system) (arguments `(#:imported-modules ((guix build python-build-system) diff --git a/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch b/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch deleted file mode 100644 index 29cdeb6e8d..0000000000 --- a/gnu/packages/patches/soundconverter-remove-gconf-dependency.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Tue, 19 Feb 2019 07:46:28 +0100 -Subject: [PATCH] gnu: soundconverter: Catch (and ignore) the right error. - -Without this patch and GConf: - - Traceback (most recent call last): - File "/gnu/…/bin/...soundconverter-real-real-real", line 164, in - from soundconverter.batch import cli_convert_main - File "/gnu/…/lib/soundconverter/python/soundconverter/batch.py", line 31, in - from soundconverter.gstreamer import TagReader - File "/gnu/…/lib/soundconverter/python/soundconverter/gstreamer.py", line 70, in - gi.require_version('GConf', '2.0') - File "/gnu/…/lib/python3.7/site-packages/gi/__init__.py", line 130, in require_version - raise ValueError('Namespace %s not available' % namespace) - ValueError: Namespace GConf not available ---- -diff -Naur soundconverter-3.0.1/soundconverter/gstreamer.py soundconverter-3.0.1/soundconverter/gstreamer.py ---- soundconverter-3.0.1/soundconverter/gstreamer.py 2018-11-23 20:38:46.000000000 +0100 -+++ soundconverter-3.0.1/soundconverter/gstreamer.py 2019-02-19 07:42:15.767684388 +0100 -@@ -88,7 +88,7 @@ - profile = description, extension, pipeline - audio_profiles_list.append(profile) - audio_profiles_dict[description] = profile --except ImportError: -+except ValueError: - pass - - required_elements = ('decodebin', 'fakesink', 'audioconvert', 'typefind', 'audiorate') -- cgit v1.2.3 From e39b857d7461e32cf737c97f47b522f9acc6f877 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 17 May 2020 03:27:37 +0200 Subject: doc: meson-build-system: Fix build type documentation. * doc/guix.texi (Build Systems): Fix meson build system description. --- doc/guix.texi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 22bf6bd224..34acc910f0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6808,8 +6808,9 @@ following phases changed to some specific for Meson: @item configure The phase runs @code{meson} with the flags specified in -@code{#:configure-flags}. The flag @option{--build-type} is always set to -@code{plain} unless something else is specified in @code{#:build-type}. +@code{#:configure-flags}. The flag @option{--buildtype} is always set to +@code{debugoptimized} unless something else is specified in +@code{#:build-type}. @item build The phase runs @code{ninja} to build the package in parallel by default, but -- cgit v1.2.3 From a7e6ec18d7bf9d3568bb829bde0fa32cd3fbf9e9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 17 May 2020 10:13:41 +0300 Subject: gnu: qemu-minimal: Use 'match' to find architecture. * gnu/packages/virtualization.scm (qemu-minimal)[arguments]: Use 'match' to target the correct architecture. --- gnu/packages/virtualization.scm | 56 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 371104cf22..c2025c4fbe 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -312,34 +312,34 @@ server and embedded PowerPC, and S390 guests.") (substitute-keyword-arguments (package-arguments qemu) ((#:configure-flags _ '(list)) ;; Restrict to the host's architecture. - (let ((arch (car (string-split (or (%current-target-system) - (%current-system)) - #\-)))) - (cond ((string=? arch "i686") - '(list "--target-list=i386-softmmu")) - ((string-prefix? "x86_64" arch) - '(list "--target-list=i386-softmmu,x86_64-softmmu")) - ((string-prefix? "mips64" arch) - '(list (string-append "--target-list=mips-softmmu,mipsel-softmmu," - "mips64-softmmu,mips64el-softmmu"))) - ((string-prefix? "mips" arch) - '(list "--target-list=mips-softmmu,mipsel-softmmu")) - ((string-prefix? "aarch64" arch) - '(list "--target-list=arm-softmmu,aarch64-softmmu")) - ((string-prefix? "arm" arch) - '(list "--target-list=arm-softmmu")) - ((string-prefix? "alpha" arch) - '(list "--target-list=alpha-softmmu")) - ((string-prefix? "powerpc64" arch) - '(list "--target-list=ppc-softmmu,ppc64-softmmu")) - ((string-prefix? "powerpc" arch) - '(list "--target-list=ppc-softmmu")) - ((string-prefix? "s390" arch) - '(list "--target-list=s390x-softmmu")) - ((string-prefix? "riscv" arch) - '(list "--target-list=riscv32-softmmu,riscv64-softmmu")) - (else ; An empty list actually builds all the targets. - ''())))))) + (match (car (string-split (or (%current-target-system) + (%current-system)) + #\-)) + ("i686" + '(list "--target-list=i386-softmmu")) + ("x86_64" + '(list "--target-list=i386-softmmu,x86_64-softmmu")) + ("mips64" + '(list (string-append "--target-list=mips-softmmu,mipsel-softmmu," + "mips64-softmmu,mips64el-softmmu"))) + ("mips" + '(list "--target-list=mips-softmmu,mipsel-softmmu")) + ("aarch64" + '(list "--target-list=arm-softmmu,aarch64-softmmu")) + ("arm" + '(list "--target-list=arm-softmmu")) + ("alpha" + '(list "--target-list=alpha-softmmu")) + ("powerpc64" + '(list "--target-list=ppc-softmmu,ppc64-softmmu")) + ("powerpc" + '(list "--target-list=ppc-softmmu")) + ("s390" + '(list "--target-list=s390x-softmmu")) + ("riscv" + '(list "--target-list=riscv32-softmmu,riscv64-softmmu")) + (else ; An empty list actually builds all the targets. + ''()))))) ;; Remove dependencies on optional libraries, notably GUI libraries. (native-inputs (fold alist-delete (package-native-inputs qemu) -- cgit v1.2.3 From 99bf646d8f5acb7958c49143a32de6e95fbde4cf Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 17 May 2020 11:16:57 +0200 Subject: gnu: racket: Update to 7.7. * gnu/packages/scheme.scm (racket): Update to 7.7. --- gnu/packages/scheme.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 46f1826ba1..5b290b9728 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -395,7 +395,7 @@ implementation techniques and as an expository tool.") (define-public racket (package (name "racket") - (version "7.6") + (version "7.7") (source (origin (method url-fetch) (uri (list (string-append "http://mirror.racket-lang.org/installers/" @@ -405,7 +405,7 @@ implementation techniques and as an expository tool.") version "/racket-" version "-src.tgz"))) (sha256 (base32 - "0yagy7qrnz96gwafnj3whh2vs54788k1ci3vkm100h68gsw638b8")) + "0cx5h3k0n58cb442qzp3jlc7n1b9dbaxv9blg2rjil2rn119yrb2")) (patches (search-patches "racket-store-checksum-override.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 720855b5c516b5c4407cdbbe57af25ab93896311 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 17 May 2020 12:23:06 +0300 Subject: gnu: kdeconnect: Fix kdeconnectd path. * gnu/packages/kde.scm (kdeconnect)[arguments]: Add configure-flag to set libexec as a top-level directory in the output. --- gnu/packages/kde.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index bf1ccef3e3..a93e776bf0 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -578,7 +578,8 @@ different notification systems.") "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5")))) (build-system qt-build-system) (arguments - `(#:configure-flags '("-DBUILD_TESTING=ON") + `(#:configure-flags '("-DBUILD_TESTING=ON" + "-DLIBEXEC_INSTALL_DIR=libexec") #:tests? #f)) ; tests fail hard in our build environment (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From c1ca686bc8b227e9bb17ba533097aa3de02436dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 05:09:19 +0200 Subject: gnu: acpica: Update to 20200430. * gnu/packages/admin.scm (acpica): Update to 20200430. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9822ba8a9b..8182544544 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1691,7 +1691,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (define-public acpica (package (name "acpica") - (version "20200326") + (version "20200430") (source (origin (method url-fetch) (uri (string-append @@ -1699,7 +1699,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") version ".tar.gz")) (sha256 (base32 - "0y08l6djjn87jmsp5kj0myjdb48000g20xlfs0a22jzzi383h3by")))) + "1hiaz9lrmjzdbi5zl0ajfflja41cixzx2j76iyx02qbjlmy9cfjc")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) -- cgit v1.2.3 From 018be4ca5ebc0e25af4f50d22b3f1c43ff05fe5f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 05:10:01 +0200 Subject: gnu: acpica: Fix typo in synopsis. * gnu/packages/admin.scm (acpica)[synopsis]: Fix typo or grammar. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8182544544..f6bf8526ef 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1711,7 +1711,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") #:tests? #f ; no 'check' target #:phases (modify-phases %standard-phases (delete 'configure)))) (home-page "https://acpica.org/") - (synopsis "Tools for the development and debug of ACPI tables") + (synopsis "Tools for the development and debugging of ACPI tables") (description "The ACPI Component Architecture (@dfn{ACPICA}) project provides an OS-independent reference implementation of the Advanced Configuration and -- cgit v1.2.3 From 4d1e4af4e9cfcb75e1b531ec5e5408747f1c903c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 05:11:29 +0200 Subject: gnu: acpica: Drop Texinfo @dfn{} usage. * gnu/packages/admin.scm (acpica)[description]: Substitute @acronym{} for @dfn{}. --- gnu/packages/admin.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f6bf8526ef..9314abf5be 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1713,12 +1713,14 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (home-page "https://acpica.org/") (synopsis "Tools for the development and debugging of ACPI tables") (description - "The ACPI Component Architecture (@dfn{ACPICA}) project provides an -OS-independent reference implementation of the Advanced Configuration and -Power Interface Specification (@dfn{ACPI}). ACPICA code contains those portions -of ACPI meant to be directly integrated into the host OS as a kernel-resident -subsystem, and a small set of tools to assist in developing and debugging ACPI -tables. This package contains only the user-space tools needed for ACPI table + "The @acronym{ACPICA, ACPI Component Architecture} project provides an +OS-independent reference implementation of the @acronym{ACPI, Advanced +Configuration and Power Interface} specification. ACPICA code contains those +portions of ACPI meant to be directly integrated into the host OS as a +kernel-resident subsystem, and a small set of tools to assist in developing and +debugging ACPI tables. + +This package contains only the user-space tools needed for ACPI table development, not the kernel implementation of ACPI.") (license license:gpl2))) ; dual GPLv2/ACPICA Licence -- cgit v1.2.3 From 677515739e07cf6e99b70fa3cae5955a664566c7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 05:16:00 +0200 Subject: gnu: cups: Update to 2.3.3 [fixes CVE-2020-3898 & CVE-2019-8842]. * gnu/packages/cups.scm (cups-minimal, cups)[replacement]: New fields. (cups-minimal-2.3.3, cups-2.3.3): New public variables. --- gnu/packages/cups.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index b253d0604e..f668d6c19b 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -187,6 +187,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") ;; satisfy this dependency. (define-public cups-minimal (package + (replacement cups-minimal-2.3.3) (name "cups-minimal") (version "2.3.1") (source @@ -249,8 +250,22 @@ device-specific programs to convert and print many types of files.") ;; CUPS is Apache 2.0 with exceptions, see the NOTICE file. (license license:asl2.0))) +(define-public cups-minimal-2.3.3 + (package + (inherit cups-minimal) + (version "2.3.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/apple/cups/releases/download/v" + version "/cups-" version "-source.tar.gz")) + (sha256 + (base32 + "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6")))))) + (define-public cups (package (inherit cups-minimal) + (replacement cups-2.3.3) (name "cups") (arguments `(;; Three tests fail: @@ -392,6 +407,12 @@ device-specific programs to convert and print many types of files.") ("cups-filters" ,cups-filters) ("zlib" ,zlib))))) +(define-public cups-2.3.3 + (package + (inherit cups) + (version "2.3.3") + (source (package-source cups-minimal-2.3.3)))) + (define-public cups-pk-helper (package (name "cups-pk-helper") -- cgit v1.2.3 From ebbf91542269fcb36d64928d4a4992e6afbf2acf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 14:09:43 +0200 Subject: etc: Install mount unit only if it exists. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This follows up on 1a1faa78b0498fbb71f1533beb4b65817c1d3f2a, and avoids the (non-fatal) error seen in . /gnu/store will remain writable on new foreign distribution installations until the next release. * etc/guix-install.sh (sys_enable_guix_daemon): Check for ‘gnu-store.mount’ presence before trying to cp it. Update forgotten copyright header. --- etc/guix-install.sh | 11 +++++++---- nix/local.mk | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index d252c132fb..bcce1d8869 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -3,7 +3,7 @@ # Copyright © 2017 sharlatan # Copyright © 2018 Ricardo Wurmus # Copyright © 2018 Efraim Flashner -# Copyright © 2019 Tobias Geerinckx-Rice +# Copyright © 2019, 2020 Tobias Geerinckx-Rice # # This file is part of GNU Guix. # @@ -344,9 +344,12 @@ sys_enable_guix_daemon() systemd) { # systemd .mount units must be named after the target directory. # Here we assume a hard-coded name of /gnu/store. - cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/gnu-store.mount" \ - /etc/systemd/system/; - chmod 664 /etc/systemd/system/gnu-store.mount; + # XXX Work around until next release. + if [ -f "${ROOT_HOME}/.config/guix/current/lib/systemd/system/gnu-store.mount" ]; then + cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/gnu-store.mount" \ + /etc/systemd/system/; + chmod 664 /etc/systemd/system/gnu-store.mount; + fi cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/guix-daemon.service" \ /etc/systemd/system/; diff --git a/nix/local.mk b/nix/local.mk index 435fdd389a..dbcdde8b0d 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -1,6 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès # Copyright © 2016 Mathieu Lirzin +# Copyright © 2020 Tobias Geerinckx-Rice # # This file is part of GNU Guix. # -- cgit v1.2.3 From 5b4db51638d3fc828a59890ccb9b3f2e306a147e Mon Sep 17 00:00:00 2001 From: "B. Wilson" Date: Wed, 13 May 2020 13:51:19 +0900 Subject: gnu: Add bombadillo. gnu/packages/web-browsers.scm (bombadillo): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/web-browsers.scm | 47 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 62b7a5bdca..b61ed7f3ca 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019 Clément Lassieur ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Raghav Gururajan +;;; Copyright © 2020 B. Wilson ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,7 +67,8 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system python) - #:use-module (guix build-system asdf)) + #:use-module (guix build-system asdf) + #:use-module (guix build-system go)) (define-public midori (package @@ -692,3 +694,46 @@ key-bindings and is fully configurable and extensible in Common Lisp.") (define-public sbcl-next (deprecated-package "sbcl-next" next)) + +(define-public bombadillo + (package + (name "bombadillo") + (version "2.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://tildegit.org/sloum/bombadillo") + (commit version))) + (sha256 + (base32 + "1m52b1wk48gkqmjy8l0x3jaksrx2v8w6w59lhr7zaw2i0n4f5k0z")) + (file-name (git-file-name name version)))) + (build-system go-build-system) + (arguments + `(#:import-path "tildegit.org/sloum/bombadillo" + #:install-source? #f + #:phases (modify-phases %standard-phases + (add-after 'install 'install-data + (lambda* (#:key outputs #:allow-other-keys) + (let* ((builddir "src/tildegit.org/sloum/bombadillo") + (out (assoc-ref outputs "out")) + (pkg (strip-store-file-name out)) + (sharedir (string-append out "/share")) + (appdir (string-append sharedir "/applications")) + (docdir (string-append sharedir "/doc/" pkg)) + (mandir (string-append sharedir "/man/man1")) + (pixdir (string-append sharedir "/pixmaps"))) + (with-directory-excursion builddir + (install-file "bombadillo.desktop" appdir) + (install-file "LICENSE" docdir) + (install-file "bombadillo.1" mandir) + (install-file "bombadillo-icon.png" pixdir) + #t))))))) + (home-page "http://bombadillo.colorfield.space") + (synopsis "Terminal browser for the gopher, gemini, and finger protocols") + (description "Bombadillo is a non-web browser for the terminal with +vim-like key bindings, a document pager, configurable settings, and robust +command selection. The following protocols are supported as first-class +citizens: gopher, gemini, finger, and local. There is also support for telnet, +http, and https via third-party applications.") + (license license:gpl3+))) -- cgit v1.2.3 From ad14938327b745f0dd7a7c58f5ae26f419379b2f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 16:01:32 +0200 Subject: gnu: sane-backends-minimal: Update to 1.0.30 [Epson security fixes]. Fixes CVE-2020-12867 (GHSL-2020-075), CVE-2020-12862 (GHSL-2020-082), CVE-2020-12863 (GHSL-2020-083), CVE-2020-12865 (GHSL-2020-084), and several other memory management bugs. Mitigates CVE-2020-12866 (GHSL-2020-079), CVE-2020-12861 (GHSL-2020-080), and CVE-2020-12864 (GHSL-2020-081). * gnu/packages/scanner.scm (sane-backends-minimal): Update to 1.0.30. --- gnu/packages/scanner.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 55a642241d..04d5065808 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2016 Andy Patterson -;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -39,16 +39,16 @@ (define-public sane-backends-minimal (package (name "sane-backends-minimal") - (version "1.0.29") + (version "1.0.30") (source (origin (method url-fetch) (uri (string-append "https://gitlab.com/sane-project/backends/uploads/" - "54f858b20a364fc35d820df935a86478/" + "c3dd60c9e054b5dee1e7b01a7edc98b0/" "sane-backends-" version ".tar.gz")) (sha256 (base32 - "1vd83vhl0hddwsdh2jb0k3yzycfghi2xa9lc3ga9r12rbx77n0ma")) + "18vryaycps3zpjzxh0wjgg8nv2f4pdvcfxxmdfj28qbzqjlrcp9z")) (modules '((guix build utils))) (snippet ;; Generated HTML files and udev rules normally embed a -- cgit v1.2.3 From 074cd595bbcd343f86aad09794d8781846ff1927 Mon Sep 17 00:00:00 2001 From: Nicolò Balzarotti Date: Sun, 17 May 2020 14:46:25 +0200 Subject: gnu: lm-sensors: Patch references to ‘egrep’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (lm-sensors)[arguments]: Patch unqualified references to ‘egrep’ as well as ‘grep’. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index aa52068794..750111f4e1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3541,9 +3541,9 @@ country-specific regulations for the wireless spectrum.") (("cat ") (string-append (assoc-ref inputs "coreutils") "/bin/cat ")) - (("grep ") + (("e?grep " match) (string-append (assoc-ref inputs "grep") - "/bin/grep ")) + "/bin/" match)) (("sed -e") (string-append (assoc-ref inputs "sed") "/bin/sed -e")) -- cgit v1.2.3 From 529d1d96ca99ac826afdd5ca8b22fccf87a9d8b8 Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Sun, 17 May 2020 17:28:18 +0200 Subject: gnu: guile-config: Update to 0.4.0. * gnu/packages/guile-xyz.scm (guile-config): Update to 0.4.0. --- gnu/packages/guile-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index fb56fb25e5..e53306ec3e 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1353,16 +1353,16 @@ PostgreSQL.") (define-public guile-config (package (name "guile-config") - (version "0.3.1") + (version "0.4.0") (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.com/a-sassmannshausen/guile-config") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0gglsqwpw77gvrqcny8irpqfl7qdf2v8n9ggwrswanxalj4vcbvf")))) + "1ax7ifnnmxww6mxc1gfz577axvn6rqy152g3ks576vai88q631pr")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 4bce3c03836bf9822b355daec847a721e82034a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 18:59:33 +0200 Subject: gnu: burp: Update to 2.3.26. * gnu/packages/backup.scm (burp): Update to 2.3.26. --- gnu/packages/backup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 6a5080bcf8..0fe6676cc2 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1029,14 +1029,14 @@ is format-agnostic, so you can feed virtually any files to it.") (define-public burp (package (name "burp") - (version "2.3.24") + (version "2.3.26") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/burp/burp-" version "/burp-" version ".tar.bz2")) (sha256 (base32 - "0dmahqx8ldqdrx9b47r7ag3m801n7h3kclcqja1cc1jzhfhfq27w")))) + "1kwm8wwmzla02cqacgpmac6n5466dqd5czx83lkbp97rmg9017h8")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 74ff56a6676f5b7a8865c6fca4dc67cfccc97490 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 19:04:23 +0200 Subject: gnu: knot: Update to 2.9.4. * gnu/packages/dns.scm (knot): Update to 2.9.4. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 469ef7605d..051fea2de9 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -595,14 +595,14 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "2.9.3") + (version "2.9.4") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-dns/" "knot-" version ".tar.xz")) (sha256 - (base32 "0zm0642hkb16sqkqpa84f89f3s0bw44m837r1nia8m89swvz3bgj")) + (base32 "00d5lkan1yfxphw8q1vrmfpmg8kykdaky8082m1s1ps03cxckwsp")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From d74ea9e560d6419e6170991520c640483d21840b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 28 Apr 2020 21:25:51 +0300 Subject: gnu: valgrind: Fix build on powerpc. * gnu/packages/valgrind.scm (valgrind)[arguments]: Add make-flags for CPU optimizations when building on powerpc. --- gnu/packages/valgrind.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/valgrind.scm b/gnu/packages/valgrind.scm index dd080bb327..75e852915e 100644 --- a/gnu/packages/valgrind.scm +++ b/gnu/packages/valgrind.scm @@ -47,7 +47,11 @@ (outputs '("doc" ;16 MB "out")) (arguments - '(#:phases + `(,@(if (string-prefix? "powerpc" (or (%current-target-system) + (%current-system))) + `(#:make-flags '("CFLAGS+=-maltivec")) + '()) + #:phases (modify-phases %standard-phases (add-after 'install 'patch-suppression-files (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From f0a9cb9cf03b2b511342c768811a6a353b6e438a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 13 May 2020 10:32:47 +0300 Subject: gnu: gsl: Disable failing tests on powerpc. * gnu/packages/maths.scm (gsl)[arguments]: Skip the same set of tests on powerpc as skipped on aarch64. --- gnu/packages/maths.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1821b2b1c7..e62fb38086 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015, 2018 Mark H Weaver -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2015 Fabian Harfert ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016, 2018, 2020 Kei Kebreau @@ -472,8 +472,9 @@ precision floating point numbers.") (arguments (let ((system (%current-system))) (cond - ((string-prefix? "aarch64" system) - ;; Some sparse matrix tests are failing on AArch64: + ((or (string-prefix? "aarch64" system) + (string-prefix? "powerpc" system)) + ;; Some sparse matrix tests are failing on AArch64 and PowerPC: ;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00001.html '(#:phases (modify-phases %standard-phases (add-before 'check 'disable-failing-tests -- cgit v1.2.3 From 03f4c9414b0c165c856d236ee0024fdf8d54862f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 28 Apr 2020 22:44:44 +0300 Subject: gnu: elfutils: Skip tests on powerpc. * gnu/packages/elf.scm (elfutils)[arguments]: Skip tests on powerpc. --- gnu/packages/elf.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 5fa66210db..098c0fc94a 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke @@ -38,7 +38,9 @@ #:use-module (gnu packages python) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) - #:use-module (gnu packages xml)) + #:use-module (gnu packages xml) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26)) (define-public elfutils (package @@ -67,10 +69,11 @@ (assoc-ref %outputs "out") "/lib")) - ;; Disable tests on MIPS (without changing + ;; Disable tests on MIPS and PowerPC (without changing ;; the arguments list on other systems). - ,@(if (string-prefix? "mips" (or (%current-target-system) - (%current-system))) + ,@(if (any (cute string-prefix? <> (or (%current-target-system) + (%current-system))) + '("mips" "powerpc")) '(#:tests? #f) '()) -- cgit v1.2.3 From d45571fe98b484233d079724fbab76af8d3f7005 Mon Sep 17 00:00:00 2001 From: nixo Date: Thu, 14 May 2020 17:17:08 +0200 Subject: gnu: julia: Specify correct llvm version. * gnu/packages/julia.scm (julia)[arguments]: Adjust configure-flag to specify the correct llvm version. Signed-off-by: Efraim Flashner --- gnu/packages/julia.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index c636fa756b..8db5e66131 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -416,7 +416,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (assoc-ref %build-inputs "utf8proc") "/include") "USE_SYSTEM_LLVM=1" - "LLVM_VER=6.0.1" + "LLVM_VER=8.0.0" "USE_LLVM_SHLIB=1" "USE_SYSTEM_LIBUNWIND=1" -- cgit v1.2.3 From ec944bdde93c73724f3f3fec2ecd0347a964504c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 May 2020 21:20:32 +0200 Subject: gnu: mu: Update to 1.4.6. * gnu/packages/mail.scm (mu): Update to 1.4.6. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index e6728aae94..7398c9f4da 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -718,7 +718,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.4.4") + (version "1.4.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/" @@ -726,7 +726,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") "mu-" version ".tar.xz")) (sha256 (base32 - "0pmx8zh5fsfhkdl0cr7ydcv6cywhxbgavnjrfr5p2ibz9gx3q3vf")))) + "15spbplf9p8cdxqfwnv3x67451sfpna9q5n2kgqqwh2y78i7zlhc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From a6ce9e355db6842538b968603c80e2ed1013b739 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 18:15:20 +0200 Subject: gnu: CUPS: Inherit replacement from cups-minimal. * gnu/packages/cups.scm (cups): Use PACKAGE/INHERIT. [replacement]: Remove. (cups-2.3.3): Remove variable. --- gnu/packages/cups.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index f668d6c19b..0250f16db3 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -264,8 +264,7 @@ device-specific programs to convert and print many types of files.") "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6")))))) (define-public cups - (package (inherit cups-minimal) - (replacement cups-2.3.3) + (package/inherit cups-minimal (name "cups") (arguments `(;; Three tests fail: @@ -407,12 +406,6 @@ device-specific programs to convert and print many types of files.") ("cups-filters" ,cups-filters) ("zlib" ,zlib))))) -(define-public cups-2.3.3 - (package - (inherit cups) - (version "2.3.3") - (source (package-source cups-minimal-2.3.3)))) - (define-public cups-pk-helper (package (name "cups-pk-helper") -- cgit v1.2.3 From 8415182a9a1c6a52dd4d18c63b421cf0a5e1b4ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 19:15:52 +0200 Subject: gnu: kdiagram: Update to 2.7.0. * gnu/packages/kde.scm (kdiagram): Update to 2.7.0. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index a93e776bf0..4f28b5b90a 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -329,14 +329,14 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") (define-public kdiagram (package (name "kdiagram") - (version "2.6.1") + (version "2.7.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/kdiagram/" version "/kdiagram-" version ".tar.xz")) (sha256 - (base32 "1c6dbp9gssjrx59z8yxzq1ay56pnw7h28symjrv0gcvhxyjirrxx")) + (base32 "1pgvf2q8b59hw0jg5ajmj5nrn4q8cgnifpvdd0fynk2ml6zym8k3")) (patches (search-patches "kdiagram-Fix-missing-link-libraries.patch")))) (build-system qt-build-system) -- cgit v1.2.3 From 7d703a2fccc38baf9789f075b9ccfe2c47eff0b3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 19:16:17 +0200 Subject: gnu: krita: Update to 4.2.9. * gnu/packages/kde.scm (krita): Update to 4.2.9. [arguments]: Add special configure flag for OPENEXR instead of ILMBASE. --- gnu/packages/kde.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 4f28b5b90a..323d2fcb00 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -360,7 +360,7 @@ illustrate project schedules.") (define-public krita (package (name "krita") - (version "4.2.7.1") + (version "4.2.9") (source (origin (method url-fetch) (uri (string-append @@ -368,14 +368,14 @@ illustrate project schedules.") "/krita-" version ".tar.gz")) (sha256 (base32 - "0gcwq1w09gmx53i2fir73l222p41299wagvhbvsxwrz0v3crzliy")))) + "1a3djmjhnvlp8dpiz68s0lwg71nv3ypq592jfgsnm5zlxa0vp1cz")))) (build-system cmake-build-system) (arguments `(#:tests? #f #:configure-flags (list "-DBUILD_TESTING=OFF" (string-append "-DCMAKE_CXX_FLAGS=-I" - (assoc-ref %build-inputs "ilmbase") + (assoc-ref %build-inputs "openexr") "/include/OpenEXR")) #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 7c003383de85d7c899a0d30158cbb198b923268a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 19:16:35 +0200 Subject: gnu: libkomparediff2: Update to 19.08.3. * gnu/packages/kde.scm (libkomparediff2): Update to 19.08.3. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 323d2fcb00..b8765c9851 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -449,14 +449,14 @@ features include brush stabilizers, brush engines and wrap-around mode.") (define-public libkomparediff2 (package (name "libkomparediff2") - (version "19.08.2") + (version "19.08.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/applications/" version "/src/libkomparediff2-" version ".tar.xz")) (sha256 - (base32 "1mvihd0xpkl8kryf5dvsfgpbgs9af8c9bzq8mmr74gfsvfb8ywy5")))) + (base32 "0p8j24d0lzylv5crdzak87016ppgph5hiyxkvapda1m8zlb5dfm1")))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 565d2eb0fe39d1a8dca70a43e063f50d56fb4640 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 19:17:02 +0200 Subject: gnu: qca: Update to 2.3.0. * gnu/packages/kde.scm (qca): Update to 2.3.0. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index b8765c9851..648c401ad0 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -481,7 +481,7 @@ used in KDE development tools Kompare and KDevelop.") (define-public qca (package (name "qca") - (version "2.2.1") + (version "2.3.0") (source (origin (method url-fetch) @@ -489,7 +489,7 @@ used in KDE development tools Kompare and KDevelop.") "/qca-" version ".tar.xz")) (sha256 (base32 - "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np")))) + "1mrj748yz1grgzmfbmffgjkpcqiaj1l3m4pbddwcj7dnl50yys0x")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 5db3f6c18152f7f3a724cdbca50dcedea4389079 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 19:17:19 +0200 Subject: gnu: kpmcore: Update to 4.1.0. * gnu/packages/patches/kpmcore-fix-tests.patch, gnu/packages/patches/kpmcore-remove-broken-test.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/kde.scm (kpmcore): Update to 4.1.0. [source](patches): Remove. --- gnu/local.mk | 2 - gnu/packages/kde.scm | 6 +- gnu/packages/patches/kpmcore-fix-tests.patch | 30 ----- .../patches/kpmcore-remove-broken-test.patch | 139 --------------------- 4 files changed, 2 insertions(+), 175 deletions(-) delete mode 100644 gnu/packages/patches/kpmcore-fix-tests.patch delete mode 100644 gnu/packages/patches/kpmcore-remove-broken-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 118a9e24eb..38b286203e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1136,8 +1136,6 @@ dist_patch_DATA = \ %D%/packages/patches/kpackage-allow-external-paths.patch \ %D%/packages/patches/kmplayer-aarch64.patch \ %D%/packages/patches/kmplayer-upstream_Fix-build-with-Qt-5.9.patch \ - %D%/packages/patches/kpmcore-fix-tests.patch \ - %D%/packages/patches/kpmcore-remove-broken-test.patch \ %D%/packages/patches/kobodeluxe-paths.patch \ %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \ %D%/packages/patches/kobodeluxe-const-charp-conversion.patch \ diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 648c401ad0..4f2d2a2eba 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -507,7 +507,7 @@ cards.") (define-public kpmcore (package (name "kpmcore") - (version "4.0.1") + (version "4.1.0") (source (origin (method url-fetch) (uri (string-append @@ -516,9 +516,7 @@ cards.") name "-" version ".tar.xz")) (sha256 (base32 - "1sslkwcj2cyrn7bpjdjdwikp1q8wrsxpsg2sxxd8hsairgy7ygh3")) - (patches (search-patches "kpmcore-fix-tests.patch" - "kpmcore-remove-broken-test.patch")))) + "0jsig7algmab9h0fb09my0axjqzw83zgscamhzl8931lribs6idm")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) diff --git a/gnu/packages/patches/kpmcore-fix-tests.patch b/gnu/packages/patches/kpmcore-fix-tests.patch deleted file mode 100644 index 12043abe72..0000000000 --- a/gnu/packages/patches/kpmcore-fix-tests.patch +++ /dev/null @@ -1,30 +0,0 @@ -Git commit c02d59aa6d314678cef9683f96b28e2a1abd82b7 by Andrius Štikonas, on behalf of Hartmut Goebel. -Committed on 07/11/2019 at 22:16. -Pushed by stikonas into branch '4.0'. - -Fix test for kpmcore: stop helper only if formerly started. - -See https://bugs.kde.org/413851 and https://phabricator.kde.org/D25161 - -diff --git a/src/util/externalcommand.cpp b/src/util/externalcommand.cpp ---- a/src/util/externalcommand.cpp -+++ b/src/util/externalcommand.cpp -@@ -433,14 +433,17 @@ - - void ExternalCommand::stopHelper() - { -+ if (!helperStarted) -+ return; - auto *interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"), - QStringLiteral("/Helper"), QDBusConnection::systemBus()); - QByteArray request; - const quint64 nonce = interface->getNonce(); - request.setNum(nonce); - QByteArray hash = QCryptographicHash::hash(request, QCryptographicHash::Sha512); - interface->exit(privateKey->signMessage(hash, QCA::EMSA3_Raw), nonce); - -+ helperStarted = false; - delete privateKey; - delete init; - } - diff --git a/gnu/packages/patches/kpmcore-remove-broken-test.patch b/gnu/packages/patches/kpmcore-remove-broken-test.patch deleted file mode 100644 index d02cca7883..0000000000 --- a/gnu/packages/patches/kpmcore-remove-broken-test.patch +++ /dev/null @@ -1,139 +0,0 @@ -From c9a08a593bac8b8610a647db118fea6f2958156d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= -Date: Thu, 7 Nov 2019 22:12:00 +0000 -Subject: [PATCH] Remove broken smart unit test. - -BUG: 413853 ---- - test/CMakeLists.txt | 9 ---- - test/testsmart.cpp | 102 -------------------------------------------- - 2 files changed, 111 deletions(-) - delete mode 100644 test/testsmart.cpp - -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 67f63a2..6a300d3 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -53,12 +53,3 @@ find_package (Threads) - # Execute external commands as root - kpm_test(testexternalcommand testexternalcommand.cpp) - add_test(NAME testexternalcommand COMMAND testexternalcommand ${BACKEND}) -- --# Including SMART files reference --set(SMARTPARSER ${CMAKE_SOURCE_DIR}/src/core/smartdiskinformation.cpp -- ${CMAKE_SOURCE_DIR}/src/core/smartattributeparseddata.cpp -- ${CMAKE_SOURCE_DIR}/src/core/smartparser.cpp) -- --# Test SMART support --kpm_test(testsmart testsmart.cpp ${SMARTPARSER}) --add_test(NAME testsmart COMMAND testsmart ${BACKEND}) -diff --git a/test/testsmart.cpp b/test/testsmart.cpp -deleted file mode 100644 -index 2236af7..0000000 ---- a/test/testsmart.cpp -+++ /dev/null -@@ -1,102 +0,0 @@ --#include "helpers.h" -- --#include "util/externalcommand.h" --#include "backend/corebackend.h" --#include "backend/corebackendmanager.h" --#include "core/smartstatus.h" --#include "core/smartparser.h" -- --#include --#include -- --static QString getDefaultDevicePath(); --static bool testSmartStatus(); --static bool testSmartParser(); -- --int main(int argc, char **argv) --{ -- QCoreApplication app(argc, argv); -- -- KPMCoreInitializer i; -- -- if (argc == 2) -- i = KPMCoreInitializer(argv[1]); -- -- if (!i.isValid()) -- return 1; -- -- CoreBackend *backend = CoreBackendManager::self()->backend(); -- -- if (!backend) -- { -- qWarning() << "Couldn't get backend."; -- return 1; -- } -- -- if (!testSmartStatus() || !testSmartParser()) -- return 1; -- -- return app.exec(); --} -- --static QString getDefaultDevicePath() --{ -- // Getting default home partition using 'df -P /home | awk 'END{print $1}'' command -- ExternalCommand command(QStringLiteral("df"), { QStringLiteral("-P"), QStringLiteral("/home"), QStringLiteral("|"), -- QStringLiteral("awk"), QStringLiteral("\'END{print $1}\'") }); -- -- if (command.run() && command.exitCode() == 0) { -- QString output = command.output(); -- return output; -- } -- -- return QString(); --} -- --static bool testSmartStatus() --{ -- QString devicePath = getDefaultDevicePath(); -- -- SmartStatus smart(devicePath); -- -- if (smart.devicePath() != devicePath) -- return false; -- -- if (!smart.status()) -- return false; -- -- if (smart.modelName() == QString()) -- return false; -- -- if (smart.firmware() == QString()) -- return false; -- -- if (smart.serial() == QString()) -- return false; -- -- if (smart.selfTestStatus() != SmartStatus::SelfTestStatus::Success) -- return false; -- -- if (!smart.isValid()) -- return false; -- -- return true; --} -- --static bool testSmartParser() --{ -- QString devicePath = getDefaultDevicePath(); -- -- SmartParser parser(devicePath); -- -- if (!parser.init()) -- return false; -- -- if (parser.devicePath() != devicePath) -- return false; -- -- if (!parser.diskInformation()) -- return false; -- -- return true; --} --- -2.17.1 -- cgit v1.2.3 From d15c38b0f91c3f5e434755313f68fb150cd0219b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 19:17:54 +0200 Subject: gnu: kqtquickcharts: Update to 19.08.3. * gnu/packages/kde.scm (kqtquickcharts): Update to 19.08.3. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 4f2d2a2eba..16a7e78c46 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -620,7 +620,7 @@ communicate with each other. Here's a few things KDE Connect can do: (define-public kqtquickcharts (package (name "kqtquickcharts") - (version "19.08.2") + (version "19.08.3") (source (origin (method url-fetch) @@ -628,7 +628,7 @@ communicate with each other. Here's a few things KDE Connect can do: version "/src/kqtquickcharts-" version ".tar.xz")) (sha256 (base32 - "1yy9fyd8y4g25ljdsbil19qdf4j3mzmzl489sx7rqpm3lfdzjh9k")))) + "0kwrqm7aa74plqkkyigi6b2hic6dzrygkgb6hsgj35ycrfn4rigi")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) -- cgit v1.2.3 From 843e77205162013b1001f0be898142309704e495 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 19:18:15 +0200 Subject: gnu: kcachegrind: Update to 19.08.3. * gnu/packages/kde.scm (kcachegrind): Update to 19.08.3. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 16a7e78c46..c52feb5725 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -645,14 +645,14 @@ charts.") (define-public kcachegrind (package (name "kcachegrind") - (version "19.04.1") + (version "19.08.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/applications/" version "/src/kcachegrind-" version ".tar.xz")) (sha256 (base32 - "1hhsk64yp6q2xh8j269j4wp9y24ggmii861r6gf02mj1mbn2p1jb")))) + "0sm3085vd79svfql6nqjyrwlknnmdyyvi0yjnmyb09mq7djf1icg")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From 5b77e9ca14ff7fc74b849492e96353939f29664b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 6 May 2020 11:27:48 +0300 Subject: build: minify-build-system: Fail to install empty files. * guix/build/minify-build-system.scm (install): Produce an error if the minified file is zero bytes. --- guix/build/minify-build-system.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/guix/build/minify-build-system.scm b/guix/build/minify-build-system.scm index 563def88e9..92158a033f 100644 --- a/guix/build/minify-build-system.scm +++ b/guix/build/minify-build-system.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,8 +55,12 @@ (let* ((out (assoc-ref outputs "out")) (js (string-append out "/share/javascript/"))) (mkdir-p js) - (for-each (cut install-file <> js) - (find-files "guix/build" "\\.min\\.js$"))) + (for-each + (lambda (file) + (if (not (zero? (stat:size (stat file)))) + (install-file file js) + (error "File is empty: " file))) + (find-files "guix/build" "\\.min\\.js$"))) #t) (define %standard-phases -- cgit v1.2.3 From 006c3f2240d9c4f90205dea12aea5341140087c6 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 12 May 2020 15:50:27 +0100 Subject: gnu: Add perl-lwpx-paranoidagent. * gnu/packages/web.scm (perl-lwpx-paranoidagent): New variable. --- gnu/packages/web.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index eabc3c0197..a3f69e1587 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -126,6 +126,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) + #:use-module (gnu packages networking) #:use-module (gnu packages nss) #:use-module (gnu packages openldap) #:use-module (gnu packages openstack) @@ -3718,6 +3719,35 @@ possibly-temporary error (like a DNS lookup timeout), it'll wait a few seconds and retry a few times.") (license license:perl-license))) +(define-public perl-lwpx-paranoidagent + (package + (name "perl-lwpx-paranoidagent") + (version "1.12") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/LWPx-ParanoidAgent-" + version ".tar.gz")) + (sha256 + (base32 + "0gfhw3jbs25yya2dryv8xvyn9myngcfcmsybj7gkq62fnznil16c")))) + (build-system perl-build-system) + (propagated-inputs + `(("perl-libwww" ,perl-libwww) + ;; Users should instead make sure SSL_ca_path is set properly. + ;; ("perl-mozilla-ca" ,perl-mozilla-ca) + ("perl-net-dns" ,perl-net-dns))) + (home-page "https://metacpan.org/release/LWPx-ParanoidAgent") + (synopsis "Security enhanced subclass of LWP::UserAgent") + (description "@code{LWPx::ParanoidAgent} is a class subclassing +@code{LWP::UserAgent} but paranoid against attackers. Its purpose is +to vet requests for a remote resource on behalf of a possibly +malicious user. The class can do the same as @code{LWP::UserAgent}, +except that proxy support has been removed. Support for URI schemes +is limited to http and https.") + (license license:perl-license))) + (define-public perl-net-amazon-s3 (package (name "perl-net-amazon-s3") -- cgit v1.2.3 From 89bd9f41ff572d8e96a6e589e07f3f8802e36535 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 14 May 2020 13:35:33 +0100 Subject: gnu: ikiwiki: Add missing input. * gnu/packages/web.scm (ikiwiki)[inputs]: Add perl-lwpx-paranoidagent. --- gnu/packages/web.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a3f69e1587..5b18f84ac3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4904,6 +4904,7 @@ NetSurf project.") ("perl-file-mimeinfo" ,perl-file-mimeinfo) ("perl-html-tagset" ,perl-html-tagset) ("perl-image-magick" ,perl-image-magick) + ("perl-lwpx-paranoidagent" ,perl-lwpx-paranoidagent) ("perl-mail-sendmail" ,perl-mail-sendmail) ("perl-timedate" ,perl-timedate) ("perl-xml-sax" ,perl-xml-sax) -- cgit v1.2.3 From 8ec6b9fe0c494ac5fd114b2b73ab66cac66da7b1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 16 May 2020 13:34:46 +0200 Subject: gnu: guile-studio: Build with Guile 3.0. * gnu/packages/guile-xyz.scm (guile-studio)[inputs]: Replace guile-2.2 with guile-3.0. --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e53306ec3e..e0ce1815da 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2417,7 +2417,7 @@ The picture values can directly be displayed in Geiser.") (delete 'configure) (delete 'install)))) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("guile-picture-language" ,guile-picture-language) ("emacs" ,emacs) ("emacs-geiser" ,emacs-geiser) -- cgit v1.2.3 From c660779722f4130e95cda89c0eb0cff534a89ef2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 16 May 2020 14:18:02 +0200 Subject: gnu: guile-studio: Update to 0.0.2-1.d24d59a. * gnu/packages/guile-xyz.scm (guile-studio): Update to 0.0.2-1.d24d59a. --- gnu/packages/guile-xyz.scm | 118 +++++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 58 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e0ce1815da..f3a8cbf247 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2375,67 +2375,69 @@ The picture values can directly be displayed in Geiser.") guile-picture-language)) (define-public guile-studio - (package - (name "guile-studio") - (version "0.0.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.elephly.net/software/guile-studio.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "10ls4ra148hd9ra7sin4kh9vv0am5pwk48p7dsjhrlg2l1hsh4hi")))) - (build-system gnu-build-system) - (arguments - `(#:modules - ((ice-9 match) - (srfi srfi-1) - ,@%gnu-build-system-modules) - #:tests? #f ; there are none - #:make-flags - (list (string-append "ICONS_DIR=" - (assoc-ref %build-inputs "adwaita-icon-theme") - "/share/icons/Adwaita/") - (string-append "PICT_DIR=" - (assoc-ref %build-inputs "guile-picture-language")) - (string-append "EMACS_DIR=" - (assoc-ref %build-inputs "emacs")) - (string-append "GUILE_DIR=" - (assoc-ref %build-inputs "guile")) - (string-join (cons "INPUTS=" - (filter-map - (lambda (input) - (match input - ((label . pkg) - (and (string-prefix? "emacs" label) pkg)))) - %build-inputs))) - (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'install)))) - (inputs - `(("guile" ,guile-3.0) - ("guile-picture-language" ,guile-picture-language) - ("emacs" ,emacs) - ("emacs-geiser" ,emacs-geiser) - ("emacs-company" ,emacs-company) - ("emacs-flycheck" ,emacs-flycheck) - ("emacs-smart-mode-line" ,emacs-smart-mode-line) - ("emacs-paren-face" ,emacs-paren-face) - ("adwaita-icon-theme" ,adwaita-icon-theme))) - (native-inputs - `(("texinfo" ,texinfo))) - (home-page "https://gnu.org/software/guile") - (synopsis "IDE for Guile") - (description - "This is Emacs with a few settings that make working with Guile easier + (let ((commit "d24d59a68e3f1fa9477e3430fc48a2efe97b805d") + (revision "1")) + (package + (name "guile-studio") + (version (git-version "0.0.2" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.elephly.net/software/guile-studio.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0kqi0q8a7si65n21b7gn8vbninwcg0fqy5hmvy3l1bi6iync20zr")))) + (build-system gnu-build-system) + (arguments + `(#:modules + ((ice-9 match) + (srfi srfi-1) + ,@%gnu-build-system-modules) + #:tests? #f ; there are none + #:make-flags + (list (string-append "ICONS_DIR=" + (assoc-ref %build-inputs "adwaita-icon-theme") + "/share/icons/Adwaita/") + (string-append "PICT_DIR=" + (assoc-ref %build-inputs "guile-picture-language")) + (string-append "EMACS_DIR=" + (assoc-ref %build-inputs "emacs")) + (string-append "GUILE_DIR=" + (assoc-ref %build-inputs "guile")) + (string-join (cons "INPUTS=" + (filter-map + (lambda (input) + (match input + ((label . pkg) + (and (string-prefix? "emacs" label) pkg)))) + %build-inputs))) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'install)))) + (inputs + `(("guile" ,guile-3.0) + ("guile-picture-language" ,guile-picture-language) + ("emacs" ,emacs) + ("emacs-geiser" ,emacs-geiser) + ("emacs-company" ,emacs-company) + ("emacs-flycheck" ,emacs-flycheck) + ("emacs-smart-mode-line" ,emacs-smart-mode-line) + ("emacs-paren-face" ,emacs-paren-face) + ("adwaita-icon-theme" ,adwaita-icon-theme))) + (native-inputs + `(("texinfo" ,texinfo))) + (home-page "https://gnu.org/software/guile") + (synopsis "IDE for Guile") + (description + "This is Emacs with a few settings that make working with Guile easier for people new to Emacs. Features include: CUA mode, Geiser, tool bar icons to evaluate Guile buffers, support for Guile's very own picture language, code completion, a simple mode line, etc.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public guile-stis-parser (let ((commit "6e85d37ffc333b722f4413a6c648263701eb75bd") -- cgit v1.2.3 From 58024d86e1c5b00567abfdb144fbff8cc2f6588e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 May 2020 14:15:02 +0200 Subject: gnu: dovecot: Update to 2.3.10.1 [security fixes]. Fixes CVE-2020-10957, CVE-2020-10958, and CVE-2020-10967. * gnu/packages/mail.scm (dovecot): Update to 2.3.10.1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 7398c9f4da..935a7333a4 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1372,7 +1372,7 @@ facilities for checking incoming mail.") (define-public dovecot (package (name "dovecot") - (version "2.3.10") + (version "2.3.10.1") (source (origin (method url-fetch) @@ -1380,7 +1380,7 @@ facilities for checking incoming mail.") (version-major+minor version) "/" "dovecot-" version ".tar.gz")) (sha256 - (base32 "1ibiz3k2flablkcqbkvfzsjnq5b5kxximhcrplflsjl57mr88ca7")))) + (base32 "035idr2j81s5mngnhd58rih79dhwwak7q01mqbx3rcmi4cpychk6")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From e5b495c18fb9ba3858b75c25659be65f7bd9b0da Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 18 May 2020 12:10:04 +0200 Subject: doc: Inherit md5.scm fix in custom 'guile-lib' variant. * doc/build.scm (guile-lib/htmlprag-fixed)[source]: Remove. [arguments]: Add 'fix-htmlprag' phase. --- doc/build.scm | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/doc/build.scm b/doc/build.scm index 2b6d0c4aea..def4bdf18a 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -182,30 +182,27 @@ content=\"width=device-width, initial-scale=1\" />")) ;; Guile-Lib with a hotfix for (htmlprag). (package (inherit guile-lib) - (source (origin - (inherit (package-source guile-lib)) - (modules '(( guix build utils))) - (snippet - '(begin - ;; When parsing - ;; "

foo

\n
", - ;; 'html->shtml' would mistakenly close 'blockquote' right - ;; before

. This patch removes 'p' from the - ;; 'parent-constraints' alist to fix that. - (substitute* "src/htmlprag.scm" - (("^[[:blank:]]*\\(p[[:blank:]]+\\. \\(body td th\\)\\).*") - "")) - #t)))) (arguments (substitute-keyword-arguments (package-arguments guile-lib) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (add-before 'check 'skip-known-failure - (lambda _ - ;; XXX: The above change causes one test failure among - ;; the htmlprag tests. - (setenv "XFAIL_TESTS" "htmlprag.scm") - #t)))))))) + (add-before 'build 'fix-htmlprag + (lambda _ + ;; When parsing + ;; "

foo

\n
", + ;; 'html->shtml' would mistakenly close 'blockquote' right + ;; before

. This patch removes 'p' from the + ;; 'parent-constraints' alist to fix that. + (substitute* "src/htmlprag.scm" + (("^[[:blank:]]*\\(p[[:blank:]]+\\. \\(body td th\\)\\).*") + "")) + #t)) + (add-before 'check 'skip-known-failure + (lambda _ + ;; XXX: The above change causes one test failure among + ;; the htmlprag tests. + (setenv "XFAIL_TESTS" "htmlprag.scm") + #t)))))))) (define* (syntax-highlighted-html input #:key -- cgit v1.2.3 From 9a27d84b7a22188d3029199ad3f6dd3b8eccae70 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Sat, 16 May 2020 19:57:18 +0200 Subject: guix describe: Add '--list-formats' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/scripts/describe.scm (%available-formats): New variable. (list-formats): New procedure. (%options, show-help): Add --list-formats * doc/guix.texi: Add --list-formats Signed-off-by: Ludovic Courtès --- doc/guix.texi | 3 +++ guix/scripts/describe.scm | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 34acc910f0..eef5b703fe 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4471,6 +4471,9 @@ produce a list of channel specifications in JSON format; produce a list of channel specifications in Recutils format. @end table +@item --list-formats +Display available formats for @option{--format} option. + @item --profile=@var{profile} @itemx -p @var{profile} Display information about @var{profile}. diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm index f13f221da9..7a2dbc453a 100644 --- a/guix/scripts/describe.scm +++ b/guix/scripts/describe.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2020 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,14 +42,26 @@ ;;; ;;; Command-line options. ;;; +(define %available-formats '("human" "channels" "json" "recutils")) + +(define (list-formats) + (display (G_ "The available formats are:\n")) + (newline) + (for-each (lambda (f) + (format #t " - ~a~%" f)) + %available-formats)) (define %options ;; Specifications of the command-line options. (list (option '(#\f "format") #t #f (lambda (opt name arg result) - (unless (member arg '("human" "channels" "json" "recutils")) + (unless (member arg %available-formats) (leave (G_ "~a: unsupported output format~%") arg)) (alist-cons 'format (string->symbol arg) result))) + (option '("list-formats") #f #f + (lambda (opt name arg result) + (list-formats) + (exit 0))) (option '(#\p "profile") #t #f (lambda (opt name arg result) (alist-cons 'profile (canonicalize-profile arg) @@ -70,6 +83,8 @@ Display information about the channels currently in use.\n")) (display (G_ " -f, --format=FORMAT display information in the given FORMAT")) + (display (G_ " + --list-formats display available formats")) (display (G_ " -p, --profile=PROFILE display information about PROFILE")) (newline) -- cgit v1.2.3 From 14950b83b0939b5c1aace45d669e89cadac04f71 Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Mon, 18 May 2020 15:30:34 +0200 Subject: gnu: guile-config: Update to 0.4.1. * gnu/packages/guile-xyz.scm (guile-config): Update to 0.4.1. --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index f3a8cbf247..674b1f922b 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1353,7 +1353,7 @@ PostgreSQL.") (define-public guile-config (package (name "guile-config") - (version "0.4.0") + (version "0.4.1") (source (origin (method git-fetch) @@ -1362,7 +1362,7 @@ PostgreSQL.") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1ax7ifnnmxww6mxc1gfz577axvn6rqy152g3ks576vai88q631pr")))) + "1c59ch96d5p4c7si8qp55fdc15375klf2hyh29y3ap8ahqx9pxqj")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 70e33ec795b42a497df342950469f65c8406988c Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Sat, 16 May 2020 15:32:45 +0200 Subject: build-system/guile: Expose #:scheme-file-regexp. * guix/build-system/guile.scm (%scheme-file-regexp): New variable. (guile-build): Accept #:scheme-file-regexp and pass it on to builder. --- guix/build-system/guile.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm index 3693014694..45e735b987 100644 --- a/guix/build-system/guile.scm +++ b/guix/build-system/guile.scm @@ -29,6 +29,10 @@ #:export (%guile-build-system-modules guile-build-system)) +(define %scheme-file-regexp + ;; Regexp to match Scheme files. + "\\.(scm|sls)$") + (define %guile-build-system-modules ;; Build-side modules imported by default. `((guix build guile-build-system) @@ -80,6 +84,7 @@ (system (%current-system)) (source-directory ".") not-compiled-file-regexp + (scheme-file-regexp %scheme-file-regexp) (compile-flags %compile-flags) (imported-modules %guile-build-system-modules) (modules '((guix build guile-build-system) @@ -97,6 +102,7 @@ (source source)) #:source-directory ,source-directory + #:scheme-file-regexp ,scheme-file-regexp #:not-compiled-file-regexp ,not-compiled-file-regexp #:compile-flags ,compile-flags #:phases ,phases -- cgit v1.2.3 From ab67f84bbe89dd096ec6fb28c12e79654ea091d1 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 17 May 2020 17:55:16 +0200 Subject: gnu: godot: Enable release build. * gnu/packages/game-development.scm (godot)[arguments]: Set release_debug target in #:scons-flags to enable optimized build. Signed-off-by: Nicolas Goaziou --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 26aa4f714b..dfa55b136f 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1585,7 +1585,7 @@ games.") (build-system scons-build-system) (arguments `(#:scons ,scons-python2 - #:scons-flags (list "platform=x11" + #:scons-flags (list "platform=x11" "target=release_debug" ,@(if (string-prefix? "aarch64" (or (%current-target-system) (%current-system))) `("CCFLAGS=-DNO_THREADS") -- cgit v1.2.3 From 6028541e61870e12da2db3e29924feb1c4298892 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 17 May 2020 17:55:17 +0200 Subject: gnu: godot: Remove obsolete workaround for aarch64. * gnu/packages/game-development.scm (godot)[arguments]: Remove -DNO_THREADS from scons-flags as Godot now builds and runs without it on aarch64. Signed-off-by: Nicolas Goaziou --- gnu/packages/game-development.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index dfa55b136f..d84b3fb24a 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1586,10 +1586,6 @@ games.") (arguments `(#:scons ,scons-python2 #:scons-flags (list "platform=x11" "target=release_debug" - ,@(if (string-prefix? "aarch64" (or (%current-target-system) - (%current-system))) - `("CCFLAGS=-DNO_THREADS") - '()) ;; Avoid using many of the bundled libs. ;; Note: These options can be found in the SConstruct file. "builtin_bullet=no" -- cgit v1.2.3 From 545511df77837079afa63c1b420d8dd2b67f7235 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 17 May 2020 17:55:18 +0200 Subject: gnu: godot: Build and install the headless version. * gnu/packages/game-development.scm (godot): Build the headless (server) binary. This is needed to package games using Godot without depending on X. [outputs]: Add "headless". [arguments]<#:phases>[build-headless]: New phase. [arguments]<#:phases>[install]: Install headless version to separate output. Signed-off-by: Nicolas Goaziou --- gnu/packages/game-development.scm | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index d84b3fb24a..03369a6d44 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1604,7 +1604,7 @@ games.") "builtin_wslay=no" "builtin_zlib=no" "builtin_zstd=no") - #:tests? #f ; There are no tests + #:tests? #f ; There are no tests #:phases (modify-phases %standard-phases (add-after 'unpack 'scons-use-env @@ -1617,20 +1617,30 @@ games.") "env_base = Environment(tools=custom_tools)\n" "env_base = Environment(ENV=os.environ)"))) #t)) + ;; Build headless tools, used for packaging games without depending on X. + (add-after 'build 'build-headless + (lambda* (#:key scons-flags #:allow-other-keys) + (apply invoke "scons" + `(,(string-append "-j" (number->string (parallel-job-count))) + "platform=server" ,@(delete "platform=x11" scons-flags))))) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) + (headless (assoc-ref outputs "headless")) + (zenity (assoc-ref inputs "zenity"))) + ;; Strip build info from filenames. (with-directory-excursion "bin" - (if (file-exists? "godot.x11.tools.64") - (rename-file "godot.x11.tools.64" "godot") - (rename-file "godot.x11.tools.32" "godot")) - (install-file "godot" bin)) - ;; Tell Godot where to find zenity for OS.alert(). - (wrap-program (string-append bin "/godot") - `("PATH" ":" prefix - (,(string-append (assoc-ref %build-inputs "zenity") "/bin")))) - #t))) + (for-each + (lambda (file) + (let ((dest (car (string-split (basename file) #\.)))) + (rename-file file dest))) + (find-files "." "godot.*\\.x11\\.opt\\.tools.*")) + (install-file "godot" (string-append out "/bin")) + (install-file "godot_server" (string-append headless "/bin"))) + ;; Tell the editor where to find zenity for OS.alert(). + (wrap-program (string-append out "/bin/godot") + `("PATH" ":" prefix (,(string-append zenity "/bin"))))) + #t)) (add-after 'install 'install-godot-desktop (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -1652,6 +1662,7 @@ games.") Type=Application~%" out))) #t)))))) + (outputs '("out" "headless")) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) ("bullet" ,bullet) -- cgit v1.2.3 From bf076da917c3fe3732e2b1a8959b3ed2677b3b4a Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 17 May 2020 17:55:19 +0200 Subject: gnu: godot: Install provided .desktop file and icons. * gnu/packages/game-development.scm (godot)[arguments]: Install the provided godot.desktop instead of creating a new one. Copy icons to the correct location in share/icons/hicolor as per XDG. Signed-off-by: Nicolas Goaziou --- gnu/packages/game-development.scm | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 03369a6d44..ac9c2ce864 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1644,24 +1644,18 @@ games.") (add-after 'install 'install-godot-desktop (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (desktop (string-append out "/share/applications")) - (icon-dir (string-append out "/share/pixmaps"))) - (rename-file "icon.png" "godot.png") - (install-file "godot.png" icon-dir) - (mkdir-p desktop) - (with-output-to-file - (string-append desktop "/godot.desktop") - (lambda _ - (format #t - "[Desktop Entry]~@ - Name=godot~@ - Comment=The godot game engine~@ - Exec=~a/bin/godot~@ - TryExec=~@*~a/bin/godot~@ - Icon=godot~@ - Type=Application~%" - out))) - #t)))))) + (applications (string-append out "/share/applications")) + (icons (string-append out "/share/icons/hicolor"))) + (mkdir-p applications) + (copy-file "misc/dist/linux/org.godotengine.Godot.desktop" + (string-append applications "/godot.desktop")) + (for-each (lambda (icon dest) + (mkdir-p (dirname dest)) + (copy-file icon dest)) + '("icon.png" "icon.svg") + `(,(string-append icons "/256x256/apps/godot.png") + ,(string-append icons "/scalable/apps/godot.svg")))) + #t))))) (outputs '("out" "headless")) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From 756605ee9e8b8442a3a39f69ef6ce662910a6ccf Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 17 May 2020 17:55:20 +0200 Subject: gnu: Add superstarfighter. * gnu/packages/games.scm (superstarfighter): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 177436e6ec..96726eaa78 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1733,6 +1733,83 @@ can be explored and changed freely.") license:gpl3+ license:silofl1.1)))) +(define-public superstarfighter + (package + (name "superstarfighter") + (version "0.6.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/notapixelstudio/superstarfighter.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fly63yf5ls1xwm15if4lxwy67wi84k4gvjllljpykrl18vw2y0y")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;there are no tests + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (chdir "godot") + (setenv "HOME" (getcwd)) + (with-output-to-file "export_presets.cfg" + (lambda () + (display + "[preset.0] +name=\"Guix\" +platform=\"Linux/X11\" +runnable=true +[preset.0.options]"))) + #t)) + (replace 'build + (lambda _ + (let ((godot (assoc-ref %build-inputs "godot-headless"))) + (invoke (string-append godot "/bin/godot_server") + "--export-pack" "Guix" + "superstarfighter.pck" "project.godot")) + #t)) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (share (string-append out "/share")) + (data (string-append share "/superstarfighter")) + (icons (string-append share "/icons/hicolor/256x256/apps"))) + (install-file "superstarfighter.pck" data) + (mkdir-p bin) + (call-with-output-file (string-append bin "/superstarfighter") + (lambda (port) + (format port + "#!/bin/sh~@ + exec ~a/bin/godot --main-pack ~a/superstarfighter.pck~%" + (assoc-ref inputs "godot") + data) + (chmod port #o755))) + (mkdir-p icons) + (copy-file "icon.png" (string-append icons "/" ,name ".png")) + (make-desktop-entry-file + (string-append share "/applications/" ,name ".desktop") + #:name "SuperStarfighter" + #:comment "Fast-paced arcade combat game" + #:exec ,name + #:icon ,name + #:categories '("Game" "ArcadeGame"))) + #t))))) + (native-inputs + `(("godot-headless" ,godot "headless"))) + (inputs + `(("godot" ,godot))) + (home-page "https://notapixel.itch.io/superstarfighter") + (synopsis "Fast-paced local multiplayer arcade game") + (description "In SuperStarfighter, up to four local players compete in a +2D arena with fast-moving ships and missiles. Different game types are +available, as well as a single-player mode with AI-controlled ships.") + (license (list license:expat ; game + license:silofl1.1)))) ; fonts + (define-public xshogi (package (name "xshogi") -- cgit v1.2.3 From 782cc119f52f28ea808a3ef0e63f80f7440b5b53 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 18 May 2020 19:07:23 +0200 Subject: gnu: python-mpsse: Update to 1.4.1. Follow-up to a7b20226b2bf1a73b8f0f6536e7fa43326f35e33. * gnu/packages/embedded.scm (python-libmpsse): Update to 1.4.1. --- gnu/packages/embedded.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 8b40990ec1..9be1065de2 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1040,7 +1040,7 @@ the Raspberry Pi chip.")))) (define-public python-libmpsse (package (name "python-libmpsse") - (version "1.4") + (version "1.4.1") (source (origin (method git-fetch) @@ -1050,7 +1050,7 @@ the Raspberry Pi chip.")))) (file-name "libmpsse-checkout") (sha256 (base32 - "14f1kiiia4kfd9mzwx4h63aa8bpz9aknbrrr7mychnsp3arw0z25")))) + "1rypfb96k2szqgygp3jnwg2zq9kwmfz0460dsahn3r2vkzml8wn7")))) (build-system gnu-build-system) (inputs `(("libftdi" ,libftdi) -- cgit v1.2.3 From 056cd035205ff94d719352532d9bf684d833b606 Mon Sep 17 00:00:00 2001 From: Simon South Date: Mon, 18 May 2020 06:50:44 -0400 Subject: gnu: emacs-elpher: Update to 2.7.4. * gnu/packages/emacs-xyz.scm (emacs-elpher): Update to 2.7.4. [home-page, source]: Use new upstream URIs. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4bbd482409..39083c90cf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20717,17 +20717,17 @@ it forcibly (define-public emacs-elpher (package (name "emacs-elpher") - (version "1.4.6") + (version "2.7.4") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tgvaughan/elpher") + (url "git://thelambdalab.xyz/elpher.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "07xansmhn4l0b9ghzf56vyx8cqg0q01aq3pz5ikx2i19v5f0rc66")))) + "13ba72sjfyg1xvam131iapzqdf9pkwpn67zlyydmm6bv9pxlr431")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) @@ -20737,7 +20737,7 @@ it forcibly (add-before 'install 'build-doc (lambda _ (invoke "makeinfo" "elpher.texi")))))) - (home-page "https://github.com/tgvaughan/elpher") + (home-page "gopher://thelambdalab.xyz/1/projects/elpher/") (synopsis "Gopher client for Emacs") (description "Elpher is a full-featured gopher client for Emacs. Its features include intuitive keyboard and mouse-driven browsing, out-of-the-box -- cgit v1.2.3 From 2e59ae238426df3f886c6a1aeca08ddc96b61143 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 18 May 2020 19:32:09 -0400 Subject: gnu: svt-av1: Update to 0.8.3. * gnu/packages/video.scm (svt-av1): Update to 0.8.3. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f34da90d5d..d5034e0d79 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3873,7 +3873,7 @@ transcode or reformat the videos in any way, producing perfect backups.") (define-public svt-av1 (package (name "svt-av1") - (version "0.8.2") + (version "0.8.3") (source (origin (method git-fetch) (uri (git-reference @@ -3882,7 +3882,7 @@ transcode or reformat the videos in any way, producing perfect backups.") (file-name (git-file-name name version)) (sha256 (base32 - "0273fxgf4r832y9s0p8hqdj1j1nj8nlz4hylya0b4nsif89yfrhp")))) + "1rh4sz1bmrsxyxfxajsffw5jd17djcrymhwsi877v02fgln027qr")))) (build-system cmake-build-system) ;; SVT-AV1 only supports Intel-compatible CPUs. (supported-systems '("x86_64-linux" "i686-linux")) -- cgit v1.2.3 From 9cdb10d52e34f7e8fa3b6238fe268646a4bbb877 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 17 May 2020 23:53:50 +0200 Subject: gnu: grub: Allow a PNG image and replace "aspect-ratio" with "resolution". * gnu/bootloaders/grub.scm (): Remove this record and replace it by ... ()[image]: ... this field with the default from %background-image, ()[resolution]: ... this field with the defaults from 'width' and 'height' of 'grub-background-image'. ()[images]: Remove this field. (svg->png): Rename to ... (image->png): ... and use 'copy-file' instead of 'svg->png', if the suffix of the image file is not ".svg". (grub-background-image): Remove the arguments 'width' and 'height'. (grub-theme-image): Add function. (grub-theme-resolution): Add function. (grub-theme-gfxmode): Add function. (grub-image): Remove function. (grub-image?): Remove function. (grub-image-aspect-ratio): Remove function. (grub-image-file): Remove function. (grub-theme-images): Remove function. (%default-theme): Remove variable. (%background-image): Remove variable. Using image formats different to SVG was not possible. For a to be chosen, the 'aspect-ratio' of it had to be 4/3, as the resolution of any image was defaulting to 1024 x 768. There was no code to determine the proper boot-resolution to make any use of a list of images with different aspect-ratios. It seems to be a better solution to only define a single image with any format, and use a given resolution only for the conversion from a SVG file. This also makes the use of a special record unnecessary. Moving the default values from '%background-image' and '%default-theme' into makes a customisation easier without (inherit) and allows to remove the undocumented variables %background-image' and '%default-theme'. Signed-off-by: Mathieu Othacehe --- gnu/bootloader/grub.scm | 93 ++++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 56 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 8c5b5eac0c..fb871c6e96 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -37,19 +37,13 @@ #:use-module (ice-9 regex) #:use-module (srfi srfi-1) #:use-module (srfi srfi-2) - #:export (grub-image - grub-image? - grub-image-aspect-ratio - grub-image-file - - grub-theme + #:export (grub-theme grub-theme? - grub-theme-images + grub-theme-image + grub-theme-resolution grub-theme-color-normal grub-theme-color-highlight - - %background-image - %default-theme + grub-theme-gfxmode grub-bootloader grub-efi-bootloader @@ -77,70 +71,57 @@ denoting a file name." file)))) (#f file))) -(define-record-type* - grub-image make-grub-image - grub-image? - (aspect-ratio grub-image-aspect-ratio ;rational number - (default 4/3)) - (file grub-image-file)) ;file-valued gexp (SVG) - (define-record-type* + ;; Default theme contributed by Felipe López. grub-theme make-grub-theme grub-theme? - (images grub-theme-images - (default '())) ;list of + (image grub-theme-image + (default (file-append %artwork-repository + "/grub/GuixSD-fully-black-4-3.svg"))) + (resolution grub-theme-resolution + (default '(1024 . 768))) (color-normal grub-theme-color-normal - (default '((fg . cyan) (bg . blue)))) + (default '((fg . light-gray) (bg . black)))) (color-highlight grub-theme-color-highlight - (default '((fg . white) (bg . blue)))) - (gfxmode grub-gfxmode + (default '((fg . yellow) (bg . black)))) + (gfxmode grub-theme-gfxmode (default '("auto")))) ;list of string -(define %background-image - (grub-image - (aspect-ratio 4/3) - (file (file-append %artwork-repository - "/grub/GuixSD-fully-black-4-3.svg")))) - -(define %default-theme - ;; Default theme contributed by Felipe López. - (grub-theme - (images (list %background-image)) - (color-highlight '((fg . yellow) (bg . black))) - (color-normal '((fg . light-gray) (bg . black))))) ;XXX: #x303030 - ;;; ;;; Background image & themes. ;;; (define (bootloader-theme config) - "Return user defined theme in CONFIG if defined or %default-theme + "Return user defined theme in CONFIG if defined or a default theme otherwise." - (or (bootloader-configuration-theme config) %default-theme)) + (or (bootloader-configuration-theme config) (grub-theme))) -(define* (svg->png svg #:key width height) - "Build a PNG of HEIGHT x WIDTH from SVG." +(define* (image->png image #:key width height) + "Build a PNG of HEIGHT x WIDTH from IMAGE if its file suffix is \".svg\". +Otherwise the picture in IMAGE is just copied." (computed-file "grub-image.png" (with-imported-modules '((gnu build svg)) (with-extensions (list guile-rsvg guile-cairo) - #~(begin - (use-modules (gnu build svg)) - (svg->png #+svg #$output - #:width #$width - #:height #$height)))))) - -(define* (grub-background-image config #:key (width 1024) (height 768)) - "Return the GRUB background image defined in CONFIG with a ratio of -WIDTH/HEIGHT, or #f if none was found." - (let* ((ratio (/ width height)) - (image (find (lambda (image) - (= (grub-image-aspect-ratio image) ratio)) - (grub-theme-images - (bootloader-theme config))))) + #~(if (string-suffix? ".svg" #+image) + (begin + (use-modules (gnu build svg)) + (svg->png #+image #$output + #:width #$width + #:height #$height)) + (copy-file #+image #$output)))))) + +(define* (grub-background-image config) + "Return the GRUB background image defined in CONFIG or #f if none was found. +If the suffix of the image file is \".svg\", then it is converted into a PNG +file with the resolution provided in CONFIG." + (let* ((theme (bootloader-theme config)) + (image (grub-theme-image theme))) (and image - (svg->png (grub-image-file image) - #:width width #:height height)))) + (match (grub-theme-resolution theme) + (((? number? width) . (? number? height)) + (image->png image #:width width #:height height)) + (_ #f))))) (define* (eye-candy config store-device store-mount-point #:key system port) @@ -153,7 +134,7 @@ system string---e.g., \"x86_64-linux\"." (define setup-gfxterm-body (let ((gfxmode (or (and-let* ((theme (bootloader-configuration-theme config)) - (gfxmode (grub-gfxmode theme))) + (gfxmode (grub-theme-gfxmode theme))) (string-join gfxmode ";")) "auto"))) -- cgit v1.2.3 From 9f59a9b4bc93b3ef6cd3bd1c9eed04c30ba2d2d4 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Fri, 15 May 2020 14:24:23 -0500 Subject: gnu: Add granite. * gnu/packages/pantheon.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Danny Milosavljevic --- gnu/local.mk | 1 + gnu/packages/pantheon.scm | 67 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 gnu/packages/pantheon.scm diff --git a/gnu/local.mk b/gnu/local.mk index 38b286203e..2e12c5a873 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -403,6 +403,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/orpheus.scm \ %D%/packages/ots.scm \ %D%/packages/package-management.scm \ + %D%/packages/pantheon.scm \ %D%/packages/parallel.scm \ %D%/packages/password-utils.scm \ %D%/packages/patchutils.scm \ diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm new file mode 100644 index 0000000000..8c5c1634ee --- /dev/null +++ b/gnu/packages/pantheon.scm @@ -0,0 +1,67 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ryan Prior +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages pantheon) + #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gtk) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages) + #:use-module (guix build-system meson) + #:use-module (guix git-download) + #:use-module ((guix licenses) :prefix license:) + #:use-module (guix packages) + #:use-module (guix utils)) + +(define-public granite + (package + (name "granite") + (version "5.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/elementary/granite.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0acicv3f9gksb352v88lwap8ailjsxdrfknl2xql7blasbjzl2q0")))) + (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-icon-cache + (lambda _ + (setenv "DESTDIR" "/") + #t))))) + (inputs + `(("gtk" ,gtk+))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib" ,glib) + ("gobject-introspection" ,gobject-introspection) + ("libgee" ,libgee) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) + (home-page "https://github.com/elementary/granite") + (synopsis "Library that extends GTK with common widgets and utilities") + (description "Granite is a companion library for GTK+ and GLib. Among other +things, it provides complex widgets and convenience functions designed for use +in apps built for the Pantheon desktop.") + (license license:lgpl3+))) -- cgit v1.2.3 From 67c0d7fb9a32065fb77f0f595299182c60db85f4 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Tue, 19 May 2020 11:46:50 +0200 Subject: gnu: Add emacs-plantuml-mode. * gnu/packages/emacs-xyz.scm (emacs-plantuml-mode): New variable. --- gnu/packages/emacs-xyz.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 39083c90cf..69786f335b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe -;;; Copyright © 2017, 2018, 2019 Clément Lassieur +;;; Copyright © 2017, 2018, 2019, 2020 Clément Lassieur ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017, 2018 Kyle Meyer ;;; Copyright © 2017 Kei Kebreau @@ -168,6 +168,7 @@ #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages wordnet) #:use-module (gnu packages photo) + #:use-module (gnu packages uml) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) @@ -22942,3 +22943,51 @@ deleting them with @code{(setq delete-by-moving-to-trash t)}. This package provides a simple but convenient user interface to manage those trashed files.") (license license:gpl3+))) + +(define-public emacs-plantuml-mode + (package + (name "emacs-plantuml-mode") + (version "1.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/skuro/plantuml-mode") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yp41d2dmf3sx7qnl5x0zdjcr9y71b2wwc9m0q31v22xqn938ipc")))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-local-plantuml + (lambda* (#:key inputs #:allow-other-keys) + (let ((plantuml (assoc-ref inputs "plantuml")) + (file "plantuml-mode.el")) + (chmod file #o644) + (emacs-substitute-variables file + ("plantuml-jar-path" + (string-append plantuml "/share/java/plantuml.jar")) + ("plantuml-executable-path" + (string-append plantuml "/bin/plantuml")) + ("plantuml-server-url" 'nil) + ("plantuml-default-exec-mode" ''executable)) + (emacs-batch-edit-file file + `(progn (progn + (goto-char (point-min)) + (re-search-forward "(defun plantuml-download-jar") + (beginning-of-line) + (kill-sexp)) + (basic-save-buffer))) + #t)))))) + (inputs + `(("plantuml" ,plantuml))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash))) + (build-system emacs-build-system) + (home-page "https://github.com/skuro/plantuml-mode") + (synopsis "Major mode for editing PlantUML sources") + (description "This package provides a major mode for editing PlantUML +sources. It features syntax highlighting, autocompletion, preview of buffer +or region and use of locally installed binaries.") + (license license:gpl3+))) -- cgit v1.2.3 From 6437c598e70284b0ca380ce8ed5d8c2f63a6ddcc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 19 May 2020 12:38:28 +0200 Subject: gnu: ngs-sdk: Update to 2.10.5. * gnu/packages/bioinformatics.scm (ngs-sdk): Update to 2.10.5. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 32b795948b..3dc40eb177 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5723,7 +5723,7 @@ Roche 454, Ion Torrent and Pacific BioSciences SMRT.") (define-public ngs-sdk (package (name "ngs-sdk") - (version "2.9.6") + (version "2.10.5") (source (origin (method git-fetch) (uri (git-reference @@ -5732,7 +5732,7 @@ Roche 454, Ion Torrent and Pacific BioSciences SMRT.") (file-name (git-file-name name version)) (sha256 (base32 - "0d5k5kabgl15as37kj9x65xc92j4gcqms86hvihw3yb6wag0r0q3")))) + "1ix51c25hjn57w93qmwzw80xh2i34wx8j2hn7szh8p6w8i3az5qa")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f ; not supported -- cgit v1.2.3 From 68de9956749043bec425839c1154ad0ea64a4baa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 19 May 2020 12:38:43 +0200 Subject: gnu: ncbi-vdb: Update to 2.10.6. * gnu/packages/bioinformatics.scm (ncbi-vdb): Update to 2.10.6. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3dc40eb177..3ad08b9db5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5789,7 +5789,7 @@ simultaneously.") (define-public ncbi-vdb (package (name "ncbi-vdb") - (version "2.9.6") + (version "2.10.6") (source (origin (method git-fetch) (uri (git-reference @@ -5798,7 +5798,7 @@ simultaneously.") (file-name (git-file-name name version)) (sha256 (base32 - "0knkj1sq34hlivgv5qd6jlczqrs3ldmfgn6vbbw7p4mqxvb9mirk")))) + "0m8hlxscidsfqm9x9fyi62q6lpf1dv5115kgjjgnrkl49q9c27m6")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f ; not supported -- cgit v1.2.3 From 9dc50c8c4742811cb2ca953e075e0ea6e0c09213 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 19 May 2020 12:39:22 +0200 Subject: gnu: sra-tools: Update to 2.10.6. * gnu/packages/bioinformatics.scm (sra-tools): Update to 2.10.6. [arguments]: Replace CC variable in utf8proc Makefile. [inputs]: Replace hdf5 with hdf5-1.10; add python-wrapper. --- gnu/packages/bioinformatics.scm | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3ad08b9db5..a738aa51a8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6148,7 +6148,7 @@ sequence itself can be retrieved from these databases.") (define-public sra-tools (package (name "sra-tools") - (version "2.9.6") + (version "2.10.6") (source (origin (method git-fetch) @@ -6158,11 +6158,11 @@ sequence itself can be retrieved from these databases.") (file-name (git-file-name name version)) (sha256 (base32 - "0vqzap68v81k0zif2mnqfy8pnw2nrhsg87p6mgq8qk3nk2jv2rgy")))) + "1cr2mijkfs5sm35ffjs6861qsd1qkgnhnbavdv65zg5d655abbjf")))) (build-system gnu-build-system) (arguments - `(#:parallel-build? #f ; not supported - #:tests? #f ; no "check" target + `(#:parallel-build? #f ; not supported + #:tests? #f ; no "check" target #:make-flags (list (string-append "DEFAULT_CRT=" (assoc-ref %build-inputs "ncbi-vdb") @@ -6205,6 +6205,9 @@ sequence itself can be retrieved from these databases.") ;; Dynamic linking (substitute* "tools/copycat/Makefile" (("smagic-static") "lmagic")) + (substitute* "tools/driver-tool/utf8proc/Makefile" + (("CC\\?=gcc") "myCC=gcc") + (("\\(CC\\)") "(myCC)")) ;; The 'configure' script doesn't recognize things like ;; '--enable-fast-install'. @@ -6217,8 +6220,9 @@ sequence itself can be retrieved from these databases.") (string-append "--with-magic-prefix=" (assoc-ref inputs "libmagic")) ;; TODO: building with libxml2 fails with linker errors - ;; (string-append "--with-xml2-prefix=" - ;; (assoc-ref inputs "libxml2")) + #; + (string-append "--with-xml2-prefix=" + (assoc-ref inputs "libxml2")) (string-append "--with-ncbi-vdb-sources=" (assoc-ref inputs "ncbi-vdb")) (string-append "--with-ncbi-vdb-build=" @@ -6234,8 +6238,9 @@ sequence itself can be retrieved from these databases.") ("ncbi-vdb" ,ncbi-vdb) ("libmagic" ,file) ("fuse" ,fuse) - ("hdf5" ,hdf5) - ("zlib" ,zlib))) + ("hdf5" ,hdf5-1.10) + ("zlib" ,zlib) + ("python" ,python-wrapper))) (home-page "https://trace.ncbi.nlm.nih.gov/Traces/sra/sra.cgi?view=software") (synopsis "Tools and libraries for reading and writing sequencing data") -- cgit v1.2.3 From 1942814978b85e0d1f5f31280767f75a95f0cd3f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2020 12:41:14 +0200 Subject: gnu: bind: Update to 9.16.3 [fixes CVE-2020-8616 & CVE-2020-8617]. * gnu/packages/dns.scm (bind): Update to 9.16.3. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 051fea2de9..d0c03ff2d5 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -119,7 +119,7 @@ and BOOTP/TFTP for network booting of diskless machines.") (define-public isc-bind (package (name "bind") - (version "9.16.2") + (version "9.16.3") (source (origin (method url-fetch) (uri (string-append @@ -127,7 +127,7 @@ and BOOTP/TFTP for network booting of diskless machines.") "/bind-" version ".tar.xz")) (sha256 (base32 - "0gwr4p14zy5jqq050n762rfc33km51qwipcwy6bsvk55ziybgrfr")))) + "0zjgaspnx0p0rp83h4yj595s25da7fjis94z9frhv3azvq9nbb17")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs -- cgit v1.2.3 From 663def11dfa560066a910ebf290df82bcd72bfbc Mon Sep 17 00:00:00 2001 From: Ryan Prior via Guix-patches via Date: Fri, 15 May 2020 20:34:46 +0000 Subject: gnu: vte: Update to 0.60.2. * gnu/packages/gnome.scm (vte): Update to 0.60.2. [arguments]<#:configure-flags>: Disable systemd. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fe874100b2..5b926b5cb2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -50,6 +50,7 @@ ;;; Copyright © 2020 raingloom ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Naga Malleswari +;;; Copyright © 2020 Ryan Prior ;;; ;;; This file is part of GNU Guix. ;;; @@ -3228,7 +3229,7 @@ libraries written in C.") (define-public vte (package (name "vte") - (version "0.58.3") + (version "0.60.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/vte/" @@ -3236,8 +3237,11 @@ libraries written in C.") "vte-" version ".tar.xz")) (sha256 (base32 - "0xa9ipwic4jnhhbzlnqbhssz10xkzv61cpkl1ammc6mdq95bbp12")))) + "19ccbw0yca78h5qcnm8claj4fg1pj68nj1fsjqqfpzhj7w72i81m")))) (build-system meson-build-system) + (arguments + `(#:configure-flags + '("-D_systemd=false"))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) -- cgit v1.2.3 From 11491e1b1bdac1255f1f529f13b8eecabdb7cc66 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 19 May 2020 12:42:56 +0200 Subject: gnu: vte: Enable vala bindings. * gnu/packages/gnome.scm (vte)[arguments]<#:configure-flags>: Add "-Dvapi=true". --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5b926b5cb2..f4ae27cc44 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3241,7 +3241,8 @@ libraries written in C.") (build-system meson-build-system) (arguments `(#:configure-flags - '("-D_systemd=false"))) + '("-Dvapi=true" + "-D_systemd=false"))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) -- cgit v1.2.3 From 969811ad0e51adcbf503e38d9c9265814e3c2e27 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Fri, 15 May 2020 14:57:34 -0500 Subject: gnu: Add pantheon-calculator. * gnu/packages/pantheon.scm (pantheon-calculator): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/pantheon.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm index 8c5c1634ee..306a1d892d 100644 --- a/gnu/packages/pantheon.scm +++ b/gnu/packages/pantheon.scm @@ -17,6 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages pantheon) + #:use-module (gnu packages cmake) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -65,3 +66,44 @@ things, it provides complex widgets and convenience functions designed for use in apps built for the Pantheon desktop.") (license license:lgpl3+))) + +(define-public pantheon-calculator + (package + (name "pantheon-calculator") + (version "1.5.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/elementary/calculator.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1csxsr2c8qvl97xz9ahwn91z095nzgr0i1mbcb1spljll2sr9lkj")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-schema-cache-generation + (lambda _ + (setenv "DESTDIR" "/") + #t))))) + (inputs + `(("granite" ,granite) + ("glib" ,glib) + ("gtk" ,gtk+) + ("libgee" ,libgee))) + (native-inputs + `(("cmake" ,cmake) + ("glib:bin" ,glib "bin") ; for glib-compile-schemas + ("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) + (home-page "https://github.com/elementary/calculator") + (synopsis "Desktop calculator") + (description "Calculator is an application for performing simple +arithmetic. It is the default calculator application in the Pantheon +desktop.") + (license license:gpl3))) -- cgit v1.2.3 From ef3cd15ed4336f661df0f72d4ca9d7a8c7e87d13 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 19 May 2020 13:06:27 +0200 Subject: gnu: granite: Fix cross-compilation. * gnu/packages/pantheon.scm (granite)[native-inputs]: Remove glib, libgee. [inputs]: Add glib, libgee. --- gnu/packages/pantheon.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm index 306a1d892d..72910e5470 100644 --- a/gnu/packages/pantheon.scm +++ b/gnu/packages/pantheon.scm @@ -52,12 +52,12 @@ (setenv "DESTDIR" "/") #t))))) (inputs - `(("gtk" ,gtk+))) + `(("glib" ,glib) + ("gtk" ,gtk+) + ("libgee" ,libgee))) (native-inputs `(("gettext" ,gettext-minimal) - ("glib" ,glib) ("gobject-introspection" ,gobject-introspection) - ("libgee" ,libgee) ("pkg-config" ,pkg-config) ("vala" ,vala))) (home-page "https://github.com/elementary/granite") -- cgit v1.2.3 From c5a2b70135c9830e9c3051ddf4a096f9a80eb952 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 19 May 2020 10:44:02 +0200 Subject: gnu: openvpn: Update to 2.4.9 [fixes CVE-2020-11810]. * gnu/packages/vpn.scm (openvpn): Update to 2.4.9. --- gnu/packages/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index e06a83bbd5..da881493bf 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -282,7 +282,7 @@ and probably others.") (define-public openvpn (package (name "openvpn") - (version "2.4.8") + (version "2.4.9") (source (origin (method url-fetch) (uri (string-append @@ -290,7 +290,7 @@ and probably others.") version ".tar.xz")) (sha256 (base32 - "149z3agjy03i66mcj5bplim2mh45s2ps1wmxbxczyzw0nxmsd37v")))) + "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-iproute2=yes"))) -- cgit v1.2.3 From 273380fda2889e5ba4e7fba28b5b104306872c69 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 19 May 2020 14:51:06 +0200 Subject: gnu: Add hitch. * gnu/packages/web.scm (hitch): New public variable. --- gnu/packages/web.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5b18f84ac3..3be0da69f8 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -123,6 +123,7 @@ #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) #:use-module (gnu packages lisp-xyz) + #:use-module (gnu packages lsof) #:use-module (gnu packages lua) #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) @@ -5468,6 +5469,60 @@ HTTP statistics for system administrators that require a visual server report on the fly.") (license license:x11))) +(define-public hitch + (package + (name "hitch") + (version "1.5.2") + (home-page "https://hitch-tls.org/") + (source (origin + (method url-fetch) + (uri (string-append home-page "source/hitch-" version ".tar.gz")) + (sha256 + (base32 + "1nnzqqigfw78nqhp81a72x1s8d6v49ayw4w5df0zzm2cb1jgv95i")))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; Most tests attempts to access hitch-tls.org which is + ;; unavailable in the build container. Run them against + ;; a dummy local web server instead. + (for-each (lambda (test) + (substitute* test + (("\\[hitch-tls\\.org\\]:80") + "[localhost]:8000"))) + (find-files "src/tests" "\\.sh$")) + (system "python3 -m http.server &") + + ;; The build container does not reap zombie processes, + ;; causing stop_hitch to hang indefinitely while waiting + ;; for the process to terminate because 'kill -0' never + ;; succeeds. Use a different test to see whether the + ;; process has shut down. + (substitute* "src/tests/hitch_test.sh" + (("kill -0 \"\\$HITCH_PID\"") + "$(ps -p $HITCH_PID -o state= | grep -qv '^Z$')")) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + + ;; For tests. + ("curl" ,curl) + ("egrep" ,grep) + ("lsof" ,lsof) + ("python" ,python))) + (inputs + `(("libev" ,libev) + ("openssl" ,openssl))) + (synopsis "Scalable TLS proxy") + (description + "Hitch is a performant TLS proxy based on @code{libev}. It terminates +SSL/TLS connections and forwards the unencrypted traffic to a backend such +as a web server. It is designed to handle many thousand connections on +multicore machines.") + (license license:bsd-2))) + (define-public httptunnel (package (name "httptunnel") -- cgit v1.2.3 From 4684580af59312c4c24f6a6af4c27e8bfea77ae9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 19 May 2020 15:39:38 +0200 Subject: gnu: vte: Remove obsolete input. * gnu/packages/gnome.scm (vte)[native-inputs]: Remove INTLTOOL. Add GETTEXT-MINIMAL. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f4ae27cc44..e35ffb7a72 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3245,7 +3245,7 @@ libraries written in C.") "-D_systemd=false"))) (native-inputs `(("pkg-config" ,pkg-config) - ("intltool" ,intltool) + ("gettext" ,gettext-minimal) ("vala" ,vala) ("gobject-introspection" ,gobject-introspection) ("glib" ,glib "bin") ; for glib-genmarshal, etc. -- cgit v1.2.3 From 970fcb0d4ae5f5ee659c001049aed63a219819dd Mon Sep 17 00:00:00 2001 From: Alex McGrath Date: Tue, 19 May 2020 00:01:46 +0100 Subject: gnu: Add wofi. * gnu/packages/xdisorg.scm (wofi): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/xdisorg.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 256b86a39a..88719775df 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -58,6 +58,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix hg-download) #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -2358,3 +2359,31 @@ is to find @file{.desktop} files and offer you a menu to start an application using @command{dmenu}.") (home-page "https://github.com/enkore/j4-dmenu-desktop") (license license:gpl3+))) + +(define-public wofi + (package + (name "wofi") + (version "1.1.2") + (source (origin + (method hg-fetch) + (uri (hg-reference + (url "https://hg.sr.ht/~scoopta/wofi") + (changeset (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "086j5wshawjbwdmmmldivfagc2rr7g5a2gk11l0snqqslm294xsn")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("gtk3" ,gtk+) + ("wayland" ,wayland))) + (synopsis "Launcher/menu program for wayland") + (description + "Wofi is a launcher/menu program for wlroots based wayland compositors +such as sway, similar to @command{rofi}.") + (home-page "https://hg.sr.ht/~scoopta/wofi") + (license license:gpl3+))) -- cgit v1.2.3 From 75ac5c5281cf032f947847532718e73afdbb9167 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2020 18:49:25 +0200 Subject: gnu: opensmtpd: Update to 6.7.0p1 [security fixes]. * gnu/packages/mail.scm (opensmtpd): Update to 6.7.0p1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 935a7333a4..63e8d1f91a 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2298,14 +2298,14 @@ transfer protocols.") (define-public opensmtpd (package (name "opensmtpd") - (version "6.6.4p1") + (version "6.7.0p1") (source (origin (method url-fetch) (uri (string-append "https://www.opensmtpd.org/archives/" "opensmtpd-" version ".tar.gz")) (sha256 - (base32 "1kyph9ycq0j21dl9n1sq5fns9p4gckdi0fmnf8awrcwrdcm9dyg2")))) + (base32 "1f8bp40ywyixflg5qbnang6l210bv4vqa1k2pgm2356bp7bmsgy1")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb) -- cgit v1.2.3 From 64d1d2b271babed83afaabf034dac67bbae3a364 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 May 2020 13:50:04 +0300 Subject: gnu: Add python-mujson. * gnu/packages/python-xyz.scm (python-mujson): New variable. --- gnu/packages/python-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c26a766d64..8532de9873 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19895,3 +19895,21 @@ allows you, from Python code, to “fix” invalid (X)HTML markup.") (define-public python2-pytidylib (package-with-python2 python-pytidylib)) + +(define-public python-mujson + (package + (name "python-mujson") + (version "1.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mujson" version)) + (sha256 + (base32 + "0wbj6r8yzsdx2b0kbldlkznr1a9nn33za2q9x3g0hbg420dwzn97")))) + (build-system python-build-system) + (home-page "https://github.com/mattgiles/mujson") + (synopsis "Use the fastest JSON functions available at import time") + (description "This packages selects the fastest JSON functions available +at import time.") + (license license:expat))) -- cgit v1.2.3 From 3d41d5dfef6e5b5383c02057db64443b895ae43d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 May 2020 14:44:26 +0300 Subject: gnu: python-jsonrpc-server: Update to 0.3.4. * gnu/packages/python-xyz.scm (python-jsonrpc-server): Update to 0.3.4. [propagated-inputs]: Remove python-future. --- gnu/packages/python-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8532de9873..e8f8d45cb4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3720,18 +3720,17 @@ Language (TOML) configuration files.") (define-public python-jsonrpc-server (package (name "python-jsonrpc-server") - (version "0.3.2") + (version "0.3.4") (source (origin (method url-fetch) (uri (pypi-uri "python-jsonrpc-server" version)) (sha256 (base32 - "0ddgdp26dfxaz6isjbb12974b3rxavgsqrn2zrmck62cmipg5g05")))) + "0dzya99nbi4mw7q85vmyw1wfgbx5dpmysnvm0bwx5m4xbi4zafy7")))) (build-system python-build-system) (propagated-inputs - `(("python-future" ,python-future) - ("python-mock" ,python-mock) + `(("python-mock" ,python-mock) ("python-pytest" ,python-pytest) ("python-ujson" ,python-ujson))) (home-page -- cgit v1.2.3 From 255a206217ce1ed414c1753c13daa5e254875fbd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 May 2020 15:42:01 +0300 Subject: gnu: Add python-rapidjson. * gnu/packages/python-web.scm (python-rapidjson): New variable. --- gnu/packages/python-web.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d64f698dbc..9ead80f29d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Eric Dvorsak -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge @@ -3769,3 +3769,47 @@ Selenium specifically provides infrastructure for the W3C WebDriver specificatio — a platform and language-neutral coding interface compatible with all major web browsers.") (license license:asl2.0))) + +(define-public python-rapidjson + (package + (name "python-rapidjson") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-rapidjson" version)) + (sha256 + (base32 + "18cl2dhx3gds5vg52jxmh9wjlbiy8dx06c3n482rfpdi9dzbv05d")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "rapidjson") #t)))) + (build-system python-build-system) + (arguments + `(#:configure-flags + (list (string-append "--rj-include-dir=" + (assoc-ref %build-inputs "rapidjson") + "/include/rapidjson")) + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (invoke "python" "setup.py" "build" + (string-append "--rj-include-dir=" + (assoc-ref %build-inputs "rapidjson") + "/include/rapidjson")))) + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + ;; Some tests are broken. + (delete-file "tests/test_base_types.py") + (delete-file "tests/test_validator.py") + (invoke "python" "-m" "pytest" "tests")))))) + (native-inputs + `(("rapidjson" ,rapidjson) + ("python-pytest" ,python-pytest) + ("python-pytz" ,python-pytz))) + (home-page "https://github.com/python-rapidjson/python-rapidjson") + (synopsis "Python wrapper around rapidjson") + (description "This package provides a python wrapper around rapidjson.") + (license license:expat))) -- cgit v1.2.3 From 45838753bba25e2e6182a15991e3aeaa84d5c44d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 May 2020 16:11:09 +0300 Subject: gnu: python-falcon: Update to 2.0.0. * gnu/packages/python-web.scm (python-falcon): Update to 2.0.0. [source]: Add snippet to remove bundled code. [arguments]: Update custom 'check phase. [propagated-inputs]: Remove python-six. [native-inputs]: Remove python-jsonschema. Add python-mujson, python-pytest-runner, python-rapidjson, python-ujson. [properties]: New field. (python2-falcon)[native-inputs]: Don't add python-rapidjson. --- gnu/packages/python-web.scm | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 9ead80f29d..2cd37c8bcf 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -222,32 +222,50 @@ comes with a SOCKS proxy client.") (define-public python-falcon (package (name "python-falcon") - (version "1.4.1") + (version "2.0.0") (source (origin (method url-fetch) (uri (pypi-uri "falcon" version)) (sha256 (base32 - "1i0vmqsk24z4biirqhpvas9h28wy7nmpy3jvnb6rz2imq04zd09r")))) + "1z6mqfv574x6jiawf67ib52g4kk20c2x7xk7wrn1573b8v7r79gf")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "falcon/vendor") + (substitute* "setup.py" + ((".*falcon\\.vendor\\.mimeparse.*") "")) + (substitute* '("falcon/media/handlers.py" + "falcon/request.py") + (("from falcon\\.vendor ") "")) + (substitute* "falcon.egg-info/SOURCES.txt" + (("falcon/vendor.*") "")) + #t)))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (invoke "pytest")))))) + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Skip orjson, which requires rust to build. + (substitute* "tests/test_media_handlers.py" + (("== 'CPython") "!= 'CPython")) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "--ignore" "falcon")))))) (propagated-inputs - `(("python-mimeparse" ,python-mimeparse) - ("python-six" ,python-six))) + `(("python-mimeparse" ,python-mimeparse))) (native-inputs `(("python-cython" ,python-cython) ;for faster binaries + ("python-mujson" ,python-mujson) + ("python-msgpack" ,python-msgpack) ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner) ("python-pyyaml" ,python-pyyaml) + ("python-rapidjson" ,python-rapidjson) ("python-requests" ,python-requests) ("python-testtools" ,python-testtools) - ("python-jsonschema" ,python-jsonschema) - ("python-msgpack" ,python-msgpack))) + ("python-ujson" ,python-ujson))) (home-page "https://falconframework.org") (synopsis "Web framework for building APIs and application backends") @@ -267,10 +285,15 @@ classes @item Compatible with both CPython and PyPy @item Cython support for better performance when used with CPython @end itemize") + (properties `((python2-variant . ,(delay python2-falcon)))) (license license:asl2.0))) (define-public python2-falcon - (package-with-python2 python-falcon)) + (let ((falcon (package-with-python2 (strip-python2-variant python-falcon)))) + (package + (inherit falcon) + (native-inputs + (alist-delete "python-rapidjson" (package-native-inputs falcon)))))) (define-public python-falcon-cors (package -- cgit v1.2.3 From cc831310068de54ebad0da9f1b92030aacde3648 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 19 May 2020 14:21:44 +0300 Subject: gnu: python-ujson: Update to 2.0.3. * gnu/packages/python-xyz.scm (python-ujson): Update to 2.0.3. [source]: Remove bundled source. [arguments]: Add phase to link to system double-conversion. Add custom 'check phase. [native-inputs]: Add double-conversion, python-setuptools-scm, python-pytest. [home-page]: Update to new home-page. [description]: Drop reference to python-2 support. (python-ujson-1): New variable. (python2-ujson): Rename to python2-ujson-1. (python-jsonrpc-server)[propagated-inputs]: Replace python-ujson with python-ujson-1. --- gnu/packages/python-xyz.scm | 59 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 8 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e8f8d45cb4..7c5b265f96 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3732,7 +3732,7 @@ Language (TOML) configuration files.") (propagated-inputs `(("python-mock" ,python-mock) ("python-pytest" ,python-pytest) - ("python-ujson" ,python-ujson))) + ("python-ujson" ,python-ujson-1))) (home-page "https://github.com/palantir/python-jsonrpc-server") (synopsis "JSON RPC 2.0 server library") @@ -18323,6 +18323,50 @@ services to what you expect in your tests.") (define-public python-ujson (package (name "python-ujson") + (version "2.0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ujson" version)) + (sha256 + (base32 + "18z9gb9ggy1r464b9q1gqs078mqgrkj6dys5a47529rqk3yfybdx")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "deps") #t)))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'link-to-system-double-conversion + (lambda* (#:key inputs #:allow-other-keys) + (let ((d-c (assoc-ref inputs "double-conversion"))) + (substitute* "setup.py" + (("./deps/double-conversion/double-conversion\"") + (string-append d-c "/include/double-conversion\"")) + (("-lstdc++" stdc) + (string-append "-L" d-c "/lib\"," + " \"-ldouble-conversion\"," + " \"" stdc))) + #t))) + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest")))))) + (native-inputs + `(("double-conversion" ,double-conversion) + ("python-setuptools-scm" ,python-setuptools-scm) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/ultrajson/ultrajson") + (synopsis "Ultra fast JSON encoder and decoder for Python") + (description + "UltraJSON is an ultra fast JSON encoder and decoder written in pure C with +bindings for Python 3.") + (license license:bsd-3))) + +(define-public python-ujson-1 + (package + (inherit python-ujson) (version "1.35") (source (origin @@ -18331,17 +18375,16 @@ services to what you expect in your tests.") (sha256 (base32 "11jz5wi7mbgqcsz52iqhpyykiaasila4lq8cmc2d54bfa3jp6q7n")))) - (build-system python-build-system) + (arguments + '(#:phases %standard-phases)) + (native-inputs '()) (home-page "http://www.esn.me") - (synopsis - "Ultra fast JSON encoder and decoder for Python") (description "UltraJSON is an ultra fast JSON encoder and decoder written in pure C with - bindings for Python 2.5+ and 3.") - (license license:bsd-3))) +bindings for Python 2.5+ and 3."))) -(define-public python2-ujson - (package-with-python2 python-ujson)) +(define-public python2-ujson-1 + (package-with-python2 python-ujson-1)) (define-public python-iocapture ;; The latest release is more than a year older than this commit. -- cgit v1.2.3 From 9593caff8d5dcd8cc369fb8c944885c1d9a14793 Mon Sep 17 00:00:00 2001 From: nikita Date: Tue, 19 May 2020 12:41:58 +0200 Subject: gnu: cwm: Update to 6.6. * gnu/packages/wm.scm (cwm): Update to 6.6. [source, home-page]: Update URLs. Signed-off-by: Leo Famulari --- gnu/packages/wm.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a29a7d9764..1151b8115d 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016 Carlo Zancanaro ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès -;;; Copyright © 2016, 2017, 2018 Nikita +;;; Copyright © 2016, 2017, 2018, 2020 Nikita ;;; Copyright © 2016 doncatnip ;;; Copyright © 2016 Ivan Vilata i Balaguer ;;; Copyright © 2017 Mekeor Melire @@ -1176,15 +1176,15 @@ It is inspired by Xmonad and dwm. Its major features include: (define-public cwm (package (name "cwm") - (version "6.3") + (version "6.6") (source (origin (method url-fetch) - (uri (string-append "http://chneukirchen.org/releases/cwm-" + (uri (string-append "https://leahneukirchen.org/releases/cwm-" version ".tar.gz")) (sha256 (base32 - "17pdp9cfgh2n3n3905l4rl9qk7b722i8psnarhlc2h98qzx7zmac")))) + "0p350pbfn92m21jiq4i324sdskxhs71p435g0mgz7cmzprnhhg92")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "CC=gcc" @@ -1219,7 +1219,7 @@ It is inspired by Xmonad and dwm. Its major features include: (native-inputs `(("pkg-config" ,pkg-config) ("bison" ,bison))) - (home-page "https://github.com/chneukirchen/cwm") + (home-page "https://github.com/leahneukirchen/cwm") (synopsis "OpenBSD fork of the calmwm window manager") (description "Cwm is a stacking window manager for X11. It is an OpenBSD project derived from the original Calm Window Manager.") -- cgit v1.2.3 From f523eaba7b5460937a230a824550243d75e5f1dc Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 19 May 2020 20:14:17 +0200 Subject: gnu: docker: Remove references to go. Fixes . * gnu/packages/docker.scm (docker)[arguments]<#:phases>[remove-go-references]: New phase. --- gnu/packages/docker.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index c95ca3f9d7..bf009a792b 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -544,7 +544,9 @@ built-in registry server of Docker.") (install-file (string-append "bundles/dynbinary-daemon/dockerd-" (getenv "VERSION")) out-bin) - #t)))))) + #t))) + (add-after 'install 'remove-go-references + (assoc-ref go:%standard-phases 'remove-go-references))))) (inputs `(("btrfs-progs" ,btrfs-progs) ("containerd" ,containerd) ; for containerd-shim -- cgit v1.2.3 From 5e3d169945935b53325e6b738a307ba286751259 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 19 May 2020 23:14:30 +0200 Subject: publish: Improve performance by increasing buffer size. * guix/scripts/publish.scm (http-write): Increase socket send buffer. --- guix/scripts/publish.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm index f5b2f5fd4e..a00f08f9d9 100644 --- a/guix/scripts/publish.scm +++ b/guix/scripts/publish.scm @@ -851,6 +851,7 @@ blocking." size) client)) (output (response-port response))) + (setsockopt client SOL_SOCKET SO_SNDBUF (* 128 1024)) (if (file-port? output) (sendfile output input size) (dump-port input output)) -- cgit v1.2.3 From 0c39013afbf12256e8ca52296a975a683b324be2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2020 19:09:06 +0200 Subject: gnu: bs1770gain: Update to 0.6.9. * gnu/packages/audio.scm (bs1770gain): Update to 0.6.9. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 2eeda826b5..e6eefad61b 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3373,14 +3373,14 @@ with support for HD extensions.") (define-public bs1770gain (package (name "bs1770gain") - (version "0.6.7") + (version "0.6.9") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/bs1770gain/bs1770gain/" version "/bs1770gain-" version ".tar.gz")) (sha256 - (base32 "13hsbqj1dkpz1gbclnjxv50kr7b4gcjai6c1l38g01433h217qjc")) + (base32 "1hcbff3q6xl9rj1pzy3fwy91y6fa99wwrhb31461j9kgc173ls7r")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 147499a469fbf56d52ea45ef1193df3eaa328bb5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2020 19:21:07 +0200 Subject: gnu: handbrake: Update to 1.3.2. * gnu/packages/video.scm (handbrake): Update to 1.3.2. --- gnu/packages/video.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d5034e0d79..bb465c64c9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2762,14 +2762,15 @@ supported players in addition to this package.") (define-public handbrake (package (name "handbrake") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) - (uri (string-append "https://download.handbrake.fr/releases/" - version "/HandBrake-" version "-source.tar.bz2")) + (uri (string-append "https://github.com/HandBrake/HandBrake/" + "releases/download/" version "/" + "HandBrake-" version "-source.tar.bz2")) (sha256 (base32 - "09rcrq0kjs1lc1as7w3glbpbfvzldwpx3xv0pfmkn4pl7acxw1f0")) + "0w7jxjrccvxp7g15dv0spildg5apmqp4gwbcqmg58va2gylynvzc")) (modules '((guix build utils))) (snippet ;; Remove "contrib" and source not necessary for -- cgit v1.2.3 From 51fd92cef46fb658becf3a58a99a34b7331a7840 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2020 19:30:27 +0200 Subject: gnu: gtkwave: Update to 3.3.104. * gnu/packages/fpga.scm (gtkwave): Update to 3.3.104. --- gnu/packages/fpga.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index ed5bc14e31..fda5de60c7 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -340,7 +340,7 @@ FOSS FPGA place and route tool.") (define-public gtkwave (package (name "gtkwave") - (version "3.3.103") + (version "3.3.104") (source (origin (method url-fetch) @@ -350,7 +350,7 @@ FOSS FPGA place and route tool.") (string-append "http://gtkwave.sourceforge.net/" "gtkwave-" version ".tar.gz"))) (sha256 - (base32 "1xzaxqbabj4sb4n10yki5acglx3736pwl3kwlq4k7i96rzvsn9f3")))) + (base32 "0kw9a33gx60kn069yhx5pyk39x1z3pwaj8l1qqwq943v62lx23fj")))) (build-system gnu-build-system) (native-inputs `(("gperf" ,gperf) -- cgit v1.2.3 From 2da5fcfdfade2129b014f3db167bd90178178ae5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2020 19:30:32 +0200 Subject: gnu: hevea: Update to 2.34. * gnu/packages/ocaml.scm (hevea): Update to 2.34. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 916c7fe292..877e841b20 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -582,14 +582,14 @@ concrete syntax of the language (Quotations, Syntax Extensions).") (define-public hevea (package (name "hevea") - (version "2.33") + (version "2.34") (source (origin (method url-fetch) (uri (string-append "http://hevea.inria.fr/old/" "hevea-" version ".tar.gz")) (sha256 (base32 - "0115bn6n6hhb08rmj0m508wjcsn1mggiagqly6s941pq811wxymb")))) + "1pzyszxw90klpcmhjqrjfc8cw6c0gm4w2blim8ydyxb6rq6qml1s")))) (build-system gnu-build-system) (inputs `(("ocaml" ,ocaml))) -- cgit v1.2.3 From 9e8f73c49cf5e8e2e4abc25808dfd77c4afdfd54 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 May 2020 21:06:54 +0200 Subject: gnu: librepcb: Update to 0.1.4. * gnu/packages/engineering.scm (librepcb): Update to 0.1.4. [inputs]: Add qtsvg. --- gnu/packages/engineering.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 37b42ca3f5..be86848538 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2047,17 +2047,18 @@ simulator backends @code{Qucsator}, @code{ngspice} and @code{Xyce}.") (define-public librepcb (package (name "librepcb") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) (uri (string-append "https://download.librepcb.org/releases/" version "/librepcb-" version "-source.zip")) (sha256 - (base32 "1ich849dsx2hmcwlwbry4mkg374n940l3hy6srh4qms2rm7vd7x0")))) + (base32 "1b5dkanz3q0y5ag80w0l85hn7axrachb5m9zvyv4zvzrfy09wa88")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) ("zlib" ,zlib))) (native-inputs `(("qttools" ,qttools) ; for lrelease -- cgit v1.2.3 From 0645a24b5621e34c39ef27a24789d95934cf40b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 00:45:23 +0200 Subject: gnu: python-ply: Update to 3.11. * gnu/packages/python-xyz.scm (python-ply): Update to 3.11. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7c5b265f96..67e6a6f93b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11395,14 +11395,14 @@ network support library.") (define-public python-ply (package (name "python-ply") - (version "3.10") + (version "3.11") (source (origin (method url-fetch) (uri (pypi-uri "ply" version)) (sha256 (base32 - "1jxsr1d2f732r6ljhvm827113dckwl6qwakfvpbdhcbhvpvlmscn")))) + "18qx113g9bi1ac4indd5phma82zcdq601lxncp3vjn43m2mc3iq0")))) (build-system python-build-system) (home-page "http://www.dabeaz.com/ply/") (synopsis "Python Lex & Yacc") -- cgit v1.2.3 From 5a4d48af52e28e97eac07c40548764ffe03dd6b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 00:45:54 +0200 Subject: gnu: python-ply: Remove Python 2 variant. * gnu/packages/python-xyz.scm (python2-ply): Remove variable. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 67e6a6f93b..1f96ed4391 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11410,9 +11410,6 @@ network support library.") It uses LR parsing and does extensive error checking.") (license license:bsd-3))) -(define-public python2-ply - (package-with-python2 python-ply)) - (define-public python-tabulate (package (name "python-tabulate") -- cgit v1.2.3 From 72faca2c50d1e8a1a39ee334a24333fe09352a6c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 00:56:19 +0200 Subject: gnu: xonsh: Update to 0.9.18. * gnu/packages/shells.scm (xonsh): Update to 0.9.18. [snippet]: Adapt to more aggressive bundling. --- gnu/packages/shells.scm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 5c8c4b5d8a..fa3eccabd4 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -493,21 +493,31 @@ ksh, and tcsh.") (define-public xonsh (package (name "xonsh") - (version "0.6.2") + (version "0.9.18") (source (origin (method url-fetch) (uri (pypi-uri "xonsh" version)) (sha256 (base32 - "0c2bbmdg0n10q54vq9k1z5n53l0mh1hb1q5xprfhilvrbr6hlcwr")) + "1h4rrwzwiwkyi9p49sjn97rl39fqq2r23hchzsw0s3fcwa7m8fkj")) (modules '((guix build utils))) (snippet `(begin - ;; Delete bundled ply. + ;; Delete bundled PLY. (delete-file-recursively "xonsh/ply") - (substitute* '("setup.py") - (("'xonsh\\.ply\\.ply',") "")) + (substitute* "setup.py" + (("\"xonsh\\.ply\\.ply\",") "")) + ;; Use our properly packaged PLY instead. + (substitute* (list "setup.py" + "tests/test_lexer.py" + "xonsh/__amalgam__.py" + "xonsh/lexer.py" + "xonsh/parsers/base.py" + "xonsh/xonfig.py") + (("from xonsh\\.ply\\.(.*) import" _ module) + (format #f "from ~a import" module)) + (("from xonsh\\.ply import") "import")) #t)))) (build-system python-build-system) (arguments -- cgit v1.2.3 From 4d9e4801d2e5975702e957d1bb76dbeb90ea0e09 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 04:27:52 +0200 Subject: gnu: http-parser: Update to 2.9.4. * gnu/packages/web.scm (http-parser): Update to 2.9.4. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3be0da69f8..285d2b3bf0 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5911,7 +5911,7 @@ into your tests. It automatically starts up a HTTP server in a separate thread (define-public http-parser (package (name "http-parser") - (version "2.9.3") + (version "2.9.4") (home-page "https://github.com/nodejs/http-parser") (source (origin (method git-fetch) @@ -5934,7 +5934,7 @@ into your tests. It automatically starts up a HTTP server in a separate thread "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))))) (sha256 (base32 - "189zi61vczqgmqjd2myjcjbbi5icrk7ccs0kn6nj8hxqiv5j3811")))) + "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From abd90f636b884e1980ddb95dfac298fb9d6b6b70 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 05:56:16 +0200 Subject: gnu: ccls: Update to 0.20190823.6. * gnu/packages/cpp.scm (ccls): Update to 0.20190823.6. --- gnu/packages/cpp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 7227b8d516..b32f4201c0 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -297,7 +297,7 @@ tools (containers, algorithms) used by other QuantStack packages.") (define-public ccls (package (name "ccls") - (version "0.20190823.5") + (version "0.20190823.6") (source (origin (method git-fetch) @@ -305,11 +305,11 @@ tools (containers, algorithms) used by other QuantStack packages.") (url "https://github.com/MaskRay/ccls") (commit version))) (sha256 - (base32 "0b2pkpzn576b92zcxpwchpkyw2fww6s69818rx4g9z34kzm35zy5")) + (base32 "11h5nwk4qqshf3i8yr4bxpnvmidrhkzd0zxhf1xqv8cv6r08k47f")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - '(#:tests? #f)) ; no check target. + '(#:tests? #f)) ; no check target (inputs `(("rapidjson" ,rapidjson))) (native-inputs -- cgit v1.2.3 From 4d89e302df210a5e4a9784f06c2151db604e85a0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 06:05:18 +0200 Subject: gnu: toybox: Update to 0.8.3. * gnu/packages/busybox.scm (toybox): Update to 0.8.3. --- gnu/packages/busybox.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 0593b86051..e3431aa31b 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -113,7 +113,7 @@ any small or embedded system.") (define-public toybox (package (name "toybox") - (version "0.8.2") + (version "0.8.3") (source (origin (method url-fetch) (uri (string-append @@ -121,7 +121,7 @@ any small or embedded system.") version ".tar.gz")) (sha256 (base32 - "1mgya8zxgf30i5w3rhsb3n70kwlhifxbajh6wqdsz6rf8kx609ws")))) + "00aw9d809wj1bqlb2fsssdgz7rj0363ya14py0gfdm0rkp98zcpa")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 712190edeae0d9e1c2e94abaab120676dd5dfa7d Mon Sep 17 00:00:00 2001 From: Holger Peters Date: Wed, 20 May 2020 09:07:03 +0200 Subject: gnu: python-webob: Update to 1.8.6. * gnu/packages/python-web.scm (python-webob): Update to 1.8.6. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2cd37c8bcf..a554f598e2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1035,14 +1035,14 @@ your Web app.") (define-public python-webob (package (name "python-webob") - (version "1.8.3") + (version "1.8.6") (source (origin (method url-fetch) (uri (pypi-uri "WebOb" version)) (sha256 (base32 - "1cpqskanmvwia8wqlpcr3ykyxysynjdnbl5namvpg8vw6jnkv1dh")))) + "026i3z99nr3px75isa9mbnky5i7rffiv4d124h5kxfjjsxz92fma")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) -- cgit v1.2.3 From 44935b2ebbde4b5bc73a06bfb2b544eca7244141 Mon Sep 17 00:00:00 2001 From: Holger Peters Date: Wed, 20 May 2020 09:07:04 +0200 Subject: gnu: Add python-venusian. * gnu/packages/python-web.scm (python-venusian): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-web.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index a554f598e2..0dff9610bc 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3836,3 +3836,28 @@ major web browsers.") (synopsis "Python wrapper around rapidjson") (description "This package provides a python wrapper around rapidjson.") (license license:expat))) + +(define-public python-venusian + (package + (name "python-venusian") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "venusian" version)) + (sha256 + (base32 "0f7f67dkgxxcjfhpdd5frb9pszkf04lyzzpn5069q0xi89r2p17n")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-runner" ,python-pytest-runner) + ("python-pytest-cov" ,python-pytest-cov))) + (arguments '(#:test-target "pytest")) + (home-page "https://docs.pylonsproject.org/projects/venusian") + (synopsis "Library for defering decorator actions") + (description + "Venusian is a library which allows framework authors to defer decorator +actions. Instead of taking actions when a function (or class) decorator is +executed at import time, you can defer the action usually taken by the +decorator until a separate scan phase.") + (license license:repoze))) -- cgit v1.2.3 From a9daf35cb1cda8b8889ec7dc796079266709baec Mon Sep 17 00:00:00 2001 From: Holger Peters Date: Wed, 20 May 2020 09:07:05 +0200 Subject: gnu: Add python-zope-deprecation. * gnu/packages/python-web.scm (python-zope-deprecation): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-web.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 0dff9610bc..dfdba6636b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3861,3 +3861,23 @@ actions. Instead of taking actions when a function (or class) decorator is executed at import time, you can defer the action usually taken by the decorator until a separate scan phase.") (license license:repoze))) + +(define-public python-zope-deprecation + (package + (name "python-zope-deprecation") + (version "4.4.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "zope.deprecation" version)) + (sha256 + (base32 + "1pz2cv7gv9y1r3m0bdv7ks1alagmrn5msm5spwdzkb2by0w36i8d")))) + (build-system python-build-system) + (native-inputs `()) + (propagated-inputs `()) + (home-page "https://zopedeprecation.readthedocs.io/") + (synopsis "Function for marking deprecations") + (description "The @code{zope.deprecation} module provides a function for +marking modules, classes, functions, methods and properties as deprecated, +displaying warnings when usaged in application code.") + (license license:zpl2.1))) -- cgit v1.2.3 From c557ae13f901d0f2e74dd2f29612a03c23704cd6 Mon Sep 17 00:00:00 2001 From: Holger Peters Date: Wed, 20 May 2020 09:07:06 +0200 Subject: gnu: Add python-translationstring. * gnu/packages/python-web.scm (python-translationstring): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-web.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index dfdba6636b..e7b8b3b198 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3881,3 +3881,21 @@ decorator until a separate scan phase.") marking modules, classes, functions, methods and properties as deprecated, displaying warnings when usaged in application code.") (license license:zpl2.1))) + +(define-public python-translationstring + (package + (name "python-translationstring") + (version "1.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "translationstring" version)) + (sha256 + (base32 + "0bdpcnd9pv0131dl08h4zbcwmgc45lyvq3pa224xwan5b3x4rr2f")))) + (build-system python-build-system) + (home-page "http://docs.pylonsproject.org/projects/translationstring") + (synopsis "Internationalization tooling for the Pylons project") + (description "This package provides a library used by various Pylons +project packages for internationalization (i18n) duties related to +translation.") + (license license:repoze))) -- cgit v1.2.3 From 79ddf25bc0a26a52ffe88c144d6ce2645462fa05 Mon Sep 17 00:00:00 2001 From: Holger Peters Date: Wed, 20 May 2020 09:07:07 +0200 Subject: gnu: Add python-plaster. * gnu/packages/python-web.scm (python-plaster): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-web.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e7b8b3b198..adc68f48c7 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3899,3 +3899,27 @@ displaying warnings when usaged in application code.") project packages for internationalization (i18n) duties related to translation.") (license license:repoze))) + +(define-public python-plaster + (package + (name "python-plaster") + (version "1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "plaster" version)) + (sha256 + (base32 + "1hy8k0nv2mxq94y5aysk6hjk9ryb4bsd13g83m60hcyzxz3wflc3")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://docs.pylonsproject.org/projects/plaster/en/latest/") + (synopsis "Configuration loader for multiple config file formats") + (description + "Plaster is a loader interface around multiple config file formats. It +exists to define a common API for applications to use when they wish to load +configuration. The library itself does not aim to handle anything except a +basic API that applications may use to find and load configuration settings. +Any specific constraints should be implemented in a pluggable loader which can +be registered via an entrypoint.") + (license license:repoze))) -- cgit v1.2.3 From 804b7722a5272dffe659368404a3447e509f2cea Mon Sep 17 00:00:00 2001 From: Holger Peters Date: Wed, 20 May 2020 09:07:08 +0200 Subject: gnu: Add python-plaster-pastedeploy. * gnu/packages/python-web.scm (python-plaster-pastedeploy): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-web.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index adc68f48c7..ddd94c09cb 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3923,3 +3923,27 @@ basic API that applications may use to find and load configuration settings. Any specific constraints should be implemented in a pluggable loader which can be registered via an entrypoint.") (license license:repoze))) + +(define-public python-plaster-pastedeploy + (package + (name "python-plaster-pastedeploy") + (version "0.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "plaster_pastedeploy" version)) + (sha256 + (base32 + "1zg7gcsvc1kzay1ry5p699rg2qavfsxqwl17mqxzr0gzw6j9679r")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-plaster" ,python-plaster) + ("python-pastedeploy" ,python-pastedeploy))) + (home-page "https://github.com/Pylons/plaster_pastedeploy") + (synopsis "Plugin for python-plaster adding PasteDeploy syntax") + (description + "This plugin for @code{python-plaster} adds support for PasteDeploy +syntax, it provides a plaster @code{Loader} object that can parse ini files +according to the standard set by PasteDeploy ") + (license license:expat))) -- cgit v1.2.3 From 8bfc0512da448007ae7c0688802d4dc8bf27fa61 Mon Sep 17 00:00:00 2001 From: Holger Peters Date: Wed, 20 May 2020 09:07:09 +0200 Subject: gnu: Add python-hupper. * gnu/packages/python-web.scm (python-hupper): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-web.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ddd94c09cb..604c59c083 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3947,3 +3947,31 @@ be registered via an entrypoint.") syntax, it provides a plaster @code{Loader} object that can parse ini files according to the standard set by PasteDeploy ") (license license:expat))) + +(define-public python-hupper + (package + (name "python-hupper") + (version "1.10.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "hupper" version)) + (sha256 + (base32 + "0am0p6g5cz6xmcaf04xq8q6dzdd9qz0phj6gcmpsckf2mcyza61q")))) + (build-system python-build-system) + (arguments '(#:test-target "pytest")) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner) + ("python-watchdog" ,python-watchdog) + ("python-mock" ,python-mock) + ("python-pytest-cov" ,python-pytest-cov))) + (propagated-inputs + `(("python-pytz" ,python-pytz))) + (home-page "https://readthedocs.org/projects/hupper") + (synopsis "Integrated process monitor tracking changes to imported Python files") + (description + "Hupper is an integrated process monitor that will track changes to any +imported Python files in sys.modules as well as custom paths. When files are +changed the process is restarted.") + (license license:expat))) -- cgit v1.2.3 From 90f44ee4967c6d387e82abf88fd2c39d94415daf Mon Sep 17 00:00:00 2001 From: Holger Peters Date: Wed, 20 May 2020 09:07:10 +0200 Subject: gnu: Add python-pyramid. * gnu/packages/python-web.scm (python-pyramid): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/python-web.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 604c59c083..05fd1599a1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3975,3 +3975,32 @@ according to the standard set by PasteDeploy ") imported Python files in sys.modules as well as custom paths. When files are changed the process is restarted.") (license license:expat))) + +(define-public python-pyramid + (package + (name "python-pyramid") + (version "1.10.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "pyramid" version)) + (sha256 + (base32 + "0rkxs1ajycg2zh1c94xlmls56mx5m161sn8112skj0amza6cn36q")))) + (build-system python-build-system) + (propagated-inputs + `(("python-hupper" ,python-hupper) + ("python-plaster-pastedeploy" ,python-plaster-pastedeploy) + ("python-translationstring" ,python-translationstring) + ("python-venusian" ,python-venusian) + ("python-webob" ,python-webob) + ("python-zope-deprecation" ,python-zope-deprecation) + ("python-zope-interface" ,python-zope-interface) + ("python-webtest" ,python-webtest) + ("python-zope-component" ,python-zope-component) + ("python-plaster" ,python-plaster))) + (home-page "https://trypyramid.com/") + (synopsis "Python web-framework suitable for small and large sites") + (description + "Pyramid makes it easy to write web applications. From minimal +request/response web apps to larger, grown applications.") + (license license:repoze))) -- cgit v1.2.3 From 42d41d86f38958ebcff370b0e56da5c69165943c Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 19 May 2020 15:31:21 +0200 Subject: gnu: Add emacs-vcsh. * gnu/packages/emacs-xyz.scm (emacs-vcsh): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 69786f335b..d952e8ea6c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14919,6 +14919,29 @@ repository, @code{magit-org-todos} will create a section in your Magit status buffer with each of your todos.") (license license:gpl3+)))) +(define-public emacs-vcsh + (package + (name "emacs-vcsh") + (version "0.4.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/stepnem/vcsh-el.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "183pffdiqb7qqmjq31wxl3fpv8qswqgg99gb716rddiyk15ysri7")))) + (build-system emacs-build-system) + (home-page "https://gitlab.com/stepnem/vcsh-el") + (synopsis "Emacs VCSH integration") + (description + "This library provides basic ``enter'' functionality and a few +convenience commands to initialize a @acronym{VCSH, Version Control System for +$HOME} repository and add files to it. It can be used in conjunction with +Magit.") + (license license:public-domain))) + (define-public emacs-f3 (package (name "emacs-f3") -- cgit v1.2.3 From 281d80d8e547fe663aaacb3226119166dd3100f9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Feb 2020 14:00:06 -0500 Subject: linux-boot: Refactor boot-system. The --root option can now be omitted, and inferred from the root file system declaration instead. * gnu/build/file-systems.scm (canonicalize-device-spec): Extend to support NFS directly, and... * gnu/build/linux-boot.scm (boot-system): ...remove NFS special casing from here. Remove nested definitions for root-fs-type, root-fs-flags and root-fs-options, and bind those inside the let* instead. Make "--root" take precedence over the device field string representation of the root file system. * doc/guix.texi (Initial RAM Disk): Document that "--root" can be left unspecified. --- doc/guix.texi | 7 +++--- gnu/build/file-systems.scm | 6 +++-- gnu/build/linux-boot.scm | 63 +++++++++++++++++++++------------------------- 3 files changed, 36 insertions(+), 40 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index eef5b703fe..4e02993771 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26534,9 +26534,10 @@ service activation programs and then spawns the GNU@tie{}Shepherd, the initialization system. @item --root=@var{root} -Mount @var{root} as the root file system. @var{root} can be a -device name like @code{/dev/sda1}, a file system label, or a file system -UUID. +Mount @var{root} as the root file system. @var{root} can be a device +name like @code{/dev/sda1}, a file system label, or a file system UUID. +When unspecified, the device name from the root file system of the +operating system declaration is used. @item --system=@var{system} Have @file{/run/booted-system} and @file{/run/current-system} point to diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index b920e8fc62..ad92d8a496 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -661,8 +661,10 @@ were found." (match spec ((? string?) - ;; Nothing to do, but wait until SPEC shows up. - (resolve identity spec identity)) + (if (string-contains spec ":/") + spec ; do not resolve NFS devices + ;; Nothing to do, but wait until SPEC shows up. + (resolve identity spec identity))) ((? file-system-label?) ;; Resolve the label. (resolve find-partition-by-label diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index c6f9df5f29..f08bb11514 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -498,25 +498,13 @@ upon error." (define (root-mount-point? fs) (string=? (file-system-mount-point fs) "/")) - (define root-fs-type - (or (any (lambda (fs) - (and (root-mount-point? fs) - (file-system-type fs))) - mounts) - "ext4")) - - (define root-fs-flags - (mount-flags->bit-mask (or (any (lambda (fs) - (and (root-mount-point? fs) - (file-system-flags fs))) - mounts) - '()))) - - (define root-fs-options - (any (lambda (fs) - (and (root-mount-point? fs) - (file-system-options fs))) - mounts)) + (define (device-string->file-system-device device-string) + ;; The "--root=SPEC" kernel command-line option always provides a + ;; string, but the string can represent a device, a UUID, or a + ;; label. So check for all three. + (cond ((string-prefix? "/" device-string) device-string) + ((uuid device-string) => identity) + (else (file-system-label device-string)))) (display "Welcome, this is GNU's early boot Guile.\n") (display "Use '--repl' for an initrd REPL.\n\n") @@ -526,7 +514,21 @@ upon error." (mount-essential-file-systems) (let* ((args (linux-command-line)) (to-load (find-long-option "--load" args)) - (root (find-long-option "--root" args))) + (root-fs (find root-mount-point? mounts)) + (root-fs-type (or (and=> root-fs file-system-type) + "ext4")) + (root-fs-device (and=> root-fs file-system-device)) + (root-fs-flags (mount-flags->bit-mask + (or (and=> root-fs file-system-flags) + '()))) + (root-options (if root-fs + (file-system-options root-fs) + #f)) + ;; --root takes precedence over the 'device' field of the root + ;; record. + (root-device (or (and=> (find-long-option "--root" args) + device-string->file-system-device) + root-fs-device))) (when (member "--repl" args) (start-repl)) @@ -561,21 +563,12 @@ upon error." (setenv "EXT2FS_NO_MTAB_OK" "1") - (if root - ;; The "--root=SPEC" kernel command-line option always provides a - ;; string, but the string can represent a device, a UUID, or a - ;; label. So check for all three. - (let ((device-spec (cond ((string-prefix? "/" root) root) - ((uuid root) => identity) - ((string-contains root ":/") #f) ; nfs - (else (file-system-label root))))) - (mount-root-file-system (if device-spec - (canonicalize-device-spec device-spec) - root) - root-fs-type - #:volatile-root? volatile-root? - #:flags root-fs-flags - #:options root-fs-options)) + (if root-device + (mount-root-file-system (canonicalize-device-spec root-device) + root-fs-type + #:volatile-root? volatile-root? + #:flags root-fs-flags + #:options root-options) (mount "none" "/root" "tmpfs")) ;; Mount the specified file systems. -- cgit v1.2.3 From fa35fb58c84d1c1741e4e63c0b37074e35ed2a61 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 25 Sep 2019 22:43:41 +0900 Subject: file-systems: Add helpers for parsing the options string into an alist. * gnu/system/file-systems.scm (file-system-options->alist) (alist->file-system-options): New procedures. * tests/file-systems.scm: New tests. * doc/guix.texi (File Systems): Add note about the newly added procedures. --- doc/guix.texi | 12 ++++++++---- gnu/system/file-systems.scm | 31 +++++++++++++++++++++++++++++++ tests/file-systems.scm | 19 +++++++++++++++++++ 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 4e02993771..05f2d595b2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11694,10 +11694,14 @@ update time on the in-memory version of the file inode), and Manual}, for more information on these flags. @item @code{options} (default: @code{#f}) -This is either @code{#f}, or a string denoting mount options passed to the -file system driver. @xref{Mount-Unmount-Remount,,, libc, The GNU C Library -Reference Manual}, for details and run @command{man 8 mount} for options for -various file systems. +This is either @code{#f}, or a string denoting mount options passed to +the file system driver. @xref{Mount-Unmount-Remount,,, libc, The GNU C +Library Reference Manual}, for details and run @command{man 8 mount} for +options for various file systems. Note that the +@code{file-system-options->alist} and @code{alist->file-system-options} +procedures from @code{(gnu system file-systems)} can be used to convert +file system options given as an association list to the string +representation, and vice-versa. @item @code{mount?} (default: @code{#t}) This value indicates whether to automatically mount the file system when diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index b41f66e943..07f272db7c 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +39,9 @@ file-system-needed-for-boot? file-system-flags file-system-options + file-system-options->alist + alist->file-system-options + file-system-mount? file-system-check? file-system-create-mount-point? @@ -251,6 +255,33 @@ UUID-TYPE, a symbol such as 'dce or 'iso9660." ((? string?) device))) +(define (file-system-options->alist string) + "Translate the option string format of a record into an +association list of options or option/value pairs." + (if string + (let ((options (string-split string #\,))) + (map (lambda (param) + (let ((=index (string-index param #\=))) + (if =index + (cons (string-take param =index) + (string-drop param (1+ =index))) + param))) + options)) + '())) + +(define (alist->file-system-options options) + "Return the string representation of OPTIONS, an association list. The +string obtained can be used as the option field of a record." + (if (null? options) + #f + (string-join (map (match-lambda + ((key . value) + (string-append key "=" value)) + (key + key)) + options) + ","))) + (define (file-system-needed-for-boot? fs) "Return true if FS has the 'needed-for-boot?' flag set, or if it holds the store--e.g., if FS is the root file system." diff --git a/tests/file-systems.scm b/tests/file-systems.scm index 4c28d0ebc5..41f1021067 100644 --- a/tests/file-systems.scm +++ b/tests/file-systems.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2017 Ludovic Courtès +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,4 +65,22 @@ (_ #f)) (source-module-closure '((gnu system file-systems))))) +(test-equal "file-system-options->alist" + '("autodefrag" ("subvol" . "home") ("compress" . "lzo")) + (file-system-options->alist "autodefrag,subvol=home,compress=lzo")) + +(test-equal "file-system-options->alist (#f)" + '() + (file-system-options->alist #f)) + +(test-equal "alist->file-system-options" + "autodefrag,subvol=root,compress=lzo" + (alist->file-system-options '("autodefrag" + ("subvol" . "root") + ("compress" . "lzo")))) + +(test-equal "alist->file-system-options (null)" + #f + (alist->file-system-options '())) + (test-end) -- cgit v1.2.3 From b460ba7992a0b4af2ddb5927dcf062784539ef7b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 14 Jul 2019 20:50:23 +0900 Subject: bootloader: grub: Allow booting from a Btrfs subvolume. * gnu/bootloader/grub.scm (strip-mount-point): Remove procedure. (normalize-file): Add procedure. (grub-configuration-file): New BTRFS-SUBVOLUME-FILE-NAME parameter. When defined, prepend its value to the kernel and initrd file names, using the NORMALIZE-FILE procedure. Adjust the call to EYE-CANDY to pass the BTRFS-SUBVOLUME-FILE-NAME argument. Normalize the KEYMAP file as well. (eye-candy): Add a BTRFS-SUBVOLUME-FILE-NAME parameter, and use it, along with the NORMALIZE-FILE procedure, to normalize the FONT-FILE and IMAGE nested variables. Adjust doc. * gnu/bootloader/depthcharge.scm (depthcharge-configuration-file): Adapt. * gnu/bootloader/extlinux.scm (extlinux-configuration-file): Likewise. * gnu/system/file-systems.scm (btrfs-subvolume?) (btrfs-store-subvolume-file-name): New procedures. * gnu/system.scm (operating-system-bootcfg): Specify the Btrfs subvolume file name the store resides on to the `operating-system-bootcfg' procedure, using the new BTRFS-SUBVOLUME-FILE-NAME argument. * doc/guix.texi (File Systems): Add a Btrfs subsection to document the use of subvolumes. * gnu/tests/install.scm (%btrfs-root-on-subvolume-os) (%btrfs-root-on-subvolume-os-source) (%btrfs-root-on-subvolume-installation-script) (%test-btrfs-root-on-subvolume-os): New variables. --- doc/guix.texi | 104 ++++++++++++++++++++++++++++++++++ gnu/bootloader/depthcharge.scm | 3 +- gnu/bootloader/extlinux.scm | 3 +- gnu/bootloader/grub.scm | 123 +++++++++++++++++++++++++---------------- gnu/system.scm | 9 ++- gnu/system/file-systems.scm | 55 ++++++++++++++++++ gnu/tests/install.scm | 94 +++++++++++++++++++++++++++++++ tests/file-systems.scm | 45 +++++++++++++++ 8 files changed, 385 insertions(+), 51 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 05f2d595b2..216422fe31 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11782,6 +11782,110 @@ and unmount user-space FUSE file systems. This requires the @code{fuse.ko} kernel module to be loaded. @end defvr +@node Btrfs file system +@subsection Btrfs file system + +The Btrfs has special features, such as subvolumes, that merit being +explained in more details. The following section attempts to cover +basic as well as complex uses of a Btrfs file system with the Guix +System. + +In its simplest usage, a Btrfs file system can be described, for +example, by: + +@lisp +(file-system + (mount-point "/home") + (type "btrfs") + (device (file-system-label "my-home"))) +@end lisp + +The example below is more complex, as it makes use of a Btrfs +subvolume, named @code{rootfs}. The parent Btrfs file system is labeled +@code{my-btrfs-pool}, and is located on an encrypted device (hence the +dependency on @code{mapped-devices}): + +@lisp +(file-system + (device (file-system-label "my-btrfs-pool")) + (mount-point "/") + (type "btrfs") + (options "subvol=rootfs") + (dependencies mapped-devices)) +@end lisp + +Some bootloaders, for example GRUB, only mount a Btrfs partition at its +top level during the early boot, and rely on their configuration to +refer to the correct subvolume path within that top level. The +bootloaders operating in this way typically produce their configuration +on a running system where the Btrfs partitions are already mounted and +where the subvolume information is readily available. As an example, +@command{grub-mkconfig}, the configuration generator command shipped +with GRUB, reads @file{/proc/self/mountinfo} to determine the top-level +path of a subvolume. + +The Guix System produces a bootloader configuration using the operating +system configuration as its sole input; it is therefore necessary to +extract the subvolume name on which @file{/gnu/store} lives (if any) +from that operating system configuration. To better illustrate, +consider a subvolume named 'rootfs' which contains the root file system +data. In such situation, the GRUB bootloader would only see the top +level of the root Btrfs partition, e.g.: + +@example +/ (top level) +├── rootfs (subvolume directory) + ├── gnu (normal directory) + ├── store (normal directory) +[...] +@end example + +Thus, the subvolume name must be prepended to the @file{/gnu/store} path +of the kernel, initrd binaries and any other files referred to in the +GRUB configuration that must be found during the early boot. + +The next example shows a nested hierarchy of subvolumes and +directories: + +@example +/ (top level) +├── rootfs (subvolume) + ├── gnu (normal directory) + ├── store (subvolume) +[...] +@end example + +This scenario would work without mounting the 'store' subvolume. +Mounting 'rootfs' is sufficient, since the subvolume name matches its +intended mount point in the file system hierarchy. Alternatively, the +'store' subvolume could be referred to by setting the @code{subvol} +option to either @code{/rootfs/gnu/store} or @code{rootfs/gnu/store}. + +Finally, a more contrived example of nested subvolumes: + +@example +/ (top level) +├── root-snapshots (subvolume) + ├── root-current (subvolume) + ├── guix-store (subvolume) +[...] +@end example + +Here, the 'guix-store' subvolume doesn't match its intended mount point, +so it is necessary to mount it. The subvolume must be fully specified, +by passing its file name to the @code{subvol} option. To illustrate, +the 'guix-store' subvolume could be mounted on @file{/gnu/store} by using +a file system declaration such as: + +@lisp +(file-system + (device (file-system-label "btrfs-pool-1")) + (mount-point "/gnu/store") + (type "btrfs") + (options "subvol=root-snapshots/root-current/guix-store,\ +compress-force=zstd,space_cache=v2")) +@end lisp + @node Mapped Devices @section Mapped Devices diff --git a/gnu/bootloader/depthcharge.scm b/gnu/bootloader/depthcharge.scm index 58cc3f3932..0a50374bd9 100644 --- a/gnu/bootloader/depthcharge.scm +++ b/gnu/bootloader/depthcharge.scm @@ -82,7 +82,8 @@ (define* (depthcharge-configuration-file config entries #:key (system (%current-system)) - (old-entries '())) + (old-entries '()) + #:allow-other-keys) (match entries ((entry) (let ((kernel (menu-entry-linux entry)) diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm index 5b4dd84965..6b5ff298e7 100644 --- a/gnu/bootloader/extlinux.scm +++ b/gnu/bootloader/extlinux.scm @@ -28,7 +28,8 @@ (define* (extlinux-configuration-file config entries #:key (system (%current-system)) - (old-entries '())) + (old-entries '()) + #:allow-other-keys) "Return the U-Boot configuration file corresponding to CONFIG, a object, and where the store is available at STORE-FS, a object. OLD-ENTRIES is taken to be a list of menu entries diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index fb871c6e96..bb40c551a7 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -58,18 +58,29 @@ ;;; ;;; Code: -(define (strip-mount-point mount-point file) - "Strip MOUNT-POINT from FILE, which is a gexp or other lowerable object -denoting a file name." - (match mount-point - ((? string? mount-point) - (if (string=? mount-point "/") - file - #~(let ((file #$file)) - (if (string-prefix? #$mount-point file) - (substring #$file #$(string-length mount-point)) - file)))) - (#f file))) +(define* (normalize-file file mount-point btrfs-subvolume-file-name) + "Strip MOUNT-POINT and prepend BTRFS-SUBVOLUME-FILE-NAME to FILE, a +G-expression or other lowerable object denoting a file name." + + (define (strip-mount-point mount-point file) + (if mount-point + (if (string=? mount-point "/") + file + #~(let ((file #$file)) + (if (string-prefix? #$mount-point file) + (substring #$file #$(string-length mount-point)) + file))) + file)) + + (define (prepend-btrfs-subvolume-file-name btrfs-subvolume-file-name file) + (if btrfs-subvolume-file-name + #~(string-append #$btrfs-subvolume-file-name #$file) + file)) + + (prepend-btrfs-subvolume-file-name btrfs-subvolume-file-name + (strip-mount-point mount-point file))) + + (define-record-type* ;; Default theme contributed by Felipe López. @@ -124,13 +135,14 @@ file with the resolution provided in CONFIG." (_ #f))))) (define* (eye-candy config store-device store-mount-point - #:key system port) - "Return a gexp that writes to PORT (a port-valued gexp) the -'grub.cfg' part concerned with graphics mode, background images, colors, and -all that. STORE-DEVICE designates the device holding the store, and -STORE-MOUNT-POINT is its mount point; these are used to determine where the -background image and fonts must be searched for. SYSTEM must be the target -system string---e.g., \"x86_64-linux\"." + #:key btrfs-store-subvolume-file-name system port) + "Return a gexp that writes to PORT (a port-valued gexp) the 'grub.cfg' part +concerned with graphics mode, background images, colors, and all that. +STORE-DEVICE designates the device holding the store, and STORE-MOUNT-POINT is +its mount point; these are used to determine where the background image and +fonts must be searched for. SYSTEM must be the target system string---e.g., +\"x86_64-linux\". BTRFS-STORE-SUBVOLUME-FILE-NAME is the file name of the +Btrfs subvolume, to be prepended to any store path, if any." (define setup-gfxterm-body (let ((gfxmode (or (and-let* ((theme (bootloader-configuration-theme config)) @@ -167,11 +179,14 @@ fi~%" #+font-file) (symbol->string (assoc-ref colors 'bg))))) (define font-file - (strip-mount-point store-mount-point - (file-append grub "/share/grub/unicode.pf2"))) + (normalize-file (file-append grub "/share/grub/unicode.pf2") + store-mount-point + btrfs-store-subvolume-file-name)) (define image - (grub-background-image config)) + (normalize-file (grub-background-image config) + store-mount-point + btrfs-store-subvolume-file-name)) (and image #~(format #$port " @@ -196,7 +211,7 @@ fi~%" #$(setup-gfxterm config font-file) #$(grub-setup-io config) - #$(strip-mount-point store-mount-point image) + #$image #$(theme-colors grub-theme-color-normal) #$(theme-colors grub-theme-color-highlight)))) @@ -304,52 +319,66 @@ code." (define* (grub-configuration-file config entries #:key (system (%current-system)) - (old-entries '())) + (old-entries '()) + btrfs-subvolume-file-name) "Return the GRUB configuration file corresponding to CONFIG, a object, and where the store is available at -STORE-FS, a object. OLD-ENTRIES is taken to be a list of menu -entries corresponding to old generations of the system." +STORE-FS, a object. OLD-ENTRIES is taken to be a list +of menu entries corresponding to old generations of the system. +BTRFS-SUBVOLUME-FILE-NAME may be used to specify on which subvolume a +Btrfs root file system resides." (define all-entries (append entries (bootloader-configuration-menu-entries config))) (define (menu-entry->gexp entry) - (let ((device (menu-entry-device entry)) - (device-mount-point (menu-entry-device-mount-point entry)) - (label (menu-entry-label entry)) - (kernel (menu-entry-linux entry)) - (arguments (menu-entry-linux-arguments entry)) - (initrd (menu-entry-initrd entry))) + (let* ((device (menu-entry-device entry)) + (device-mount-point (menu-entry-device-mount-point entry)) + (label (menu-entry-label entry)) + (arguments (menu-entry-linux-arguments entry)) + (kernel (normalize-file (menu-entry-linux entry) + device-mount-point + btrfs-subvolume-file-name)) + (initrd (normalize-file (menu-entry-initrd entry) + device-mount-point + btrfs-subvolume-file-name))) ;; Here DEVICE is the store and DEVICE-MOUNT-POINT is its mount point. ;; Use the right file names for KERNEL and INITRD in case ;; DEVICE-MOUNT-POINT is not "/", meaning that the store is on a ;; separate partition. - (let ((kernel (strip-mount-point device-mount-point kernel)) - (initrd (strip-mount-point device-mount-point initrd))) - #~(format port "menuentry ~s { + + ;; When BTRFS-SUBVOLUME-FILE-NAME is defined, prepend it the kernel and + ;; initrd paths, to allow booting from a Btrfs subvolume. + #~(format port "menuentry ~s { ~a linux ~a ~a initrd ~a }~%" - #$label - #$(grub-root-search device kernel) - #$kernel (string-join (list #$@arguments)) - #$initrd)))) + #$label + #$(grub-root-search device kernel) + #$kernel (string-join (list #$@arguments)) + #$initrd))) (define sugar (eye-candy config (menu-entry-device (first all-entries)) (menu-entry-device-mount-point (first all-entries)) + #:btrfs-store-subvolume-file-name btrfs-subvolume-file-name #:system system #:port #~port)) (define keyboard-layout-config - (let ((layout (bootloader-configuration-keyboard-layout config)) - (grub (bootloader-package - (bootloader-configuration-bootloader config)))) - #~(let ((keymap #$(and layout - (keyboard-layout-file layout #:grub grub)))) - (when keymap - (format port "\ + (let* ((layout (bootloader-configuration-keyboard-layout config)) + (grub (bootloader-package + (bootloader-configuration-bootloader config))) + (keymap* (and layout + (keyboard-layout-file layout #:grub grub))) + (keymap (and keymap* + (if btrfs-subvolume-file-name + #~(string-append #$btrfs-subvolume-file-name + #$keymap*) + keymap*)))) + #~(when #$keymap + (format port "\ insmod keylayouts -keymap ~a~%" keymap))))) +keymap ~a~%" #$keymap)))) (define builder #~(call-with-output-file #$output diff --git a/gnu/system.scm b/gnu/system.scm index cd75e4d4ba..d929187695 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Danny Milosavljevic ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Florian Pelz +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -1102,19 +1103,23 @@ entry." (define* (operating-system-bootcfg os #:optional (old-entries '())) "Return the bootloader configuration file for OS. Use OLD-ENTRIES, a list of , to populate the \"old entries\" menu." - (let* ((root-fs (operating-system-root-file-system os)) + (let* ((file-systems (operating-system-file-systems os)) + (root-fs (operating-system-root-file-system os)) (root-device (file-system-device root-fs)) (params (operating-system-boot-parameters os root-device #:system-kernel-arguments? #t)) (entry (boot-parameters->menu-entry params)) (bootloader-conf (operating-system-bootloader os))) + (define generate-config-file (bootloader-configuration-file-generator (bootloader-configuration-bootloader bootloader-conf))) (generate-config-file bootloader-conf (list entry) - #:old-entries old-entries))) + #:old-entries old-entries + #:btrfs-subvolume-file-name + (btrfs-store-subvolume-file-name file-systems)))) (define* (operating-system-boot-parameters os root-device #:key system-kernel-arguments?) diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 07f272db7c..0f94577760 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -22,7 +22,10 @@ #:use-module (ice-9 match) #:use-module (rnrs bytevectors) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-2) #:use-module (srfi srfi-9) + #:use-module (srfi srfi-26) + #:use-module (srfi srfi-35) #:use-module (srfi srfi-9 gnu) #:use-module (guix records) #:use-module (gnu system uuid) @@ -49,6 +52,8 @@ file-system-location file-system-type-predicate + btrfs-subvolume? + btrfs-store-subvolume-file-name file-system-label file-system-label? @@ -566,4 +571,54 @@ system has the given TYPE." (lambda (fs) (string=? (file-system-type fs) type))) + +;;; +;;; Btrfs specific helpers. +;;; + +(define (btrfs-subvolume? fs) + "Predicate to check if FS, a file-system object, is a Btrfs subvolume." + (and-let* ((btrfs-file-system? (string= "btrfs" (file-system-type fs))) + (option-keys (map (match-lambda + ((key . value) key) + (key key)) + (file-system-options->alist + (file-system-options fs))))) + (find (cut string-prefix? "subvol" <>) option-keys))) + +(define (btrfs-store-subvolume-file-name file-systems) + "Return the subvolume file name within the Btrfs top level onto which the +store is located, else #f." + + (define (prepend-slash/maybe s) + (if (string=? "/" (string-take s 1)) + s + (string-append "/" s))) + + (define (file-name-depth file-name) + (length (string-tokenize file-name %not-slash))) + + (and-let* ((btrfs-subvolume-fs (filter btrfs-subvolume? file-systems)) + (btrfs-subvolume-fs* + (sort btrfs-subvolume-fs + (lambda (fs1 fs2) + (> (file-name-depth (file-system-mount-point fs1)) + (file-name-depth (file-system-mount-point fs2)))))) + (store-subvolume-fs + (find (lambda (fs) (file-prefix? (file-system-mount-point fs) + (%store-prefix))) + btrfs-subvolume-fs*)) + (options (file-system-options->alist + (file-system-options store-subvolume-fs)))) + ;; XXX: Deriving the subvolume name based from a subvolume ID is not + ;; supported, as we'd need to query the actual file system. + (or (and=> (assoc-ref options "subvol") prepend-slash/maybe) + ;; FIXME: Use &fix-hint once it no longer pulls in (guix utils). + (raise (condition + (&message + (message "The store is on a Btrfs subvolume, but the \ +subvolume name is unknown. +Hint: Use the \"subvol\" Btrfs file system option."))))))) + + ;;; file-systems.scm ends here diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 94d970e1cc..cea26c8ef3 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -61,6 +61,7 @@ %test-raid-root-os %test-encrypted-root-os %test-btrfs-root-os + %test-btrfs-root-on-subvolume-os %test-jfs-root-os %test-f2fs-root-os @@ -863,6 +864,99 @@ build (current-guix) and then store a couple of full system images.") (command (qemu-command/writable-image image))) (run-basic-test %btrfs-root-os command "btrfs-root-os"))))) + +;;; +;;; Btrfs root file system on a subvolume. +;;; + +(define-os-with-source (%btrfs-root-on-subvolume-os + %btrfs-root-on-subvolume-os-source) + ;; The OS we want to install. + (use-modules (gnu) (gnu tests) (srfi srfi-1)) + + (operating-system + (host-name "hurd") + (timezone "America/Montreal") + (locale "en_US.UTF-8") + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) + (kernel-arguments '("console=ttyS0")) + (file-systems (cons* (file-system + (device (file-system-label "btrfs-pool")) + (mount-point "/") + (options "subvol=rootfs,compress=zstd") + (type "btrfs")) + (file-system + (device (file-system-label "btrfs-pool")) + (mount-point "/home") + (options "subvol=homefs,compress=lzo") + (type "btrfs")) + %base-file-systems)) + (users (cons (user-account + (name "charlie") + (group "users") + (supplementary-groups '("wheel" "audio" "video"))) + %base-user-accounts)) + (services (cons (service marionette-service-type + (marionette-configuration + (imported-modules '((gnu services herd) + (guix combinators))))) + %base-services)))) + +(define %btrfs-root-on-subvolume-installation-script + ;; Shell script of a simple installation. + "\ +. /etc/profile +set -e -x +guix --version + +export GUIX_BUILD_OPTIONS=--no-grafts +ls -l /run/current-system/gc-roots +parted --script /dev/vdb mklabel gpt \\ + mkpart primary ext2 1M 3M \\ + mkpart primary ext2 3M 2G \\ + set 1 boot on \\ + set 1 bios_grub on + +# Setup the top level Btrfs file system with its subvolume. +mkfs.btrfs -L btrfs-pool /dev/vdb2 +mount /dev/vdb2 /mnt +btrfs subvolume create /mnt/rootfs +btrfs subvolume create /mnt/homefs +umount /dev/vdb2 + +# Mount the subvolumes, ready for installation. +mount LABEL=btrfs-pool -o 'subvol=rootfs,compress=zstd' /mnt +mkdir /mnt/home +mount LABEL=btrfs-pool -o 'subvol=homefs,compress=zstd' /mnt/home + +herd start cow-store /mnt +mkdir /mnt/etc +cp /etc/target-config.scm /mnt/etc/config.scm +guix system build /mnt/etc/config.scm +guix system init /mnt/etc/config.scm /mnt --no-substitutes +sync +reboot\n") + +(define %test-btrfs-root-on-subvolume-os + (system-test + (name "btrfs-root-on-subvolume-os") + (description + "Test basic functionality of an OS installed like one would do by hand. +This test is expensive in terms of CPU and storage usage since we need to +build (current-guix) and then store a couple of full system images.") + (value + (mlet* %store-monad + ((image + (run-install %btrfs-root-on-subvolume-os + %btrfs-root-on-subvolume-os-source + #:script + %btrfs-root-on-subvolume-installation-script)) + (command (qemu-command/writable-image image))) + (run-basic-test %btrfs-root-on-subvolume-os command + "btrfs-root-on-subvolume-os"))))) + ;;; ;;; JFS root file system. diff --git a/tests/file-systems.scm b/tests/file-systems.scm index 41f1021067..7f7c373884 100644 --- a/tests/file-systems.scm +++ b/tests/file-systems.scm @@ -83,4 +83,49 @@ #f (alist->file-system-options '())) + +;;; +;;; Btrfs related. +;;; + +(define %btrfs-root-subvolume + (file-system + (device (file-system-label "btrfs-pool")) + (mount-point "/") + (type "btrfs") + (options "subvol=rootfs,compress=zstd"))) + +(define %btrfs-store-subvolid + (file-system + (device (file-system-label "btrfs-pool")) + (mount-point "/gnu/store") + (type "btrfs") + (options "subvolid=10,compress=zstd") + (dependencies (list %btrfs-root-subvolume)))) + +(define %btrfs-store-subvolume + (file-system + (device (file-system-label "btrfs-pool")) + (mount-point "/gnu/store") + (type "btrfs") + (options "subvol=/some/nested/file/name") + (dependencies (list %btrfs-root-subvolume)))) + +(test-assert "btrfs-subvolume? (subvol)" + (btrfs-subvolume? %btrfs-root-subvolume)) + +(test-assert "btrfs-subvolume? (subvolid)" + (btrfs-subvolume? %btrfs-store-subvolid)) + +(test-equal "btrfs-store-subvolume-file-name" + "/some/nested/file/name" + (parameterize ((%store-prefix "/gnu/store")) + (btrfs-store-subvolume-file-name (list %btrfs-root-subvolume + %btrfs-store-subvolume)))) + +(test-error "btrfs-store-subvolume-file-name (subvolid)" + (parameterize ((%store-prefix "/gnu/store")) + (btrfs-store-subvolume-file-name (list %btrfs-root-subvolume + %btrfs-store-subvolid)))) + (test-end) -- cgit v1.2.3 From 489699c45676978fed745b9f1de723e73f7535ed Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 20 May 2020 08:25:31 -0400 Subject: news: Add entry for Btrfs subvolume boot support. * etc/news.scm: Add entry. --- etc/news.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index 898f07a45c..e059504d6a 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -11,6 +11,21 @@ (channel-news (version 0) + (entry (commit "b460ba7992a0b4af2ddb5927dcf062784539ef7b") + (title (en "Add support to boot from a Btrfs subvolume") + (fr "Ajout du support pour démarrer depuis un sous-volume Btrfs")) + (body + (en "The generation of the GRUB configuration file produced from an +operating system declaration now takes into account the use of a Btrfs +subvolume for the partition holding @file{/gnu/store}. Run the command +@command{info \"(guix) Btrfs file system\"} for more information and +examples." + (fr "La génération du fichier de configuration de GRUB produite à +partir de la déclaration d'un @code{operating-system} tient maintenant compte +de l'utilisation d'un sous-volume Btrfs pour la partition contenant +@file{/gnu/store}. Exécutez la commande @command{info\"(guix) Btrfs file +system\"} pour des exemples et plus d'information."))) + (entry (commit "6456232164890dbf5aa20394ee24637feb4b7b9e") (title (en "@command{guix pack -RR} introduces a new execution engine") -- cgit v1.2.3 From 1271c14f65eb926f3fc0fb0eaebbb7e32b5f9822 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 20 May 2020 08:40:18 -0400 Subject: news: Update copyright. * etc/news.scm: Update copyright, as a follow-up to 489699c456. --- etc/news.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/news.scm b/etc/news.scm index e059504d6a..bb42cdd48c 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -3,6 +3,7 @@ ;; Copyright © 2019, 2020 Ludovic Courtès ;; Copyright © 2020 Mathieu Othacehe ;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;; Copyright © 2020 Maxim Cournoyer ;; ;; Copying and distribution of this file, with or without modification, are ;; permitted in any medium without royalty provided the copyright notice and -- cgit v1.2.3 From 12df6684b983507b2a73e14f45d28a71cddfb3b1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 20 May 2020 09:00:05 -0400 Subject: news: Add missing closing parentheses. This broke 'guix pull'. Apologies! * etc/news.scm: Fix the latest entry. --- etc/news.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/news.scm b/etc/news.scm index bb42cdd48c..1ba7598073 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -20,12 +20,12 @@ operating system declaration now takes into account the use of a Btrfs subvolume for the partition holding @file{/gnu/store}. Run the command @command{info \"(guix) Btrfs file system\"} for more information and -examples." +examples.") (fr "La génération du fichier de configuration de GRUB produite à partir de la déclaration d'un @code{operating-system} tient maintenant compte de l'utilisation d'un sous-volume Btrfs pour la partition contenant @file{/gnu/store}. Exécutez la commande @command{info\"(guix) Btrfs file -system\"} pour des exemples et plus d'information."))) +system\"} pour des exemples et plus d'information.")))) (entry (commit "6456232164890dbf5aa20394ee24637feb4b7b9e") (title (en "@command{guix pack -RR} introduces a new execution -- cgit v1.2.3 From 76899e9285516ff875114f52f0d45a4c19bd52b2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 17:21:38 +0200 Subject: gnu: perl-db-file: Update to 1.853. * gnu/packages/databases.scm (perl-db-file): Update to 1.853. --- gnu/packages/databases.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f563ae8b5d..9caa2384b2 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2049,17 +2049,14 @@ database.") (define-public perl-db-file (package (name "perl-db-file") - (version "1.852") + (version "1.853") (source (origin (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/P/PM/PMQS/DB_File-" - version - ".tar.gz")) + (uri (string-append "mirror://cpan/authors/id/P/PM/PMQS/DB_File-" + version ".tar.gz")) (sha256 - (base32 - "14c30xyqx9c1hxw40bqbzls41al8gmklxv5jbk2kknmn4dsrbdrs")))) + (base32 "1y967si45vj0skip1hnhicbv9da29fv6qcfwnsbnvj06n36mkj6h")))) (build-system perl-build-system) (inputs `(("bdb" ,bdb))) (native-inputs `(("perl-test-pod" ,perl-test-pod))) -- cgit v1.2.3 From d0ed680b24e1daa965d3ec3bb0853c3682d21f69 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 17:21:51 +0200 Subject: gnu: perl-dbi: Update to 1.643. * gnu/packages/databases.scm (perl-dbi): Update to 1.643. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9caa2384b2..d86d9b99f1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1459,7 +1459,7 @@ extremely small.") (define-public perl-dbi (package (name "perl-dbi") - (version "1.642") + (version "1.643") (source (origin (method url-fetch) (uri (string-append @@ -1467,7 +1467,7 @@ extremely small.") version ".tar.gz")) (sha256 (base32 - "0pbzqazrx7pnw4nbyaf27in4b6yddkirbd2ws7mnqa2n7812a81z")))) + "1yinx39960y241vf2sknxj0dfz82a5m9gvklq5rw78k0nlyrjawa")))) (build-system perl-build-system) (synopsis "Database independent interface for Perl") (description "This package provides an database interface for Perl.") -- cgit v1.2.3 From 26aa1fd2303d6469627f3d3158f4982cbc73d2b1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 18:32:54 +0200 Subject: gnu: perl-dbd-sqlite: Update to 1.64. * gnu/packages/databases.scm (perl-dbd-sqlite): Update to 1.64. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d86d9b99f1..2489d3bb55 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1703,7 +1703,7 @@ columns, primary keys, unique constraints and relationships.") (define-public perl-dbd-sqlite (package (name "perl-dbd-sqlite") - (version "1.62") + (version "1.64") (source (origin (method url-fetch) (uri (string-append @@ -1711,7 +1711,7 @@ columns, primary keys, unique constraints and relationships.") version ".tar.gz")) (sha256 (base32 - "0p78ri1q6xpc1i98i6mlriv8n66iz8r5r11dlsknjm4y58rfz0mx")))) + "00gz5aw3xrr92lf9nfk0dhmy7a8jzmxhznddd9b0a8w4a1xqzbpl")))) (build-system perl-build-system) (inputs `(("sqlite" ,sqlite))) (propagated-inputs `(("perl-dbi" ,perl-dbi))) -- cgit v1.2.3 From b7dfd579c126104ccaeda1ab04ad4cf3f8021754 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 18:35:49 +0200 Subject: gnu: python-lmdb: Update to 0.98. * gnu/packages/databases.scm (python-lmdb): Update to 0.98. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 2489d3bb55..f54a931bf7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2379,13 +2379,13 @@ etc., and an SQL engine for performing simple SQL queries.") (define-public python-lmdb (package (name "python-lmdb") - (version "0.95") + (version "0.98") (source (origin (method url-fetch) (uri (pypi-uri "lmdb" version)) (sha256 (base32 - "0nx9f193gzl33r1lbqhb96h1igya7pz8wmahr8m9x5zgc05hal91")) + "027pgbdhhdcbwj53vrzr6a60gjhmz4s75gl3180fd4q8pwlbq986")) (modules '((guix build utils))) (snippet ;; Delete bundled lmdb source files. -- cgit v1.2.3 From 937b08b110e62de78a7d1d1072163cd2f4534677 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 18:36:41 +0200 Subject: gnu: python-lmdb: Remove Python 2 variant. * gnu/packages/databases.scm (python2-lmdb): Remove variable. --- gnu/packages/databases.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f54a931bf7..3b1b9ed366 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2421,9 +2421,6 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.") ;; but not actually needed on platforms currently supported by Guix. license:bsd-3)))) -(define-public python2-lmdb - (package-with-python2 python-lmdb)) - (define-public python-orator (package (name "python-orator") -- cgit v1.2.3 From 47253d4837f72dc912f08bdbcd657d968e6ef8ce Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 18:37:31 +0200 Subject: gnu: mame: Update to 0.221. * gnu/packages/emulators.scm (mame): Update to 0.221. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 85e2016e49..7fad8a775b 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1274,7 +1274,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.220") + (version "0.221") (source (origin (method git-fetch) @@ -1283,7 +1283,7 @@ play them on systems for which they were never designed!") (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 - (base32 "0x3yr195zi7xjr21p1c2l8c0vhg0a0af0mpz4i1w7q7r9krvcvz4")) + (base32 "07fl7alj9zlyb93i8lnn4706ndy3qiv0pjvwnwysk5rqa0r3463y")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit v1.2.3 From 5c30eb61d74034a1b7c188b8d7be7df0b926025f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 19:08:10 +0200 Subject: gnu: http-parser: Fix build [and guix pull] on armhf-linux. * gnu/packages/web.scm (http-parser)[source]: Add patch. * gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../http-parser-fix-assertion-on-armhf.patch | 39 ++++++++++++++++++++++ gnu/packages/web.scm | 24 +++++++------ 3 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2e12c5a873..8d737f211e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1081,6 +1081,7 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ + %D%/packages/patches/http-parser-fix-assertion-on-armhf.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hurd-cross.patch \ %D%/packages/patches/hplip-remove-imageprocessor.patch \ diff --git a/gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch b/gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch new file mode 100644 index 0000000000..79bd3e8dbc --- /dev/null +++ b/gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch @@ -0,0 +1,39 @@ +From: Tobias Geerinckx-Rice +Date: Wed, 20 May 2020 19:17:13 +0200 +Subject: [PATCH] gnu: http-client: Fix assertion on armhf-linux. + +Copied verbatim from [0] to fix guix pull[1] on ARM systems. + +[0]: https://github.com/nodejs/http-parser/pull/510 +[1]: https://issues.guix.gnu.org/40604 + +From 0e5868aebb9eb92b078d27bb2774c2154dc167e2 Mon Sep 17 00:00:00 2001 +From: Ben Noordhuis +Date: Thu, 30 Apr 2020 11:22:50 +0200 +Subject: [PATCH] Fix sizeof(http_parser) assert + +The result should be 32 on both 32 bits and 64 bits architectures +because of struct padding. + +Fixes: https://github.com/nodejs/http-parser/issues/507 +--- + test.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/test.c b/test.c +index 7983424..f60a84f 100644 +--- a/test.c ++++ b/test.c +@@ -4220,8 +4220,11 @@ main (void) + patch = version & 255; + printf("http_parser v%u.%u.%u (0x%06lx)\n", major, minor, patch, version); + ++ /* Should be 32 on both 32 bits and 64 bits architectures because of ++ * struct padding, see https://github.com/nodejs/http-parser/issues/507. ++ */ + printf("sizeof(http_parser) = %u\n", (unsigned int)sizeof(http_parser)); +- assert(sizeof(http_parser) == 4 + 4 + 8 + 2 + 2 + 4 + sizeof(void *)); ++ assert(sizeof(http_parser) == 32); + + //// API + test_preserve_data(); diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 285d2b3bf0..1851590628 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5917,24 +5917,26 @@ into your tests. It automatically starts up a HTTP server in a separate thread (method git-fetch) (uri (git-reference (url home-page) (commit (string-append "v" version)))) + (sha256 + (base32 + "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")) (file-name (git-file-name name version)) (patches - ;; When parsing URLs, treat an empty port (eg - ;; `http://hostname:/`) as if it were unspecified. This patch is - ;; applied to Fedora's http-parser and to libgit2's bundled version. - (list + (cons* (origin + ;; Treat an empty port (e.g. `http://hostname:/`) when parsing + ;; URLs as if no port were specified. This patch is applied + ;; to Fedora's http-parser and to libgit2's bundled version. (method url-fetch) (uri (string-append - "https://src.fedoraproject.org/rpms/http-parser/raw/" - "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/" - "f/0001-url-treat-empty-port-as-default.patch")) + "https://src.fedoraproject.org/rpms/http-parser/raw/" + "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/" + "f/0001-url-treat-empty-port-as-default.patch")) (sha256 (base32 - "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))))) - (sha256 - (base32 - "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")))) + "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))) + ;; A fix for . + (search-patches "http-parser-fix-assertion-on-armhf.patch"))))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From fa876b2cd08ba46e494c6df5abd3caa2ce96dc3e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 19:25:29 +0200 Subject: gnu: gnu-efi: Update to 3.0.12. * gnu/packages/efi.scm (gnu-efi): Update to 3.0.12. --- gnu/packages/efi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index d986913243..1aaf45f298 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -37,14 +37,14 @@ (define-public gnu-efi (package (name "gnu-efi") - (version "3.0.11") + (version "3.0.12") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gnu-efi/" "gnu-efi-" version ".tar.bz2")) (sha256 - (base32 "1ffnc4xbzfggs37ymrgfx76j56kk2644c081ivhr2bjkla9ag3gj")))) + (base32 "0sbn6am3k5lqafycggh1g964fcwjwnh0i9hhwrk4ncrwzphz55h1")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; none exist -- cgit v1.2.3 From 84c983f1657e1732e1279256489dd3903ce4af33 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 19:26:59 +0200 Subject: gnu: gnu-efi: Mark up description. * gnu/packages/efi.scm (gnu-efi)[description]: Use @acronym. --- gnu/packages/efi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 1aaf45f298..da00fdf932 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -54,8 +54,8 @@ (modify-phases %standard-phases (delete 'configure)))) (synopsis "EFI toolchain") - (description "This package provides an EFI (Extensible Firmware -Interface) toolchain for building programs that can run in the + (description "This package provides an @acronym{EFI, Extensible Firmware +Interface} toolchain for building programs that can run in the environment presented by Intel's EFI.") (home-page "https://directory.fsf.org/wiki/GNU_EFI") ;; Distribution is allowed only when accepting all those licenses. -- cgit v1.2.3 From 01f15b157eb14dff7e3f574d7d141bd74edf8dce Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 19:35:21 +0200 Subject: gnu: translate-shell: Update to 0.9.6.12. * gnu/packages/dictionaries.scm (translate-shell): Update to 0.9.6.12. --- gnu/packages/dictionaries.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 06ccfafb40..4f8c35d040 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -231,7 +231,7 @@ and a Python library.") (define-public translate-shell (package (name "translate-shell") - (version "0.9.6.11") + (version "0.9.6.12") (source (origin (method git-fetch) @@ -240,7 +240,7 @@ and a Python library.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "137fz3ahzf65hfqcs4k7hhrmfjlhlw7wr3gfsvk88bnyqkyw44sm")))) + (base32 "075vqnha21rhr1b61dim7dqlfwm1yffyzcaa83s36rpk9r5sddzx")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6b87881ce72451f5c72f50a1a37cb302f0a97700 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 20:02:46 +0200 Subject: gnu: libmanette: Update to 0.2.4. * gnu/packages/games.scm (libmanette): Update to 0.2.4. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 96726eaa78..111e1e0579 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6836,7 +6836,7 @@ when packaged in Blorb container files or optionally from individual files.") (define-public libmanette (package (name "libmanette") - (version "0.2.3") + (version "0.2.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libmanette/" @@ -6844,7 +6844,7 @@ when packaged in Blorb container files or optionally from individual files.") "libmanette-" version ".tar.xz")) (sha256 (base32 - "1zxh7jn2zg7hivmal5zxam6fxvjsd1w6hlw0m2kysk76b8anbw60")))) + "1xrc6rh73v5w3kbkflzv1yg8sbxk4wf06hfk95raxhxlssza9q2g")))) (build-system meson-build-system) (native-inputs `(("glib" ,glib "bin") ; for glib-compile-resources -- cgit v1.2.3 From ef91997a197b1e1f922db8f4e749c759ccbcff11 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 20:57:19 +0200 Subject: gnu: wmbattery: Update to 2.54. * gnu/packages/gnustep.scm (wmbattery): Update to 2.54. [native-inputs]: Remove autoconf & automake. --- gnu/packages/gnustep.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index ce68fc77ed..7a8a39eee3 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -158,7 +158,7 @@ interface. It is fast, feature rich, easy to configure, and easy to use.") (define-public wmbattery (package (name "wmbattery") - (version "2.51") + (version "2.54") (source (origin (method url-fetch) (uri (string-append @@ -166,7 +166,7 @@ interface. It is fast, feature rich, easy to configure, and easy to use.") version ".orig.tar.gz")) (sha256 (base32 - "084a3irxbmgms4bqaga80mlx9wgvlkx6d2w0ns939yrpfzg87laj")))) + "1r4n58mwkm69y1pjs7l64hg8r1lpndrzyrfl2rdgd4zi6v0jhyyw")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; no "check" target (inputs @@ -176,9 +176,7 @@ interface. It is fast, feature rich, easy to configure, and easy to use.") ("libxpm" ,libxpm) ("upower" ,upower))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "https://www.dockapps.net/wmbattery") (synopsis "Display laptop battery info") (description -- cgit v1.2.3 From ebf5e53c7d8f1d44d1efc7a7da8f529147d95389 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 21:18:06 +0200 Subject: news: Remove superfluous closing bracket. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/news.scm: Use an equal number of ‘(’s and ‘)’s. --- etc/news.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/news.scm b/etc/news.scm index 1ba7598073..a69140b547 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -25,7 +25,7 @@ examples.") partir de la déclaration d'un @code{operating-system} tient maintenant compte de l'utilisation d'un sous-volume Btrfs pour la partition contenant @file{/gnu/store}. Exécutez la commande @command{info\"(guix) Btrfs file -system\"} pour des exemples et plus d'information.")))) +system\"} pour des exemples et plus d'information."))) (entry (commit "6456232164890dbf5aa20394ee24637feb4b7b9e") (title (en "@command{guix pack -RR} introduces a new execution -- cgit v1.2.3 From 52c463a9ca0b591ef095c85e421867149135628d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 May 2020 21:24:51 +0200 Subject: news: Add ‘nl’ translation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/news.scm: Add an ‘nl’ ‘translation’. --- etc/news.scm | 11 +++++++++-- gnu/packages/gl.scm | 7 +++---- gnu/packages/xfce.scm | 8 ++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/etc/news.scm b/etc/news.scm index a69140b547..aace3eaa3c 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -1,6 +1,7 @@ ;; GNU Guix news, for use by 'guix pull'. ;; ;; Copyright © 2019, 2020 Ludovic Courtès +;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;; Copyright © 2020 Mathieu Othacehe ;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;; Copyright © 2020 Maxim Cournoyer @@ -14,7 +15,8 @@ (entry (commit "b460ba7992a0b4af2ddb5927dcf062784539ef7b") (title (en "Add support to boot from a Btrfs subvolume") - (fr "Ajout du support pour démarrer depuis un sous-volume Btrfs")) + (fr "Ajout du support pour démarrer depuis un sous-volume Btrfs") + (nl "Nieuwe ondersteuning voor het opstarten vanaf een Btrfs-subvolume")) (body (en "The generation of the GRUB configuration file produced from an operating system declaration now takes into account the use of a Btrfs @@ -25,7 +27,12 @@ examples.") partir de la déclaration d'un @code{operating-system} tient maintenant compte de l'utilisation d'un sous-volume Btrfs pour la partition contenant @file{/gnu/store}. Exécutez la commande @command{info\"(guix) Btrfs file -system\"} pour des exemples et plus d'information."))) +system\"} pour des exemples et plus d'information.") + (nl "Het opmaken van het GRUB-configuratiebestand op basis van +een @code{operating-system}-declaratie houdt nu rekening met het gebruik van +een Btrfs-subvolume voor de partitie die @file{/gnu/store} bevat. Voer +@command{info \"(guix) Btrfs file system\"} uit voor meer informatie en +voorbeelden."))) (entry (commit "6456232164890dbf5aa20394ee24637feb4b7b9e") (title (en "@command{guix pack -RR} introduces a new execution diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index e024dd2756..fdc361d761 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -775,7 +775,7 @@ and visualizations.") (define-public gl2ps (package (name "gl2ps") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) @@ -783,15 +783,14 @@ and visualizations.") "http://geuz.org/gl2ps/src/gl2ps-" version ".tgz")) (sha256 - (base32 - "1qpidkz8x3bxqf69hlhyz1m0jmfi9kq24fxsp7rq6wfqzinmxjq3")))) + (base32 "1sgzv547h7hrskb9qd0x5yp45kmhvibjwj2mfswv95lg070h074d")))) (build-system cmake-build-system) (inputs `(("libpng" ,libpng) ("mesa" ,mesa) ("zlib" ,zlib))) (arguments - `(#:tests? #f)) ;; no tests + `(#:tests? #f)) ; no tests (home-page "http://www.geuz.org/gl2ps/") (synopsis "OpenGL to PostScript printing library") (description "GL2PS is a C library providing high quality vector diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 61b64ef553..f447c4097d 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -120,15 +120,15 @@ Xfce Desktop Environment.") (define-public xfconf (package (name "xfconf") - (version "4.14.1") + (version "4.14.3") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" - name "/" (version-major+minor version) "/" - name "-" version ".tar.bz2")) + "xfconf/" (version-major+minor version) "/" + "xfconf-" version ".tar.bz2")) (sha256 (base32 - "0n8d55c98ff7wgwv3qa4g369sv4iasgm1w62zq10kq5f56iy14xq")))) + "00hcb96bw5ylfs9ppblchj8zv9026m3dlf7lnmgiq5f6xyh5542q")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From bbac3fff1dbec130479c7eb9a0600bd3d1d1a9c2 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Wed, 20 May 2020 16:02:21 -0500 Subject: gnu: git-remote-gcrypt: Update to 1.3. * gnu/packages/version-control.scm (git-remote-gcrypt): Update to 1.3. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 6f985bf84d..09ffd8f271 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2019 Jovany Leandro G.C ;;; Copyright © 2019 Kei Kebreau -;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2020 Roel Janssen ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 John D. Boy @@ -773,7 +773,7 @@ to lock down your entire repository.") (define-public git-remote-gcrypt (package (name "git-remote-gcrypt") - (version "1.0.3") + (version "1.3") (source (origin (method git-fetch) (uri (git-reference @@ -782,7 +782,7 @@ to lock down your entire repository.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1vay3204729c7wajgn3nxf0s0hzwpdrw14pl6kd8w2ss25gvw2k1")))) + "0n8fzvr6y0pxrbvkywlky2bd8jvi0ayp4n9hwi84l1ldmv4a40dh")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 72c785f95914c6a06bce4df5d180d129f06adae8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 10:21:47 +0200 Subject: gnu: Add ruby-deep-merge. * gnu/packages/ruby.scm (ruby-deep-merge): New public variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4ce42f90bf..adc5753fb4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3502,6 +3502,28 @@ URIs using the normal URI.parse method.") (home-page "https://github.com/dball/data_uri") (license license:expat))) +(define-public ruby-deep-merge + (package + (name "ruby-deep-merge") + (version "1.2.1") + (home-page "https://github.com/danielsdeleo/deep_merge") + ;; The Rubygem source does not contain the gemspec required for tests. + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0c9rk23ilhc0n4489y6lda2wzphpzh6ish6fahlbpjhxn82wb931")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-minitest" ,ruby-minitest))) + (synopsis "Recursively merge hashes") + (description + "Deep Merge is a set of utility functions for @code{Hash}. It permits +you to merge elements inside a hash together recursively.") + (license license:expat))) + (define-public ruby-git (package (name "ruby-git") -- cgit v1.2.3 From 955981534fecdc7eed133fffff198c7ce6347677 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 10:33:12 +0200 Subject: gnu: Add ruby-hocon. * gnu/packages/ruby.scm (ruby-hocon): New public variable. --- gnu/packages/ruby.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index adc5753fb4..8f003f8000 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3560,6 +3560,38 @@ and manipulate Git repositories by wrapping system calls to the git binary.") (home-page "https://github.com/schacon/ruby-git") (license license:expat))) +(define-public ruby-hocon + (package + (name "ruby-hocon") + (version "1.3.0") + (home-page "https://github.com/puppetlabs/ruby-hocon") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wz4cswjg3gs1y1bar7j4j88wjimfa9zhvy51jyi177i5dzax416")))) + (build-system ruby-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "rspec") + (format #t "test suite not run~%")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "HOCON config library") + (description + "This package provides Ruby support for the @acronym{HOCON, +Human-Optimized Config Object Notation} configuration file format. It +supports parsing and modifying HOCON and JSON files, and rendering parsed +objects back to a @code{String}.") + (license license:asl2.0))) + (define-public ruby-slop (package (name "ruby-slop") -- cgit v1.2.3 From e6483f8c65eba0f7348b700cfb810e82f94d129a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 11:50:25 +0200 Subject: gnu: Add ruby-wwtd. * gnu/packages/ruby.scm (ruby-wwtd): New public variable. --- gnu/packages/ruby.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8f003f8000..4570a54e7b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -9150,3 +9150,55 @@ which snapshots to consider and what files to include.") (home-page "https://github.com/hartator/wayback-machine-downloader") (license license:expat))) + +(define-public ruby-wwtd + (package + (name "ruby-wwtd") + (version "1.4.1") + (home-page "http://github.com/grosser/wwtd") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gw7vfnbb41cy67yw82zji3jkhfsgmzcgzaszm99ax77y18wclf2")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled library. + (delete-file "spec/rake-12.3.0.gem") + #t)))) + (build-system ruby-build-system) + (arguments + '(;; XXX: Tests need multiple versions of ruby, wants to run + ;; `bundle install`, etc. + #:tests? #f + #:phases (modify-phases %standard-phases + (replace 'replace-git-ls-files + (lambda _ + (substitute* "wwtd.gemspec" + (("git ls-files lib/ bin/`") + "find lib/ bin/ -type f |sort`")) + #t)) + (add-before 'check 'remove-version-constraints + (lambda _ + (delete-file "Gemfile.lock") + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "rspec" "spec/") + (format #t "test suite not run~%")) + #t))))) + (native-inputs + `(("ruby-bump" ,ruby-bump) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "Run @file{.travis.yml} files locally") + (description + "WWTD is a @dfn{Travis Simulator} that lets you run test matrices +defined in @file{.travis.yml} on your local machine, using @code{rvm}, +@code{rbenv}, or @code{chruby} to test different versions of Ruby.") + (license license:expat))) -- cgit v1.2.3 From def7908a59bbf27f5d660ebf79fe1cc7a0153133 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 12:38:59 +0200 Subject: gnu: Add ruby-single-cov. * gnu/packages/ruby.scm (ruby-single-cov): New public variable. --- gnu/packages/ruby.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4570a54e7b..b3e28261e0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4077,6 +4077,61 @@ invocation, and source and documentation browsing.") (home-page "https://pryrepl.org") (license license:expat))) +(define-public ruby-single-cov + (package + (name "ruby-single-cov") + (version "1.3.2") + (home-page "https://github.com/grosser/single_cov") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05qdzpcai1p23a120gb9bxkfl4y73k9hicx34ch2lsk31lgi9bl7")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "default" + #:phases (modify-phases %standard-phases + (replace 'replace-git-ls-files + (lambda _ + (substitute* "single_cov.gemspec" + (("`git ls-files lib/ bin/ MIT-LICENSE`") + "`find lib/ bin/ MIT-LICENSE -type f | sort`")) + #t)) + (add-before 'check 'remove-version-constraints + (lambda _ + (delete-file "Gemfile.lock") + #t)) + (add-before 'check 'make-files-writable + (lambda _ + ;; Tests need to create local directories and open files + ;; with write permissions. + (for-each make-file-writable + (find-files "specs" #:directories? #t)) + #t)) + (add-before 'check 'disable-failing-test + (lambda _ + ;; XXX: This test copies assets from minitest, but can + ;; not cope with the files being read-only. Just skip + ;; it for now. + (substitute* "specs/single_cov_spec.rb" + (("it \"complains when coverage is bad\"") + "xit \"complains when coverage is bad\"")) + #t))))) + (native-inputs + `(("ruby-bump" ,ruby-bump) + ("ruby-minitest" ,ruby-minitest) + ("ruby-rspec" ,ruby-rspec) + ("ruby-simplecov" ,ruby-simplecov))) + (synopsis "Code coverage reporting tool") + (description + "This package provides actionable code coverage reports for Ruby +projects. It has very little overhead and can be easily integrated with +development tools to catch coverage problems early.") + (license license:expat))) + (define-public ruby-guard (package (name "ruby-guard") -- cgit v1.2.3 From 2fc3cc244a16f641079cdfb758e37c8a3b8e2ed4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 16:56:00 +0200 Subject: gnu: ruby-mocha: Update to 1.11.2. * gnu/packages/ruby.scm (ruby-mocha): Update to 1.11.2. [arguments]: Remove obsolete phases. Add phase to solve a dependency cycle. [native-inputs]: Remove BUNDLER, RUBY-YARD, RUBY-TEST-UNIT, and RUBY-REDCARPET. * gnu/packages/rails.scm (ruby-web-console)[arguments]: Remove workaround for old Mocha version. --- gnu/packages/rails.scm | 6 ------ gnu/packages/ruby.scm | 48 +++++++++++------------------------------------- 2 files changed, 11 insertions(+), 43 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index f77c153197..2fc7f0a113 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -555,12 +555,6 @@ application bootup, plugins, generators, and Rake tasks.") ;; tzinfo-data is propagated by ruby-activesupport, but it ;; needs to be in the Gemfile to become available. (("group :test do") "group :test do\n gem 'tzinfo-data'")) - #t)) - (add-after 'unpack 'fix-mocha-minitest-require - (lambda _ - (substitute* "test/test_helper.rb" - ;; This chanegd in recent versions of Mocha - (("mocha/minitest") "mocha/mini_test")) #t))))) (propagated-inputs `(("ruby-actionview" ,ruby-actionview) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b3e28261e0..5eb75d7c62 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2990,53 +2990,27 @@ Ruby, but can be used for all programs.") (define-public ruby-mocha (package (name "ruby-mocha") - (version "1.1.0") + (version "1.11.2") (source (origin (method url-fetch) (uri (rubygems-uri "mocha" version)) (sha256 (base32 - "107nmnngbv8lq2g7hbjpn5kplb4v2c8gs9lxrg6vs8gdbddkilzi")))) + "0hxmkm8qxd04vwj8mqnpyrf2dwy7g1k9zipdfhl4y71cw7ijm9n4")))) (build-system ruby-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'add-test-unit-to-search-path - (lambda* (#:key inputs #:allow-other-keys) - (let* ((test-unit (assoc-ref inputs "ruby-test-unit"))) - (substitute* "Rakefile" - (("t\\.libs << 'test'" line) - (string-append line "; t.libs << \"" - test-unit "/lib/ruby/vendor_ruby" - "/gems/test-unit-" - ,(package-version ruby-test-unit) - "/lib\"")))) - #t)) - (add-before 'check 'use-latest-redcarpet - (lambda _ - (substitute* "mocha.gemspec" - ((".freeze, \\[\"~> 1\"\\]") - ".freeze, [\">= 3\"]")) - #t)) - (add-before 'check 'hardcode-version - (lambda _ - ;; Mocha is undefined at build time - (substitute* "Rakefile" - (("#\\{Mocha::VERSION\\}") ,version)) - #t)) - (add-before 'check 'remove-failing-test - ;; FIXME: This test fails for reasons unrelated to Guix packaging. - (lambda _ - (delete-file "test/acceptance/stubbing_nil_test.rb") - #t))))) - (propagated-inputs - `(("ruby-metaclass" ,ruby-metaclass))) + (add-before 'check 'remove-rubocop-dependency + (lambda _ + ;; Disable dependency on Rubocop, which is just a linter, + ;; and would introduce a circular dependency. + (substitute* "mocha.gemspec" + ((".*rubocop.*") + "true\n")) + #t))))) (native-inputs - `(("bundler" ,bundler) - ("ruby-yard" ,ruby-yard) - ("ruby-introspection" ,ruby-introspection) - ("ruby-test-unit" ,ruby-test-unit) - ("ruby-redcarpet" ,ruby-redcarpet))) + `(("ruby-introspection" ,ruby-introspection))) (synopsis "Mocking and stubbing library for Ruby") (description "Mocha is a mocking and stubbing library with JMock/SchMock syntax, which -- cgit v1.2.3 From e3febab58254dfe91995468f2db64121e1c50fa1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 16:57:49 +0200 Subject: gnu: ruby-mocha: Update license. * gnu/packages/ruby.scm (ruby-mocha)[license]: Add LICENSE:RUBY. --- gnu/packages/ruby.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5eb75d7c62..207f87b746 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3016,7 +3016,8 @@ Ruby, but can be used for all programs.") "Mocha is a mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.") (home-page "http://gofreerange.com/mocha/docs") - (license license:expat))) + ;; Mocha can be used with either license at the users choice. + (license (list license:expat license:ruby)))) (define-public ruby-mocha-on-bacon (package -- cgit v1.2.3 From 8d85543b6a0df8abf35bd317588deb81c1726602 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 17:35:53 +0200 Subject: gnu: Add ruby-maxitest. * gnu/packages/ruby.scm (ruby-maxitest): New public variable. --- gnu/packages/ruby.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 207f87b746..36cb42e300 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2987,6 +2987,59 @@ Ruby, but can be used for all programs.") (home-page "https://github.com/alexch/rerun/") (license license:expat))) +(define-public ruby-maxitest + (package + (name "ruby-maxitest") + (version "3.6.0") + (home-page "https://github.com/grosser/maxitest") + (source (origin + ;; Pull from git because the gem does not contain tests. + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07b3j0bv3dx5j42jlvpvl07aaxplyi6wq688y3jl8y528ww2hjz8")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "default" + #:phases (modify-phases %standard-phases + (replace 'replace-git-ls-files + (lambda _ + (substitute* "maxitest.gemspec" + (("`git ls-files lib/ bin/ MIT-LICENSE Readme.md`") + "`find lib/ bin/ MIT-LICENSE Readme.md -type f | sort`")) + #t)) + (add-before 'check 'remove-version-constraints + (lambda _ + ;; Don't use specific versions of dependencies, instead + ;; take whatever is available in Guix. + (delete-file "Gemfile.lock") + #t)) + (add-before 'check 'add-mtest-on-PATH + (lambda _ + ;; Tests use 'mtest' which is not automatically added on + ;; PATH. + (setenv "PATH" (string-append (getcwd) "/bin:" + (getenv "PATH"))) + #t))))) + (native-inputs + `(("ps" ,procps) + ("ruby-bump" ,ruby-bump) + ("ruby-byebug" ,ruby-byebug) + ("ruby-rspec" ,ruby-rspec) + ("ruby-wwtd" ,ruby-wwtd))) + (propagated-inputs + `(("ruby-minitest" ,ruby-minitest))) + (synopsis "Minitest with extra features") + (description + "Maxitest is a wrapper around Minitest with extra functionality such +as timeouts, an @command{mtest} executable that can run tests by line +number, support for interrupted tests, better backtraces, and more.") + (license license:expat))) + (define-public ruby-mocha (package (name "ruby-mocha") -- cgit v1.2.3 From 6623a1512333479107c31137efec412d4d9d4585 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 17:54:02 +0200 Subject: gnu: Add ruby-fakefs. * gnu/packages/ruby.scm (ruby-fakefs): New public variable. --- gnu/packages/ruby.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 36cb42e300..83dea8d37a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1542,6 +1542,50 @@ a Ruby object.") (home-page "https://github.com/rails/execjs") (license license:expat))) +(define-public ruby-fakefs + (package + (name "ruby-fakefs") + (version "1.2.2") + (home-page "https://github.com/fakefs/fakefs") + (source (origin + ;; The Rubygems release does not contain tests. + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "008dq9knyip2bfbl0mrk8b8r7bv0k3bf128wcfqsgy1rqal4mgwk")))) + (build-system ruby-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'replace-git-ls-files + (lambda _ + (substitute* "fakefs.gemspec" + (("`git ls-files lib README.md LICENSE`") + "`find lib README.md LICENSE -type f | sort`")) + #t)) + (add-before 'check 'remove-version-constraints + (lambda _ + ;; Drop hard version requirements for test dependencies. + (substitute* "fakefs.gemspec" + (("(.*add_development_dependency .*), .*" _ dep) + (string-append dep "\n"))) + #t)) + ))) + (native-inputs + `(("ruby-bump" ,ruby-bump) + ("ruby-maxitest" ,ruby-maxitest) + ("ruby-rubocop" ,ruby-rubocop) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "Fake file system for Ruby") + (description + "This package provides a fake file system for use in test suites. It +avoids the need for manually creating temporary directories, or dealing +with platform intricacies in @code{File} and @code{FileUtils}.") + (license license:expat))) + (define-public ruby-orderedhash (package (name "ruby-orderedhash") -- cgit v1.2.3 From 8f85018daaa3548e721c369511a654f5f7753653 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 18:14:10 +0200 Subject: gnu: Add ruby-gherkin-ruby. * gnu/packages/ruby.scm (ruby-gherkin-ruby): New public variable. --- gnu/packages/ruby.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 83dea8d37a..4eb9d0d696 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5698,6 +5698,25 @@ It is intended be used by all Cucumber implementations to parse (home-page "https://github.com/cucumber-attic/gherkin") (license license:expat))) +(define-public ruby-gherkin-ruby + (package + (name "ruby-gherkin-ruby") + (version "0.3.2") + (home-page "http://github.com/codegram/gherkin-ruby") + (source (origin + (method url-fetch) + (uri (rubygems-uri "gherkin-ruby" version)) + (sha256 + (base32 + "18ay7yiibf4sl9n94k7mbi4k5zj2igl4j71qcmkswv69znyx0sn1")))) + (build-system ruby-build-system) + (synopsis "Pure Ruby Gherkin parser") + (description + "Gherkin-ruby is a Gherkin parser written in pure Ruby and less than +200 lines of code.") + ;; XXX: No license information anywhere but Readme.md. + (license license:expat))) + (define-public ruby-aruba (package (name "ruby-aruba") -- cgit v1.2.3 From 305e9b33ca25f6d6c017fa988d72e08760dc0074 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 18:41:04 +0200 Subject: gnu: Add ruby-colorize. * gnu/packages/ruby.scm (ruby-colorize): New public variable. --- gnu/packages/ruby.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4eb9d0d696..248518b957 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7842,6 +7842,36 @@ is part of Ruby's standard library. It more closely conforms to RFC 3986, RFC 3987, and RFC 6570 (level 4), providing support for IRIs and URI templates.") (license license:asl2.0))) +(define-public ruby-colorize + (package + (name "ruby-colorize") + (version "0.8.1") + (source (origin + (method url-fetch) + (uri (rubygems-uri "colorize" version)) + (sha256 + (base32 + "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b")))) + (build-system ruby-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'check 'remove-codeclimate-dependency + (lambda _ + (substitute* "test/test_colorize.rb" + ;; Do not hook the tests into the online CodeClimate + ;; service which is unnecessary for these tests. + (("require 'codeclimate-test-reporter'") + "") + (("CodeClimate.*") "")) + #t))))) + (synopsis "Add color effects to the @code{String} class") + (description + "This package extends the @code{String} class and adds a +@code{ColorizedString} with methods to set text color, background color, +and text effects.") + (home-page "http://github.com/fazibear/colorize") + (license license:gpl2+))) + (define-public ruby-colorator (package (name "ruby-colorator") -- cgit v1.2.3 From c09bc60ded3a50e30f4c1361f6d0a4551dce02e3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 18:42:08 +0200 Subject: gnu: Add ruby-spinach. * gnu/packages/ruby.scm (ruby-spinach): New public variable. --- gnu/packages/ruby.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 248518b957..3201f9f38a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4253,6 +4253,34 @@ file or directories are modified.") (home-page "https://guardgem.org/") (license license:expat))) +(define-public ruby-spinach + (package + (name "ruby-spinach") + (version "0.11.0") + (home-page "http://github.com/codegram/spinach") + (source (origin + (method url-fetch) + (uri (rubygems-uri "spinach" version)) + (sha256 + (base32 + "1mv053mqz9c8ngqa6wp1ymk2fax6j0yqzax6918akrdr7c3fx3c6")))) + (build-system ruby-build-system) + (arguments + ;; FIXME: Disable tests altogether because they depend on 'capybara' + ;; which in turn depends on many other unpackaged gems. Enable once + ;; capybara is available. + '(#:tests? #f)) + (propagated-inputs + `(("ruby-colorize" ,ruby-colorize) + ("ruby-gherkin-ruby" ,ruby-gherkin-ruby) + ("ruby-json" ,ruby-json))) + (synopsis "Gherkin-based BDD framework") + (description + "Spinach is a high-level @acronym{BDD, Behavior-driven development} +framework that leverages the expressive @code{Gherkin} language to help you +define executable specifications of your code.") + (license license:expat))) + (define-public ruby-tilt (package (name "ruby-tilt") -- cgit v1.2.3 From 2156cc9cd60e8adde475e25f45128e324ea9dff3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 18:42:51 +0200 Subject: gnu: Add ruby-parallel-tests. * gnu/packages/ruby.scm (ruby-parallel-tests): New public variable. --- gnu/packages/ruby.scm | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3201f9f38a..363ee8546c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3993,6 +3993,70 @@ for select languages.") (home-page "http://coderay.rubychan.de") (license license:expat))) +(define-public ruby-parallel-tests + (package + (name "ruby-parallel-tests") + (version "2.32.0") + (home-page "https://github.com/grosser/parallel_tests") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (string-append name version)) + (sha256 + (base32 + "0l2rjz9fnxv7hvz679v7a75mghsh9x9qpvbyapiavqsx21v42l7m")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "default" + #:phases (modify-phases %standard-phases + (add-after 'patch-source-shebangs 'patch-shell-invokations + (lambda _ + (substitute* '("lib/parallel_tests/tasks.rb" + "spec/parallel_tests/tasks_spec.rb") + (("/bin/sh") (which "sh")) + (("/bin/bash") (which "bash"))) + #t)) + (add-before 'check 'remove-version-constraints + (lambda _ + ;; Remove hard coded version constraints, instead just + ;; use whatever versions are available in Guix. + (delete-file "Gemfile.lock") + (substitute* "Gemfile" + (("'minitest',.*") + "'minitest'\n") + (("'cucumber',.*") + "'cucumber'\n")) + #t)) + (add-before 'check 'disable-rails-test + (lambda _ + ;; XXX: This test attempts to download and run the test + ;; suites of multiple Rails versions(!) directly. + (delete-file "spec/rails_spec.rb") + #t)) + (add-before 'check 'set-HOME + (lambda _ + ;; Some tests check the output of Bundler, and fail when + ;; Bundler warns that /homeless-shelter does not exist. + (setenv "HOME" "/tmp") + #t))))) + (native-inputs + `(("ruby-bump" ,ruby-bump) + ("ruby-cucumber" ,ruby-cucumber) + ("ruby-minitest" ,ruby-minitest) + ("ruby-rake" ,ruby-rake) + ("ruby-rspec" ,ruby-rspec) + ("ruby-spinach" ,ruby-spinach))) + (propagated-inputs + `(("ruby-parallel" ,ruby-parallel))) + (synopsis "Run tests in parallel") + (description + "This package can speed up @code{Test::Unit}, @code{RSpec}, +@code{Cucumber}, and @code{Spinach} tests by running them concurrently +across multiple CPU cores.") + (license license:expat))) + (define-public ruby-parser (package (name "ruby-parser") -- cgit v1.2.3 From 96bf7521e0918b055a2e9fa7a09183f04c97165b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 19:11:16 +0200 Subject: gnu: Add ruby-forking-test-runner. * gnu/packages/ruby.scm (ruby-forking-test-runner): New public variable. --- gnu/packages/ruby.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 363ee8546c..70ed0dfd0f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1884,6 +1884,57 @@ libraries such as Libnotify.") (home-page "https://github.com/guard/notiffany") (license license:expat))) +(define-public ruby-forking-test-runner + (package + (name "ruby-forking-test-runner") + (version "1.6.0") + (home-page "https://github.com/grosser/forking_test_runner") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mrglzkj2nrgisccf2f30zbfmcs0awv1g3lw994b2az90fl39x8m")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "spec" + ;; FIXME: ActiveRecord depends on sqlite3 1.3.6, but Guix has + ;; 1.4.1, which in turn breaks the tests that use ActiveRecord. + #:tests? #f + #:phases (modify-phases %standard-phases + (replace 'replace-git-ls-files + (lambda _ + (substitute* "forking_test_runner.gemspec" + (("`git ls-files lib/ bin/ MIT-LICENSE`") + "`find lib/ bin/ MIT-LICENSE -type f | sort`")) + #t)) + (add-before 'check 'remove-version-constraints + (lambda _ + ;; Ignore hard coded version constraints for the tests. + (delete-file "Gemfile.lock") + #t)) + (add-before 'check 'set-HOME + (lambda _ + ;; Many tests invoke Bundler, and fails when Bundler + ;; warns that /homeless-shelter does not exist. + (setenv "HOME" "/tmp") + #t))))) + (native-inputs + `(("ruby-activerecord" ,ruby-activerecord) + ("ruby-bump" ,ruby-bump) + ("ruby-rspec" ,ruby-rspec) + ("ruby-sqlite3" ,ruby-sqlite3) + ("ruby-wwtd" ,ruby-wwtd))) + (propagated-inputs + `(("ruby-parallel-tests" ,ruby-parallel-tests))) + (synopsis "Run every test in a fork") + (description + "This package is a wrapper around @code{parallel_tests} that runs every +test in a fork to avoid pollution and get clean output per test.") + (license license:expat))) + (define-public ruby-formatador (package (name "ruby-formatador") -- cgit v1.2.3 From 4a98314da9f308bba230fa3e5117e404f7aedd51 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 19:45:20 +0200 Subject: gnu: Add ruby-fast-gettext. * gnu/packages/ruby.scm (ruby-fast-gettext): New public variable. --- gnu/packages/ruby.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 70ed0dfd0f..97789c1f40 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2406,6 +2406,65 @@ interface for Ruby programs.") (home-page "https://github.com/mperham/connection_pool") (license license:expat))) +(define-public ruby-fast-gettext + (package + (name "ruby-fast-gettext") + (version "2.0.2") + (home-page "https://github.com/grosser/fast_gettext") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rd48fp89k1sclgn2v26br2glwl3iv7z72mizzzmkdmqalqfn1sa")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "spec" + #:phases (modify-phases %standard-phases + (add-before 'check 'remove-version-constraints + (lambda _ + (delete-file "Gemfile.lock") + #t)) + (add-before 'check 'remove-activerecord-test + (lambda _ + ;; FIXME: This test fails because ActiveRecord depends on + ;; a different version of ruby-sqlite than the currently + ;; available one. + (delete-file + "spec/fast_gettext/translation_repository/db_spec.rb") + #t)) + (add-before 'check 'disable-i18n-test + (lambda _ + ;; XXX: This test checks i18n intricasies with Rails 3 and + ;; automatically disables itself for Rails 4.0, but does + ;; not know about newer versions as it has not been updated + ;; since 2014. Disable for later versions of Rails too. + (substitute* "spec/fast_gettext/vendor/string_spec.rb" + (((string-append "ActiveRecord::VERSION::MAJOR == 4 and " + "ActiveRecord::VERSION::MINOR == 0")) + "ActiveRecord::VERSION::MAJOR >= 4")) + #t))))) + (native-inputs + `(;; For tests. + ("ruby-activerecord" ,ruby-activerecord) + ("ruby-activesupport" ,ruby-activesupport) + ("ruby-bump" ,ruby-bump) + ("ruby-forking-test-runner" ,ruby-forking-test-runner) + ("ruby-i18n" ,ruby-i18n) + ("ruby-rubocop" ,ruby-rubocop) + ("ruby-rspec" ,ruby-rspec) + ("ruby-single-cov" ,ruby-single-cov) + ("ruby-sqlite3" ,ruby-sqlite3) + ("ruby-wwtd" ,ruby-wwtd))) + (synopsis "Fast implementation of @code{GetText}") + (description + "This package provides an alternative implementation of the Ruby +@code{GetText} library that is approximately 12x faster yet thread safe.") + ;; Some parts are covered by the Ruby license, see file headers. + (license (list license:expat license:ruby)))) + (define-public ruby-net-http-persistent (package (name "ruby-net-http-persistent") -- cgit v1.2.3 From 4dd8677f7b0eb282f5e8c9126cd279a26692e231 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 20:05:54 +0200 Subject: gnu: varnish-modules: Update to 0.16.0. * gnu/packages/web.scm (varnish-modules): Update to 0.16.0. [source](uri): Adjust for new location. --- gnu/packages/web.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1851590628..5f80a035b2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5686,15 +5686,15 @@ configuration language.") (package (name "varnish-modules") (home-page "https://github.com/varnish/varnish-modules") - (version "0.15.0") + (version "0.16.0") (source (origin (method url-fetch) - (uri (string-append "https://download.varnish-software.com" - "/varnish-modules/varnish-modules-" - version ".tar.gz")) + (uri (string-append "https://github.com/varnish/varnish-modules" + "/releases/download/varnish-modules-" version + "/varnish-modules-" version ".tar.gz")) (sha256 (base32 - "09li9lqa1kb275w1rby2zldyg8r9cfcl4qyv53qyd9xbzilrz751")))) + "1ph5bplsip4rycql1c2hgbvmrwbgcrgv2ldgfp7saxxbsv5cpcds")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 453e66d7772a2182244e35dd6224a73f97cfc07d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 20:06:29 +0200 Subject: gnu: varnish-modules: Update description. * gnu/packages/web.scm (varnish-modules)[description]: Use @acronym instead of @dfn. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5f80a035b2..d550e78bad 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5704,7 +5704,7 @@ configuration language.") (synopsis "Collection of Varnish modules") (description "This package provides a collection of modules (@dfn{vmods}) for the Varnish -cache server, extending the @dfn{Varnish Configuration Language} (VCL) with +cache server, extending the @acronym{VCL, Varnish Configuration Language} with additional capabilities.") (license license:bsd-2))) -- cgit v1.2.3 From ab9de8cfb0525ef43668712ac898707f97f9a620 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 16:23:29 +0200 Subject: gnu: fontconfig: Add replacement with font-dejavu instead of gs-fonts. This fixes , , and . Reported by Pierre Neidhardt, W Knight, Alexandros Theodotou, and others. * gnu/packages/fontutils.scm (fontconfig)[replacement]: New field. (fontconfig/font-dejavu): New variable. --- gnu/packages/fontutils.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index e552ece50b..ab9bd4346f 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages autotools) + #:use-module (gnu packages fonts) #:use-module (gnu packages gettext) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -292,6 +293,12 @@ fonts to/from the WOFF2 format.") (define-public fontconfig (package (name "fontconfig") + + ;; This replacement is not security-related, but works around the fact + ;; that gs-fonts are not recognized by newer versions of Pango, causing + ;; many applications to fail to find fonts otherwise. + (replacement fontconfig/font-dejavu) + (version "2.13.1") (source (origin (method url-fetch) @@ -348,6 +355,13 @@ high quality, anti-aliased and subpixel rendered text on a display.") "See COPYING in the distribution.")) (home-page "https://www.freedesktop.org/wiki/Software/fontconfig"))) +(define fontconfig/font-dejavu + (package + (inherit fontconfig) + (inputs + ;; XXX: Reuse the name to avoid having to override the configure flags. + `(("gs-fonts" ,font-dejavu))))) + (define-public t1lib (package (name "t1lib") -- cgit v1.2.3 From 1e3cf9de840c6968f73b6b6c515dd870563b05cb Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Wed, 13 May 2020 09:52:45 +0200 Subject: gnu: Add python-random-user-agent. * gnu/packages/python-web.scm (python-random-user-agent): New variable. Signed-off-by: Marius Bakke --- gnu/packages/python-web.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 05fd1599a1..00caf7f229 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4004,3 +4004,23 @@ changed the process is restarted.") "Pyramid makes it easy to write web applications. From minimal request/response web apps to larger, grown applications.") (license license:repoze))) + +(define-public python-random-user-agent + (package + (name "python-random-user-agent") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "random_user_agent" version)) + (sha256 + (base32 + "04nhzdh2ki7ybhjrmghxci6hcm6i03vvin2q2ynj87fbr1pa534g")))) + (build-system python-build-system) + (home-page "https://github.com/Luqman-Ud-Din/random_user_agent") + (synopsis "List of user agents") + (description + "This package provides a list of user agents, from a collection of more +than 326,000 known user-agents. Users can pick a random one, or select one +based on filters.") + (license license:expat))) -- cgit v1.2.3 From b2bdd7a12919d1af4d1314729fa02d87897be8d4 Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Mon, 18 May 2020 15:28:05 -0400 Subject: gnu: racket-minimal: Fix hash for version 7.7. This is a follow-up to commit 99bf646d8f5acb7958c49143a32de6e95fbde4cf. * gnu/packages/scheme.scm (racket-minimal)[source]: Update hash. Signed-off-by: Marius Bakke --- gnu/packages/scheme.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 5b290b9728..4551e57d4a 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -537,7 +537,7 @@ of libraries.") version "/racket-minimal-" version "-src.tgz"))) (sha256 (base32 - "0id094q9024hj2n3907l7dblp3iix1v5289xzskmh5c26xfygp9y")) + "1lxcd4ix8q3089xql48hwccxvcpkinfxwxnc6fhcjdgzqcyxh3ln")) (patches (search-patches "racket-store-checksum-override.patch")))) (synopsis "Racket without bundled packages such as Dr. Racket") -- cgit v1.2.3 From 9b65cdd902ec39115dbf3e0ad34e49f544ab4267 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 19 May 2020 09:46:49 +0200 Subject: gnu: python-shouldbe: Python 3.8 compatibility. * gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch: Add compatibility patch. * gnu/local.mk (dist_patch_DATA): Add new file. * gnu/packages/python-xyz.scm (python-shouldbe)[source]: Add patch. Signed-off-by: Marius Bakke --- gnu/local.mk | 1 + .../patches/python-shouldbe-0.1.2-cpy3.8.patch | 82 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 3 +- 3 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8d737f211e..91f094ce0f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1434,6 +1434,7 @@ dist_patch_DATA = \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ %D%/packages/patches/python-robotframework-honor-source-date-epoch.patch \ + %D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch \ %D%/packages/patches/python-slugify-depend-on-unidecode.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ diff --git a/gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch b/gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch new file mode 100644 index 0000000000..f3b56e42d6 --- /dev/null +++ b/gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch @@ -0,0 +1,82 @@ +Fix compatibility with Python 3.8. + +Upstream issue: https://github.com/DirectXMan12/should_be/pull/5 + +diff -x '*.pyc' -Naur shouldbe-0.1.2/should_be/core.py shouldbe-0.1.2.patched/should_be/core.py +--- shouldbe-0.1.2/should_be/core.py 2019-03-06 07:38:22.000000000 +0100 ++++ shouldbe-0.1.2.patched/should_be/core.py 2020-05-18 08:44:24.214664704 +0200 +@@ -103,7 +103,7 @@ + return resf + + +-def buildCode(baseCode, argcount=None, kwonlyargcount=None, ++def buildCode(baseCode, argcount=None, posonlyargcount=None, kwonlyargcount=None, + nlocals=None, stacksize=None, flags=None, + code=None, consts=None, names=None, + varnames=None, filename=None, name=None, +@@ -121,6 +121,24 @@ + nlocals or baseCode.co_nlocals, + stacksize or baseCode.co_stacksize, + flags or baseCode.co_flags, ++ code or baseCode.co_code, ++ consts or baseCode.co_consts, ++ names or baseCode.co_names, ++ varnames or baseCode.co_varnames, ++ filename or baseCode.co_filename, ++ name or baseCode.co_name, ++ firstlineno or baseCode.co_firstlineno, ++ lnotab or baseCode.co_lnotab, ++ freevars or baseCode.co_freevars, ++ cellvars or baseCode.co_cellvars) ++ elif hasattr(baseCode, 'co_posonlyargcount'): ++ # Python 3.8 ++ resc = CodeType(argcount or baseCode.co_argcount, ++ posonlyargcount or baseCode.co_posonlyargcount, ++ kwonlyargcount or baseCode.co_kwonlyargcount, ++ nlocals or baseCode.co_nlocals, ++ stacksize or baseCode.co_stacksize, ++ flags or baseCode.co_flags, + code or baseCode.co_code, + consts or baseCode.co_consts, + names or baseCode.co_names, +diff -x '*.pyc' -Naur shouldbe-0.1.2/should_be/tests/test_container_mixin.py shouldbe-0.1.2.patched/should_be/tests/test_container_mixin.py +--- shouldbe-0.1.2/should_be/tests/test_container_mixin.py 2019-03-01 06:38:16.000000000 +0100 ++++ shouldbe-0.1.2.patched/should_be/tests/test_container_mixin.py 2020-05-18 09:00:51.372531064 +0200 +@@ -7,31 +7,31 @@ + self.lst = [1, 2, 3] + + def test_should_include_iter(self): +- err_msg = (r'[a-zA-Z0-9.]+ should have included \[.+?\]' ++ err_msg = (r'[a-zA-Z0-9.()]+ should have included \[.+?\]' + r', but did not have items .+') +- self.assertRaisesRegexp(AssertionError, err_msg, ++ self.assertRaisesRegex(AssertionError, err_msg, + self.lst.should_include, [4]) + + self.lst.should_include([1, 2, 3]) + + def test_should_include_item(self): +- err_msg = (r'[a-zA-Z0-9.]+ should have included .+?' ++ err_msg = (r'[a-zA-Z0-9.()]+ should have included .+?' + r', but did not') +- self.assertRaisesRegexp(AssertionError, err_msg, ++ self.assertRaisesRegex(AssertionError, err_msg, + self.lst.should_include, 4) + + self.lst.should_include(3) + + def test_shouldnt_include_iter(self): + err_msg = 'should not have included' +- self.assertRaisesRegexp(AssertionError, err_msg, ++ self.assertRaisesRegex(AssertionError, err_msg, + self.lst.shouldnt_include, [2, 3]) + + self.lst.shouldnt_include([4, 5]) + + def test_shouldnt_include_item(self): + err_msg = 'should not have included' +- self.assertRaisesRegexp(AssertionError, err_msg, ++ self.assertRaisesRegex(AssertionError, err_msg, + self.lst.shouldnt_include, 3) + + self.lst.shouldnt_include(4) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1f96ed4391..a0f44dde8b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18788,7 +18788,8 @@ and cuts down boilerplate code when testing libraries for asyncio.") (uri (pypi-uri "shouldbe" version)) (sha256 (base32 - "16zbvjxf71dl4yfbgcr6idyim3mdrfvix1dv8b95p0s9z07372pj")))) + "16zbvjxf71dl4yfbgcr6idyim3mdrfvix1dv8b95p0s9z07372pj")) + (patches (search-patches "python-shouldbe-0.1.2-cpy3.8.patch")))) (build-system python-build-system) (propagated-inputs `(("python-forbiddenfruit" ,python-forbiddenfruit))) -- cgit v1.2.3 From f717cfa84bd67568c2303ffb6ce1699eed0fb6d9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 May 2020 19:11:22 -0400 Subject: gnu: linux-libre@4.4: Update 4.4.224. * gnu/packages/linux.scm (linux-libre-4.4-version): Update 4.4.224. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 750111f4e1..7da67911f5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,10 +409,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.223") +(define-public linux-libre-4.4-version "4.4.224") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "09fln0sdfif2zv2jifp24yiqi0vcyj8fqx2jz91g21zvsxk3x5nd"))) + (hash (base32 "1lb8ypn558vk73bj4a20wq40cig9vmzjn2xzzdws78gfair6hxpg"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 79a2cfd858e05630faa147447002bdc094b4fb6b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 May 2020 19:12:22 -0400 Subject: gnu: linux-libre@4.9: Update 4.9.224. * gnu/packages/linux.scm (linux-libre-4.9-version): Update 4.9.224. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7da67911f5..aac125a797 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -401,10 +401,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.223") +(define-public linux-libre-4.9-version "4.9.224") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1r9ag1fhy0g429q44qlqh0qkf42qkhzxa04gxlmnrinqypk00lyg"))) + (hash (base32 "0jf92cx0b3wq9fxa3169wk4wqvy58hglfk6lsynszy8kjplhfvfz"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 575e32fae85377ca0817395b80e2f2ec28b0c76b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 May 2020 19:12:48 -0400 Subject: gnu: linux-libre@4.14: Update 4.14.181. * gnu/packages/linux.scm (linux-libre-4.14-version): Update 4.14.181. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index aac125a797..f35e0fd99b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -393,10 +393,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.180") +(define-public linux-libre-4.14-version "4.14.181") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "03pd4wpg526n391jwc0kbmbxi059mvq8d42a9qbym9mnv5rzjkj4"))) + (hash (base32 "0kaasqhmg9in7pf4ldk9z4z1cjgv1c9xdr1ca0pznngygibym6xb"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From fa0fac06321b688780eb28f7aa7a856036cb7a80 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 May 2020 19:13:25 -0400 Subject: gnu: linux-libre@4.19: Update 4.19.124. * gnu/packages/linux.scm (linux-libre-4.19-version): Update 4.19.124. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f35e0fd99b..05ba8f106f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -385,10 +385,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.123") +(define-public linux-libre-4.19-version "4.19.124") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0gwrkbbfy85ajxpg7q6j9mn8mzhmsr1v3wmh5c76p34d3b9i96d7"))) + (hash (base32 "005dznldnj1m03cbkc5pd2q2cv9jj1j6a0x2vh4p79ypg4c01nfm"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From efcdb475018c108b8fea4773577efe3665e89667 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 May 2020 19:14:05 -0400 Subject: gnu: linux-libre@5.6: Update 5.6.14. * gnu/packages/linux.scm (linux-libre-5.6-version): Update 5.6.14. (linux-libre-5.6-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 05ba8f106f..ecc30a9255 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,10 +369,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) -(define-public linux-libre-5.6-version "5.6.13") +(define-public linux-libre-5.6-version "5.6.14") (define-public linux-libre-5.6-pristine-source (let ((version linux-libre-5.6-version) - (hash (base32 "11zriz0jwqizv0pq0laql0svsnspdfnxqykq70v22x39iyfdf9gi"))) + (hash (base32 "18vyxi64i93v4qyky5q62kkasm1da7wmz91xfkx3j7ki84skyxik"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.6))) -- cgit v1.2.3 From 498e2e669d38f5eb4cf2a49ef8e6bc85f99efd5d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 May 2020 19:14:37 -0400 Subject: gnu: linux-libre: Update 5.4.42. * gnu/packages/linux.scm (linux-libre-5.4-version): Update 5.4.42. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ecc30a9255..f6acc086a7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -377,10 +377,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.6))) -(define-public linux-libre-5.4-version "5.4.41") +(define-public linux-libre-5.4-version "5.4.42") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0mxhz3f0ayz0nggndbikp44kx307yxf16qzsv46hni6p8z1ffr0y"))) + (hash (base32 "0cdwazpzfrrb2y5fp87v9yihy7v8mlbqjzxpzmv7p83609y1nhsf"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 3da3ec93a373a23e43d70aeabaac8fba681b07f8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 04:00:02 +0200 Subject: gnu: uhttpmock: Update to 0.5.2. * gnu/packages/web.scm (uhttpmock): Update to 0.5.2. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d550e78bad..baea844e4f 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4671,15 +4671,14 @@ you'd expect.") (define-public uhttpmock (package (name "uhttpmock") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (string-append "http://tecnocode.co.uk/downloads/uhttpmock/" name "-" version ".tar.xz")) (sha256 - (base32 - "163py4klka423x7li2b685gmg3a6hjf074mlff2ajhmi3l0lm8x6")))) + (base32 "0glyx07kxc3s3cx5vp30kfgscl9q6bghcq1zysfyxm24r0h6j58p")))) (build-system glib-or-gtk-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From 102fd8c7f428a198fad6f563f0094072b7cd003c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 04:05:07 +0200 Subject: gnu: criu: Update to 3.14. * gnu/packages/virtualization.scm (criu): Update to 3.14. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index c2025c4fbe..27527b4116 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -745,14 +745,14 @@ domains, their live performance and resource utilization statistics.") (define-public criu (package (name "criu") - (version "3.13") + (version "3.14") (source (origin (method url-fetch) (uri (string-append "http://download.openvz.org/criu/criu-" version ".tar.bz2")) (sha256 (base32 - "1yn9ix9lqvqvjrs3a3g6g1wqfniyf9n7giy0mr3jvijmrcm7y0pa")))) + "1jrr3v99g18gc0hriz0avq6ccdvyya0j6wwz888sdsc4icc30gzn")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 5098b90bf5cb52f80011e023d821dfa8bcb74b32 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 04:08:49 +0200 Subject: gnu: python-pytest-sugar: Update to 0.9.3. * gnu/packages/check.scm (python-pytest-sugar): Update to 0.9.3. --- gnu/packages/check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index e8547a5096..12e01795ee 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1703,14 +1703,13 @@ normally the case.") (define-public python-pytest-sugar (package (name "python-pytest-sugar") - (version "0.9.2") + (version "0.9.3") (source (origin (method url-fetch) (uri (pypi-uri "pytest-sugar" version)) (sha256 - (base32 - "1asq7yc4g8bx2sn7yy974mhc9ywvaihasjab4inkirdwn9s7mn7w")))) + (base32 "1i0hv3h49zvl62jbiyjag84carbrp3zprqzxffdr291nxavvac0n")))) (build-system python-build-system) (propagated-inputs `(("python-packaging" ,python-packaging) -- cgit v1.2.3 From 0523ab2cb28c4700620952a451e1aaa61cd7924b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 04:54:40 +0200 Subject: gnu: python-apipkg: Remove Python 2 variant. * gnu/packages/python-xyz.scm (python2-apipkg): Remove variable. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a0f44dde8b..02e406e5f5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9495,9 +9495,6 @@ pure Python module that works on virtually all Python versions.") (home-page "https://github.com/pytest-dev/apipkg") (license license:expat))) -(define-public python2-apipkg - (package-with-python2 python-apipkg)) - (define-public python-execnet (package (name "python-execnet") -- cgit v1.2.3 From b3200505efd1e77c5b3213d6afd61e30eb5ca691 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 04:53:44 +0200 Subject: gnu: python-apipkg: Update to 1.5. * gnu/packages/python-xyz.scm (python-apipkg): Update to 1.5. [native-inputs]: Add python-setuptools-scm. --- gnu/packages/python-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 02e406e5f5..5c0f0bda82 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9478,16 +9478,17 @@ applications.") (define-public python-apipkg (package (name "python-apipkg") - (version "1.4") + (version "1.5") (source (origin (method url-fetch) (uri (pypi-uri "apipkg" version)) (sha256 (base32 - "1iks5701qnp3dlr3q1d9qm68y2plp2m029irhpz92a44psfkjf1f")))) + "1xhak74yj3lqflvpijg15rnkklrigvsp5q7s4as4h6a157d8q8ip")))) (build-system python-build-system) (native-inputs - `(("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest) + ("python-setuptools-scm" ,python-setuptools-scm))) (synopsis "Namespace control and lazy-import mechanism") (description "With apipkg you can control the exported namespace of a Python package and greatly reduce the number of imports for your users. It is a small -- cgit v1.2.3 From 32cde877ee4c78772989b72a4eb9cdb699cc9541 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 05:35:00 +0200 Subject: gnu: ganv: Update to 1.6.0. * gnu/packages/gtk.scm (ganv): Update to 1.6.0. [arguments]: Don't override #:python. --- gnu/packages/gtk.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3e2cb30246..385e4e97e4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -318,14 +318,14 @@ functions which were removed.") (define-public ganv (package (name "ganv") - (version "1.4.2") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/ganv-" version ".tar.bz2")) (sha256 (base32 - "0g7s5mp14qgbfjdql0k1s8464r21g47ssn5dws6jazsnw6njhl0l")))) + "0pik2d3995z0rjcjhb4hsj5fsph3m8khg6j10k6mx4j2j727aq6l")))) (build-system waf-build-system) (arguments `(#:phases @@ -337,7 +337,6 @@ functions which were removed.") (string-append "-Wl,-rpath=" (assoc-ref outputs "out") "/lib")) #t))) - #:python ,python-2 ;XXX: The bundled waf fails with Python 3.7.0. #:tests? #f)) ; no check target (inputs `(("gtk" ,gtk+-2) -- cgit v1.2.3 From b91dcefda1507df61b5ebfa821cbf1ea8a47b5f9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 05:35:12 +0200 Subject: gnu: patchage: Update to 1.0.2. * gnu/packages/audio.scm (patchage): Update to 1.0.2. --- gnu/packages/audio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e6eefad61b..35c4001303 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2191,7 +2191,7 @@ buffers, and audio capture.") (define-public patchage (package (name "patchage") - (version "1.0.0") + (version "1.0.2") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/patchage-" @@ -2199,10 +2199,10 @@ buffers, and audio capture.") ".tar.bz2")) (sha256 (base32 - "1agdpwwi42176l4mxj0c4fsvdiv1ig56bfnnx0msckxmy57df8bb")))) + "0dk3fiac10m83mwss3026yz7ygc47c2iw924cwwnh2fyydc9bsy6")))) (build-system waf-build-system) (arguments - `(#:tests? #f ; no check target + `(#:tests? #f ; no check target #:python ,python-2)) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From 70f5cabc291b731f8532bb73166e41f7d2739a88 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 05:40:30 +0200 Subject: gnu: xfwm4: Update to 4.14.2. * gnu/packages/xfce.scm (xfwm4): Update to 4.14.2. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index f447c4097d..7a6784b928 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -724,7 +724,7 @@ and import the new pictures from your camera.") (define-public xfwm4 (package (name "xfwm4") - (version "4.14.1") + (version "4.14.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -732,7 +732,7 @@ and import the new pictures from your camera.") "xfwm4-" version ".tar.bz2")) (sha256 (base32 - "0a0la57jh618qfl7czsn7mspcraqczkm1m616j7jwxkhh2hq21qh")))) + "14pxiymg0hpg3yijbjv5w6259pra4rqq79b7a6mvd8wn4ls40nxi")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 3cc6412056876cf6b17b368bf982d5c4a7153fd7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 05:52:12 +0200 Subject: gnu: tuxguitar: Update to 1.5.4. * gnu/packages/music.scm (tuxguitar): Update to 1.5.4. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3736abb353..3d8a3d4321 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1755,7 +1755,7 @@ is subjective.") (define-public tuxguitar (package (name "tuxguitar") - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) (uri (string-append @@ -1763,7 +1763,7 @@ is subjective.") version "/tuxguitar-" version "-src.tar.gz")) (sha256 (base32 - "1qy5kjcsl3c86kdlyvsf6dsfmfl1mv8zg0ln6g3qg3i8f35vlpp6")))) + "0fjhf56lhlhm84v08917xp4yw8y6d0qajm4qiy1gfp8dm74whwwg")))) (build-system ant-build-system) (arguments `(#:build-target "build" -- cgit v1.2.3 From b82a45d804375bc9ccdfa53ad258adfb8dabc896 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 05:59:35 +0200 Subject: gnu: shotwell: Update to 0.30.9. * gnu/packages/gnome.scm (shotwell): Update to 0.30.9. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e35ffb7a72..092f9fcb00 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5696,7 +5696,7 @@ metadata in photo and video files of various formats.") (define-public shotwell (package (name "shotwell") - (version "0.30.8") + (version "0.30.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/shotwell/" @@ -5704,7 +5704,7 @@ metadata in photo and video files of various formats.") "shotwell-" version ".tar.xz")) (sha256 (base32 - "1f7m007g6w1sz8s60w6x81ghp2rrjmik8phd958b2hy8zz92wbbj")))) + "1y556yyzfya0310v5wqjkf17hy5lhf028iminvvgi2pdfva344id")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 8825a01b3953904ced9cf45374a3c3fc9f83a190 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 06:23:27 +0200 Subject: gnu: ncmpc: Update to 0.38. * gnu/packages/mpd.scm (ncmpc): Update to 0.38. --- gnu/packages/mpd.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 755fa5d482..543345d9e0 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016, 2018, 2019, 2020 Leo Famulari -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Evan Straw ;;; ;;; This file is part of GNU Guix. @@ -183,7 +183,7 @@ player daemon.") (define-public ncmpc (package (name "ncmpc") - (version "0.37") + (version "0.38") (source (origin (method url-fetch) (uri @@ -192,7 +192,7 @@ player daemon.") "/ncmpc-" version ".tar.xz")) (sha256 (base32 - "0p31jpv1vj01bqf1589mnfpv9618cfsv259rlnbqybg1yqkvg3kw")))) + "18i73q33xq89abrxjd3hhl05gjniv6ms76ndjlc168ydm8wamh9b")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From a0828560b58f6b6c8b400caf0ceee396abc7d4c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 21 May 2020 11:30:50 +0300 Subject: gnu: boost-for-mysql: Fix building. Co-authored with Jonathan Brielmaier * gnu/packages/boost.scm (boost-for-mysql)[arguments]: Replace inherited 'configure, phase remove references to python and update the substitute regex for boost-1.59. Absorb 'more-bin-sh-patching into 'configure.Adjust make-flags to always pass '--without-python'. [native-inputs]: Remove python. --- gnu/packages/boost.scm | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 2f2ca289ab..d28c58d663 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2019, 2020 Giacomo Leidi ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. ;;; @@ -241,12 +242,40 @@ across a broad spectrum of applications.") (arguments (substitute-keyword-arguments (package-arguments boost) ((#:phases phases) `(modify-phases ,phases - ;; This was removed after boost-1.67. - (add-before 'configure 'more-bin-sh-patching - (lambda _ - (substitute* "tools/build/doc/bjam.qbk" - (("/bin/sh") (which "sh"))))) - (delete 'provide-libboost_python))))) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((icu (assoc-ref inputs "icu4c")) + (out (assoc-ref outputs "out"))) + (substitute* (append + (find-files "tools/build/src/engine/" "execunix\\.c.*") + '("libs/config/configure" + "libs/spirit/classic/phoenix/test/runtest.sh" + "tools/build/doc/bjam.qbk" + "tools/build/src/engine/Jambase")) + (("/bin/sh") (which "sh"))) + + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh")) + + ,@(if (%current-target-system) + `((call-with-output-file "user-config.jam" + (lambda (port) + (format port + "using gcc : cross : ~a-c++ ;" + ,(%current-target-system))))) + '()) + + (invoke "./bootstrap.sh" + (string-append "--prefix=" out) + ;; Auto-detection looks for ICU only in traditional + ;; install locations. + (string-append "--with-icu=" icu) + "--with-toolset=gcc")))) + (delete 'provide-libboost_python))) + ((#:make-flags make-flags) + `(cons* "--without-python" ,make-flags)))) + (native-inputs + (alist-delete "python" (package-native-inputs boost))) (properties '((hidden? . #t))))) (define-public boost-sync -- cgit v1.2.3 From c3f1f09586967c3fefbb280014a4d46b57786696 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 7 May 2020 14:25:51 +0200 Subject: build: asdf-build-system: Use SBCL source in CL packages. * guix/build/asdf-build-system.scm (copy-files-to-output): Don't attempt to reset timestamps on files without write access. (install): When parent SBCL package is in the inputs, use its source. This way we get possibly patched sources in CL packages as well (e.g. for FFI). This is also useful for sources that generate files on load-op, like cl-unicode. * guix/build-system/asdf.scm (package-with-build-system): Forward the SBCL parent as a native input so that it can be used in the above install phase. --- guix/build-system/asdf.scm | 5 +++- guix/build/asdf-build-system.scm | 54 +++++++++++++++++++++++++++++++++++----- 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index f794bf006b..630b99e2bf 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -230,7 +230,10 @@ set up using CL source package conventions." ((#:phases phases) (list phases-transformer phases)))) (inputs (new-inputs package-inputs)) (propagated-inputs (new-propagated-inputs)) - (native-inputs (new-inputs package-native-inputs)) + (native-inputs (append (if target-is-source? + (list (list (package-name pkg) pkg)) + '()) + (new-inputs package-native-inputs))) (outputs (if target-is-source? '("out") (package-outputs pkg))))) diff --git a/guix/build/asdf-build-system.scm b/guix/build/asdf-build-system.scm index f3f4b49bcf..25dd031962 100644 --- a/guix/build/asdf-build-system.scm +++ b/guix/build/asdf-build-system.scm @@ -85,7 +85,8 @@ valid." ;; files before compiling. (for-each (lambda (file) (let ((s (lstat file))) - (unless (eq? (stat:type s) 'symlink) + (unless (or (eq? (stat:type s) 'symlink) + (not (access? file W_OK))) (utime file 0 0 0 0)))) (find-files source #:directories? #t)) (copy-recursively source target #:keep-mtime? #t) @@ -97,12 +98,53 @@ valid." (find-files target "\\.asd$")) #t)) -(define* (install #:key outputs #:allow-other-keys) - "Copy and symlink all the source files." +(define* (install #:key inputs outputs #:allow-other-keys) + "Copy and symlink all the source files. +The source files are taken from the corresponding compile package (e.g. SBCL) +if it's present in the native-inputs." (define output (assoc-ref outputs "out")) - (copy-files-to-output output - (package-name->name+version - (strip-store-file-name output)))) + (define package-name + (package-name->name+version + (strip-store-file-name output))) + (define (no-prefix pkgname) + (if (string-index pkgname #\-) + (string-drop pkgname (1+ (string-index pkgname #\-))) + pkgname)) + (define parent + (match (assoc package-name inputs + (lambda (key alist-car) + (let* ((alt-key (no-prefix key)) + (alist-car (no-prefix alist-car))) + (or (string=? alist-car key) + (string=? alist-car alt-key))))) + (#f #f) + (p (cdr p)))) + (define parent-name + (and parent + (package-name->name+version (strip-store-file-name parent)))) + (define parent-source + (and parent + (string-append parent "/share/common-lisp/" + (string-take parent-name + (string-index parent-name #\-)) + "-source"))) + + (define (first-subdirectory directory) ; From gnu-build-system. + "Return the file name of the first sub-directory of DIRECTORY." + (match (scandir directory + (lambda (file) + (and (not (member file '("." ".."))) + (file-is-directory? (string-append directory "/" + file))))) + ((first . _) first))) + (define source-directory + (if (and parent-source + (file-exists? parent-source)) + (string-append parent-source "/" (first-subdirectory parent-source)) + ".")) + + (with-directory-excursion source-directory + (copy-files-to-output output package-name))) (define* (copy-source #:key outputs asd-system-name #:allow-other-keys) "Copy the source to the library output." -- cgit v1.2.3 From 09db7f39ba9660f5f5a3f6cfa2e54ee6df8d9dd4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 7 May 2020 18:19:34 +0200 Subject: gnu: cl-dexador: Fix build with new sbcl-package->cl-source-package function. * gnu/packages/lisp-xyz.scm (cl-dexador)[arguments]: Remove 'reset-gzip-timestamps phase. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 60fb4b0487..f0f28ae8f3 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5867,8 +5867,8 @@ neat APIs and connection-pooling. It is meant to supersede Drakma.") ;; asdf-build-system/source has its own phases and does not inherit ;; from asdf-build-system/sbcl phases. (modify-phases %standard-phases/source - (add-after 'unpack 'fix-permissions - (lambda _ (make-file-writable "t/data/test.gz") #t))))))) + ;; Already done in SBCL package. + (delete 'reset-gzip-timestamps)))))) (define-public ecl-dexador (sbcl-package->ecl-package sbcl-dexador)) -- cgit v1.2.3 From c6201ab9dc7cc9bac6e27739da50727f38a97159 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 7 May 2020 19:17:41 +0200 Subject: gnu: cl-iolib: Propagate libfixposix or else it won't compile. * gnu/packages/lisp-xyz.scm (cl-iolib)[propagated-inputs]: Add libfixposix. --- gnu/packages/lisp-xyz.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f0f28ae8f3..7e13beda31 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5568,7 +5568,13 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.") ((#:asd-system-name _) "iolib"))))) (define-public cl-iolib - (sbcl-package->cl-source-package sbcl-iolib)) + (let ((parent (sbcl-package->cl-source-package sbcl-iolib))) + (package + (inherit parent) + (propagated-inputs + ;; Need header to compile. + `(("libfixposix" ,libfixposix) + ,@(package-propagated-inputs parent)))))) (define-public sbcl-ieee-floats (let ((commit "566b51a005e81ff618554b9b2f0b795d3b29398d") -- cgit v1.2.3 From 0fadc00a1a5bfbb6ca9caf1bfae06e839684843c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 8 May 2020 11:14:02 +0200 Subject: gnu: cl-cffi-gtk-gobject: Fix build with new sbcl-package->cl-source-package function. * gnu/packages/lisp-xyz.scm (sbcl-cl-cffi-gtk-boot0)[inputs]: Add all inputs. [arguments]: Patch whole source. (sbcl-cl-cffi-gtk-glib)[inputs]: Remove glib. (sbcl-cl-cffi-gtk-glib)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-gobject)[inputs]: Remove glib. (sbcl-cl-cffi-gtk-gobject)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-gio)[inputs]: Remove glib. (sbcl-cl-cffi-gtk-gio)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-cairo)[inputs]: Remove cairo. (sbcl-cl-cffi-gtk-cairo)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-pango)[inputs]: Remove pango. (sbcl-cl-cffi-gtk-pango)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-gdk-pixbuf)[inputs]: Remove gdk-pixbuf. (sbcl-cl-cffi-gtk-gdk-pixbuf)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-gdk-gdk)[inputs]: Remove gtk+. (sbcl-cl-cffi-gtk-gdk-gdk)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk)[arguments]: Reuse boot0 source. --- gnu/packages/lisp-xyz.scm | 341 ++++++++++++++++++++++------------------------ 1 file changed, 165 insertions(+), 176 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7e13beda31..b78eec7f4d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2876,7 +2876,41 @@ Lisp implementations.") (inputs `(("iterate" ,sbcl-iterate) ("cffi" ,sbcl-cffi) - ("trivial-features" ,sbcl-trivial-features))) + ("trivial-features" ,sbcl-trivial-features) + ("glib" ,glib) + ("cairo" ,cairo) + ("pango" ,pango) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gtk" ,gtk+))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "glib/glib.init.lisp" + (("libglib|libgthread" all) + (string-append (assoc-ref inputs "glib") "/lib/" all))) + (substitute* "gobject/gobject.init.lisp" + (("libgobject" all) + (string-append (assoc-ref inputs "glib") "/lib/" all))) + (substitute* "gio/gio.init.lisp" + (("libgio" all) + (string-append (assoc-ref inputs "glib") "/lib/" all))) + (substitute* "cairo/cairo.init.lisp" + (("libcairo" all) + (string-append (assoc-ref inputs "cairo") "/lib/" all))) + (substitute* "pango/pango.init.lisp" + (("libpango" all) + (string-append (assoc-ref inputs "pango") "/lib/" all))) + (substitute* "gdk-pixbuf/gdk-pixbuf.init.lisp" + (("libgdk_pixbuf" all) + (string-append (assoc-ref inputs "gdk-pixbuf") "/lib/" all))) + (substitute* "gdk/gdk.init.lisp" + (("libgdk" all) + (string-append (assoc-ref inputs "gtk") "/lib/" all))) + (substitute* "gdk/gdk.package.lisp" + (("libgtk" all) + (string-append (assoc-ref inputs "gtk") "/lib/" all)))))))) (home-page "https://github.com/Ferada/cl-cffi-gtk/") (synopsis "Common Lisp binding for GTK+3") (description @@ -2889,192 +2923,155 @@ is a library for creating graphical user interfaces.") (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-glib") (inputs - `(("glib" ,glib) - ("bordeaux-threads" ,sbcl-bordeaux-threads) + `(("bordeaux-threads" ,sbcl-bordeaux-threads) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "glib/cl-cffi-gtk-glib.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "glib/glib.init.lisp" - (("libglib|libgthread" all) - (string-append (assoc-ref inputs "glib") "/lib/" all)))))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "glib/cl-cffi-gtk-glib.asd"))))) (define-public sbcl-cl-cffi-gtk-gobject (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-gobject") (inputs - `(("glib" ,glib) - ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("trivial-garbage" ,sbcl-trivial-garbage) ("bordeaux-threads" ,sbcl-bordeaux-threads) ("closer-mop" ,sbcl-closer-mop) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "gobject/cl-cffi-gtk-gobject.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "gobject/gobject.init.lisp" - (("libgobject" all) (string-append - (assoc-ref inputs "glib") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-gobject"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "gobject/cl-cffi-gtk-gobject.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-gobject"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk-gio (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-gio") (inputs - `(("glib" ,glib) - ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "gio/cl-cffi-gtk-gio.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "gio/gio.init.lisp" - (("libgio" all) - (string-append - (assoc-ref inputs "glib") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-gio"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "gio/cl-cffi-gtk-gio.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-gio"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk-cairo (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-cairo") (inputs - `(("cairo" ,cairo) - ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "cairo/cl-cffi-gtk-cairo.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "cairo/cairo.init.lisp" - (("libcairo" all) - (string-append - (assoc-ref inputs "cairo") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-cairo"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "cairo/cl-cffi-gtk-cairo.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-cairo"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk-pango (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-pango") (inputs - `(("pango" ,pango) - ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ("cl-cffi-gtk-cairo" ,sbcl-cl-cffi-gtk-cairo) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "pango/cl-cffi-gtk-pango.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "pango/pango.init.lisp" - (("libpango" all) - (string-append - (assoc-ref inputs "pango") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-pango"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "pango/cl-cffi-gtk-pango.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-pango"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk-gdk-pixbuf (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-gdk-pixbuf") (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) - ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) + `(("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "gdk-pixbuf/cl-cffi-gtk-gdk-pixbuf.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "gdk-pixbuf/gdk-pixbuf.init.lisp" - (("libgdk_pixbuf" all) - (string-append - (assoc-ref inputs "gdk-pixbuf") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-gdk-pixbuf"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "gdk-pixbuf/cl-cffi-gtk-gdk-pixbuf.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-gdk-pixbuf"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk-gdk (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-gdk") (inputs - `(("gtk" ,gtk+) - ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ("cl-cffi-gtk-gio" ,sbcl-cl-cffi-gtk-gio) ("cl-cffi-gtk-gdk-pixbuf" ,sbcl-cl-cffi-gtk-gdk-pixbuf) @@ -3082,32 +3079,23 @@ is a library for creating graphical user interfaces.") ("cl-cffi-gtk-pango" ,sbcl-cl-cffi-gtk-pango) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "gdk/cl-cffi-gtk-gdk.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "gdk/gdk.init.lisp" - (("libgdk" all) - (string-append - (assoc-ref inputs "gtk") "/lib/" all))) - (substitute* "gdk/gdk.package.lisp" - (("libgtk" all) - (string-append - (assoc-ref inputs "gtk") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-gdk"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "gdk/cl-cffi-gtk-gdk.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-gdk"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk (package @@ -3122,26 +3110,27 @@ is a library for creating graphical user interfaces.") (native-inputs `(("fiveam" ,sbcl-fiveam))) (arguments - `(#:asd-file "gtk/cl-cffi-gtk.asd" - #:test-asd-file "test/cl-cffi-gtk-test.asd" + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "gtk/cl-cffi-gtk.asd") + ((#:test-asd-file _ "") "test/cl-cffi-gtk-test.asd") ;; TODO: Tests fail with memory fault. ;; See https://github.com/Ferada/cl-cffi-gtk/issues/24. - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + ((#:tests? _ #f) #f) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public cl-cffi-gtk (sbcl-package->cl-source-package sbcl-cl-cffi-gtk)) -- cgit v1.2.3 From fabfa9afb4816e3465ec67eb5e40ecc8e0324f18 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Thu, 21 May 2020 11:29:41 +0200 Subject: news: Add ‘de’ translation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/news.scm: Add a ‘de’ translation. --- etc/news.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index aace3eaa3c..6bf88ccb44 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -15,6 +15,8 @@ (entry (commit "b460ba7992a0b4af2ddb5927dcf062784539ef7b") (title (en "Add support to boot from a Btrfs subvolume") + (de "Unterstützung für Systemstart von einem +Btrfs-Unterlaufwerk hinzugefügt") (fr "Ajout du support pour démarrer depuis un sous-volume Btrfs") (nl "Nieuwe ondersteuning voor het opstarten vanaf een Btrfs-subvolume")) (body @@ -23,6 +25,11 @@ operating system declaration now takes into account the use of a Btrfs subvolume for the partition holding @file{/gnu/store}. Run the command @command{info \"(guix) Btrfs file system\"} for more information and examples.") + (de "Für die Erzeugung einer GRUB-Konfigurationsdatei aus einer +Betriebssystemdeklaration kann jetzt ein Btrfs-Unterlaufwerk („Subvolume“) für +die Partition mit @file{/gnu/store} angegeben werden. Führen Sie +@command{info \"(guix) Btrfs file system\"} aus, wenn Sie mehr Informationen +und Beispiele sehen möchten.") (fr "La génération du fichier de configuration de GRUB produite à partir de la déclaration d'un @code{operating-system} tient maintenant compte de l'utilisation d'un sous-volume Btrfs pour la partition contenant -- cgit v1.2.3 From cf1518f581fc9ff7dc42a07fb06ebb4273668490 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Wed, 20 May 2020 18:18:23 +0200 Subject: gnu: Add libfreenect. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/openkinect.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: 宋文武 --- gnu/local.mk | 1 + gnu/packages/openkinect.scm | 141 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 gnu/packages/openkinect.scm diff --git a/gnu/local.mk b/gnu/local.mk index 91f094ce0f..1d9de9a57e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -394,6 +394,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/nvi.scm \ %D%/packages/ocaml.scm \ %D%/packages/ocr.scm \ + %D%/packages/openkinect.scm \ %D%/packages/onc-rpc.scm \ %D%/packages/opencl.scm \ %D%/packages/openbox.scm \ diff --git a/gnu/packages/openkinect.scm b/gnu/packages/openkinect.scm new file mode 100644 index 0000000000..536eb5a6fd --- /dev/null +++ b/gnu/packages/openkinect.scm @@ -0,0 +1,141 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ekaitz Zarraga +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages openkinect) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system cmake) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages libusb) + #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages gl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages image-processing)) + +(define-public libfreenect + (let ((version "0.6.1")) + (package + (name "libfreenect") + (version version) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenKinect/libfreenect") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0was1va167rqshmpn382h36yyprpfi9cwillb6ylppmnfdrfrhrr")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f ; package has no tests + #:configure-flags + '("-DBUILD_FAKENECT=ON" + "-DBUILD_CPP=ON" + "-DBUILD_EXAMPLES=OFF" ; available in libfreenect-examples + "-DBUILD_CV=OFF" ; available in libfreenect-cv + "-DBUILD_PYTHON=OFF" ; available in python-libfreenect + "-DBUILD_C_SYNC=ON") + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-udev-rules + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (rules-out (string-append out "/lib/udev/rules.d"))) + (install-file "../source/platform/linux/udev/51-kinect.rules" + (string-append rules-out "51-kinect.rules")) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libusb" ,libusb))) + (synopsis "Drivers and libraries for the Xbox Kinect device") + (description "libfreenect is a userspace driver for the Microsoft Kinect. +It supports: RGB and Depth Images, Motors, Accelerometer, LED and Audio.") + (home-page "https://openkinect.org/") + (license license:gpl2+)))) + +;; Library are already compiled in libfreenect, avoid build it again. +(define libfreenect-derived-phases + '(modify-phases %standard-phases + (add-after 'unpack 'patch-CMakeLists.txt + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + ((".*libusb.*") "") + (("add_subdirectory \\(src\\)") "") + ((".*libfreenectConfig.cmake.*") "")) + #t)))) + +(define-public libfreenect-examples + (package + (inherit libfreenect) + (name "libfreenect-examples") + (inputs + `(("libfreenect" ,libfreenect) + ("glut" ,freeglut))) + (arguments + `(#:tests? #f ; package has no tests + #:configure-flags '("-DBUILD_EXAMPLES=ON" + "-DBUILD_FAKENECT=OFF" + "-DBUILD_CPP=OFF" + "-DBUILD_C_SYNC=OFF" + "-DBUILD_CV=OFF") + #:phases ,libfreenect-derived-phases)) + (synopsis "Examples for libfreenect, the Xbox Kinect device library"))) + +(define-public libfreenect-opencv + (package + (inherit libfreenect) + (name "libfreenect-opencv") + (inputs + `(("libfreenect" ,libfreenect) + ("opencv" ,opencv))) + (arguments + `(#:tests? #f ; package has no tests + #:configure-flags '("-DBUILD_EXAMPLES=OFF" + "-DBUILD_FAKENECT=OFF" + "-DBUILD_CPP=OFF" + "-DBUILD_C_SYNC=OFF" + "-DBUILD_CV=ON") + #:phases ,libfreenect-derived-phases)) + (synopsis "OpenCV wrapper for libfreenect, the Xbox Kinect device +library"))) + +(define-public python-libfreenect + (package + (inherit libfreenect) + (name "python-libfreenect") + (native-inputs + `(("python-cython" ,python-cython))) + (inputs + `(("libfreenect" ,libfreenect))) + (propagated-inputs + `(("python" ,python) + ("python-numpy" ,python-numpy))) + (arguments + `(#:tests? #f ; package has no tests + #:configure-flags '("-DBUILD_EXAMPLES=OFF" + "-DBUILD_FAKENECT=OFF" + "-DBUILD_CPP=OFF" + "-DBUILD_C_SYNC=OFF" + "-DBUILD_CV=OFF" + "-DBUILD_PYTHON3=ON") + #:phases ,libfreenect-derived-phases)) + (synopsis "Python wrapper for libfreenect, the Xbox Kinect device +library"))) -- cgit v1.2.3 From ab82124f0ea186b1fb054c69085c7c5b7e1dc2ae Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 18 May 2020 17:52:42 +0100 Subject: gnu: Add perl-test-distribution. * gnu/packages/perl-check.scm (perl-test-distribution): New variable. --- gnu/packages/perl-check.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 0031b46948..ccd9279f3a 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Kei Kebreau +;;; Copyright © 2020 Paul Garlick ;;; ;;; This file is part of GNU Guix. ;;; @@ -457,6 +458,40 @@ files, as well as to verify that there are no missing or unknown files.") @file{MANIFEST} file matches its distribution.") (license perl-license))) +(define-public perl-test-distribution + (package + (name "perl-test-distribution") + (version "2.00") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SR/SRSHAH/Test-Distribution-" + version ".tar.gz")) + (sha256 + (base32 + "0s1bj459qaw2x1fckklv9irpf3mr8gp2cm9vlyrb5dyanrzx1v2h")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) + (propagated-inputs + `(("perl-file-find-rule" ,perl-file-find-rule) + ("perl-pod-coverage" ,perl-pod-coverage) + ("perl-test-pod" ,perl-test-pod) + ("perl-test-pod-coverage" ,perl-test-pod-coverage))) + (home-page "https://metacpan.org/release/Test-Distribution") + (synopsis "Perform tests on all modules of a distribution") + (description "When used in a test script @code{Test::Distribution} +goes through all the modules in your distribution, checks their POD, +checks that they compile successfully and checks that they all define +a $VERSION. In addition, this module performs a number of tests on +the distribution itself. It checks that the distributed files match +the SIGNATURE file, if that file exists. It checks that the +distribution is not missing any core description files. It also +checks that the complete set of pre-requisite packages are listed in +the Makefile.PL file.") + (license perl-license))) + (define-public perl-test-eol (package (name "perl-test-eol") -- cgit v1.2.3 From e5082a1e6a3cf54fc1439d350c84210c18ae9557 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 19 May 2020 11:48:07 +0100 Subject: gnu: Add perl-datetime-format-iso8601. * gnu/packages/perl.scm (perl-datetime-format-iso8601): New variable. --- gnu/packages/perl.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index d32e7b6ece..220519cde1 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3079,6 +3079,34 @@ formats, as defined in RFC 2445. It can be used to parse these formats in order to create the appropriate objects.") (license (package-license perl)))) +(define-public perl-datetime-format-iso8601 + (package + (name "perl-datetime-format-iso8601") + (version "0.08") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-" + version ".tar.gz")) + (sha256 + (base32 + "1syccqd5jlwms8v78ksnf68xijzl97jky5vbwhnyhxi5gvgfx8xk")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) + (propagated-inputs + `(("perl-datetime" ,perl-datetime) + ("perl-datetime-format-builder" ,perl-datetime-format-builder) + ("perl-file-find-rule" ,perl-file-find-rule) + ("perl-test-distribution" ,perl-test-distribution) + ("perl-test-pod" ,perl-test-pod))) + (home-page "https://metacpan.org/release/DateTime-Format-ISO8601") + (synopsis "Parse ISO8601 date and time formats") + (description "@code{DateTime::Format::ISO8601} is a DateTime +extension that parses almost all ISO8601 date and time formats.") + (license perl-license))) + (define-public perl-datetime-format-natural (package (name "perl-datetime-format-natural") -- cgit v1.2.3 From f2a53a4a9cd47ddab00d0e1116acc934a90e8f7e Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 20 May 2020 10:52:19 +0100 Subject: gnu: perl-xml-feed: Add missing inputs. * gnu/packages/xml.scm (perl-xml-feed)[inputs]: Add perl-datetime-format-flexible, perl-datetime-format-iso8601 and perl-datetime-format-natural. --- gnu/packages/xml.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 51ac6d44d1..417b1fb402 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Jack Hill ;;; Copyright © 2019 Giacomo Leidi +;;; Copyright © 2020 Paul Garlick ;;; ;;; This file is part of GNU Guix. ;;; @@ -826,7 +827,10 @@ server, collect the answer, and finally decoding the XML to Perl.") (inputs `(("perl-class-errorhandler" ,perl-class-errorhandler) ("perl-datetime" ,perl-datetime) + ("perl-datetime-format-flexible" ,perl-datetime-format-flexible) + ("perl-datetime-format-iso8601" ,perl-datetime-format-iso8601) ("perl-datetime-format-mail" ,perl-datetime-format-mail) + ("perl-datetime-format-natural" ,perl-datetime-format-natural) ("perl-datetime-format-w3cdtf" ,perl-datetime-format-w3cdtf) ("perl-feed-find" ,perl-feed-find) ("perl-html-parser" ,perl-html-parser) -- cgit v1.2.3 From 2ee918777b456bf3d00e62fed1c7c51491ff8a30 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 20 May 2020 12:59:11 +0100 Subject: gnu: perl-xml-feed: Enable tests. * gnu/packages/xml.scm (perl-xml-feed)[arguments]: Remove field. --- gnu/packages/xml.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 417b1fb402..be00981e57 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -818,8 +818,6 @@ server, collect the answer, and finally decoding the XML to Perl.") (base32 "1z1a88bpy64j42bbyl8acbfl3dn9iaz47gx6clkgy5sbn4kr0kgk")))) (build-system perl-build-system) - (arguments - `(#:tests? #f)) ; tests require internet connection (native-inputs `(("perl-module-build" ,perl-module-build) ("perl-uri" ,perl-uri) -- cgit v1.2.3 From 40b793fd51fde559d44b2d9d5a984377946ef944 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 20 May 2020 23:42:07 +0100 Subject: gnu: perl-xml-feed: Propagate inputs. * gnu/packages/xml.scm (perl-xml-feed)[inputs]: Move to... [propagated-inputs]: ...here. --- gnu/packages/xml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index be00981e57..d9efd5264b 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -822,7 +822,7 @@ server, collect the answer, and finally decoding the XML to Perl.") `(("perl-module-build" ,perl-module-build) ("perl-uri" ,perl-uri) ("perl-class-data-inheritable" ,perl-class-data-inheritable))) - (inputs + (propagated-inputs `(("perl-class-errorhandler" ,perl-class-errorhandler) ("perl-datetime" ,perl-datetime) ("perl-datetime-format-flexible" ,perl-datetime-format-flexible) -- cgit v1.2.3 From a7f89f97b73a732b7333b21e95946ed4c794b121 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 21 May 2020 13:10:08 +0100 Subject: gnu: ikiwiki: Add missing input. * gnu/packages/web.scm (ikiwiki)[inputs]: Add perl-xml-feed. [arguments]: Add 'pre-check' phase. --- gnu/packages/web.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index baea844e4f..cf9bff8b3b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4876,6 +4876,13 @@ NetSurf project.") (invoke "find" "doc" "underlays" "-type" "f" "-exec" "touch" "{}" "+") #t)) + (add-before 'check 'pre-check + ;; XDG_DATA_DIRS is needed by the podcast.t test. + (lambda* (#:key inputs #:allow-other-keys) + (setenv "XDG_DATA_DIRS" + (string-append (assoc-ref inputs "shared-mime-info") + "/share")) + #t)) (add-after 'install 'wrap-programs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -4907,6 +4914,7 @@ NetSurf project.") ("perl-lwpx-paranoidagent" ,perl-lwpx-paranoidagent) ("perl-mail-sendmail" ,perl-mail-sendmail) ("perl-timedate" ,perl-timedate) + ("perl-xml-feed" ,perl-xml-feed) ("perl-xml-sax" ,perl-xml-sax) ("perl-xml-simple" ,perl-xml-simple) ("perl-xml-twig" ,perl-xml-twig) -- cgit v1.2.3 From 1ee8b7192c761136f9d4aa3e32b940360dc888df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 04:04:35 +0200 Subject: gnu: criu: Download sources over HTTPS. * gnu/packages/virtualization.scm (criu)[source]: Use HTTPS. --- gnu/packages/virtualization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 27527b4116..e0b9a21e72 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -748,7 +748,7 @@ domains, their live performance and resource utilization statistics.") (version "3.14") (source (origin (method url-fetch) - (uri (string-append "http://download.openvz.org/criu/criu-" + (uri (string-append "https://download.openvz.org/criu/criu-" version ".tar.bz2")) (sha256 (base32 -- cgit v1.2.3 From c1ab9e881a0a5ba840ddb998dd7c60f6649f0f69 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 04:00:06 +0200 Subject: gnu: uhttpmock: Don't use NAME in source URI. * gnu/packages/web.scm (uhttpmock)[source]: Hard-code NAME. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index cf9bff8b3b..0aaa5e80bb 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4676,7 +4676,7 @@ you'd expect.") (origin (method url-fetch) (uri (string-append "http://tecnocode.co.uk/downloads/uhttpmock/" - name "-" version ".tar.xz")) + "uhttpmock-" version ".tar.xz")) (sha256 (base32 "0glyx07kxc3s3cx5vp30kfgscl9q6bghcq1zysfyxm24r0h6j58p")))) (build-system glib-or-gtk-build-system) -- cgit v1.2.3 From 1476ea0e55f7f644e920e90f48f7d545e24db25a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 13:59:15 +0200 Subject: gnu: mpop: Update to 1.4.9. * gnu/packages/mail.scm (mpop): Update to 1.4.9. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 63e8d1f91a..e3fd416dd9 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2166,14 +2166,14 @@ converts them to maildir format directories.") (define-public mpop (package (name "mpop") - (version "1.4.7") + (version "1.4.9") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/mpop/releases/" "mpop-" version ".tar.xz")) (sha256 - (base32 "0c6n5afn9pr4p7gxkv462lysrw52w9fhvavzm99c78dcp9dj5xnk")))) + (base32 "0hinmyd4lipy9wi3grwm72vv6xrpf4m08i9g9nlxzxnwfanw885q")))) (build-system gnu-build-system) (inputs `(("gnutls" ,gnutls))) -- cgit v1.2.3 From f2de892b375d30ad79502509a47a15f0f4d68fee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 14:52:01 +0200 Subject: gnu: http-parser: Fix build [and guix pull!] on i686-linux. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This follows up on commit 5c30eb61d74034a1b7c188b8d7be7df0b926025f. * gnu/packages/web.scm (http-parser)[source]: Apply the armhf patch not here… [arguments]: …but in a phase & only on armhf-linux. [native-inputs]: Add it on armhf-linux. --- gnu/packages/web.scm | 62 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0aaa5e80bb..f6fab8f036 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5920,30 +5920,28 @@ into your tests. It automatically starts up a HTTP server in a separate thread (name "http-parser") (version "2.9.4") (home-page "https://github.com/nodejs/http-parser") - (source (origin - (method git-fetch) - (uri (git-reference (url home-page) - (commit (string-append "v" version)))) - (sha256 - (base32 - "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")) - (file-name (git-file-name name version)) - (patches - (cons* - (origin - ;; Treat an empty port (e.g. `http://hostname:/`) when parsing - ;; URLs as if no port were specified. This patch is applied - ;; to Fedora's http-parser and to libgit2's bundled version. - (method url-fetch) - (uri (string-append - "https://src.fedoraproject.org/rpms/http-parser/raw/" - "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/" - "f/0001-url-treat-empty-port-as-default.patch")) - (sha256 - (base32 - "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))) - ;; A fix for . - (search-patches "http-parser-fix-assertion-on-armhf.patch"))))) + (source + (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (sha256 + (base32 "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")) + (file-name (git-file-name name version)) + (patches + (list + (origin + ;; Treat an empty port (e.g. `http://hostname:/`) when parsing + ;; URLs as if no port were specified. This patch is applied + ;; to Fedora's http-parser and to libgit2's bundled version. + (method url-fetch) + (uri (string-append + "https://src.fedoraproject.org/rpms/http-parser/raw/" + "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/" + "f/0001-url-treat-empty-port-as-default.patch")) + (sha256 + (base32 + "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))))))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -5956,6 +5954,14 @@ into your tests. It automatically starts up a HTTP server in a separate thread '("CC=gcc"))) #:phases (modify-phases %standard-phases + ,@(match (%current-system) + ("armhf-linux" + '((add-before 'check 'apply-assertion.patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch (assoc-ref inputs "assertion.patch"))) + (invoke "patch" "-p1" "-i" patch) + #t))))) + (_ '())) ,@(if (%current-target-system) '((replace 'configure (lambda* (#:key target #:allow-other-keys) @@ -5966,6 +5972,14 @@ into your tests. It automatically starts up a HTTP server in a separate thread (string-append "AR=" target "-ar\n"))) #t))) '((delete 'configure)))))) + (native-inputs + `(,@(match (%current-system) + ("armhf-linux" + ;; A fix for which in turn + ;; breaks i686-linux builds. + `(("assertion.patch" + ,@(search-patches "http-parser-fix-assertion-on-armhf.patch")))) + (_ '())))) (synopsis "HTTP request/response parser for C") (description "This is a parser for HTTP messages written in C. It parses both requests and responses. The parser is designed to be used in -- cgit v1.2.3 From 276d7115182b5d0ae1d21a7c0c55cf391300eb0d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 21 May 2020 16:00:07 +0300 Subject: gnu: gnuastro: Update to 0.12. * gnu/packages/astronomy.scm (gnuastro): Update to 0.12. --- gnu/packages/astronomy.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 7261c62978..2c97ef08d3 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 John Darrington ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2018, 2019 Efraim Flashner +;;; Copyright © 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2019 by Amar Singh ;;; Copyright © 2020 R Veera Kumar ;;; Copyright © 2020 Guillaume Le Vaillant @@ -128,7 +128,7 @@ header.") (define-public gnuastro (package (name "gnuastro") - (version "0.11") + (version "0.12") (source (origin (method url-fetch) @@ -136,7 +136,7 @@ header.") version ".tar.lz")) (sha256 (base32 - "0c1yc2qb7vrqad96savfn06rn01izlfz0va738signv93qqj5k3v")))) + "0ypk1c72q778cixfa52vjxzbd5m4qc6hfjgnipy16sfa7mnspmyf")))) (inputs `(("cfitsio" ,cfitsio) ("gsl" ,gsl) -- cgit v1.2.3 From c8b8e612dddf6249fafbaa34cedfb459f92a52b6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 21 May 2020 16:51:38 +0300 Subject: gnu: gnuastro: Don't build static libraries. * gnu/packages/astronomy.scm (gnuastro)[arguments]: Add configure-flag to skip building static libraries. --- gnu/packages/astronomy.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 2c97ef08d3..5b4590945d 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -137,6 +137,9 @@ header.") (sha256 (base32 "0ypk1c72q778cixfa52vjxzbd5m4qc6hfjgnipy16sfa7mnspmyf")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("cfitsio" ,cfitsio) ("gsl" ,gsl) @@ -147,7 +150,6 @@ header.") (native-inputs `(("libtool" ,libtool) ("lzip" ,lzip))) - (build-system gnu-build-system) (home-page "https://www.gnu.org/software/gnuastro/") (synopsis "Astronomy utilities") (description "The GNU Astronomy Utilities (Gnuastro) is a suite of -- cgit v1.2.3 From a011f67b07e463d7da0f790bdbc4ea0d9274f6dc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 May 2020 11:07:14 +0200 Subject: gnu: ruby-fakefs: Fix lonely parens. * gnu/packages/ruby.scm (ruby-fakefs)[arguments]: Move dangling parents up. --- gnu/packages/ruby.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 97789c1f40..94b16957e0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1572,8 +1572,7 @@ a Ruby object.") (substitute* "fakefs.gemspec" (("(.*add_development_dependency .*), .*" _ dep) (string-append dep "\n"))) - #t)) - ))) + #t))))) (native-inputs `(("ruby-bump" ,ruby-bump) ("ruby-maxitest" ,ruby-maxitest) -- cgit v1.2.3 From 29f4bb2e91ffe0da8f87832c909a33d51042a3bd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 May 2020 20:11:07 +0200 Subject: gnu: cogl: Update to 1.22.6. * gnu/packages/gnome.scm (cogl): Update to 1.22.6. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 092f9fcb00..c523df50c3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4440,7 +4440,7 @@ throughout GNOME for API documentation).") (define-public cogl (package (name "cogl") - (version "1.22.4") + (version "1.22.6") (source (origin (method url-fetch) @@ -4448,7 +4448,7 @@ throughout GNOME for API documentation).") (version-major+minor version) "/" "cogl-" version ".tar.xz")) (sha256 - (base32 "1q0drs82a8f6glg1v29bb6g2nf15fw0rvdx3d0rgcgfarfaby5sj")))) + (base32 "0x8v4n61q89qy27v824bqswpz6bmn801403w2q3pa1lcwk9ln4vd")))) ;; NOTE: mutter exports a bundled fork of cogl, so when making changes to ;; cogl, corresponding changes may be appropriate in mutter as well. (build-system gnu-build-system) -- cgit v1.2.3 From b4f04e0efff1fb6112b84dc6d36ea46215c336b2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 May 2020 21:03:05 +0200 Subject: gnu: cogl: Enable tests. * gnu/packages/gnome.scm (cogl)[native-inputs]: Add XORG-SERVER-FOR-TESTS. [arguments]: Remove #:tests?. Add #:disallowed-references. Add #:phases to prepare test environment. --- gnu/packages/gnome.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c523df50c3..938efbcdf3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4455,7 +4455,7 @@ throughout GNOME for API documentation).") (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums ("gobject-introspection" ,gobject-introspection) - ;;("xorg-server" ,xorg-server) ; for the test suite + ("xorg-server" ,xorg-server-for-tests) ("pkg-config" ,pkg-config))) (propagated-inputs `(("glib" ,glib) @@ -4474,7 +4474,8 @@ throughout GNOME for API documentation).") ("gst-plugins-base" ,gst-plugins-base) ("wayland" ,wayland))) (arguments - `(#:configure-flags (list "--enable-cogl-gst" + `(#:disallowed-references (,xorg-server-for-tests) + #:configure-flags (list "--enable-cogl-gst" "--enable-wayland-egl-platform" "--enable-wayland-egl-server" @@ -4483,19 +4484,18 @@ throughout GNOME for API documentation).") (string-append "--with-gl-libname=" (assoc-ref %build-inputs "mesa") "/lib/libGL.so")) - ;; XXX FIXME: All tests fail, with many warnings printed like this: - ;; _FontTransOpen: Unable to Parse address - ;; ${prefix}/share/fonts/X11/misc/ - #:tests? #f - #; #:phases - #; + #:phases (modify-phases %standard-phases (add-before 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) - ;; The test suite requires a running X server. - (system (format #f "~a/bin/Xvfb :1 &" - (assoc-ref inputs "xorg-server"))) - (setenv "DISPLAY" ":1") + (lambda* (#:key tests? inputs #:allow-other-keys) + (if tests? + (begin + ;; The test suite requires a running X server. + (system (format #f "~a/bin/Xvfb :1 +extension GLX &" + (assoc-ref inputs "xorg-server"))) + (setenv "DISPLAY" ":1") + #t) + (format #t "test suite not run~%")) #t))))) (home-page "https://www.cogl3d.org") (synopsis "Object oriented GL/GLES Abstraction/Utility Layer") -- cgit v1.2.3 From c743a9189cd04b164f6027751c4f9a994c5c1f76 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 21 May 2020 23:08:18 +0300 Subject: gnu: kodi: Update to 18.7. * gnu/packages/kodi.scm (kodi): Update to 18.7. --- gnu/packages/kodi.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 81294f4859..c81a4bc487 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2017, 2019 Marius Bakke ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice -;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2018, 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -269,7 +269,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") (define-public kodi (package (name "kodi") - (version "18.6") + (version "18.7") (source (origin (method git-fetch) (uri (git-reference @@ -278,7 +278,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") (file-name (git-file-name name version)) (sha256 (base32 - "0rwymipn5hljy5xrslzmrljmj6f9wb191wi7gjw20wl6sv44d0bk")) + "082cpih84j7v29w55qhj0rdia7hdjpwi81qywiwawd4vlyimpv2h")) (patches (search-patches "kodi-skip-test-449.patch" "kodi-increase-test-timeout.patch" "kodi-set-libcurl-ssl-parameters.patch")) -- cgit v1.2.3 From d4d9f882a35b536507c4671dabc6e63e0d3b95e9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 22:10:51 +0200 Subject: gnu: edgar: Update to 1.33. * gnu/packages/games.scm (edgar): Update to 1.33. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 111e1e0579..9e1a01fc04 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7359,7 +7359,7 @@ where the player draws runes in real time to effect the desired spell.") (define-public edgar (package (name "edgar") - (version "1.32") + (version "1.33") (source (origin (method url-fetch) @@ -7367,7 +7367,7 @@ where the player draws runes in real time to effect the desired spell.") (string-append "https://github.com/riksweeney/edgar/releases/download/" version "/edgar-" version "-1.tar.gz")) (sha256 - (base32 "12lam6qcscc5ima1w2ksd1cvsvxbd17h6mqkgsqpzx8ap43p2r5p")))) + (base32 "1mbx7dvizdca4g1blcv3bdh6yxd13k47rkya4rdzg0nvvz24m175")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; there are no tests #:make-flags -- cgit v1.2.3 From 6381565d9db2f03f92a951e7fe7317acfa7dad13 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 22:14:05 +0200 Subject: gnu: opensmtpd: Update to 6.7.1p1. * gnu/packages/mail.scm (opensmtpd): Update to 6.7.1p1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index e3fd416dd9..8e72edc221 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2298,14 +2298,14 @@ transfer protocols.") (define-public opensmtpd (package (name "opensmtpd") - (version "6.7.0p1") + (version "6.7.1p1") (source (origin (method url-fetch) (uri (string-append "https://www.opensmtpd.org/archives/" "opensmtpd-" version ".tar.gz")) (sha256 - (base32 "1f8bp40ywyixflg5qbnang6l210bv4vqa1k2pgm2356bp7bmsgy1")))) + (base32 "1jh8vxfajm1mvp1v5yh6llrhjzv0n9fgab88mlwllwqynhcfjy3l")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb) -- cgit v1.2.3 From 0b7fd225394623a2f2a10d0f422c462c673e3f8a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 19:08:18 +0200 Subject: gnu: liblcf: Update to 0.6.2. * gnu/packages/easyrpg.scm (liblcf): Update to 0.6.2. --- gnu/packages/easyrpg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/easyrpg.scm b/gnu/packages/easyrpg.scm index 05cdc42449..4adddb85be 100644 --- a/gnu/packages/easyrpg.scm +++ b/gnu/packages/easyrpg.scm @@ -39,7 +39,7 @@ (define-public liblcf (package (name "liblcf") - (version "0.6.1") + (version "0.6.2") (source (origin (method url-fetch) (uri (string-append @@ -47,7 +47,7 @@ "/liblcf-" version ".tar.gz")) (sha256 (base32 - "1qz387r4shbx48r3z7k8llkzz4b039zmak98wxpiwn6a23cssdn5")))) + "0n2k4brd264jg9p6918x7dnb2iimpzjh8q3v1fws58450xbgnkqc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 1ce1583186578deffa119b056ba977d795f52691 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 21:01:19 +0200 Subject: gnu: font-abattis-cantarell: Update to 0.201. * gnu/packages/fonts.scm (font-abattis-cantarell): Update to 0.201. [native-inputs]: Remove appstream-glib. --- gnu/packages/fonts.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index f4071f456f..9284609373 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -196,7 +196,7 @@ itself.")))) (define-public font-cantarell (package (name "font-abattis-cantarell") - (version "0.111") + (version "0.201") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/cantarell-fonts/" @@ -204,11 +204,10 @@ itself.")))) "/cantarell-fonts-" version ".tar.xz")) (sha256 (base32 - "05hpnhihwm9sxlq1qn993g03pwkmpjbn0dvnba71r1gfjv0jp2w5")))) + "0qwqmkczqy09fdj8l11nr841ks0dwsydqg55qyms12m4yvjn87xn")))) (build-system meson-build-system) (native-inputs - `(("appstream-glib" ,appstream-glib) - ("gettext" ,gettext-minimal))) ;for msgfmt + `(("gettext" ,gettext-minimal))) ; for msgfmt (home-page "https://wiki.gnome.org/Projects/CantarellFonts") (synopsis "Cantarell sans-serif typeface") (description "The Cantarell font family is a contemporary Humanist -- cgit v1.2.3 From 5e46b827cf79c064372a99537e469505218def0a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 21 May 2020 00:26:36 +0200 Subject: doc: Use "Alternatively" instead of "Alternately". These two words have different meanings and we really meant "alternatively" here. * doc/guix.texi (System Installation): (Preparing for Installation): (Invoking guix refresh): (Invoking guix challenge): (Networking Services): "Alternatively", not "Alternately". --- doc/guix.texi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 216422fe31..1ec30b8eeb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -1831,7 +1831,7 @@ how to use it, hit the @key{RET} key (``return'' or ``enter'') on the link that follows: @pxref{Top, Info reader,, info-stnd, Stand-alone GNU Info}. Hit @kbd{l} afterwards to come back here. -Alternately, run @command{info info} in another tty to keep the manual +Alternatively, run @command{info info} in another tty to keep the manual available. @end quotation @end ifinfo @@ -2021,7 +2021,7 @@ Guix System in a virtual machine (VM). @section Preparing for Installation Once you have booted, you can use the guided graphical installer, which makes -it easy to get started (@pxref{Guided Graphical Installation}). Alternately, +it easy to get started (@pxref{Guided Graphical Installation}). Alternatively, if you are already familiar with GNU/Linux and if you want more control than what the graphical installer provides, you can choose the ``manual'' installation process (@pxref{Manual Installation}). @@ -9542,7 +9542,7 @@ gnu/packages/gettext.scm:29:13: gettext would be upgraded from 0.18.1.1 to 0.18. gnu/packages/glib.scm:77:12: glib would be upgraded from 2.34.3 to 2.37.0 @end example -Alternately, one can specify packages to consider, in which case a +Alternatively, one can specify packages to consider, in which case a warning is emitted for packages that lack an updater: @example @@ -10727,7 +10727,7 @@ guix challenge git \ This automatically invokes @command{diffoscope}, which displays detailed information about files that differ. -Alternately, we can do something along these lines (@pxref{Invoking guix +Alternatively, we can do something along these lines (@pxref{Invoking guix archive}): @example @@ -14519,7 +14519,7 @@ subsystem name and a command (with optional arguments) to execute upon subsystem request. The command @command{internal-sftp} implements an in-process SFTP -server. Alternately, one can specify the @command{sftp-server} command: +server. Alternatively, one can specify the @command{sftp-server} command: @lisp (service openssh-service-type (openssh-configuration -- cgit v1.2.3 From 1ad5209d904d471ded6cf53b4e29b64e963dea3f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 21 May 2020 23:25:23 +0200 Subject: maint: Add "make check-channel-news". * build-aux/check-channel-news.scm: New file. * Makefile.am (EXTRA_DIST): Add it. (check-channel-news): New phony rule. * doc/contributing.texi (Commit Access): Mention "make check-channel-news". --- Makefile.am | 8 +++- build-aux/check-channel-news.scm | 82 ++++++++++++++++++++++++++++++++++++++++ doc/contributing.texi | 8 ++++ 3 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 build-aux/check-channel-news.scm diff --git a/Makefile.am b/Makefile.am index fd368d7493..3113e6b042 100644 --- a/Makefile.am +++ b/Makefile.am @@ -557,6 +557,7 @@ EXTRA_DIST += \ build-aux/cuirass/guix-modular.scm \ build-aux/cuirass/hydra-to-cuirass.scm \ build-aux/check-final-inputs-self-contained.scm \ + build-aux/check-channel-news.scm \ build-aux/compile-as-derivation.scm \ build-aux/generate-authors.scm \ build-aux/git-authenticate.scm \ @@ -885,6 +886,11 @@ assert-final-inputs-self-contained: $(GOBJECTS) $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/check-final-inputs-self-contained.scm" +# Validate channel news. +check-channel-news: $(GOBJECTS) + $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)" \ + "$(top_srcdir)/build-aux/check-channel-news.scm" + # Compute the Hydra jobs and write them in the target file. hydra-jobs.scm: $(GOBJECTS) $(AM_V_at)$(MKDIR_P) "`dirname "$@"`" @@ -904,7 +910,7 @@ cuirass-jobs.scm: $(GOBJECTS) .PHONY: gen-ChangeLog gen-AUTHORS gen-tarball-version .PHONY: assert-no-store-file-names assert-binaries-available -.PHONY: assert-final-inputs-self-contained +.PHONY: assert-final-inputs-self-contained check-channel-news .PHONY: clean-go make-go as-derivation authenticate .PHONY: update-guix-package update-NEWS release diff --git a/build-aux/check-channel-news.scm b/build-aux/check-channel-news.scm new file mode 100644 index 0000000000..eb7b89e437 --- /dev/null +++ b/build-aux/check-channel-news.scm @@ -0,0 +1,82 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +;;; +;;; Validate 'etc/news.scm'. +;;; + +(use-modules (git) + (guix git) + (guix ui) + (guix channels) + (srfi srfi-26) + (ice-9 match)) + +;; XXX: These two things are currently private. +(define read-channel-news (@@ (guix channels) read-channel-news)) +(define channel-news-entries (cut struct-ref <> 0)) + +(define (all-the-news directory) + "Return the read from DIRECTORY, a checkout of the 'guix' +channel." + (call-with-input-file (string-append directory "/etc/news.scm") + read-channel-news)) + +(define (validate-texinfo str type language) + "Parse STR as a Texinfo fragment and raise an error if that fails." + (catch #t + (lambda () + (texi->plain-text str)) + (lambda (key . args) + (print-exception (current-error-port) #f key args) + (report-error (G_ "the Texinfo snippet below is invalid (~a, ~a):~%") + type language) + (display str (current-error-port)) + (exit 1)))) + +(define (validate-news-entry repository entry) + "Validate ENTRY, a , making sure it refers to an +existent commit of REPOSITORY and contains only valid Texinfo." + (catch 'git-error + (lambda () + (let ((commit (commit-lookup repository + (string->oid + (channel-news-entry-commit entry))))) + (for-each (match-lambda + ((language . title) + (validate-texinfo title 'title language))) + (channel-news-entry-title entry)) + (for-each (match-lambda + ((language . body) + (validate-texinfo body 'body language))) + (channel-news-entry-body entry)))) + (lambda (key error . rest) + (if (= GIT_ENOTFOUND (git-error-code error)) + (leave (G_ "commit '~a' of entry '~a' does not exist~%") + (channel-news-entry-commit entry) + (channel-news-entry-title entry)) + (apply throw key error rest))))) + +(let* ((this-directory (dirname (current-filename))) + (top-directory (string-append this-directory "/..")) + (entries (channel-news-entries (all-the-news top-directory)))) + (with-repository top-directory repository + (for-each (cut validate-news-entry repository <>) + entries) + (info (G_ "All ~a channel news entries are valid.~%") + (length entries)))) diff --git a/doc/contributing.texi b/doc/contributing.texi index 44bec00236..7b1f7e7c94 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1278,6 +1278,14 @@ When pushing a commit on behalf of somebody else, please add a with @command{git am --signoff}. This improves tracking of who did what. +When adding channel news entries (@pxref{Channels, Writing Channel +News}), make sure they are well-formed by running the following command +right before pushing: + +@example +make check-channel-news +@end example + For anything else, please post to @email{guix-patches@@gnu.org} and leave time for a review, without committing anything (@pxref{Submitting Patches}). If you didn’t receive any reply after two weeks, and if -- cgit v1.2.3 From 73b27eaa64d90051870242464543153b8bcb95de Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 18 May 2020 21:57:49 +0200 Subject: tests: Test 'add-to-store' with several hash algorithms. * tests/store.scm ("add-to-store"): New test. --- tests/store.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/store.scm b/tests/store.scm index 0af099c1ad..f007846dc1 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -115,6 +115,18 @@ (passwd:name (getpwuid (getuid))))))) (list (stat:uid s) (stat:perms s)))) +(test-equal "add-to-store" + '("sha1" "sha256" "sha512") + (let* ((file (search-path %load-path "guix.scm")) + (content (call-with-input-file file get-bytevector-all))) + (map (lambda (hash-algo) + (let ((file (add-to-store %store "guix.scm" #f hash-algo file))) + (and (direct-store-path? file) + (bytevector=? (call-with-input-file file get-bytevector-all) + content) + hash-algo))) + '("sha1" "sha256" "sha512")))) + (test-equal "add-data-to-store" #vu8(1 2 3 4 5) (call-with-input-file (add-data-to-store %store "data" #vu8(1 2 3 4 5)) -- cgit v1.2.3 From 9418aaa00db44d3e0e3318ff66faace0d7b43326 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 18 May 2020 21:59:58 +0200 Subject: tests: Test fixed-output derivations with several hash algorithms. * tests/derivations.scm ("fixed-output derivation"): Test several hash algorithms. --- tests/derivations.scm | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/tests/derivations.scm b/tests/derivations.scm index ef6cec6c76..a409fa99f0 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -324,20 +324,29 @@ #:hash hash #:hash-algo 'sha256))) (fixed-output-derivation? drv))) -(test-assert "fixed-output derivation" - (let* ((builder (add-text-to-store %store "my-fixed-builder.sh" - "echo -n hello > $out" '())) - (hash (sha256 (string->utf8 "hello"))) - (drv (derivation %store "fixed" - %bash `(,builder) - #:sources `(,builder) ;optional - #:hash hash #:hash-algo 'sha256)) - (succeeded? (build-derivations %store (list drv)))) - (and succeeded? - (let ((p (derivation->output-path drv))) - (and (equal? (string->utf8 "hello") - (call-with-input-file p get-bytevector-all)) - (bytevector? (query-path-hash %store p))))))) +(test-equal "fixed-output derivation" + '(sha1 sha256 sha512) + (map (lambda (hash-algorithm) + (let* ((builder (add-text-to-store %store "my-fixed-builder.sh" + "echo -n hello > $out" '())) + (sha256 (sha256 (string->utf8 "hello"))) + (hash (bytevector-hash + (string->utf8 "hello") + (lookup-hash-algorithm hash-algorithm))) + (drv (derivation %store + (string-append + "fixed-" (symbol->string hash-algorithm)) + %bash `(,builder) + #:sources `(,builder) ;optional + #:hash hash + #:hash-algo hash-algorithm))) + (build-derivations %store (list drv)) + (let ((p (derivation->output-path drv))) + (and (bytevector=? (string->utf8 "hello") + (call-with-input-file p get-bytevector-all)) + (bytevector? (query-path-hash %store p)) + hash-algorithm)))) + '(sha1 sha256 sha512))) (test-assert "fixed-output derivation: output paths are equal" (let* ((builder1 (add-text-to-store %store "fixed-builder1.sh" -- cgit v1.2.3 From 18ae1ec3ecfe22d55d6cdf595a442afebbc5595a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 18 May 2020 22:10:20 +0200 Subject: guix hash, guix download: Add '--hash'. * guix/scripts/download.scm (%default-options): Add 'hash-algorithm'. (show-help, %options): Add "--hash". (guix-download): Honor it. * guix/scripts/hash.scm (%default-options): Add 'hash-algorithm'. (show-help, %options): Add "--hash". (guix-hash): Honor it. * tests/guix-hash.sh: Test '-H sha512'. * doc/guix.texi (Invoking guix download): Document it. (Invoking guix hash): Document it. --- doc/guix.texi | 15 +++++++++++++++ guix/scripts/download.scm | 14 ++++++++++++-- guix/scripts/hash.scm | 21 +++++++++++++++++---- tests/guix-hash.sh | 6 +++++- 4 files changed, 49 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 1ec30b8eeb..197207697e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9018,6 +9018,11 @@ Certificates}), unless @option{--no-check-certificate} is used. The following options are available: @table @code +@item --hash=@var{algorithm} +@itemx -H @var{algorithm} +Compute a hash using the specified @var{algorithm}. @xref{Invoking guix +hash}, for more information. + @item --format=@var{fmt} @itemx -f @var{fmt} Write the hash in the format specified by @var{fmt}. For more @@ -9057,6 +9062,16 @@ following options: @table @code +@item --hash=@var{algorithm} +@itemx -H @var{algorithm} +Compute a hash using the specified @var{algorithm}, @code{sha256} by +default. + +@var{algorithm} must the name of a cryptographic hash algorithm +supported by Libgcrypt @i{via} Guile-Gcrypt---e.g., @code{sha512} or +@code{sha3-256} (@pxref{Hash Functions,,, guile-gcrypt, Guile-Gcrypt +Reference Manual}). + @item --format=@var{fmt} @itemx -f @var{fmt} Write the hash in the format specified by @var{fmt}. diff --git a/guix/scripts/download.scm b/guix/scripts/download.scm index 22cd75ea0b..b4446c2e2f 100644 --- a/guix/scripts/download.scm +++ b/guix/scripts/download.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2012, 2013, 2015, 2016, 2017, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,6 +77,7 @@ (define %default-options ;; Alist of default option values. `((format . ,bytevector->nix-base32-string) + (hash-algorithm . ,(hash-algorithm sha256)) (verify-certificate? . #t) (download-proc . ,download-to-store*))) @@ -89,6 +90,8 @@ Supported formats: 'nix-base32' (default), 'base32', and 'base16' ('hex' and 'hexadecimal' can be used as well).\n")) (format #t (G_ " -f, --format=FMT write the hash in the given format")) + (format #t (G_ " + -H, --hash=ALGORITHM use the given hash ALGORITHM")) (format #t (G_ " --no-check-certificate do not validate the certificate of HTTPS servers ")) @@ -119,6 +122,13 @@ Supported formats: 'nix-base32' (default), 'base32', and 'base16' (alist-cons 'format fmt-proc (alist-delete 'format result)))) + (option '(#\H "hash") #t #f + (lambda (opt name arg result) + (match (lookup-hash-algorithm (string->symbol arg)) + (#f + (leave (G_ "~a: unknown hash algorithm~%") arg)) + (algo + (alist-cons 'hash-algorithm algo result))))) (option '("no-check-certificate") #f #f (lambda (opt name arg result) (alist-cons 'verify-certificate? #f result))) @@ -175,7 +185,7 @@ Supported formats: 'nix-base32' (default), 'base32', and 'base16' (or path (leave (G_ "~a: download failed~%") arg)) - port-sha256)) + (cute port-hash (assoc-ref opts 'hash-algorithm) <>))) (fmt (assq-ref opts 'format))) (format #t "~a~%~a~%" path (fmt hash)) #t))) diff --git a/guix/scripts/hash.scm b/guix/scripts/hash.scm index b8b2158195..cfc4420260 100644 --- a/guix/scripts/hash.scm +++ b/guix/scripts/hash.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2016, 2017 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2020 Ludovic Courtès ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2018 Tim Gesthuizen @@ -42,7 +42,8 @@ (define %default-options ;; Alist of default option values. - `((format . ,bytevector->nix-base32-string))) + `((format . ,bytevector->nix-base32-string) + (hash-algorithm . ,(hash-algorithm sha256)))) (define (show-help) (display (G_ "Usage: guix hash [OPTION] FILE @@ -53,6 +54,8 @@ and 'hexadecimal' can be used as well).\n")) (format #t (G_ " -x, --exclude-vcs exclude version control directories")) (format #t (G_ " + -H, --hash=ALGORITHM use the given hash ALGORITHM")) + (format #t (G_ " -f, --format=FMT write the hash in the given format")) (format #t (G_ " -r, --recursive compute the hash on FILE recursively")) @@ -69,6 +72,13 @@ and 'hexadecimal' can be used as well).\n")) (list (option '(#\x "exclude-vcs") #f #f (lambda (opt name arg result) (alist-cons 'exclude-vcs? #t result))) + (option '(#\H "hash") #t #f + (lambda (opt name arg result) + (match (lookup-hash-algorithm (string->symbol arg)) + (#f + (leave (G_ "~a: unknown hash algorithm~%") arg)) + (algo + (alist-cons 'hash-algorithm algo result))))) (option '(#\f "format") #t #f (lambda (opt name arg result) (define fmt-proc @@ -139,8 +149,11 @@ and 'hexadecimal' can be used as well).\n")) (force-output port) (get-hash)) (match file - ("-" (port-sha256 (current-input-port))) - (_ (call-with-input-file file port-sha256)))))) + ("-" (port-hash (assoc-ref opts 'hash-algorithm) + (current-input-port))) + (_ (call-with-input-file file + (cute port-hash (assoc-ref opts 'hash-algorithm) + <>))))))) (match args ((file) diff --git a/tests/guix-hash.sh b/tests/guix-hash.sh index 190c9e7f8a..1c595b49ed 100644 --- a/tests/guix-hash.sh +++ b/tests/guix-hash.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2013, 2014, 2016 Ludovic Courtès +# Copyright © 2013, 2014, 2016, 2020 Ludovic Courtès # Copyright © 2016 Jan Nieuwenhuizen # # This file is part of GNU Guix. @@ -31,6 +31,10 @@ test `echo -n | guix hash -` = 0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9 test `guix hash -f nix-base32 /dev/null` = 0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73 test `guix hash -f hex /dev/null` = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 test `guix hash -f base32 /dev/null` = 4oymiquy7qobjgx36tejs35zeqt24qpemsnzgtfeswmrw6csxbkq +test `guix hash -H sha512 -f hex /dev/null` = cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e + +if guix hash -H abcd1234 /dev/null; +then false; else true; fi mkdir "$tmpdir" echo -n executable > "$tmpdir/exe" -- cgit v1.2.3 From 0e4e9c8e7655f3e2a9c2615923768d211ac02a3e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 18 May 2020 22:25:13 +0200 Subject: guix hash, guix download: Support base64 format. * guix/scripts/download.scm (show-help, %options): Support "base64" format. * guix/scripts/hash.scm (show-help, %options): Likewise. * tests/guix-hash.sh: Test it. * doc/guix.texi (Invoking guix hash): Document it. --- doc/guix.texi | 2 +- guix/scripts/download.scm | 12 ++++++++---- guix/scripts/hash.scm | 14 +++++++++----- tests/guix-hash.sh | 1 + 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 197207697e..01dab5b72c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9076,7 +9076,7 @@ Reference Manual}). @itemx -f @var{fmt} Write the hash in the format specified by @var{fmt}. -Supported formats: @code{nix-base32}, @code{base32}, @code{base16} +Supported formats: @code{base64}, @code{nix-base32}, @code{base32}, @code{base16} (@code{hex} and @code{hexadecimal} can be used as well). If the @option{--format} option is not specified, @command{guix hash} diff --git a/guix/scripts/download.scm b/guix/scripts/download.scm index b4446c2e2f..589f62da9d 100644 --- a/guix/scripts/download.scm +++ b/guix/scripts/download.scm @@ -23,6 +23,7 @@ #:use-module (gcrypt hash) #:use-module (guix base16) #:use-module (guix base32) + #:autoload (guix base64) (base64-encode) #:use-module ((guix download) #:hide (url-fetch)) #:use-module ((guix build download) #:select (url-fetch)) @@ -84,10 +85,11 @@ (define (show-help) (display (G_ "Usage: guix download [OPTION] URL Download the file at URL to the store or to the given file, and print its -file name and the hash of its contents. - -Supported formats: 'nix-base32' (default), 'base32', and 'base16' -('hex' and 'hexadecimal' can be used as well).\n")) +file name and the hash of its contents.\n")) + (newline) + (display (G_ "\ +Supported formats: 'base64', 'nix-base32' (default), 'base32', +and 'base16' ('hex' and 'hexadecimal' can be used as well).\n")) (format #t (G_ " -f, --format=FMT write the hash in the given format")) (format #t (G_ " @@ -111,6 +113,8 @@ Supported formats: 'nix-base32' (default), 'base32', and 'base16' (lambda (opt name arg result) (define fmt-proc (match arg + ("base64" + base64-encode) ("nix-base32" bytevector->nix-base32-string) ("base32" diff --git a/guix/scripts/hash.scm b/guix/scripts/hash.scm index cfc4420260..9b4f419a24 100644 --- a/guix/scripts/hash.scm +++ b/guix/scripts/hash.scm @@ -20,12 +20,13 @@ ;;; along with GNU Guix. If not, see . (define-module (guix scripts hash) - #:use-module (guix base32) #:use-module (gcrypt hash) #:use-module (guix serialization) #:use-module (guix ui) #:use-module (guix scripts) #:use-module (guix base16) + #:use-module (guix base32) + #:autoload (guix base64) (base64-encode) #:use-module (ice-9 binary-ports) #:use-module (rnrs files) #:use-module (ice-9 match) @@ -47,10 +48,11 @@ (define (show-help) (display (G_ "Usage: guix hash [OPTION] FILE -Return the cryptographic hash of FILE. - -Supported formats: 'nix-base32' (default), 'base32', and 'base16' ('hex' -and 'hexadecimal' can be used as well).\n")) +Return the cryptographic hash of FILE.\n")) + (newline) + (display (G_ "\ +Supported formats: 'base64', 'nix-base32' (default), 'base32', +and 'base16' ('hex' and 'hexadecimal' can be used as well).\n")) (format #t (G_ " -x, --exclude-vcs exclude version control directories")) (format #t (G_ " @@ -83,6 +85,8 @@ and 'hexadecimal' can be used as well).\n")) (lambda (opt name arg result) (define fmt-proc (match arg + ("base64" + base64-encode) ("nix-base32" bytevector->nix-base32-string) ("base32" diff --git a/tests/guix-hash.sh b/tests/guix-hash.sh index 1c595b49ed..3538b9aeda 100644 --- a/tests/guix-hash.sh +++ b/tests/guix-hash.sh @@ -32,6 +32,7 @@ test `guix hash -f nix-base32 /dev/null` = 0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lz test `guix hash -f hex /dev/null` = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 test `guix hash -f base32 /dev/null` = 4oymiquy7qobjgx36tejs35zeqt24qpemsnzgtfeswmrw6csxbkq test `guix hash -H sha512 -f hex /dev/null` = cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e +test `guix hash -H sha1 -f base64 /dev/null` = "2jmj7l5rSw0yVb/vlWAYkK/YBwk=" if guix hash -H abcd1234 /dev/null; then false; else true; fi -- cgit v1.2.3 From 56f7ca6e7c8b5eadeee48b00bcbd78f9fa9e5f43 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 18 May 2020 23:21:36 +0200 Subject: packages: Add 'base64' macro. * guix/packages.scm (define-compile-time-decoder): New macro. (base32): Redefine in terms of it. (base64): New macro. --- guix/packages.scm | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 3fff50a6e8..c1c4805ae9 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -28,6 +28,7 @@ #:use-module (guix monads) #:use-module (guix gexp) #:use-module (guix base32) + #:autoload (guix base64) (base64-decode) #:use-module (guix grafts) #:use-module (guix derivations) #:use-module (guix memoization) @@ -62,6 +63,7 @@ origin-snippet origin-modules base32 + base64 package package? @@ -197,19 +199,24 @@ (set-record-type-printer! print-origin) -(define-syntax base32 - (lambda (s) - "Return the bytevector corresponding to the given Nix-base32 +(define-syntax-rule (define-compile-time-decoder name string->bytevector) + "Define NAME as a macro that runs STRING->BYTEVECTOR at macro expansion time +if possible." + (define-syntax name + (lambda (s) + "Return the bytevector corresponding to the given textual representation." - (syntax-case s () - ((_ str) - (string? (syntax->datum #'str)) - ;; A literal string: do the conversion at expansion time. - (with-syntax ((bv (nix-base32-string->bytevector - (syntax->datum #'str)))) - #''bv)) - ((_ str) - #'(nix-base32-string->bytevector str))))) + (syntax-case s () + ((_ str) + (string? (syntax->datum #'str)) + ;; A literal string: do the conversion at expansion time. + (with-syntax ((bv (string->bytevector (syntax->datum #'str)))) + #''bv)) + ((_ str) + #'(string->bytevector str)))))) + +(define-compile-time-decoder base32 nix-base32-string->bytevector) +(define-compile-time-decoder base64 base64-decode) (define (origin-actual-file-name origin) "Return the file name of ORIGIN, either its 'file-name' field or the file -- cgit v1.2.3 From ce0be5675b702b2ff89aed1772ebb42af4150243 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 19 May 2020 15:55:08 +0200 Subject: packages: Introduce and use it in . * guix/packages.scm (): New record type. (define-content-hash-constructor, build-content-hash) (content-hash): New macros. (print-content-hash): New procedure. (): Rename constructor to '%origin'. [sha256]: Remove field. [hash]: New field. Adjust users. (origin-compatibility-helper, origin): New macros. (origin-sha256): New deprecated procedure. (origin->derivation): Adjust accordingly. * tests/packages.scm ("package-source-derivation, origin, sha512"): New test. * guix/tests.scm: Hide (gcrypt hash) 'sha256' for proper syntax matching. * tests/challenge.scm: Add #:prefix for (gcrypt hash) and adjust users. * tests/derivations.scm: Likewise. * tests/store.scm: Likewise. * tests/graph.scm ("bag DAG, including origins"): Provide 'sha256' field with the right length. * gnu/packages/aspell.scm (aspell-dictionary) (aspell-dict-ca, aspell-dict-it): Use 'hash' and 'content-hash' for proper syntax matching. * gnu/packages/bash.scm (bash-patch): Rename 'sha256' to 'sha256-bv'. * gnu/packages/bootstrap.scm (bootstrap-executable): Rename 'sha256' to 'bv'. * gnu/packages/readline.scm (readline-patch): Likewise. * gnu/packages/virtualization.scm (qemu-patch): Rename 'sha256' to 'sha256-bv'. * guix/import/utils.scm: Hide (gcrypt hash) 'sha256'. --- doc/guix.texi | 34 ++++++++++- gnu/packages/aspell.scm | 8 +-- gnu/packages/bash.scm | 8 +-- gnu/packages/bootstrap.scm | 6 +- gnu/packages/readline.scm | 8 +-- gnu/packages/virtualization.scm | 4 +- guix/import/utils.scm | 2 +- guix/packages.scm | 126 ++++++++++++++++++++++++++++++++++++---- guix/tests.scm | 2 +- tests/challenge.scm | 6 +- tests/derivations.scm | 32 +++++----- tests/graph.scm | 6 +- tests/packages.scm | 28 ++++++++- tests/store.scm | 8 +-- 14 files changed, 220 insertions(+), 58 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 01dab5b72c..c1e23b5ef3 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5966,9 +5966,13 @@ specified in the @code{uri} field as a @code{git-reference} object; a @end table @item @code{sha256} -A bytevector containing the SHA-256 hash of the source. Typically the -@code{base32} form is used here to generate the bytevector from a -base-32 string. +A bytevector containing the SHA-256 hash of the source. This is +equivalent to providing a @code{content-hash} SHA256 object in the +@code{hash} field described below. + +@item @code{hash} +The @code{content-hash} object of the source---see below for how to use +@code{content-hash}. You can obtain this information using @code{guix download} (@pxref{Invoking guix download}) or @code{guix hash} (@pxref{Invoking @@ -6013,6 +6017,30 @@ this is @code{#f}, a sensible default is used. @end table @end deftp +@deftp {Data Type} content-hash @var{value} [@var{algorithm}] +Construct a content hash object for the given @var{algorithm}, and with +@var{value} as its hash value. When @var{algorithm} is omitted, assume +it is @code{sha256}. + +@var{value} can be a literal string, in which case it is base32-decoded, +or it can be a bytevector. + +The following forms are all equivalent: + +@lisp +(content-hash "05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj") +(content-hash "05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj" + sha256) +(content-hash (base32 + "05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj")) +(content-hash (base64 "kkb+RPaP7uyMZmu4eXPVkM4BN8yhRd8BTHLslb6f/Rc=") + sha256) +@end lisp + +Technically, @code{content-hash} is currently implemented as a macro. +It performs sanity checks at macro-expansion time, when possible, such +as ensuring that @var{value} has the right size for @var{algorithm}. +@end deftp @node Build Systems @section Build Systems diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 7550736c40..22256f750b 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015, 2016 Alex Kost ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016, 2017, 2019 Efraim Flashner @@ -111,7 +111,7 @@ dictionaries, including personal ones.") (uri (string-append "mirror://gnu/aspell/dict/" dict-name "/" prefix dict-name "-" version ".tar.bz2")) - (sha256 sha256))) + (hash (content-hash sha256)))) (build-system gnu-build-system) (arguments `(#:phases @@ -163,7 +163,7 @@ dictionaries, including personal ones.") (method url-fetch) (uri (string-append "https://www.softcatala.org/pub/softcatala/aspell/" version "/aspell6-ca-" version ".tar.bz2")) - (sha256 sha256))) + (hash (content-hash sha256)))) (home-page "https://www.softcatala.org/pub/softcatala/aspell/")))) (define-public aspell-dict-de @@ -264,7 +264,7 @@ dictionaries, including personal ones.") (uri (string-append "mirror://sourceforge/linguistico/" "Dizionario%20italiano%20per%20Aspell/" version "/" "aspell6-it-" version ".tar.bz2")) - (sha256 sha256))) + (hash (content-hash sha256)))) (home-page "http://linguistico.sourceforge.net/pages/dizionario_italiano.html")))) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 1b342827c5..311e07a944 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2015, 2017 Leo Famulari ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner @@ -48,12 +48,12 @@ "Return the URL of Bash patch number SEQNO." (format #f "mirror://gnu/bash/bash-5.0-patches/bash50-~3,'0d" seqno)) -(define (bash-patch seqno sha256) - "Return the origin of Bash patch SEQNO, with expected hash SHA256" +(define (bash-patch seqno sha256-bv) + "Return the origin of Bash patch SEQNO, with expected hash SHA256-BV." (origin (method url-fetch) (uri (patch-url seqno)) - (sha256 sha256))) + (sha256 sha256-bv))) (define-syntax-rule (patch-series (seqno hash) ...) (list (bash-patch seqno (base32 hash)) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index f58ce2de93..a3ecb6e692 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018, 2019 Mark H Weaver ;;; Copyright © 2017, 2020 Efraim Flashner ;;; Copyright © 2018, 2020 Jan (janneke) Nieuwenhuizen @@ -151,14 +151,14 @@ built for SYSTEM." (format #f (G_ "could not find bootstrap binary '~a' \ for system '~a'") program system)))))) - ((sha256) + ((bv) (origin (method url-fetch/executable) (uri (map (cute string-append <> (bootstrap-executable-file-name system program)) %bootstrap-executable-base-urls)) (file-name program) - (sha256 sha256))))))) + (hash (content-hash bv sha256)))))))) ;;; diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 5f61dcb735..8a36883347 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2020 Ludovic Courtès ;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -35,12 +35,12 @@ (format #f "mirror://gnu/readline/readline-~a-patches/readline~a-~3,'0d" version (string-join (string-split version #\.) "") seqno)) -(define (readline-patch version seqno sha256) - "Return the origin of Readline patch SEQNO, with expected hash SHA256" +(define (readline-patch version seqno sha256-bv) + "Return the origin of Readline patch SEQNO, with expected hash SHA256-BV" (origin (method url-fetch) (uri (patch-url version seqno)) - (sha256 sha256))) + (sha256 sha256-bv))) (define-syntax-rule (patch-series version (seqno hash) ...) (list (readline-patch version seqno (base32 hash)) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e0b9a21e72..32113a0f2c 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -104,14 +104,14 @@ #:use-module (srfi srfi-1) #:use-module (ice-9 match)) -(define (qemu-patch commit file-name sha256) +(define (qemu-patch commit file-name sha256-bv) "Return an origin for COMMIT." (origin (method url-fetch) (uri (string-append "http://git.qemu.org/?p=qemu.git;a=commitdiff_plain;h=" commit)) - (sha256 sha256) + (hash (content-hash sha256-bv sha256)) (file-name file-name))) (define-public qemu diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 3809c3d074..0cfa1f8321 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -24,7 +24,7 @@ (define-module (guix import utils) #:use-module (guix base32) #:use-module ((guix build download) #:prefix build:) - #:use-module (gcrypt hash) + #:use-module ((gcrypt hash) #:hide (sha256)) #:use-module (guix http-client) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) diff --git a/guix/packages.scm b/guix/packages.scm index c1c4805ae9..3d9988d836 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -35,6 +35,8 @@ #:use-module (guix build-system) #:use-module (guix search-paths) #:use-module (guix sets) + #:use-module (guix deprecation) + #:use-module (guix i18n) #:use-module (ice-9 match) #:use-module (ice-9 vlist) #:use-module (ice-9 regex) @@ -44,16 +46,23 @@ #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) + #:use-module (rnrs bytevectors) #:use-module (web uri) #:re-export (%current-system %current-target-system search-path-specification) ;for convenience - #:export (origin + #:export (content-hash + content-hash? + content-hash-algorithm + content-hash-value + + origin origin? this-origin origin-uri origin-method - origin-sha256 + origin-hash + origin-sha256 ;deprecated origin-file-name origin-actual-file-name origin-patches @@ -157,15 +166,79 @@ ;;; ;;; Code: +;; Crytographic content hash. +(define-immutable-record-type + (%content-hash algorithm value) + content-hash? + (algorithm content-hash-algorithm) ;symbol + (value content-hash-value)) ;bytevector + +(define-syntax-rule (define-content-hash-constructor name + (algorithm size) ...) + "Define NAME as a constructor that ensures that (1) its +second argument is among the listed ALGORITHM, and (2), when possible, that +its first argument has the right size for the chosen algorithm." + (define-syntax name + (lambda (s) + (syntax-case s (algorithm ...) + ((_ bv algorithm) + (let ((bv* (syntax->datum #'bv))) + (when (and (bytevector? bv*) + (not (= size (bytevector-length bv*)))) + (syntax-violation 'content-hash "invalid content hash length" s)) + #'(%content-hash 'algorithm bv))) + ...)))) + +(define-content-hash-constructor build-content-hash + (sha256 32) + (sha512 64)) + +(define-syntax content-hash + (lambda (s) + "Return a content hash with the given parameters. The default hash +algorithm is sha256. If the first argument is a literal string, it is decoded +as base32. Otherwise, it must be a bytevector." + ;; What we'd really want here is something like C++ 'constexpr'. + (syntax-case s () + ((_ str) + (string? (syntax->datum #'str)) + #'(content-hash str sha256)) + ((_ str algorithm) + (string? (syntax->datum #'str)) + (with-syntax ((bv (base32 (syntax->datum #'str)))) + #'(content-hash bv algorithm))) + ((_ (id str) algorithm) + (and (string? (syntax->datum #'str)) + (free-identifier=? #'id #'base32)) + (with-syntax ((bv (nix-base32-string->bytevector (syntax->datum #'str)))) + #'(content-hash bv algorithm))) + ((_ (id str) algorithm) + (and (string? (syntax->datum #'str)) + (free-identifier=? #'id #'base64)) + (with-syntax ((bv (base64-decode (syntax->datum #'str)))) + #'(content-hash bv algorithm))) + ((_ bv) + #'(content-hash bv sha256)) + ((_ bv hash) + #'(build-content-hash bv hash))))) + +(define (print-content-hash hash port) + (format port "#" + (content-hash-algorithm hash) + (bytevector->nix-base32-string (content-hash-value hash)))) + +(set-record-type-printer! print-content-hash) + + ;; The source of a package, such as a tarball URL and fetcher---called ;; "origin" to avoid name clash with `package-source', `source', etc. (define-record-type* - origin make-origin + %origin make-origin origin? this-origin (uri origin-uri) ; string (method origin-method) ; procedure - (sha256 origin-sha256) ; bytevector + (hash origin-hash) ; (file-name origin-file-name (default #f)) ; optional file name ;; Patches are delayed so that the 'search-patch' calls are made lazily, @@ -188,12 +261,37 @@ (patch-guile origin-patch-guile ; package or #f (default #f))) +(define-syntax origin-compatibility-helper + (syntax-rules (sha256) + ((_ () (fields ...)) + (%origin fields ...)) + ((_ ((sha256 exp) rest ...) (others ...)) + (%origin others ... + (hash (content-hash exp sha256)) + rest ...)) + ((_ (field rest ...) (others ...)) + (origin-compatibility-helper (rest ...) + (others ... field))))) + +(define-syntax-rule (origin fields ...) + "Build an record, automatically converting 'sha256' field +specifications to 'hash'." + (origin-compatibility-helper (fields ...) ())) + +(define-deprecated (origin-sha256 origin) + origin-hash + (let ((hash (origin-hash origin))) + (unless (eq? (content-hash-algorithm hash) 'sha256) + (raise (condition (&message + (message (G_ "no SHA256 hash for origin")))))) + (content-hash-value hash))) + (define (print-origin origin port) "Write a concise representation of ORIGIN to PORT." (match origin - (($ uri method sha256 file-name patches) + (($ uri method hash file-name patches) (simple-format port "#" - uri (bytevector->base32-string sha256) + uri hash (force patches) (number->string (object-address origin) 16))))) @@ -238,6 +336,7 @@ name of its URI." ;; git, svn, cvs, etc. reference #f)))) + (define %supported-systems ;; This is the list of system types that are supported. By default, we ;; expect all packages to build successfully here. @@ -1388,14 +1487,19 @@ unless you know what you are doing." #:optional (system (%current-system))) "Return the derivation corresponding to ORIGIN." (match origin - (($ uri method sha256 name (= force ()) #f) + (($ uri method hash name (= force ()) #f) ;; No patches, no snippet: this is a fixed-output derivation. - (method uri 'sha256 sha256 name #:system system)) - (($ uri method sha256 name (= force (patches ...)) snippet + (method uri + (content-hash-algorithm hash) + (content-hash-value hash) + name #:system system)) + (($ uri method hash name (= force (patches ...)) snippet (flags ...) inputs (modules ...) guile-for-build) ;; Patches and/or a snippet. - (mlet %store-monad ((source (method uri 'sha256 sha256 name - #:system system)) + (mlet %store-monad ((source (method uri + (content-hash-algorithm hash) + (content-hash-value hash) + name #:system system)) (guile (package->derivation (or guile-for-build (default-guile)) system diff --git a/guix/tests.scm b/guix/tests.scm index 95a7d7c4b8..3ccf049a7d 100644 --- a/guix/tests.scm +++ b/guix/tests.scm @@ -26,7 +26,7 @@ #:use-module (guix monads) #:use-module ((guix utils) #:select (substitute-keyword-arguments)) #:use-module ((guix build utils) #:select (mkdir-p)) - #:use-module (gcrypt hash) + #:use-module ((gcrypt hash) #:hide (sha256)) #:use-module (guix build-system gnu) #:use-module (gnu packages base) #:use-module (gnu packages bootstrap) diff --git a/tests/challenge.scm b/tests/challenge.scm index bb5633a3eb..9c6d6e0d58 100644 --- a/tests/challenge.scm +++ b/tests/challenge.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2017, 2019 Ludovic Courtès +;;; Copyright © 2015, 2017, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,7 +19,7 @@ (define-module (test-challenge) #:use-module (guix tests) #:use-module (guix tests http) - #:use-module (gcrypt hash) + #:use-module ((gcrypt hash) #:prefix gcrypt:) #:use-module (guix store) #:use-module (guix monads) #:use-module (guix derivations) @@ -135,7 +135,7 @@ (mlet* %store-monad ((drv (gexp->derivation "something" #~(list #$output #$text))) (out -> (derivation->output-path drv)) - (hash -> (sha256 #vu8()))) + (hash -> (gcrypt:sha256 #vu8()))) (with-derivation-narinfo* drv (sha256 => hash) (>>= (compare-contents (list out) (%test-substitute-urls)) (match-lambda diff --git a/tests/derivations.scm b/tests/derivations.scm index a409fa99f0..9f1104a887 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -23,7 +23,7 @@ #:use-module (guix grafts) #:use-module (guix store) #:use-module (guix utils) - #:use-module (gcrypt hash) + #:use-module ((gcrypt hash) #:prefix gcrypt:) #:use-module (guix base32) #:use-module (guix tests) #:use-module (guix tests http) @@ -215,7 +215,7 @@ #:env-vars `(("url" . ,(object->string (%local-url)))) #:hash-algo 'sha256 - #:hash (sha256 (string->utf8 text))))) + #:hash (gcrypt:sha256 (string->utf8 text))))) (and (build-derivations %store (list drv)) (string=? (call-with-input-file (derivation->output-path drv) get-string-all) @@ -230,7 +230,7 @@ #:env-vars `(("url" . ,(object->string (%local-url)))) #:hash-algo 'sha256 - #:hash (sha256 (random-bytevector 100))))) ;wrong + #:hash (gcrypt:sha256 (random-bytevector 100))))) ;wrong (guard (c ((store-protocol-error? c) (string-contains (store-protocol-error-message c) "failed"))) (build-derivations %store (list drv)) @@ -245,7 +245,7 @@ #:env-vars `(("url" . ,(object->string (%local-url)))) #:hash-algo 'sha256 - #:hash (sha256 (random-bytevector 100))))) + #:hash (gcrypt:sha256 (random-bytevector 100))))) (guard (c ((store-protocol-error? c) (string-contains (store-protocol-error-message (pk c)) "failed"))) (build-derivations %store (list drv)) @@ -273,7 +273,7 @@ #:env-vars `(("url" . ,(object->string (%local-url)))) #:hash-algo 'sha256 - #:hash (sha256 (string->utf8 text))))) + #:hash (gcrypt:sha256 (string->utf8 text))))) (and (with-http-server `((200 ,text)) (build-derivations %store (list drv))) (with-http-server `((200 ,text)) @@ -317,7 +317,7 @@ (test-assert "fixed-output-derivation?" (let* ((builder (add-text-to-store %store "my-fixed-builder.sh" "echo -n hello > $out" '())) - (hash (sha256 (string->utf8 "hello"))) + (hash (gcrypt:sha256 (string->utf8 "hello"))) (drv (derivation %store "fixed" %bash `(,builder) #:sources (list builder) @@ -329,10 +329,10 @@ (map (lambda (hash-algorithm) (let* ((builder (add-text-to-store %store "my-fixed-builder.sh" "echo -n hello > $out" '())) - (sha256 (sha256 (string->utf8 "hello"))) - (hash (bytevector-hash + (sha256 (gcrypt:sha256 (string->utf8 "hello"))) + (hash (gcrypt:bytevector-hash (string->utf8 "hello") - (lookup-hash-algorithm hash-algorithm))) + (gcrypt:lookup-hash-algorithm hash-algorithm))) (drv (derivation %store (string-append "fixed-" (symbol->string hash-algorithm)) @@ -353,7 +353,7 @@ "echo -n hello > $out" '())) (builder2 (add-text-to-store %store "fixed-builder2.sh" "echo hey; echo -n hello > $out" '())) - (hash (sha256 (string->utf8 "hello"))) + (hash (gcrypt:sha256 (string->utf8 "hello"))) (drv1 (derivation %store "fixed" %bash `(,builder1) #:hash hash #:hash-algo 'sha256)) @@ -368,7 +368,7 @@ (test-assert "fixed-output derivation, recursive" (let* ((builder (add-text-to-store %store "my-fixed-builder.sh" "echo -n hello > $out" '())) - (hash (sha256 (string->utf8 "hello"))) + (hash (gcrypt:sha256 (string->utf8 "hello"))) (drv (derivation %store "fixed-rec" %bash `(,builder) #:sources (list builder) @@ -390,7 +390,7 @@ "echo -n hello > $out" '())) (builder2 (add-text-to-store %store "fixed-builder2.sh" "echo hey; echo -n hello > $out" '())) - (hash (sha256 (string->utf8 "hello"))) + (hash (gcrypt:sha256 (string->utf8 "hello"))) (fixed1 (derivation %store "fixed" %bash `(,builder1) #:hash hash #:hash-algo 'sha256)) @@ -427,7 +427,7 @@ "echo -n hello > $out" '())) (builder2 (add-text-to-store %store "fixed-builder2.sh" "echo hey; echo -n hello > $out" '())) - (hash (sha256 (string->utf8 "hello"))) + (hash (gcrypt:sha256 (string->utf8 "hello"))) (fixed1 (derivation %store "fixed" %bash `(,builder1) #:hash hash #:hash-algo 'sha256)) @@ -680,7 +680,7 @@ (let* ((value (getenv "GUIX_STATE_DIRECTORY")) (drv (derivation %store "leaked-env-vars" %bash '("-c" "echo -n $GUIX_STATE_DIRECTORY > $out") - #:hash (sha256 (string->utf8 value)) + #:hash (gcrypt:sha256 (string->utf8 value)) #:hash-algo 'sha256 #:sources (list %bash) #:leaked-env-vars '("GUIX_STATE_DIRECTORY")))) @@ -1106,7 +1106,7 @@ (builder2 '(call-with-output-file (pk 'difference-here! %output) (lambda (p) (write "hello" p)))) - (hash (sha256 (string->utf8 "hello"))) + (hash (gcrypt:sha256 (string->utf8 "hello"))) (input1 (build-expression->derivation %store "fixed" builder1 #:hash hash #:hash-algo 'sha256)) @@ -1127,7 +1127,7 @@ (builder2 '(call-with-output-file (pk 'difference-here! %output) (lambda (p) (write "hello" p)))) - (hash (sha256 (string->utf8 "hello"))) + (hash (gcrypt:sha256 (string->utf8 "hello"))) (input1 (build-expression->derivation %store "fixed" builder1 #:hash hash #:hash-algo 'sha256)) diff --git a/tests/graph.scm b/tests/graph.scm index 136260c7d1..0663d13b49 100644 --- a/tests/graph.scm +++ b/tests/graph.scm @@ -162,7 +162,11 @@ edges." (let-values (((backend nodes+edges) (make-recording-backend))) (let* ((m (lambda* (uri hash-type hash name #:key system) (text-file "foo-1.2.3.tar.gz" "This is a fake!"))) - (o (origin (method m) (uri "the-uri") (sha256 #vu8(0 1 2)))) + (o (origin + (method m) (uri "the-uri") + (sha256 + (base32 + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")))) (p (dummy-package "p" (source o)))) (run-with-store %store (export-graph (list p) 'port diff --git a/tests/packages.scm b/tests/packages.scm index c528d2080c..4935d4503e 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -29,7 +29,7 @@ #:renamer (lambda (name) (cond ((eq? name 'location) 'make-location) (else name)))) - #:use-module (gcrypt hash) + #:use-module ((gcrypt hash) #:hide (sha256)) #:use-module (guix derivations) #:use-module (guix packages) #:use-module (guix grafts) @@ -51,6 +51,7 @@ #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (srfi srfi-64) + #:use-module (rnrs bytevectors) #:use-module (rnrs io ports) #:use-module (ice-9 vlist) #:use-module (ice-9 regex) @@ -497,6 +498,31 @@ (search-path %load-path "guix/base32.scm") get-bytevector-all))))) +(test-equal "package-source-derivation, origin, sha512" + "hello" + (let* ((bash (search-bootstrap-binary "bash" (%current-system))) + (builder (add-text-to-store %store "my-fixed-builder.sh" + "echo -n hello > $out" '())) + (method (lambda* (url hash-algo hash #:optional name + #:rest rest) + (and (eq? hash-algo 'sha512) + (raw-derivation name bash (list builder) + #:sources (list builder) + #:hash hash + #:hash-algo hash-algo)))) + (source (origin + (method method) + (uri "unused://") + (file-name "origin-sha512") + (hash (content-hash + (bytevector-hash (string->utf8 "hello") + (hash-algorithm sha512)) + sha512)))) + (drv (package-source-derivation %store source)) + (output (derivation->output-path drv))) + (build-derivations %store (list drv)) + (call-with-input-file output get-string-all))) + (unless (network-reachable?) (test-skip 1)) (test-equal "package-source-derivation, snippet" "OK" diff --git a/tests/store.scm b/tests/store.scm index f007846dc1..06f7939657 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -22,7 +22,7 @@ #:use-module (guix store) #:use-module (guix utils) #:use-module (guix monads) - #:use-module (gcrypt hash) + #:use-module ((gcrypt hash) #:prefix gcrypt:) #:use-module (guix base32) #:use-module (guix packages) #:use-module (guix derivations) @@ -321,7 +321,7 @@ #:env-vars `(("t2" . ,t2)))) (o (derivation->output-path d))) (with-derivation-narinfo d - (sha256 => (sha256 (string->utf8 t2))) + (sha256 => (gcrypt:sha256 (string->utf8 t2))) (references => (list t2)) (equal? (references/substitutes s (list o t3 t2 t1)) @@ -940,7 +940,7 @@ (foldm %store-monad (lambda (item result) (define ref-hash - (let-values (((port get) (open-sha256-port))) + (let-values (((port get) (gcrypt:open-sha256-port))) (write-file item port) (close-port port) (get))) @@ -1144,7 +1144,7 @@ (info (query-path-info %store item))) (and (equal? (path-info-references info) (list ref)) (equal? (path-info-hash info) - (sha256 + (gcrypt:sha256 (string->utf8 (call-with-output-string (cut write-file item <>)))))))) -- cgit v1.2.3 From feea1d0e62fdd09c4b209c549d65fe93e506d690 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 22 May 2020 00:23:15 +0200 Subject: lint: archival: Use 'origin-hash'. * guix/lint.scm (check-archival): Use 'origin-hash' instead of 'origin-sha256', removing hard-coded "sha256". --- guix/lint.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index e192f292a4..6271894360 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -1154,15 +1154,18 @@ try again later") ((? origin? origin) ;; Since "save" origins are not supported for non-VCS source, all ;; we can do is tell whether a given tarball is available or not. - (if (origin-sha256 origin) ;XXX: for ungoogled-chromium - (match (lookup-content (origin-sha256 origin) "sha256") - (#f - (list (make-warning package - (G_ "source not archived on Software \ + (if (origin-hash origin) ;XXX: for ungoogled-chromium + (let ((hash (origin-hash origin))) + (match (lookup-content (content-hash-value hash) + (symbol->string + (content-hash-algorithm hash))) + (#f + (list (make-warning package + (G_ "source not archived on Software \ Heritage") - #:field 'source))) - ((? content?) - '())) + #:field 'source))) + ((? content?) + '()))) '())))) (match-lambda* ((key url method response) -- cgit v1.2.3 From c7d2dd69004b020de5d86898d2497ab3c8435c37 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 22 May 2020 00:24:35 +0200 Subject: upstream: Use 'origin-hash'. * guix/upstream.scm (update-package-source): Use 'origin-hash' instead of 'origin-sha256'. --- guix/upstream.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/upstream.scm b/guix/upstream.scm index c11de0b25b..67d0eeefbb 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015 Alex Kost ;;; Copyright © 2019 Ricardo Wurmus ;;; @@ -441,7 +441,8 @@ new version string if an update was made, and #f otherwise." (if version-loc (let* ((loc (package-location package)) (old-version (package-version package)) - (old-hash (origin-sha256 (package-source package))) + (old-hash (content-hash-value + (origin-hash (package-source package)))) (old-url (match (origin-uri (package-source package)) ((? string? url) url) (_ #f))) -- cgit v1.2.3 From ef1d475b00822194e8e4db794756815d00b7d132 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 22 May 2020 00:25:26 +0200 Subject: gnu: llvm: Remove unused 'package-elisp-from-package' procedure. This private procedure had been unused since 3a3d4d9d545028cda846ae827a60249f7162d34e. * gnu/packages/llvm.scm (package-elisp-from-package): Remove. --- gnu/packages/llvm.scm | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 15e15281a7..47b490aac8 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -866,35 +866,6 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.") "This package provides a Python binding to LLVM for use in Numba.") (license license:bsd-3))) -(define (package-elisp-from-package source-package package-name - source-files) - "Return a package definition named PACKAGE-NAME that packages the Emacs Lisp -SOURCE-FILES found in SOURCE-PACKAGE." - (let ((orig (package-source source-package))) - (package - (inherit source-package) - (name package-name) - (build-system emacs-build-system) - (source (origin - (method (origin-method orig)) - (uri (origin-uri orig)) - (sha256 (origin-sha256 orig)) - (file-name (string-append package-name "-" - (package-version source-package))) - (modules '((guix build utils) - (srfi srfi-1) - (ice-9 ftw))) - (snippet - `(let* ((source-files (quote ,source-files)) - (basenames (map basename source-files))) - (map copy-file - source-files basenames) - (map delete-file-recursively - (fold delete - (scandir ".") - (append '("." "..") basenames))) - #t))))))) - (define-public emacs-clang-format (package (inherit clang) -- cgit v1.2.3 From 0bdfae5363f01a2ad0954ea864ab604c5062fb33 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 22 May 2020 10:55:09 +0300 Subject: gnu: freeipmi: Update to 1.6.5. * gnu/packages/freeipmi.scm (freeipmi): Update to 1.6.5. --- gnu/packages/freeipmi.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/freeipmi.scm b/gnu/packages/freeipmi.scm index 57fe527cbe..4dd9cb7271 100644 --- a/gnu/packages/freeipmi.scm +++ b/gnu/packages/freeipmi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Ludovic Courtès -;;; Copyright © 2015, 2016, 2017 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2020 Efraim Flashner ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -28,14 +28,14 @@ (define-public freeipmi (package (name "freeipmi") - (version "1.6.4") + (version "1.6.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/freeipmi/freeipmi-" version ".tar.gz")) (sha256 (base32 - "0g0s4iwx0ng4rv7hp5cc3kkx4drahsc89981gwjblf04lfavppv5")))) + "1ncf1s84752xaq07h36wrxa5ww1167s2bizkww0igxv8djyddwk1")))) (build-system gnu-build-system) (inputs `(("libgcrypt" ,libgcrypt))) -- cgit v1.2.3 From d8feee9f18ede0d1ea4d0e4876f09a0dab770295 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 22 May 2020 11:00:06 +0300 Subject: gnu: freeipmi: Don't build static libraries. This shrinks the size of the package by about 33%. * gnu/packages/freeipmi.scm (freeipmi)[arguments]: Add configure-flag to disable static libraries. --- gnu/packages/freeipmi.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/freeipmi.scm b/gnu/packages/freeipmi.scm index 4dd9cb7271..78ab287c5b 100644 --- a/gnu/packages/freeipmi.scm +++ b/gnu/packages/freeipmi.scm @@ -37,6 +37,8 @@ (base32 "1ncf1s84752xaq07h36wrxa5ww1167s2bizkww0igxv8djyddwk1")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("libgcrypt" ,libgcrypt))) (home-page "https://www.gnu.org/software/freeipmi/") -- cgit v1.2.3 From cd5d5f53228fd5bf96d9f790aa2606ae71fa68d7 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 18 Feb 2020 11:36:37 +0100 Subject: doc: Update 'Bootstrapping' for further binary seed reduction. * doc/images/gcc-core-mesboot0-graph.dot: New image, replacing * doc/images/gcc-mesboot0-bag-graph.dot: ... remove file. * doc/local.mk (DOT_FILES): Update for new image file. * doc/guix.texi (Reduced Binary Seed Bootstrap): Use it in updated description of further reduction of the trusted computing base. --- doc/guix.texi | 117 ++++++++++++++++--------------- doc/images/gcc-core-mesboot0-graph.dot | 114 ++++++++++++++++++++++++++++++ doc/images/gcc-mesboot-bag-graph.dot | 123 --------------------------------- doc/local.mk | 2 +- 4 files changed, 178 insertions(+), 178 deletions(-) create mode 100644 doc/images/gcc-core-mesboot0-graph.dot delete mode 100644 doc/images/gcc-mesboot-bag-graph.dot diff --git a/doc/guix.texi b/doc/guix.texi index c1e23b5ef3..2b1f307c2d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -35,7 +35,7 @@ Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 Nikita Gillmann@* -Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* +Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* @@ -28761,10 +28761,8 @@ Binutils, libc, and the other packages mentioned above---the @dfn{bootstrap binaries}. These bootstrap binaries are ``taken for granted'', though we can also -re-create them if needed (more on that later). - -For @code{i686-linux} and @code{x86_64-linux} the Guix bootstrap process is -more elaborate, @pxref{Reduced Binary Seed Bootstrap}. +re-create them if needed (@pxref{Preparing to Use the Bootstrap +Binaries}). @menu * Reduced Binary Seed Bootstrap:: A Bootstrap worthy of GNU. @@ -28780,60 +28778,71 @@ Coreutils, Awk, Findutils, `sed', and `grep' and Guile, GCC, Binutils, and the GNU C Library (@pxref{Bootstrapping}). Usually, these bootstrap binaries are ``taken for granted.'' -Taking these binaries for granted means that we consider them to be a correct -and trustworthy `seed' for building the complete system. Therein lies a -problem: the current combined size of these bootstrap binaries is about 250MB -(@pxref{Bootstrappable Builds,,, mes, GNU Mes}). Auditing or even inspecting -these is next to impossible. +Taking the bootstrap binaries for granted means that we consider them to +be a correct and trustworthy ``seed'' for building the complete system. +Therein lies a problem: the combined size of these bootstrap binaries is +about 250MB (@pxref{Bootstrappable Builds,,, mes, GNU Mes}). Auditing +or even inspecting these is next to impossible. -For @code{i686-linux} and @code{x86_64-linux}, Guix now features a ``Reduced -Binary Seed'' bootstrap @footnote{We would like to say: ``Full Source -Bootstrap'' and while we are working towards that goal it would be hyperbole -to use that term for what we do now.}. +For @code{i686-linux} and @code{x86_64-linux}, Guix now features a +``Reduced Binary Seed'' bootstrap @footnote{We would like to say: ``Full +Source Bootstrap'' and while we are working towards that goal it would +be hyperbole to use that term for what we do now.}. The Reduced Binary Seed bootstrap removes the most critical tools---from a trust perspective---from the bootstrap binaries: GCC, Binutils and the GNU C Library are replaced by: @code{bootstrap-mescc-tools} (a tiny assembler and linker) and @code{bootstrap-mes} (a small Scheme Interpreter and a C compiler -written in Scheme and the Mes C Library, built for TinyCC and for GCC). Using -these new binary seeds and a new set of -@c -packages@footnote{@c -nyacc-boot, -mes-boot, -tcc-boot0, -tcc-boot, -make-mesboot0, -diffutils-mesboot, -binutils-mesboot0, -gcc-core-mesboot, -mesboot-headers, -glibc-mesboot0, -gcc-mesboot0, -binutils-mesboot, -make-mesboot, -gcc-mesboot1, -gcc-mesboot1-wrapper, -glibc-headers-mesboot, -glibc-mesboot, -gcc-mesboot, -and -gcc-mesboot-wrapper. -} -@c -the ``missing'' Binutils, GCC, and the GNU C Library are built from source. -From here on the more traditional bootstrap process resumes. This approach -has reduced the bootstrap binaries in size to about 130MB. Work is ongoing to -reduce this further. If you are interested, join us on @code{#bootstrappable} -on the Freenode IRC network. - -@c ./pre-inst-env guix graph --type=bag -e '(begin (use-modules (guix packages)) (%current-system "i686-linux") (@@ (gnu packages commencement) gcc-mesboot))' > doc/images/gcc-mesboot-bag-graph.dot -@c dot -T png doc/images/gcc-mesboot-bag-graph.dot > doc/images/gcc-mesboot-bag-graph.png - -Below is the generated dependency graph for @code{gcc-mesboot}, the bootstrap -compiler used to build the rest of GuixSD. - -@image{images/gcc-mesboot-bag-graph,6in,,Dependency graph of the gcc-mesboot} +written in Scheme and the Mes C Library, built for TinyCC and for GCC). + +Using these new binary seeds the ``missing'' Binutils, GCC, and the GNU +C Library are built from source. From here on the more traditional +bootstrap process resumes. This approach has reduced the bootstrap +binaries in size to about 145MB in Guix v1.1. + +The next step that Guix has taken is to replace the shell and all its +utilities with implementations in Guile Scheme, the @emph{Scheme-only +bootstrap}. Gash (@pxref{Gash,,, gash, The Gash manual}) is a +POSIX-compatible shell that replaces Bash, and it comes with Gash Utils +which has minimalist replacements for Awk, the GNU Core Utilities, Grep, +Gzip, Sed, and Tar. The rest of the bootstrap binary seeds that were +removed are now built from source. + +Building the GNU System from source is currently only possibly by adding +some historical GNU packages as intermediate steps@footnote{Packages +such as @code{gcc-2.95.3}, @code{binutils-2.14}, @code{glibc-2.2.5}, +@code{gzip-1.2.4}, @code{tar-1.22}, and some others. For details, see +@file{gnu/packages/commencement.scm}.}. As Gash and Gash Utils mature, +and GNU packages become more bootstrappable again (e.g., new releases of +GNU Sed will also ship as gzipped tarballs again, as alternative to the +hard to bootstrap @code{xz}-compression), this set of added packages can +hopefully be reduced again. + +The graph below shows the resulting dependency graph for +@code{gcc-core-mesboot0}, the bootstrap compiler used for the +traditional bootstrap of the rest of the Guix System. + +@c ./pre-inst-env guix graph -e '(@@ (gnu packages commencement) gcc-core-mesboot0)' | sed -re 's,((bootstrap-mescc-tools|bootstrap-mes|guile-bootstrap).*shape =) box,\1 ellipse,' > doc/images/gcc-core-mesboot0-graph.dot +@image{images/gcc-core-mesboot0-graph,6in,,Dependency graph of gcc-core-mesboot0} + +The only significant binary bootstrap seeds that remain@footnote{ +Ignoring the 68KB @code{mescc-tools}; that will be removed later, +together with @code{mes}.} are a Scheme intepreter and a Scheme +compiler: GNU Mes and GNU Guile@footnote{Not shown in this graph are the +static binaries for @file{bash}, @code{tar}, and @code{xz} that are used +to get Guile running.}. + +This further reduction has brought down the size of the binary seed to +about 60MB for @code{i686-linux} and @code{x86_64-linux}. + +Work is ongoing to remove all binary blobs from our free software +bootstrap stack, working towards a Full Source Bootstrap. Also ongoing +is work to bring these bootstraps to the @code{arm-linux} and +@code{aarch64-linux} architectures and to the Hurd. + +If you are interested, join us on @samp{#bootstrappable} on the Freenode +IRC network or discuss on @email{bug-mes@@gnu.org} or +@email{gash-devel@@nongnu.org}. @node Preparing to Use the Bootstrap Binaries @section Preparing to Use the Bootstrap Binaries @@ -28853,7 +28862,7 @@ guix graph -t derivation \ | dot -Tps > gcc.ps @end example -or, for the Reduced Binary Seed bootstrap +or, for the further Reduced Binary Seed bootstrap @example guix graph -t derivation \ diff --git a/doc/images/gcc-core-mesboot0-graph.dot b/doc/images/gcc-core-mesboot0-graph.dot new file mode 100644 index 0000000000..191582ed4c --- /dev/null +++ b/doc/images/gcc-core-mesboot0-graph.dot @@ -0,0 +1,114 @@ +digraph "Guix package" { + "139781154519456" [label = "gcc-core-mesboot0@2.95.3", shape = box, fontname = Helvetica]; + "139781154519456" -> "139781154519632" [color = darkgoldenrod]; + "139781154519456" -> "139781154520688" [color = darkgoldenrod]; + "139781154519456" -> "139781034971312" [color = darkgoldenrod]; + "139781154519456" -> "139781154520160" [color = darkgoldenrod]; + "139781154519456" -> "139781034971664" [color = darkgoldenrod]; + "139781154519456" -> "139781154519984" [color = darkgoldenrod]; + "139781154519456" -> "139781154519808" [color = darkgoldenrod]; + "139781154519456" -> "139781154520512" [color = darkgoldenrod]; + "139781154519456" -> "139781034971488" [color = darkgoldenrod]; + "139781154519456" -> "139781034972896" [color = darkgoldenrod]; + "139781154519456" -> "139781034972368" [color = darkgoldenrod]; + "139781154519456" -> "139781034973072" [color = darkgoldenrod]; + "139781154519456" -> "139781131267872" [color = darkgoldenrod]; + "139781154519632" [label = "binutils-mesboot0@2.14", shape = box, fontname = Helvetica]; + "139781154519632" -> "139781154520688" [color = peachpuff4]; + "139781154519632" -> "139781034971312" [color = peachpuff4]; + "139781154519632" -> "139781154520160" [color = peachpuff4]; + "139781154519632" -> "139781034971664" [color = peachpuff4]; + "139781154519632" -> "139781154519984" [color = peachpuff4]; + "139781154519632" -> "139781154519808" [color = peachpuff4]; + "139781154519632" -> "139781154520512" [color = peachpuff4]; + "139781154519632" -> "139781034971488" [color = peachpuff4]; + "139781154519632" -> "139781034972896" [color = peachpuff4]; + "139781154519632" -> "139781034972368" [color = peachpuff4]; + "139781154519632" -> "139781034973072" [color = peachpuff4]; + "139781154519632" -> "139781131267872" [color = peachpuff4]; + "139781154520688" [label = "bash-mesboot0@2.05b", shape = box, fontname = Helvetica]; + "139781154520688" -> "139781034971488" [color = magenta]; + "139781154520688" -> "139781034971840" [color = magenta]; + "139781154520688" -> "139781034972896" [color = magenta]; + "139781154520688" -> "139781034972368" [color = magenta]; + "139781154520688" -> "139781034973072" [color = magenta]; + "139781154520688" -> "139781131267872" [color = magenta]; + "139781034971488" [label = "make-mesboot0@3.80", shape = box, fontname = Helvetica]; + "139781034971488" -> "139781034971840" [color = dimgrey]; + "139781034971488" -> "139781034972896" [color = dimgrey]; + "139781034971488" -> "139781034972368" [color = dimgrey]; + "139781034971488" -> "139781034973072" [color = dimgrey]; + "139781034971488" -> "139781131267872" [color = dimgrey]; + "139781034971840" [label = "tcc-boot0@0.9.26-1103-g6e62e0e", shape = box, fontname = Helvetica]; + "139781034971840" -> "139781034972016" [color = magenta]; + "139781034971840" -> "139781131266816" [color = magenta]; + "139781034971840" -> "139781034972896" [color = magenta]; + "139781034971840" -> "139781034972368" [color = magenta]; + "139781034971840" -> "139781034973072" [color = magenta]; + "139781034971840" -> "139781131267872" [color = magenta]; + "139781034972016" [label = "mes-boot@0.22", shape = box, fontname = Helvetica]; + "139781034972016" -> "139781034972192" [color = cyan3]; + "139781034972016" -> "139781131266816" [color = cyan3]; + "139781034972016" -> "139781034972896" [color = cyan3]; + "139781034972016" -> "139781034972368" [color = cyan3]; + "139781034972016" -> "139781034973072" [color = cyan3]; + "139781034972016" -> "139781131267872" [color = cyan3]; + "139781034972192" [label = "bootstrap-mes-rewired@0.19", shape = ellipse, fontname = Helvetica]; + "139781034972192" -> "139781131266640" [color = darkseagreen]; + "139781034972192" -> "139781034972896" [color = darkseagreen]; + "139781131266640" [label = "bootstrap-mes@0", shape = ellipse, fontname = Helvetica]; + "139781034972896" [label = "gash-boot@0.2.0", shape = box, fontname = Helvetica]; + "139781034972896" -> "139781034973072" [color = darkviolet]; + "139781034972896" -> "139781131267872" [color = darkviolet]; + "139781034973072" [label = "bootar@1", shape = box, fontname = Helvetica]; + "139781034973072" -> "139781131267872" [color = darkviolet]; + "139781131267872" [label = "guile-bootstrap@2.0", shape = ellipse, fontname = Helvetica]; + "139781131266816" [label = "bootstrap-mescc-tools@0.5.2", shape = ellipse, fontname = Helvetica]; + "139781034972368" [label = "gash-utils-boot@0.1.0", shape = box, fontname = Helvetica]; + "139781034972368" -> "139781034973072" [color = darkseagreen]; + "139781034972368" -> "139781034972896" [color = darkseagreen]; + "139781034972368" -> "139781131267872" [color = darkseagreen]; + "139781034971312" [label = "bzip2-mesboot@1.0.8", shape = box, fontname = Helvetica]; + "139781034971312" -> "139781034971488" [color = cyan3]; + "139781034971312" -> "139781034971840" [color = cyan3]; + "139781034971312" -> "139781034972896" [color = cyan3]; + "139781034971312" -> "139781034972368" [color = cyan3]; + "139781034971312" -> "139781034973072" [color = cyan3]; + "139781034971312" -> "139781131267872" [color = cyan3]; + "139781154520160" [label = "diffutils-mesboot@2.7", shape = box, fontname = Helvetica]; + "139781154520160" -> "139781034971488" [color = red]; + "139781154520160" -> "139781034971840" [color = red]; + "139781154520160" -> "139781034972896" [color = red]; + "139781154520160" -> "139781034972368" [color = red]; + "139781154520160" -> "139781034973072" [color = red]; + "139781154520160" -> "139781131267872" [color = red]; + "139781034971664" [label = "gzip-mesboot@1.2.4", shape = box, fontname = Helvetica]; + "139781034971664" -> "139781034971840" [color = red]; + "139781034971664" -> "139781034972896" [color = red]; + "139781034971664" -> "139781034972368" [color = red]; + "139781034971664" -> "139781034973072" [color = red]; + "139781034971664" -> "139781131267872" [color = red]; + "139781154519984" [label = "patch-mesboot@2.5.9", shape = box, fontname = Helvetica]; + "139781154519984" -> "139781034971488" [color = blue]; + "139781154519984" -> "139781034971840" [color = blue]; + "139781154519984" -> "139781034972896" [color = blue]; + "139781154519984" -> "139781034972368" [color = blue]; + "139781154519984" -> "139781034973072" [color = blue]; + "139781154519984" -> "139781131267872" [color = blue]; + "139781154519808" [label = "sed-mesboot0@1.18", shape = box, fontname = Helvetica]; + "139781154519808" -> "139781034971488" [color = red]; + "139781154519808" -> "139781034971840" [color = red]; + "139781154519808" -> "139781034972896" [color = red]; + "139781154519808" -> "139781034972368" [color = red]; + "139781154519808" -> "139781034973072" [color = red]; + "139781154519808" -> "139781131267872" [color = red]; + "139781154520512" [label = "tcc-boot@0.9.27", shape = box, fontname = Helvetica]; + "139781154520512" -> "139781034971312" [color = darkviolet]; + "139781154520512" -> "139781034971488" [color = darkviolet]; + "139781154520512" -> "139781034971840" [color = darkviolet]; + "139781154520512" -> "139781034972896" [color = darkviolet]; + "139781154520512" -> "139781034972368" [color = darkviolet]; + "139781154520512" -> "139781034973072" [color = darkviolet]; + "139781154520512" -> "139781131267872" [color = darkviolet]; + +} diff --git a/doc/images/gcc-mesboot-bag-graph.dot b/doc/images/gcc-mesboot-bag-graph.dot deleted file mode 100644 index 74d1896fb1..0000000000 --- a/doc/images/gcc-mesboot-bag-graph.dot +++ /dev/null @@ -1,123 +0,0 @@ -digraph "Guix bag" { - "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" [label = "gcc-mesboot@4.9.4", shape = box, fontname = Helvetica]; - "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" [color = darkviolet]; - "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/86dqsl7b3qrzxl0zd049i5rl7l19gnk0-gcc-mesboot1-wrapper-4.7.4.drv" [color = darkviolet]; - "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" [color = darkviolet]; - "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" [color = darkviolet]; - "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkviolet]; - "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkviolet]; - "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = darkviolet]; - "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [color = darkviolet]; - "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" [color = darkviolet]; - "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" [label = "binutils-mesboot@2.20.1a", shape = box, fontname = Helvetica]; - "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" [color = dimgrey]; - "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" [color = dimgrey]; - "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" [color = dimgrey]; - "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = dimgrey]; - "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = dimgrey]; - "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = dimgrey]; - "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [color = dimgrey]; - "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" [color = dimgrey]; - "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" [label = "binutils-mesboot0@2.20.1a", shape = box, fontname = Helvetica]; - "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/xjvyz26a4m191p5aqyifi7fw57vjps15-tcc-boot-0.9.27.drv" [color = peachpuff4]; - "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = peachpuff4]; - "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = peachpuff4]; - "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = peachpuff4]; - "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" [color = peachpuff4]; - "/gnu/store/xjvyz26a4m191p5aqyifi7fw57vjps15-tcc-boot-0.9.27.drv" [label = "tcc-boot@0.9.27", shape = box, fontname = Helvetica]; - "/gnu/store/xjvyz26a4m191p5aqyifi7fw57vjps15-tcc-boot-0.9.27.drv" -> "/gnu/store/as3hax4r1zzxz4ihlzj9yq3rs83gm93c-mes-boot-0.18.drv" [color = cyan3]; - "/gnu/store/xjvyz26a4m191p5aqyifi7fw57vjps15-tcc-boot-0.9.27.drv" -> "/gnu/store/p437zhq42yavzknp3miacrgnaw206h7i-tcc-boot0-0.9.26-5.c7b3f59.drv" [color = cyan3]; - "/gnu/store/xjvyz26a4m191p5aqyifi7fw57vjps15-tcc-boot-0.9.27.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = cyan3]; - "/gnu/store/as3hax4r1zzxz4ihlzj9yq3rs83gm93c-mes-boot-0.18.drv" [label = "mes-boot@0.18", shape = box, fontname = Helvetica]; - "/gnu/store/as3hax4r1zzxz4ihlzj9yq3rs83gm93c-mes-boot-0.18.drv" -> "/gnu/store/gd83makzwnb2aq1x0hylfsi8gaxln5js-bootstrap-mescc-tools-0.5.2.drv" [color = darkviolet]; - "/gnu/store/as3hax4r1zzxz4ihlzj9yq3rs83gm93c-mes-boot-0.18.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkviolet]; - "/gnu/store/as3hax4r1zzxz4ihlzj9yq3rs83gm93c-mes-boot-0.18.drv" -> "/gnu/store/viccpx5izm9z0ci5nvib0xkdrsfqixlr-bootstrap-mes-0.drv" [color = darkviolet]; - "/gnu/store/gd83makzwnb2aq1x0hylfsi8gaxln5js-bootstrap-mescc-tools-0.5.2.drv" [label = "bootstrap-mescc-tools@0.5.2", shape = box, fontname = Helvetica]; - "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [label = "bootstrap-binaries@0", shape = box, fontname = Helvetica]; - "/gnu/store/viccpx5izm9z0ci5nvib0xkdrsfqixlr-bootstrap-mes-0.drv" [label = "bootstrap-mes@0", shape = box, fontname = Helvetica]; - "/gnu/store/p437zhq42yavzknp3miacrgnaw206h7i-tcc-boot0-0.9.26-5.c7b3f59.drv" [label = "tcc-boot0@0.9.26-5.c7b3f59", shape = box, fontname = Helvetica]; - "/gnu/store/p437zhq42yavzknp3miacrgnaw206h7i-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/as3hax4r1zzxz4ihlzj9yq3rs83gm93c-mes-boot-0.18.drv" [color = dimgrey]; - "/gnu/store/p437zhq42yavzknp3miacrgnaw206h7i-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/gd83makzwnb2aq1x0hylfsi8gaxln5js-bootstrap-mescc-tools-0.5.2.drv" [color = dimgrey]; - "/gnu/store/p437zhq42yavzknp3miacrgnaw206h7i-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = dimgrey]; - "/gnu/store/p437zhq42yavzknp3miacrgnaw206h7i-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/viccpx5izm9z0ci5nvib0xkdrsfqixlr-bootstrap-mes-0.drv" [color = dimgrey]; - "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [label = "diffutils-mesboot@2.7", shape = box, fontname = Helvetica]; - "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" -> "/gnu/store/as3hax4r1zzxz4ihlzj9yq3rs83gm93c-mes-boot-0.18.drv" [color = peachpuff4]; - "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" -> "/gnu/store/xjvyz26a4m191p5aqyifi7fw57vjps15-tcc-boot-0.9.27.drv" [color = peachpuff4]; - "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = peachpuff4]; - "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = peachpuff4]; - "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" -> "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" [color = peachpuff4]; - "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" [label = "make-mesboot0@3.80", shape = box, fontname = Helvetica]; - "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" -> "/gnu/store/xjvyz26a4m191p5aqyifi7fw57vjps15-tcc-boot-0.9.27.drv" [color = darkgoldenrod]; - "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkgoldenrod]; - "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkgoldenrod]; - "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" [label = "glibc-mesboot0@2.2.5", shape = box, fontname = Helvetica]; - "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" [color = darkseagreen]; - "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" [color = darkseagreen]; - "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkseagreen]; - "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkseagreen]; - "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = darkseagreen]; - "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/kd7b9sba79s1l7hjdhav51gvci5ws4jy-mesboot-headers-0.18.drv" [color = darkseagreen]; - "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" [color = darkseagreen]; - "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" [label = "gcc-core-mesboot@2.95.3", shape = box, fontname = Helvetica]; - "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" [color = dimgrey]; - "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/xjvyz26a4m191p5aqyifi7fw57vjps15-tcc-boot-0.9.27.drv" [color = dimgrey]; - "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = dimgrey]; - "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = dimgrey]; - "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = dimgrey]; - "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" [color = dimgrey]; - "/gnu/store/kd7b9sba79s1l7hjdhav51gvci5ws4jy-mesboot-headers-0.18.drv" [label = "mesboot-headers@0.18", shape = box, fontname = Helvetica]; - "/gnu/store/kd7b9sba79s1l7hjdhav51gvci5ws4jy-mesboot-headers-0.18.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = cyan3]; - "/gnu/store/kd7b9sba79s1l7hjdhav51gvci5ws4jy-mesboot-headers-0.18.drv" -> "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [color = cyan3]; - "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [label = "linux-libre-headers-bootstrap@0", shape = box, fontname = Helvetica]; - "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" [label = "gcc-mesboot0@2.95.3", shape = box, fontname = Helvetica]; - "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" [color = darkseagreen]; - "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" [color = darkseagreen]; - "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" [color = darkseagreen]; - "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkseagreen]; - "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkseagreen]; - "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = darkseagreen]; - "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [color = darkseagreen]; - "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" [color = darkseagreen]; - "/gnu/store/86dqsl7b3qrzxl0zd049i5rl7l19gnk0-gcc-mesboot1-wrapper-4.7.4.drv" [label = "gcc-mesboot1-wrapper@4.7.4", shape = box, fontname = Helvetica]; - "/gnu/store/86dqsl7b3qrzxl0zd049i5rl7l19gnk0-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = red]; - "/gnu/store/86dqsl7b3qrzxl0zd049i5rl7l19gnk0-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" [color = red]; - "/gnu/store/86dqsl7b3qrzxl0zd049i5rl7l19gnk0-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" [color = red]; - "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" [label = "glibc-mesboot@2.16.0", shape = box, fontname = Helvetica]; - "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" [color = blue]; - "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" [color = blue]; - "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" [color = blue]; - "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" [color = blue]; - "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = blue]; - "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = blue]; - "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = blue]; - "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [color = blue]; - "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" [color = blue]; - "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" [label = "glibc-headers-mesboot@2.16.0", shape = box, fontname = Helvetica]; - "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" [color = red]; - "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" [color = red]; - "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" [color = red]; - "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/kd7b9sba79s1l7hjdhav51gvci5ws4jy-mesboot-headers-0.18.drv" [color = red]; - "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = red]; - "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = red]; - "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = red]; - "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [color = red]; - "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" [color = red]; - "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" [label = "gcc-mesboot1@4.7.4", shape = box, fontname = Helvetica]; - "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" [color = darkseagreen]; - "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" [color = darkseagreen]; - "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" [color = darkseagreen]; - "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkseagreen]; - "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkseagreen]; - "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = darkseagreen]; - "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [color = darkseagreen]; - "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" [color = darkseagreen]; - "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" [label = "make-mesboot@3.82", shape = box, fontname = Helvetica]; - "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" -> "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" [color = magenta]; - "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" -> "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" [color = magenta]; - "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" -> "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" [color = magenta]; - "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" -> "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" [color = magenta]; - "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = magenta]; - "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = magenta]; - "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" -> "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [color = magenta]; - -} diff --git a/doc/local.mk b/doc/local.mk index f8709bb3a4..aca1958edd 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -39,7 +39,7 @@ DOT_FILES = \ %D%/images/bootstrap-packages.dot \ %D%/images/coreutils-graph.dot \ %D%/images/coreutils-bag-graph.dot \ - %D%/images/gcc-mesboot-bag-graph.dot \ + %D%/images/gcc-core-mesboot0-graph.dot \ %D%/images/service-graph.dot \ %D%/images/shepherd-graph.dot -- cgit v1.2.3 From 21051eb79efece62d3bda495ce554239ae7bbde2 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 22 May 2020 17:45:19 +0200 Subject: gnu: Add glabels. * gnu/packages/gnome.scm (glabels): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/gnome.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 938efbcdf3..f4703d4dde 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -51,6 +51,7 @@ ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Naga Malleswari ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2020 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -10013,6 +10014,37 @@ to.") ;; snowball license:bsd-2)))) +(define-public glabels + (package + (name "glabels") + (version "3.4.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + "glabels-" version ".tar.xz")) + (sha256 + (base32 "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q")))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("intltool" ,intltool) + ("itstool" ,itstool) + ("pkg-config" ,pkg-config))) + (inputs + `(("gtk+" ,gtk+) + ("librsvg" ,librsvg) + ("libxml2" ,libxml2))) + (home-page "https://glabels.org/") + (synopsis "Program for creating labels and business cards") + (description + "gLabels is a program for creating labels and business cards. It is +designed to work with various laser/ink-jet peel-off label and business +card sheets that you’ll find at most office supply stores.") + (license license:gpl3+))) + (define-public libratbag (package (name "libratbag") -- cgit v1.2.3 From 50ea3135e0948a042cd3b899e970f6ade291a0c2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 22 May 2020 18:34:22 +0200 Subject: gnu: bash: Do not autoload (gcrypt hash). Fixes . Reported by Matias Jose Seco Baccanelli . * gnu/packages/bash.scm: Avoid #:autoload for (gcrypt hash). On Guile 2.2, autoloading would bring it not only the 'port-sha256' binding (as on 3.0) but also the 'sha256' binding. As a result, use of 'sha256' in the 'origin' form wouldn't match. --- gnu/packages/bash.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 311e07a944..3ba8a13e40 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -38,8 +38,11 @@ #:use-module (guix store) #:use-module (guix build-system gnu) #:autoload (guix gnupg) (gnupg-verify*) - #:autoload (gcrypt hash) (port-sha256) #:autoload (guix base32) (bytevector->nix-base32-string) + + ;; See for why not #:autoload here. + #:use-module ((gcrypt hash) #:select (port-sha256)) + #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 format)) -- cgit v1.2.3 From 9af90aafdfd8afd5fb7b5377ca5daf2215d38d7a Mon Sep 17 00:00:00 2001 From: Caleb Ristvedt Date: Thu, 21 May 2020 20:30:58 -0500 Subject: gnu: guile-fibers: Add patch to fix resource leak. guile-fibers@1.0.0 has a resource leak where run-fibers will only destroy one scheduler, but it creates as many as there are cpu cores by default (see https://github.com/wingo/fibers/issues/36). This causes the tests to fail on systems with many cores, and can cause guile to crash under certain circumstances. This fixes that resource leak. At present neither git master nor the latest release has fixed this yet. * gnu/packages/patches/guile-fibers-destroy-peer-schedulers.patch: New patch. * gnu/local.mk: Add it to the list of patches. * gnu/packages/guile-xyz.scm (guile-fibers): Use it. --- gnu/local.mk | 1 + gnu/packages/guile-xyz.scm | 5 ++++- .../guile-fibers-destroy-peer-schedulers.patch | 24 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/guile-fibers-destroy-peer-schedulers.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1d9de9a57e..2f24f892b1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1053,6 +1053,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-3.0-relocatable.patch \ %D%/packages/patches/guile-linux-syscalls.patch \ %D%/packages/patches/guile-3.0-linux-syscalls.patch \ + %D%/packages/patches/guile-fibers-destroy-peer-schedulers.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 674b1f922b..a1deee32d1 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -523,7 +523,10 @@ Unix-style DSV format and RFC 4180 format.") (("#:use-module \\(fibers\\)") (string-append "#:use-module (fibers)\n" "#:use-module (ice-9 threads)\n"))) - #t)))) + #t)) + (patches + ;; fixes a resource leak that causes crashes in the tests + (search-patches "guile-fibers-destroy-peer-schedulers.patch")))) (build-system gnu-build-system) (arguments '(;; The code uses 'scm_t_uint64' et al., which are deprecated in 3.0. diff --git a/gnu/packages/patches/guile-fibers-destroy-peer-schedulers.patch b/gnu/packages/patches/guile-fibers-destroy-peer-schedulers.patch new file mode 100644 index 0000000000..8bb7153153 --- /dev/null +++ b/gnu/packages/patches/guile-fibers-destroy-peer-schedulers.patch @@ -0,0 +1,24 @@ +Fibers 1.0.0 has a bug in run-fibers in which peer schedulers aren't destroyed - +so if you had 4 cores, 1 would be destroyed when run-fibers returned, but the +other 3 would stay around. Each scheduler uses 3 file descriptors, so for +machines with many cores, this resource leak adds up quickly - quickly enough +that the test suite can even fail because of it. + +See https://github.com/wingo/fibers/issues/36. + +This fixes that. It should be safe to destroy the peer schedulers at the given +point because the threads that could be running them are all either dead or the +current thread. + +As of May 21, 2020, this bug still existed in the 1.0.0 (latest) release and in +git master. +--- a/fibers.scm 2020-05-21 18:38:06.890690154 -0500 ++++ b/fibers.scm 2020-05-21 18:38:56.395686693 -0500 +@@ -137,5 +137,6 @@ + (%run-fibers scheduler hz finished? affinity)) + (lambda () + (stop-auxiliary-threads scheduler))))) ++ (for-each destroy-scheduler (scheduler-remote-peers scheduler)) + (destroy-scheduler scheduler) + (apply values (atomic-box-ref ret)))))) + -- cgit v1.2.3 From 01c22be7bb48f0500ac5c9e16f8210222e9286ef Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sat, 9 May 2020 18:48:35 +0200 Subject: gnu: network-manager: Update to 1.24.0. * gnu/packages/gnome.scm (network-manager): Update to 1.24.0. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f4703d4dde..2fed03ab08 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -52,6 +52,7 @@ ;;; Copyright © 2020 Naga Malleswari ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -6350,7 +6351,7 @@ users.") (define-public network-manager (package (name "network-manager") - (version "1.18.4") + (version "1.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/NetworkManager/" @@ -6359,7 +6360,7 @@ users.") (patches (search-patches "nm-plugin-path.patch")) (sha256 (base32 - "0pnh1wr2p1fqa5pr945fr3lngfc5ccfrmgddqsg55lxnjpv0ggd3")) + "06044fl60bjlj7c6rqqfbm5795h61h6yzp7ch392hzcnm46wwhn3")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From c2f236fa92748b92458495ac58c6c7954bebc2d2 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 11 May 2020 09:07:17 +0200 Subject: gnu: network-manager: Add iwd support. --- gnu/packages/gnome.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2fed03ab08..46166e078d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6382,7 +6382,9 @@ users.") "--with-suspend-resume=elogind" "--with-consolekit=no" "--with-crypto=gnutls" - "--disable-config-plugin-ibft" + "--with-iwd=yes" + "--with-libaudit=yes" + "--with-resolvconf=yes" "--sysconfdir=/etc" "--localstatedir=/var" (string-append "--with-udev-dir=" @@ -6436,10 +6438,6 @@ users.") (lambda _ ;; For the missing /etc/machine-id. (setenv "DBUS_FATAL_WARNINGS" "0") - - ;; XXX: Regenerate some of the tests that are dependent on Python version. - ;; Try removing this variable for newer versions of NetworkManager. - (setenv "NM_TEST_REGENERATE" "1") #t)) (replace 'install (lambda _ @@ -6474,7 +6472,9 @@ users.") ("gnutls" ,gnutls) ("iptables" ,iptables) ("isc-dhcp" ,isc-dhcp) + ("iwd" ,iwd) ; wpa_supplicant alternative ("jansson" ,jansson) + ("libaudit" ,audit) ("libgcrypt" ,libgcrypt) ("libgudev" ,libgudev) ("libndp" ,libndp) @@ -6482,6 +6482,7 @@ users.") ("libsoup" ,libsoup) ("modem-manager" ,modem-manager) ("newt" ,newt) ;for the 'nmtui' console interface + ("openresolv" ,openresolv) ; alternative resolv.conf manager ("polkit" ,polkit) ("ppp" ,ppp) ("readline" ,readline) -- cgit v1.2.3 From 255ff74f3ab514a76068f6cfccc7f8dbcf8b7f3f Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 11 May 2020 15:39:57 +0200 Subject: gnu: network-manager: Switch to meson-build-system. --- gnu/packages/gnome.scm | 134 ++++++++++++++++++++++++++----------------------- 1 file changed, 71 insertions(+), 63 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 46166e078d..fb7c3b4fbd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6367,42 +6367,42 @@ users.") (substitute* "src/devices/wwan/nm-modem-manager.c" (("systemd") "elogind")) #t)))) - (build-system gnu-build-system) + (build-system meson-build-system) (outputs '("out" "doc")) ; 8 MiB of gtk-doc HTML (arguments - '(#:configure-flags + `(#:configure-flags (let ((out (assoc-ref %outputs "out")) - (doc (assoc-ref %outputs "doc")) (dhclient (string-append (assoc-ref %build-inputs "isc-dhcp") "/sbin/dhclient"))) - (list "--with-libnm-glib" ; needed by network-manager-applet - "--with-systemd-journal=no" - "--with-session-tracking=elogind" - "--with-suspend-resume=elogind" - "--with-consolekit=no" - "--with-crypto=gnutls" - "--with-iwd=yes" - "--with-libaudit=yes" - "--with-resolvconf=yes" - "--sysconfdir=/etc" - "--localstatedir=/var" - (string-append "--with-udev-dir=" - out "/lib/udev") - (string-append "--with-dbus-sys-dir=" - out "/etc/dbus-1/system.d") - (string-append "--with-html-dir=" - doc "/share/gtk-doc/html") - (string-append "--with-dhclient=" dhclient))) + (list + ;; Otherwise, the RUNPATH will lack the final 'NetworkManager' path + ;; component. + (string-append "-Dc_link_args=-Wl,-rpath=" + out "/lib:" + out "/lib/NetworkManager/" ,version) + "-Dsystemd_journal=false" + "-Dsession_tracking=elogind" + "-Dsuspend_resume=elogind" + "-Dsystemdsystemunitdir=no" + "-Dsession_tracking_consolekit=false" + "-Ddhcpcd=no" + "-Ddhcpcanon=no" + "-Dcrypto=gnutls" + "-Diwd=true" + "-Dlibaudit=yes" + "-Dqt=false" + "-Ddocs=true" + "--sysconfdir=/etc" + "--localstatedir=/var" + (string-append "-Dudev_dir=" + out "/lib/udev") + (string-append "-Ddbus_conf_dir=" + out "/etc/dbus-1/system.d") + + (string-append "-Ddhclient=" dhclient))) #:phases (modify-phases %standard-phases - ;; This bare "ls" invocation breaks some tests. - (add-after 'unpack 'patch-ls-invocation - (lambda _ - (substitute* "build-aux/ltmain.sh" - (("`ls -") - (string-append "`" (which "ls") " -"))) - #t)) (add-before 'configure 'pre-configure (lambda _ ;; These tests try to test aspects of network-manager's @@ -6410,61 +6410,64 @@ users.") ;; cope with being already in the Guix build jail as that jail ;; lacks some features that they would like to proxy over (like ;; a /sys mount). - (substitute* '("Makefile.in") - (("src/platform/tests/test-address-linux") " ") - (("src/platform/tests/test-cleanup-linux") " ") - (("src/platform/tests/test-link-linux") " ") - (("src/platform/tests/test-route-linux") " ") - (("src/devices/tests/test-acd") "") - (("src/devices/tests/test-arping") " ") - (("src/devices/tests/test-lldp") " ") - (("src/tests/test-route-manager-linux") " ")) - #t)) - (add-after 'unpack 'delete-failing-tests - (lambda _ - ;; FIXME: These three tests fail for unknown reasons. - ;; ERROR:libnm-core/tests/test-general.c:5842: - ;; _json_config_check_valid: assertion failed (res == expected): (1 == 0) - ;; ERROR:libnm-core/tests/test-keyfile.c:647: - ;; test_team_conf_read_invalid: assertion failed: (nm_setting_team_get_config (s_team) == NULL) - ;; ERROR:libnm-core/tests/test-setting.c:907: - ;; _test_team_config_sync: assertion failed: (nm_streq0 (nm_setting_team_get_runner (s_team), runner)) - (substitute* "Makefile.in" - (("libnm-core/tests/test-general") " ") - (("libnm-core/tests/test-keyfile") " ") - (("libnm-core/tests/test-setting\\$\\(EXEEXT\\)") " ")) + (substitute* "src/platform/tests/meson.build" + ((".*test-address-linux.*") "") + ((".*test-cleanup-linux.*") "") + ((".*test-link-linux.*") "") + ((".*test-route-linux.*") "")) + (substitute* "src/devices/tests/meson.build" + ((".*test-acd.*") "") + ((".*test-lldp.*") "")) #t)) + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook"))) + (substitute* (find-files "." ".*\\.(xsl|xml)") + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd"))) + #t))) (add-before 'check 'pre-check (lambda _ ;; For the missing /etc/machine-id. (setenv "DBUS_FATAL_WARNINGS" "0") #t)) - (replace 'install + (add-before 'install 'no-polkit-magic + ;; Meson ‘magically’ invokes pkexec, which fails (not setuid). (lambda _ - (invoke "make" - "sysconfdir=/tmp" - "rundir=/tmp" - "statedir=/tmp" - "nmstatedir=/tmp/nm" - "install") - #t))))) + (setenv "PKEXEC_UID" "something") + #t)) + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (for-each (lambda (directory) + (copy-recursively (string-append out directory) + (string-append doc directory)) + (delete-file-recursively + (string-append out directory))) + '("/share/doc" "/share/gtk-doc")) + #t)))))) (propagated-inputs `(("glib" ,glib))) (native-inputs - `(("glib:bin" ,glib "bin") ; for gdbus-codegen + `(("glib:bin" ,glib "bin") ; for gdbus-codegen + ("gtk-doc" ,gtk-doc) ("gobject-introspection" ,gobject-introspection) + ("docbook-xml" ,docbook-xml) ("docbook-xsl" ,docbook-xsl) ("intltool" ,intltool) ("libxslt" ,libxslt) ("libxml2" ,libxml2) ("pkg-config" ,pkg-config) + ("vala" ,vala) ;; For testing. ("python" ,python-wrapper) ("python-dbus" ,python-dbus) ("python-pygobject" ,python-pygobject))) (inputs - `(("coreutils" ,coreutils) ; for ls - ("curl" ,curl) + `(("curl" ,curl) ("cyrus-sasl" ,cyrus-sasl) ("dbus-glib" ,dbus-glib) ("dnsmasq" ,dnsmasq) @@ -6480,6 +6483,7 @@ users.") ("libndp" ,libndp) ("libnl" ,libnl) ("libsoup" ,libsoup) + ("mobile-broadband-provider-info" ,mobile-broadband-provider-info) ("modem-manager" ,modem-manager) ("newt" ,newt) ;for the 'nmtui' console interface ("openresolv" ,openresolv) ; alternative resolv.conf manager @@ -6496,7 +6500,11 @@ devices and connections, attempting to keep active network connectivity when available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE devices, and provides VPN integration with a variety of different VPN services.") - (license license:gpl2+) + ;; “This NetworkManager project consists of the daemon, client tools, and + ;; libnm. libnm is licensed LGPL-2.1+, while the rest is licensed under + ;; GPL-2.0+.” + (license (list license:gpl2+ + license:lgpl2.1+)) (properties '((upstream-name . "NetworkManager"))))) (define-public network-manager-openvpn -- cgit v1.2.3 From 8d0548fd34ff4b6f79b58a77f7266f3e672beb62 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 11 May 2020 16:45:24 +0200 Subject: gnu: network-manager: Appease guix lint. * gnu/packages/gnome.scm (network-manager)[home-page]: Use the permenant redirect URL. * gnu/packages/patches/nm-plugin-path.patch: Renamed to 'gnu/packages/patches/network-manager-plugin-path.patch'. --- gnu/local.mk | 2 +- gnu/packages/gnome.scm | 4 +- .../patches/network-manager-plugin-path.patch | 51 ++++++++++++++++++++++ gnu/packages/patches/nm-plugin-path.patch | 51 ---------------------- 4 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 gnu/packages/patches/network-manager-plugin-path.patch delete mode 100644 gnu/packages/patches/nm-plugin-path.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2f24f892b1..961dedfdf6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1297,7 +1297,7 @@ dist_patch_DATA = \ %D%/packages/patches/netsurf-y2038-tests.patch \ %D%/packages/patches/netsurf-longer-test-timeout.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ - %D%/packages/patches/nm-plugin-path.patch \ + %D%/packages/patches/network-manager-plugin-path.patch \ %D%/packages/patches/nsis-env-passthru.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-pkgconfig.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fb7c3b4fbd..784eb65426 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6357,7 +6357,7 @@ users.") (uri (string-append "mirror://gnome/sources/NetworkManager/" (version-major+minor version) "/" "NetworkManager-" version ".tar.xz")) - (patches (search-patches "nm-plugin-path.patch")) + (patches (search-patches "network-manager-plugin-path.patch")) (sha256 (base32 "06044fl60bjlj7c6rqqfbm5795h61h6yzp7ch392hzcnm46wwhn3")) @@ -6493,7 +6493,7 @@ users.") ("util-linux" ,util-linux) ("elogind" ,elogind))) (synopsis "Network connection manager") - (home-page "https://www.gnome.org/projects/NetworkManager/") + (home-page "https://wiki.gnome.org/Projects/NetworkManager") (description "NetworkManager is a system network service that manages your network devices and connections, attempting to keep active network connectivity when diff --git a/gnu/packages/patches/network-manager-plugin-path.patch b/gnu/packages/patches/network-manager-plugin-path.patch new file mode 100644 index 0000000000..505ae31534 --- /dev/null +++ b/gnu/packages/patches/network-manager-plugin-path.patch @@ -0,0 +1,51 @@ +From d3026a6d331298003ccc6cd9d2e20dcb7fa9ae1d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= +Date: Wed, 3 Jul 2019 13:31:54 +0200 +Subject: [PATCH] respect NM_VPN_PLUGIN_DIR + +--- + src/vpn/nm-vpn-manager.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/vpn/nm-vpn-manager.c b/src/vpn/nm-vpn-manager.c +index d063916..d779166 100644 +--- a/src/vpn/nm-vpn-manager.c ++++ b/src/vpn/nm-vpn-manager.c +@@ -223,6 +223,7 @@ nm_vpn_manager_init (NMVpnManager *self) + GSList *infos, *info; + const char *conf_dir_etc = _nm_vpn_plugin_info_get_default_dir_etc (); + const char *conf_dir_lib = _nm_vpn_plugin_info_get_default_dir_lib (); ++ const char *conf_dir_user = _nm_vpn_plugin_info_get_default_dir_user (); + + /* Watch the VPN directory for changes */ + file = g_file_new_for_path (conf_dir_lib); +@@ -241,6 +242,14 @@ nm_vpn_manager_init (NMVpnManager *self) + G_CALLBACK (vpn_dir_changed), self); + } + ++ file = g_file_new_for_path (conf_dir_user); ++ priv->monitor_etc = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL, NULL); ++ g_object_unref (file); ++ if (priv->monitor_etc) { ++ priv->monitor_id_etc = g_signal_connect (priv->monitor_etc, "changed", ++ G_CALLBACK (vpn_dir_changed), self); ++ } ++ + /* first read conf_dir_lib. The name files are not really user configuration, but + * plugin configuration. Hence we expect ~newer~ plugins to install their files + * in /usr/lib/NetworkManager. We want to prefer those files. +@@ -255,6 +264,11 @@ nm_vpn_manager_init (NMVpnManager *self) + try_add_plugin (self, info->data); + g_slist_free_full (infos, g_object_unref); + ++ infos = _nm_vpn_plugin_info_list_load_dir (conf_dir_user, TRUE, 0, NULL, NULL); ++ for (info = infos; info; info = info->next) ++ try_add_plugin (self, info->data); ++ g_slist_free_full (infos, g_object_unref); ++ + priv->active_services = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, NULL); + } + +-- +2.22.0 + diff --git a/gnu/packages/patches/nm-plugin-path.patch b/gnu/packages/patches/nm-plugin-path.patch deleted file mode 100644 index 505ae31534..0000000000 --- a/gnu/packages/patches/nm-plugin-path.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d3026a6d331298003ccc6cd9d2e20dcb7fa9ae1d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= -Date: Wed, 3 Jul 2019 13:31:54 +0200 -Subject: [PATCH] respect NM_VPN_PLUGIN_DIR - ---- - src/vpn/nm-vpn-manager.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/src/vpn/nm-vpn-manager.c b/src/vpn/nm-vpn-manager.c -index d063916..d779166 100644 ---- a/src/vpn/nm-vpn-manager.c -+++ b/src/vpn/nm-vpn-manager.c -@@ -223,6 +223,7 @@ nm_vpn_manager_init (NMVpnManager *self) - GSList *infos, *info; - const char *conf_dir_etc = _nm_vpn_plugin_info_get_default_dir_etc (); - const char *conf_dir_lib = _nm_vpn_plugin_info_get_default_dir_lib (); -+ const char *conf_dir_user = _nm_vpn_plugin_info_get_default_dir_user (); - - /* Watch the VPN directory for changes */ - file = g_file_new_for_path (conf_dir_lib); -@@ -241,6 +242,14 @@ nm_vpn_manager_init (NMVpnManager *self) - G_CALLBACK (vpn_dir_changed), self); - } - -+ file = g_file_new_for_path (conf_dir_user); -+ priv->monitor_etc = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL, NULL); -+ g_object_unref (file); -+ if (priv->monitor_etc) { -+ priv->monitor_id_etc = g_signal_connect (priv->monitor_etc, "changed", -+ G_CALLBACK (vpn_dir_changed), self); -+ } -+ - /* first read conf_dir_lib. The name files are not really user configuration, but - * plugin configuration. Hence we expect ~newer~ plugins to install their files - * in /usr/lib/NetworkManager. We want to prefer those files. -@@ -255,6 +264,11 @@ nm_vpn_manager_init (NMVpnManager *self) - try_add_plugin (self, info->data); - g_slist_free_full (infos, g_object_unref); - -+ infos = _nm_vpn_plugin_info_list_load_dir (conf_dir_user, TRUE, 0, NULL, NULL); -+ for (info = infos; info; info = info->next) -+ try_add_plugin (self, info->data); -+ g_slist_free_full (infos, g_object_unref); -+ - priv->active_services = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, NULL); - } - --- -2.22.0 - -- cgit v1.2.3 From cf390391c817751bbf6c49539c68f277f23d4ad1 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 11 May 2020 16:11:16 +0200 Subject: gnu: modem-manager: Update to 1.12.10. * gnu/packages/freedesktop.scm (modem-manager): Update to 1.12.10. [arguments]: Remove arguments '--disable-more-warnings'. --- gnu/packages/freedesktop.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index f00cb1e076..90154cbba9 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1115,7 +1115,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.") (define-public modem-manager (package (name "modem-manager") - (version "1.10.8") + (version "1.12.10") (source (origin (method url-fetch) (uri (string-append @@ -1123,15 +1123,11 @@ which speak the Qualcomm MSM Interface (QMI) protocol.") "ModemManager-" version ".tar.xz")) (sha256 (base32 - "16hnl0sdriqgv4v30mfs64mdl9rw7lsh802zlm3ggwxxil3p9qfb")))) + "1apq9camys2gaw6y6ic1ld20cncfwpmxnzvh4j5zkbbjpf5hbcxj")))) (build-system gnu-build-system) (arguments '(#:configure-flags - `(,(string-append "--with-udev-base-dir=" %output "/lib/udev") - ;; FIXME: Without this flag the build fails with "error: assignment - ;; from incompatible pointer type" whenever the return value of - ;; "g_object_ref" is assigned to "ctx->self". - "--disable-more-warnings"))) + `(,(string-append "--with-udev-base-dir=" %output "/lib/udev")))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums ("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From 8b554a4e5a8a4b376db56d1e037eb804f2c12340 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 11 May 2020 16:26:39 +0200 Subject: gnu: libnma: Update to 1.8.28. * gnu/packages/gnome.scm (libnma): Update to 1.8.28. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 784eb65426..f9756e4308 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -809,7 +809,7 @@ client devices can handle.") (define-public libnma (package (name "libnma") - (version "1.8.26") + (version "1.8.28") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -817,7 +817,7 @@ client devices can handle.") name "-" version ".tar.xz")) (sha256 (base32 - "1w9lld38risnk1krknfwln24kabdxnj274pyz4jhndphwigrshaf")))) + "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t)) -- cgit v1.2.3 From c25ca6b79ea73a71eacbfa28a21ebdc5433e3c2a Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 11 May 2020 16:30:55 +0200 Subject: gnu: libnma: Update inputs. * gnu/packages/gnome.scm (libnam)[arguments]: Remove 'glib-or-gtk?' and add phase 'patch-docbook-xml'. [native-inputs]: Add 'docboock-xml-4.3' and 'vala'. [inputs]: Remove 'adwaita'icon-theme'. squash! gnu: libnma: Update inputs and licenses. --- gnu/packages/gnome.scm | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f9756e4308..3394c1eb75 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -820,16 +820,26 @@ client devices can handle.") "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t)) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook"))) + (substitute* "libnma-docs.xml" + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd"))) + #t)))))) (native-inputs - `(("gettext" ,gettext-minimal) + `(("docbook-xml" ,docbook-xml-4.3) + ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gtk-doc" ,gtk-doc) ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) (inputs - `(("adwaita-icon-theme" ,adwaita-icon-theme) - ("gcr" ,gcr) + `(("gcr" ,gcr) ("gtk+" ,gtk+) ("iso-codes" ,iso-codes) ("mobile-broadband-provider-info" ,mobile-broadband-provider-info) @@ -838,11 +848,10 @@ client devices can handle.") (description "Libnma is an applet library for Network Manager. It was initially part of network-manager-applet and has now become a separate project.") - (home-page "https://gitlab.gnome.org/GNOME/libnma") - - ;; Some files carry the "GPL-2.0+" SPDX identifier while others say - ;; "LGPL-2.1+". - (license license:gpl2+))) + (home-page "https://gitlab.gnome.org/GNOME/libnma") + ;; Some files carry the "GPL-2.0+" SPDX identifier while others say + ;; "LGPL-2.1+". + (license license:gpl2+))) (define-public gnome-menus (package -- cgit v1.2.3 From b1da33d9657ae255294e3b49d5b050bd64b3ee61 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 11 May 2020 16:34:50 +0200 Subject: gnu: libnma: Adjust indentation. * gnu/packages/gnome.scm (libnma): Adjust indentation. --- gnu/packages/gnome.scm | 76 +++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3394c1eb75..6683750fd1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -808,44 +808,44 @@ client devices can handle.") (define-public libnma (package - (name "libnma") - (version "1.8.28") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja")))) - (build-system meson-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-docbook-xml - (lambda* (#:key inputs #:allow-other-keys) - (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook"))) - (substitute* "libnma-docs.xml" - (("http://.*/docbookx\\.dtd") - (string-append xmldoc "/docbookx.dtd"))) - #t)))))) - (native-inputs - `(("docbook-xml" ,docbook-xml-4.3) - ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc) - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("vala" ,vala))) - (inputs - `(("gcr" ,gcr) - ("gtk+" ,gtk+) - ("iso-codes" ,iso-codes) - ("mobile-broadband-provider-info" ,mobile-broadband-provider-info) - ("network-manager" ,network-manager))) - (synopsis "Network Manager's applet library") - (description "Libnma is an applet library for Network Manager. It was + (name "libnma") + (version "1.8.28") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja")))) + (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook"))) + (substitute* "libnma-docs.xml" + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd"))) + #t)))))) + (native-inputs + `(("docbook-xml" ,docbook-xml-4.3) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gtk-doc" ,gtk-doc) + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) + (inputs + `(("gcr" ,gcr) + ("gtk+" ,gtk+) + ("iso-codes" ,iso-codes) + ("mobile-broadband-provider-info" ,mobile-broadband-provider-info) + ("network-manager" ,network-manager))) + (synopsis "Network Manager's applet library") + (description "Libnma is an applet library for Network Manager. It was initially part of network-manager-applet and has now become a separate project.") (home-page "https://gitlab.gnome.org/GNOME/libnma") -- cgit v1.2.3 From 3fe368c0ffe9e00360c3fdf60b4dcb0aa5fe5e3a Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 11 May 2020 16:36:21 +0200 Subject: gnu: network-manager-openvpn: Update to 1.8.12. * gnu/packages/gnome.scm (network-manager-openvpn): Update to 1.8.12. [inputs]: Replace 'network-manager-applet' with 'libnma'. --- gnu/packages/gnome.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6683750fd1..b73f0ad31d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6519,8 +6519,7 @@ services.") (define-public network-manager-openvpn (package (name "network-manager-openvpn") - ;; Updating? Check whether network-manager-applet still needs libnm_gtk. - (version "1.8.10") + (version "1.8.12") (source (origin (method url-fetch) (uri (string-append @@ -6529,7 +6528,7 @@ services.") "/NetworkManager-openvpn-" version ".tar.xz")) (sha256 (base32 - "1vri49yff4lj13dnzkpq9nx3a4z1bmbrv807r151plj8m1mwhg5g")))) + "062kh4zj7jfbwy4zzcwpq2m457bzbpm3l18s0ysnw3mgia3siz8f")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var") @@ -6559,7 +6558,7 @@ services.") ("kmod" ,kmod) ("openvpn" ,openvpn) ("network-manager" ,network-manager) - ("network-manager-applet" ,network-manager-applet) ;for libnma + ("libnma" ,libnma) ("libsecret" ,libsecret))) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "OpenVPN plug-in for NetworkManager") -- cgit v1.2.3 From 4ca449c50e669b229dbee38e26323bbee7ed5c9c Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 11 May 2020 18:36:10 +0200 Subject: gnu: network-manager-openconnect: Use libnma. * gnu/packages/gnome.scm (network-manager-openconnect)[native-inputs]: Replace 'network-manager-applet' by 'libnma'. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b73f0ad31d..e651f2e2b4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6649,7 +6649,7 @@ Compatible with Cisco VPN concentrators configured to use IPsec.") #t))))) (native-inputs `(("intltool" ,intltool) - ("network-manager-applet" ,network-manager-applet) ;for libnma + ("libnma" ,libnma) ("pkg-config" ,pkg-config))) (inputs `(("gcr" ,gcr) -- cgit v1.2.3 From 7c43b78d2cb131796e92500880a9084c2c2ae429 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 11 May 2020 19:37:17 +0200 Subject: gnu: network-manager-vpnc: Use 'libnma'. * gnu/packages/gnome.scm (network-manager-vpnc)[arguments]: Add configure flag '--with-libnm-glib=no'. [inputs]: Replace 'network-manager-applet' with 'libnma'. --- gnu/packages/gnome.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e651f2e2b4..7305c8a986 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6583,7 +6583,11 @@ to virtual private networks (VPNs) via OpenVPN.") "1js5lwcsqws4klgypfxl4ikmakv7v7xgddij1fj6b0y0qicx0kyy")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var") + `(#:configure-flags '("--enable-absolute-paths" + "--localstatedir=/var" + ;; libnm-glib has been removed from network-manager + ;; 1de8383ad9fdfc8f552117e5d109bdfa7005634b + "--with-libnm-glib=no") #:phases (modify-phases %standard-phases (add-after 'configure 'patch-path @@ -6607,7 +6611,7 @@ to virtual private networks (VPNs) via OpenVPN.") ("kmod" ,kmod) ("vpnc" ,vpnc) ("network-manager" ,network-manager) - ("network-manager-applet" ,network-manager-applet) ;for libnma + ("libnma" ,libnma) ("libsecret" ,libsecret))) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "VPNC plug-in for NetworkManager") -- cgit v1.2.3 From 4c29111232c44c84908922442abd1cd83ddc7686 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 11 May 2020 16:59:17 +0200 Subject: gnu: network-manager-applet: Update to 1.16.0. * gnu/packages/gnome.scm (netowrk-manager-applet): Update to 1.16.0. [arguments]: Remove 'configure-flags'. [inputs]: Add 'libnma', remove 'iso-codes' and 'mobile-broadband-provider-info'. --- gnu/packages/gnome.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7305c8a986..0a24994edb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6702,7 +6702,7 @@ Cisco's AnyConnect SSL VPN.") (define-public network-manager-applet (package (name "network-manager-applet") - (version "1.8.24") + (version "1.16.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/network-manager-applet/" @@ -6710,13 +6710,10 @@ Cisco's AnyConnect SSL VPN.") "network-manager-applet-" version ".tar.xz")) (sha256 (base32 - "1gzvz4wfqfsfclqg56y954al8x6fmz71cnxlx1i4nqr7a25bp2qi")))) + "1rf3nm0hjcy9f8ajb4vmvwy503w8yj8d4daxkcb7w7i7b92qmyfn")))) (build-system meson-build-system) (arguments - '(#:configure-flags - ;; ‘Nobody should be using this’ but network-manager-openvpn 1.8.10 does. - (list "-Dlibnm_gtk=true") - #:glib-or-gtk? #t)) + '(#:glib-or-gtk? #t)) (native-inputs `(("intltool" ,intltool) ("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. @@ -6730,14 +6727,13 @@ Cisco's AnyConnect SSL VPN.") ("network-manager" ,network-manager))) (inputs `(("gcr" ,gcr) - ("iso-codes" ,iso-codes) + ("libnma" ,libnma) ("libgudev" ,libgudev) ("libnotify" ,libnotify) ("libsecret" ,libsecret) ("libselinux" ,libselinux) ("jansson" ,jansson) ; for team support - ("modem-manager" ,modem-manager) - ("mobile-broadband-provider-info" ,mobile-broadband-provider-info))) + ("modem-manager" ,modem-manager))) (synopsis "Applet for managing network connections") (home-page "https://www.gnome.org/projects/NetworkManager/") (description -- cgit v1.2.3 From 8ce78609065f8e703dd7b2f36560a8ba278a294e Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 11 May 2020 19:53:11 +0200 Subject: gnu: network-manager-applet: Appease guix lint. * gnu/packages/gnome.scm (network-manager-applet)[home-page]: Replace with permanent redirect URL. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0a24994edb..7afa25d7c0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6735,7 +6735,7 @@ Cisco's AnyConnect SSL VPN.") ("jansson" ,jansson) ; for team support ("modem-manager" ,modem-manager))) (synopsis "Applet for managing network connections") - (home-page "https://www.gnome.org/projects/NetworkManager/") + (home-page "https://wiki.gnome.org/Projects/NetworkManager") (description "This package contains a systray applet for NetworkManager. It displays the available networks and allows users to easily switch between them.") -- cgit v1.2.3 From 8d9477b8b8ce671b7c817a4c0dab73f095db955b Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Fri, 22 May 2020 15:13:35 +0200 Subject: gnu: gnome-initial-setup: Use 'libnma'. * gnu/packages/gnome.scm (gnome-initial-setup)[inputs]: Replace 'network-manager-applet' with 'libnma'. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7afa25d7c0..b3459e4861 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -645,9 +645,9 @@ extraction, and lookup for applications on the desktop.") ("json-glib" ,json-glib) ("krb5" ,mit-krb5) ("libgweather" ,libgweather) + ("libnma" ,libnma) ("libsecret" ,libsecret) ("network-manager" ,network-manager) - ("network-manager-applet" ,network-manager-applet) ("packagekit" ,packagekit) ("polkit" ,polkit) ("pwquality" ,libpwquality) -- cgit v1.2.3 From 46cf343440a74da662c0b4985e5a43321d86ddd2 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Fri, 22 May 2020 15:15:56 +0200 Subject: gnu: gnome-control-center: Use 'libnma'. * gnu/packages/gnome.scm (gnome-control-center)[inputs]: Add 'libnma'. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b3459e4861..e94d65908d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7124,6 +7124,7 @@ devices using the GNOME desktop.") ("libgnomekbd" ,libgnomekbd) ("libgudev" ,libgudev) ("libgtop" ,libgtop) + ("libnma" ,libnma) ("libpwquality" ,libpwquality) ("libsecret" ,libsecret) ("libsoup" ,libsoup) -- cgit v1.2.3 From cc1698bc03ae6ca505f5a86bacad7fbd0fef2848 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 21 May 2020 12:44:15 -0400 Subject: gnu: go-golang-org-x-sys: Update to 0.0.0-6.c709ea0. * gnu/packages/golang.scm (go-golang-org-x-sys): Update to 0.0.0-6.c709ea0. --- gnu/packages/golang.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 69f46df743..3a7af4304b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -723,8 +723,8 @@ processing.") (license license:bsd-3)))) (define-public go-golang-org-x-sys - (let ((commit "749cb33beabd9aa6d3178e3de05bcc914f70b2bf") - (revision "5")) + (let ((commit "c709ea063b76879dc9915358f55d4d77c16ab6d5") + (revision "6")) (package (name "go-golang-org-x-sys") (version (git-version "0.0.0" revision commit)) @@ -736,7 +736,7 @@ processing.") (file-name (git-file-name name version)) (sha256 (base32 - "0dm3257q3rv2kyn5lmqqim2fqg634v6rhrqq4glvbk4wx4l3v337")))) + "15nq53a6kcqchng4j0d1pjw0m6hny6126nhjdwqw5n9dzh6a226d")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/sys" -- cgit v1.2.3 From c2176548835a88aa06e62f4cd21c41c8818f9113 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 21 May 2020 12:43:36 -0400 Subject: gnu: go-golang-org-x-crypto: Update to 0.0.0-5.2aa609c. * gnu/packages/golang.scm (go-golang-org-x-crypto): Update to 0.0.0-5.2aa609c. --- gnu/packages/golang.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3a7af4304b..6295071589 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -623,8 +623,8 @@ Go programming language.") (license license:bsd-3)))) (define-public go-golang-org-x-crypto - (let ((commit "9756ffdc24725223350eb3266ffb92590d28f278") - (revision "4")) + (let ((commit "2aa609cf4a9d7d1126360de73b55b6002f9e052a") + (revision "5")) (package (name "go-golang-org-x-crypto") (version (git-version "0.0.0" revision commit)) @@ -637,7 +637,7 @@ Go programming language.") version "-checkout")) (sha256 (base32 - "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8")))) + "1yvis6fqbsd7f356aqyi18f76vnwj3bry6mxqnkvshq4cwrf92il")))) (build-system go-build-system) (arguments '(#:import-path "golang.org/x/crypto" -- cgit v1.2.3 From 618df2e335acb49a27ca014b555ede34f79503f3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 21 May 2020 12:45:23 -0400 Subject: gnu: go-github-com-kr-pretty: Update to 0.2.0. * gnu/packages/golang.scm (go-github-com-kr-pretty): Update to 0.2.0. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6295071589..b5b868cb2d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2803,7 +2803,7 @@ format in Go.") (define-public go-github-com-kr-pretty (package (name "go-github-com-kr-pretty") - (version "0.1.0") + (version "0.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -2812,7 +2812,7 @@ format in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp")))) + "1pm4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp")))) (build-system go-build-system) (propagated-inputs `(("go-github-com-kr-text" ,go-github-com-kr-text))) -- cgit v1.2.3 From 3a8935099f38005b53fe47b483d863a35ce1258e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 21 May 2020 12:46:20 -0400 Subject: gnu: go-github-com-jackpal-gateway: Update to 1.0.6. * gnu/packages/syncthing.scm (go-github-com-jackpal-gateway): Update to 1.0.6. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index ad4c30d064..75de5b46a0 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -394,7 +394,7 @@ compression format.") (define-public go-github-com-jackpal-gateway (package (name "go-github-com-jackpal-gateway") - (version "1.0.5") + (version "1.0.6") (source (origin (method git-fetch) (uri (git-reference @@ -403,7 +403,7 @@ compression format.") (file-name (git-file-name name version)) (sha256 (base32 - "1ird5xmizj632l3dq24s2xgb8w1dn6v8xznlqz252gvngyr2gjl1")))) + "1yms2dw4dnz4cvj9vhwh6193d50jhvn5awsp2g3a4lcc3sjrgd6m")))) (build-system go-build-system) (arguments `(#:import-path "github.com/jackpal/gateway")) -- cgit v1.2.3 From 64905c24ad56d9278d8790365647d10b2d8eddc4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 21 May 2020 12:55:10 -0400 Subject: gnu: Add go-github-com-twmb-murmur3. * gnu/packages/golang.scm (go-github-com-calmh-murmur3): Replace with ... (go-github-com-twmb-murmur3): ... new variable. (go-github-com-willf-bloom): Use go-github-com-twmb-murmur3. --- gnu/packages/golang.scm | 50 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b5b868cb2d..3a9b109663 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2186,33 +2186,31 @@ Reference algorithm has been slightly hacked as to support the streaming mode required by Go's standard Hash interface.") (license license:bsd-3))) -(define-public go-github-com-calmh-murmur3 - (let ((commit "74e9af8f47ac56901c490d45546ca167b60c7066") - (revision "0")) - (package - (name "go-github-com-calmh-murmur3") - (version (git-version "1.1.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/calmh/murmur3.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0k8345ivx228qdbkl8bisd2wxwsinkb44ghba6r09538fr3fbr5w")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/calmh/murmur3")) - (home-page "https://github.com/calmh/murmur3") - (synopsis "Native MurmurHash3 Go implementation") - (description "Native Go implementation of Austin Appleby's third +(define-public go-github-com-twmb-murmur3 + (package + (name "go-github-com-twmb-murmur3") + (version "1.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/twmb/murmur3.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00riapwkyf23l5wyis47mbr8rwr4yrjw491jfc30wpzs111c1gyy")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/twmb/murmur3")) + (home-page "https://github.com/twmb/murmur3") + (synopsis "Native MurmurHash3 Go implementation") + (description "Native Go implementation of Austin Appleby's third MurmurHash revision (aka MurmurHash3). Reference algorithm has been slightly hacked as to support the streaming mode required by Go's standard Hash interface.") - (license license:bsd-3)))) + (license license:bsd-3))) (define-public go-github-com-multiformats-go-multihash (let ((commit "97cdb562a04c6ef66d8ed40cd62f8fbcddd396d6") @@ -3496,14 +3494,14 @@ efficient space usage.") (modify-phases %standard-phases (add-after 'unpack 'patch-import-path (lambda _ - ;; See 'go.mod' in the source distribution of Syncthing 1.4.1 for + ;; See 'go.mod' in the source distribution of Syncthing 1.5.0 for ;; more information. ;; (substitute* "src/github.com/willf/bloom/bloom.go" - (("spaolacci") "calmh")) + (("spaolacci") "twmb")) #t))))) (propagated-inputs - `(("go-github-com-calmh-murmur3" ,go-github-com-calmh-murmur3) + `(("go-github-com-twmb-murmur3" ,go-github-com-twmb-murmur3) ("go-github-com-willf-bitset" ,go-github-com-willf-bitset))) (synopsis "Bloom filters in Go") (description "This package provides a Go implementation of bloom filters, -- cgit v1.2.3 From 4a1bc86678df784b0c578e621275db10ffad0be4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 21 May 2020 14:20:05 -0400 Subject: gnu: go-github-com-marten-seemann-qtls: Update to 0.4.1. * gnu/packages/golang.scm (go-github-com-marten-seemann-qtls): Update to 0.4.1. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3a9b109663..58016dcbf8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3042,7 +3042,7 @@ mutex, simply ignore the RLock/RUnlock functions.") (define-public go-github-com-marten-seemann-qtls (package (name "go-github-com-marten-seemann-qtls") - (version "0.3.2") + (version "0.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -3051,7 +3051,7 @@ mutex, simply ignore the RLock/RUnlock functions.") (file-name (git-file-name name version)) (sha256 (base32 - "1mdymj66qrqy80pfkwy9s9z9ifkg251whngw5lim09zm90wv2q7a")))) + "0dz60y98nm7l70hamq0v2vrs2dspyr5yqhnrds2dfh7hchxvq76j")))) (build-system go-build-system) (arguments '(#:import-path "github.com/marten-seemann/qtls" -- cgit v1.2.3 From 7df8cb254e2683b9f6e8cc5302b8babbd44b1eb4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 21 May 2020 14:20:39 -0400 Subject: gnu: Add go-github-com-marten-seemann-chacha20. * gnu/packages/golang.scm (go-github-com-marten-seemann-chacha20): New variable. --- gnu/packages/golang.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 58016dcbf8..ac952b52da 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3065,6 +3065,28 @@ the Go standard library's TLS 1.3 implementation.") (home-page "https://github.com/marten-seemann/qtls") (license license:bsd-3))) +(define-public go-github-com-marten-seemann-chacha20 + (package + (name "go-github-com-marten-seemann-chacha20") + (version "0.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/marten-seemann/chacha20") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0x1j4cvbap45zk962qkjalc1h3axhzzdy9cdzhcjmprmm1ql4gjm")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/marten-seemann/chacha20")) + (synopsis "ChaCha20 in Go") + (description "This package is an external copy of the Go standard library's +internal ChaCha20 package.") + (home-page "https://github.com/marten-seemann/chacha20") + (license license:bsd-3))) + (define-public go-github-com-cheekybits-genny (package (name "go-github-com-cheekybits-genny") -- cgit v1.2.3 From cfe4b6e29d33104cb60a1d15e24b2b74733f0501 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 21 May 2020 12:56:37 -0400 Subject: gnu: go-github-com-lucas-clemente-quic-go: Update to 0.14.4. * gnu/packages/golang.scm (go-github-com-lucas-clemente-quic-go): Update to 0.14.4. [propagated-inputs]: Add go-github-com-marten-seemann-chacha20. --- gnu/packages/golang.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ac952b52da..c6f47aa144 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3114,7 +3114,7 @@ implementation of generics.") (define-public go-github-com-lucas-clemente-quic-go (package (name "go-github-com-lucas-clemente-quic-go") - (version "0.12.1") + (version "0.14.4") (source (origin (method git-fetch) (uri (git-reference @@ -3123,7 +3123,7 @@ implementation of generics.") (file-name (git-file-name name version)) (sha256 (base32 - "156nhq4dvw7mr08j952248v81q7702phbn4mp228319sahnbv65h")))) + "04l3gqbc3gh079n8vgnrsf8ypgv8sl63xjf28jqfrb45v2l73vyz")))) (build-system go-build-system) (arguments '(#:import-path "github.com/lucas-clemente/quic-go" @@ -3132,6 +3132,7 @@ implementation of generics.") (propagated-inputs `(("go-golang-org-x-crypto" ,go-golang-org-x-crypto) ("go-github-com-cheekybits-genny" ,go-github-com-cheekybits-genny) + ("go-github-com-marten-seemann-chacha20" ,go-github-com-marten-seemann-chacha20) ("go-github-com-marten-seemann-qtls" ,go-github-com-marten-seemann-qtls) ("go-github-com-golang-protobuf-proto" ,go-github-com-golang-protobuf-proto))) (synopsis "QUIC in Go") -- cgit v1.2.3 From 0ffc13921f31728f5421486ba37dfbcb3783815e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 22 May 2020 15:04:01 -0400 Subject: gnu: Change name of Go asn1-ber package and update to 1.3.1. * gnu/packages/syncthing.scm (go-gopkg.in-asn1-ber.v1): Replace with ... (go-github-com-go-asn1-ber-asn1-ber): ... new variable. [arguments]: Remove custom 'check' phase. --- gnu/packages/syncthing.scm | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 75de5b46a0..8286ab4f99 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -942,35 +942,26 @@ server tools for Prometheus metrics.") (home-page "https://github.com/prometheus/client_golang") (license asl2.0))) -(define-public go-gopkg.in-asn1-ber.v1 +(define-public go-github-com-go-asn1-ber-asn1-ber (package - (name "go-gopkg.in-asn1-ber.v1") - (version "1.3") + (name "go-github-com-go-asn1-ber-asn1-ber") + (version "1.3.1") (source (origin (method git-fetch) (uri (git-reference - (url "https://gopkg.in/asn1-ber.v1") + (url "https://github.com/go-asn1-ber/asn1-ber") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "00ixms8x3lrhywbvq5v2sagcqsxa1pcnlk17dp5lnwckv3xg4psb")))) + "0dxfmgk84fn0p6pz3i0cspynh6rly5pfk9wghm1q07mx99npln02")))) (build-system go-build-system) (arguments - '(#:import-path "gopkg.in/asn1-ber.v1" - ;; Tests don't pass "vet" on Go since 1.11. See - ;; https://github.com/go-asn1-ber/asn1-ber/issues/20. - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key import-path #:allow-other-keys) - (invoke "go" "test" - "-vet=off" - import-path)))))) + '(#:import-path "github.com/go-asn1-ber/asn1-ber")) (synopsis "ASN.1 BER encoding and decoding in Go") (description "This package provides ASN.1 BER encoding and decoding in the Go language.") - (home-page "https://gopkg.in/asn1-ber.v1") + (home-page "https://github.com/go-asn1-ber/asn1-ber") (license expat))) (define-public go-gopkg.in-ldap.v2 -- cgit v1.2.3 From 4185edf2086af01ab072c6e667a14fdf313b71d1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 22 May 2020 16:32:08 -0400 Subject: gnu: Change name of Go ldap package and update to 3.1.7. * gnu/packages/syncthing.scm (go-gopkg.in-ldap.v2): Replace with ... (go-github-com-go-ldap-ldap): ... new variable. --- gnu/packages/syncthing.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 8286ab4f99..1030b6b557 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -964,29 +964,29 @@ Go language.") (home-page "https://github.com/go-asn1-ber/asn1-ber") (license expat))) -(define-public go-gopkg.in-ldap.v2 +(define-public go-github-com-go-ldap-ldap (package - (name "go-gopkg.in-ldap.v2") - (version "2.5.1") + (name "go-github-com-go-ldap-ldap") + (version "3.1.7") (source (origin (method git-fetch) (uri (git-reference - (url "https://gopkg.in/ldap.v2") + (url "https://github.com/go-ldap/ldap") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1wf81wy04nhkqs0dg5zkivr4sh37r83bxrfwjz9vr4jq6vmljr3h")))) + "1z6wxia7a1jkmasa9mm6g4n8f0qqbp5rw6vk0zyh4vzk7azklnj2")))) (build-system go-build-system) (arguments - '(#:import-path "gopkg.in/ldap.v2" - #:tests? #f)) ; the test suite requires network access + '(#:import-path "github.com/go-ldap/ldap/v3" + #:tests? #f)) ; test suite requires internet access (propagated-inputs - `(("go-gopkg.in-asn1-ber.v1" ,go-gopkg.in-asn1-ber.v1))) + `(("go-github-com-go-asn1-ber-asn1-ber" ,go-github-com-go-asn1-ber-asn1-ber))) + (home-page "https://github.com/go-ldap/ldap") (synopsis "LDAP v3 functionality for Go") (description "This package provides basic LDAP v3 functionality in the Go language.") - (home-page "https://gopkg.in/ldap.v2") (license expat))) (define-public go-github-com-flynn-archive-go-shlex -- cgit v1.2.3 From 595f30c0de09659d5aeaecfba7384b0c4e668b55 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 21 May 2020 12:56:58 -0400 Subject: gnu: Syncthing: Update to 1.5.0. * gnu/packages/syncthing.scm (syncthing): Update to 1.5.0. [inputs]: Replace go-gopkg.in-ldap.v2 with go-github-com-go-ldap-ldap. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 1030b6b557..99bdd7704b 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -32,7 +32,7 @@ (define-public syncthing (package (name "syncthing") - (version "1.4.2") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -40,7 +40,7 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "16dqpbn4saxmmmqd5ya8zdkwvxzz4nim1p4w954zkkdz3cyg86h6")) + "1394b8y4nllihnjngc0kjpdy7pvyh6v1h09hkn8rdmwxpsdkqkjb")) (modules '((guix build utils))) ;; Delete bundled ("vendored") free software source code. (snippet '(begin @@ -77,7 +77,7 @@ ("go-github-com-syndtr-goleveldb" ,go-github-com-syndtr-goleveldb) ("go-github-com-thejerf-suture" ,go-github-com-thejerf-suture) ("go-golang-org-x-time" ,go-golang-org-x-time) - ("go-gopkg.in-ldap.v2" ,go-gopkg.in-ldap.v2) + ("go-github-com-go-ldap-ldap" ,go-github-com-go-ldap-ldap) ("go-github-com-gogo-protobuf" ,go-github-com-gogo-protobuf) ("go-github-com-shirou-gopsutil" ,go-github-com-shirou-gopsutil) ("go-github-com-prometheus-client-golang" -- cgit v1.2.3 From f64a74dd6c69a0e404b40b7688cdcbcaf63fdf42 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Fri, 22 May 2020 14:12:50 -0400 Subject: gnu: git-annex: Update to 8.20200522. * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20200522. [source]: Remove patch that is now in a release. * gnu/packages/patches/git-annex-S3v4.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Leo Famulari --- gnu/local.mk | 1 - gnu/packages/haskell-apps.scm | 6 +-- gnu/packages/patches/git-annex-S3v4.patch | 77 ------------------------------- 3 files changed, 2 insertions(+), 82 deletions(-) delete mode 100644 gnu/packages/patches/git-annex-S3v4.patch diff --git a/gnu/local.mk b/gnu/local.mk index 961dedfdf6..575b18eb41 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -979,7 +979,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ - %D%/packages/patches/git-annex-S3v4.patch \ %D%/packages/patches/glib-tests-timer.patch \ %D%/packages/patches/glibc-CVE-2015-5180.patch \ %D%/packages/patches/glibc-CVE-2015-7547.patch \ diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index ecfe439c4b..3089c17145 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -37,7 +37,6 @@ #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system haskell) - #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages curl) #:use-module (gnu packages gl) @@ -342,15 +341,14 @@ to @code{cabal repl}).") (define-public git-annex (package (name "git-annex") - (version "8.20200501") + (version "8.20200522") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) - (patches (search-patches "git-annex-S3v4.patch")) (sha256 - (base32 "19rggaymvqy7r61n2rl2nigwdi2hzq5l1afcd5l0k1vbacwgq4jl")))) + (base32 "1v71k5k9mcj1nq4pb8apx99rgw2rmckr6yshhvjl1dr6j70d67x8")))) (build-system haskell-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/patches/git-annex-S3v4.patch b/gnu/packages/patches/git-annex-S3v4.patch deleted file mode 100644 index 9f7cea329e..0000000000 --- a/gnu/packages/patches/git-annex-S3v4.patch +++ /dev/null @@ -1,77 +0,0 @@ -From the upstream commit, with the changes to CHANGELOG and the docs -folder removed. - -From 1532d67c3ecf452b8c86bcc5928525398755cd01 Mon Sep 17 00:00:00 2001 -From: Joey Hess -Date: Thu, 7 May 2020 13:18:11 -0400 -Subject: [PATCH] S3: Support signature=v4 - -To use S3 Signature Version 4. Some S3 services seem to require v4, while -others may only support v2, which remains the default. - -I'm also not sure if v4 works correctly in all cases, there is this -upstream bug report: https://github.com/aristidb/aws/issues/262 -I've only tested it against the default S3 endpoint. ---- - CHANGELOG | 3 +++ - Remote/S3.hs | 23 ++++++++++++++++++- - ..._3bbdf23c8a4a480f4f6b8e8a2f8ddecd._comment | 13 +++++++++++ - ..._854390b9a781da82ecb85ad85eecad04._comment | 13 +++++++++++ - doc/special_remotes/S3.mdwn | 4 ++++ - ..._cf57e8dbd9fdc7c487565b61808b6bb2._comment | 10 ++++++++ - 6 files changed, 65 insertions(+), 1 deletion(-) - create mode 100644 doc/bugs/S3_special_remote_support_for_DigitalOcean_Spaces/comment_2_3bbdf23c8a4a480f4f6b8e8a2f8ddecd._comment - create mode 100644 doc/forum/backblaze_s3/comment_1_854390b9a781da82ecb85ad85eecad04._comment - create mode 100644 doc/special_remotes/S3/comment_34_cf57e8dbd9fdc7c487565b61808b6bb2._comment - -diff --git a/Remote/S3.hs b/Remote/S3.hs -index cb345d1f8..e3ea492f2 100644 ---- a/Remote/S3.hs -+++ b/Remote/S3.hs -@@ -99,6 +99,8 @@ remote = specialRemoteType $ RemoteType - (FieldDesc "port to connect to") - , optionalStringParser requeststyleField - (FieldDesc "for path-style requests, set to \"path\"") -+ , signatureVersionParser signatureField -+ (FieldDesc "S3 signature version") - , optionalStringParser mungekeysField HiddenField - , optionalStringParser AWS.s3credsField HiddenField - ] -@@ -148,6 +150,22 @@ protocolField = Accepted "protocol" - requeststyleField :: RemoteConfigField - requeststyleField = Accepted "requeststyle" - -+signatureField :: RemoteConfigField -+signatureField = Accepted "signature" -+ -+newtype SignatureVersion = SignatureVersion Int -+ -+signatureVersionParser :: RemoteConfigField -> FieldDesc -> RemoteConfigFieldParser -+signatureVersionParser f fd = -+ genParser go f defver fd -+ (Just (ValueDesc "v2 or v4")) -+ where -+ go "v2" = Just (SignatureVersion 2) -+ go "v4" = Just (SignatureVersion 4) -+ go _ = Nothing -+ -+ defver = SignatureVersion 2 -+ - portField :: RemoteConfigField - portField = Accepted "port" - -@@ -877,7 +895,10 @@ s3Configuration c = cfg - Nothing - | port == 443 -> AWS.HTTPS - | otherwise -> AWS.HTTP -- cfg = S3.s3 proto endpoint False -+ cfg = case getRemoteConfigValue signatureField c of -+ Just (SignatureVersion 4) -> -+ S3.s3v4 proto endpoint False S3.SignWithEffort -+ _ -> S3.s3 proto endpoint False - - data S3Info = S3Info - { bucket :: S3.Bucket --- -2.26.2 - -- cgit v1.2.3 From 6597893ba27153efd61bc28b15c1f4cd1aab2864 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Fri, 22 May 2020 15:17:32 +0200 Subject: gnu: libaom: Update to 2.0.0 * gnu/packages/video.scm (libaom): Update to 2.0.0. Signed-off-by: Leo Famulari --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index bb465c64c9..cd3e5ba9ef 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -283,7 +283,7 @@ television and DVD. It is also known as AC-3.") (define-public libaom (package (name "libaom") - (version "1.0.0-errata1-avif") + (version "2.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -292,7 +292,7 @@ television and DVD. It is also known as AC-3.") (file-name (git-file-name name version)) (sha256 (base32 - "169yfgh7zigc21h71qclfyr7s4wwp2i9vbr4z6pkabypvass4v7m")))) + "1616xjhj6770ykn82ml741h8hx44v507iky3s9h7a5lnk9d4cxzy")))) (build-system cmake-build-system) (native-inputs `(("perl" ,perl) -- cgit v1.2.3 From 8d7ee11aac9b4a56b7fd47f0e7b250d6062c7832 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 22 May 2020 19:09:55 -0400 Subject: gnu: libavif: Update to 0.7.3. * gnu/packages/image.scm (libavif): Update to 0.7.3. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 28d3385e71..24f1b1570c 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1986,7 +1986,7 @@ This package can be used to create @code{favicon.ico} files for web sites.") (define-public libavif (package (name "libavif") - (version "0.7.1") + (version "0.7.3") (source (origin (method git-fetch) (uri (git-reference @@ -1995,7 +1995,7 @@ This package can be used to create @code{favicon.ico} files for web sites.") (file-name (git-file-name name version)) (sha256 (base32 - "1xybjbbprvfsrwgysrn7grg6yp7v6ch5vci7zvdcdzcgyrbph172")))) + "17hagdngpc4xzrr0aa48nx399y5lawyyx9cpcdhpds1mqk6p77lp")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DAVIF_CODEC_AOM=ON" "-DAVIF_CODEC_DAV1D=ON" -- cgit v1.2.3 From 05e1edf2220080eda548106d48f4699ee97fa263 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 22 May 2020 19:18:24 -0400 Subject: gnu: dav1d: Update to 0.7.0. * gnu/packages/video.scm (dav1d): Update to 0.7.0. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index cd3e5ba9ef..422eb79941 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3693,7 +3693,7 @@ transitions, and effects and then export your film to many common formats.") (define-public dav1d (package (name "dav1d") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) @@ -3701,7 +3701,7 @@ transitions, and effects and then export your film to many common formats.") "/dav1d/" version "/dav1d-" version ".tar.xz")) (sha256 (base32 - "0w5k572jzxp7zwdbsa0jgjzri6hsrkydawzzilrw46nxpcak37q9")))) + "0xcykraf42gkymzqx1k1lcdclgk9y5yf7rr56vslrgmr0r849qnk")))) (build-system meson-build-system) (native-inputs `(("nasm" ,nasm))) (home-page "https://code.videolan.org/videolan/dav1d") -- cgit v1.2.3 From b2d81186165631c50a6e760b52d5830409b65585 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 22 May 2020 21:51:41 -0300 Subject: gnu: Add emacs-fountain-mode. * gnu/packages/emacs-xyz.scm (emacs-fountain-mode): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d952e8ea6c..8951119da9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -70,6 +70,7 @@ ;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 pinoaffe +;;; Copyright © 2020 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -2767,6 +2768,26 @@ Emacs.") files and directories.") (license license:gpl3+))) +(define-public emacs-fountain-mode + (package + (name "emacs-fountain-mode") + (version "3.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rnkn/fountain-mode") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08giwg0jwk8zzj2i4cm08322qr6znrnv9a49za7c6j47bykpwj6s")))) + (build-system emacs-build-system) + (home-page "https://github.com/rnkn/fountain-mode") + (synopsis "Major mode for screenwriting in Fountain markup") + (description "Fountain Mode is a scriptwriting program for GNU Emacs +using the Fountain plain text markup format.") + (license license:gpl3+))) + (define-public emacs-fringe-helper (let ((commit "ef4a9c023bae18ec1ddd7265f1f2d6d2e775efdd") (revision "1")) -- cgit v1.2.3 From 28e9a1118b8dc3c14d1ffc0533ac2c6683f65ad0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 23 May 2020 09:43:51 +0200 Subject: gnu: emacs-flycheck-grammalecte: Remove "/usr/bin/env" references. * gnu/packages/emacs-xyz.scm (emacs-flycheck-grammalecte)[arguments]: Fix more python3 locations. --- gnu/packages/emacs-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8951119da9..fe68a56fd6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3797,13 +3797,15 @@ for Flow files.") #:emacs ,emacs ;need libxml support #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-python-executable - ;; Hardcode python3 executable in the Emacs library. + (add-after 'unpack 'specify-python-location + ;; Hard-code python3 executable location in the library. (lambda* (#:key inputs #:allow-other-keys) (let ((python3 (string-append (assoc-ref inputs "python") "/bin/python3"))) (substitute* "flycheck-grammalecte.el" (("\"python3") (string-append "\"" python3))) + (substitute* '("conjugueur.py" "flycheck-grammalecte.py") + (("/usr/bin/env python3?") python3)) #t))) (add-before 'build 'link-to-grammalecte ;; XXX: The Python part of the package requires grammalecte, but -- cgit v1.2.3 From e7b2ac1cd8aaa3451e29b7529317932ed9149e68 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 May 2020 14:04:48 +0200 Subject: gnu: Add libglvnd. * gnu/packages/gl.scm (libglvnd): New public variable. --- gnu/packages/gl.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index fdc361d761..23b8ed1a29 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -664,6 +664,53 @@ OpenGL graphics API.") "A library for handling OpenGL function pointer management.") (license license:x11))) +(define-public libglvnd + (package + (name "libglvnd") + (version "1.3.1") + (home-page "https://gitlab.freedesktop.org/glvnd/libglvnd") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mkzdzdxjxjl794rblq4mq33wmb8ikqmfswbqdbr8gw2kw4wlhdl")))) + (build-system meson-build-system) + (arguments + '(#:configure-flags '("-Dx11=enabled") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-glx-tests + (lambda _ + ;; This package is meant to be used alongside Mesa. + ;; To avoid a circular dependency, disable tests that + ;; require a running Xorg server. + (substitute* "tests/meson.build" + (("if with_glx") + "if false")) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libx11" ,libx11) + ("libxext" ,libxext) + ("xorgproto" ,xorgproto))) + (synopsis "Vendor-neutral OpenGL dispatch library") + (description + "libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL +API calls between multiple vendors. It allows multiple drivers from +different vendors to coexist on the same filesystem, and determines which +vendor to dispatch each API call to at runtime. + +Both GLX and EGL are supported, in any combination with OpenGL and OpenGL ES.") + ;; libglvnd is available under a custom X11-style license, and incorporates + ;; code with various other licenses. See README.md for details. + (license (list (license:x11-style "file://README.md") + license:x11 + license:expat)))) + (define-public soil (package (name "soil") -- cgit v1.2.3 From 22070ad1ff6b943972912cc7b0bc2c04bb28c80c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 May 2020 15:31:14 +0200 Subject: gnu: redshift: Build and install redshift-gtk in a separate output. This also installs a redshift.desktop file as a side-effect. * gnu/packages/xdisorg.scm (redshift)[outputs, arguments]: New fields. --- gnu/packages/xdisorg.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 88719775df..1714cb8caf 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Alex Kost -;;; Copyright © 2016, 2017, 2019 Marius Bakke +;;; Copyright © 2016, 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2016 Petter ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017 Nikita @@ -1152,6 +1152,50 @@ the X.Org X Server version 1.7 and later (X11R7.5 or later).") (base32 "1fi27b73x85qqar526dbd33av7mahca2ykaqwr7siqiw1qqcby6j")))) (build-system gnu-build-system) + (arguments + `(#:imported-modules (,@%gnu-build-system-modules + (guix build python-build-system)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'split-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gtk (assoc-ref outputs "gtk")) + (desktop-file "/share/applications/redshift-gtk.desktop")) + (mkdir-p (string-append gtk "/bin")) + (link (string-append out "/bin/redshift-gtk") + (string-append gtk "/bin/redshift-gtk")) + (delete-file (string-append out "/bin/redshift-gtk")) + (copy-recursively (string-append out "/lib") + (string-append gtk "/lib")) + (delete-file-recursively (string-append out "/lib")) + (mkdir-p (string-append gtk "/share/applications")) + (link (string-append out desktop-file) + (string-append gtk desktop-file)) + (delete-file (string-append out desktop-file)) + (with-directory-excursion (string-append out "/share") + (for-each (lambda (dir) + (copy-recursively + (string-append out "/share/" dir) + (string-append gtk "/share/" dir)) + (delete-file-recursively dir)) + '("appdata" "icons"))) + #t))) + (add-after 'split-outputs 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((gtk (assoc-ref outputs "gtk")) + (python-version + (@ (guix build python-build-system) python-version)) + (python (assoc-ref inputs "python")) + (sitedir (string-append gtk "/lib/python" + (python-version python) + "/site-packages"))) + (wrap-program (string-append gtk "/bin/redshift-gtk") + `("PYTHONPATH" ":" prefix + (,(string-append sitedir ":" (getenv "PYTHONPATH")))) + `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))) + #t)))))) + (outputs '("out" "gtk")) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) @@ -1160,7 +1204,13 @@ the X.Org X Server version 1.7 and later (X11R7.5 or later).") ("libx11" ,libx11) ("libxcb" ,libxcb) ("libxxf86vm" ,libxxf86vm) - ("glib" ,glib))) ; for Geoclue2 support + ("glib" ,glib) ;for Geoclue2 support + + ;; To build the GTK3 GUI, we need these. + ("gtk+" ,gtk+) + ("python" ,python) + ("python-pygobject" ,python-pygobject) + ("python-pyxdg" ,python-pyxdg))) (home-page "https://github.com/jonls/redshift") (synopsis "Adjust the color temperature of your screen") (description -- cgit v1.2.3 From 9fdf982b418e379dc5abfaa072583f19eb314240 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 May 2020 22:33:22 +0200 Subject: gnu: inxi: Update to 3.1.00-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.1.00-1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9314abf5be..cb8e73e95a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3336,7 +3336,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.0.38-1") + (version "3.1.00-1") (source (origin (method git-fetch) @@ -3345,7 +3345,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "1qw3sxgd3ly916bzzl3873s3flngwd3vh57slw0shsj7ivz8bfnm")))) + (base32 "0md6yfd297l8695g0rsbs4mm74dc3k00rfjl4x2n4i33mkylp6qa")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit v1.2.3 From 99f80e5ccdc32eeb588eb8436738ba46973bbe84 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 May 2020 01:44:00 +0200 Subject: gnu: polybar: Update to 3.4.3. * gnu/packages/wm.scm (polybar): Update to 3.4.3. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 1151b8115d..f9db2dbe4d 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1268,14 +1268,14 @@ its size (define-public polybar (package (name "polybar") - (version "3.4.2") + (version "3.4.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/polybar/polybar/releases/" "download/" version "/polybar-" version ".tar")) (sha256 - (base32 "0fmnviz4b01aw50nkv4yibm8ykc5ff860ynw3xb1ymlsjrvwj8jd")))) + (base32 "0bw22qvbcdvyd0qv3ax48r34rnclbbb6dyb8h8zljq1r3lf15vfl")))) (build-system cmake-build-system) (arguments ;; Test is disabled because it requires downloading googletest from the -- cgit v1.2.3 From d2bc9f0e7d94536662d1466529915c7db3648360 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 May 2020 01:52:49 +0200 Subject: gnu: qtractor: Update to 0.9.14. * gnu/packages/music.scm (qtractor): Update to 0.9.14. [source]: Fetch over HTTPS. --- gnu/packages/music.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3d8a3d4321..1d02e3abcf 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2499,14 +2499,14 @@ from the command line.") (define-public qtractor (package (name "qtractor") - (version "0.9.12") + (version "0.9.14") (source (origin (method url-fetch) - (uri (string-append "http://downloads.sourceforge.net/qtractor/" + (uri (string-append "https://downloads.sourceforge.net/qtractor/" "qtractor-" version ".tar.gz")) (sha256 (base32 - "06493sf4hr178jkvric3rmc2phh1ph2jlyh8kl9z248amq3zfnhy")))) + "1gh268gdpj7nw19xfh7k2l3aban4yrs1lmx33qswrnngs2izj1fk")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no "check" target -- cgit v1.2.3 From 6d2155168fecee297ceb44f58fa2ccbd31ee7031 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 May 2020 02:00:32 +0200 Subject: gnu: spice-protocol: Update to 0.14.2. * gnu/packages/spice.scm (spice-protocol): Update to 0.14.2. [arguments]: Install COPYING manually now. --- gnu/packages/spice.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 29a024c8a9..4aff8dbf56 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix download) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) @@ -101,16 +102,26 @@ system to use the host GPU to accelerate 3D rendering.") (define-public spice-protocol (package (name "spice-protocol") - (version "0.14.1") + (version "0.14.2") (source (origin (method url-fetch) (uri (string-append "https://www.spice-space.org/download/releases/" - "spice-protocol-" version ".tar.bz2")) + "spice-protocol-" version ".tar.xz")) (sha256 (base32 - "0ahk5hlanwhbc64r80xmchdav3ls156cvh9l68a0l22bhdhxmrkr")))) - (build-system gnu-build-system) + "1sgi9ksb781qs47pdbw0bmnyg8dgayn5xrzj6vzdy043nv466flg")))) + (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" + ,name "-" ,version))) + (install-file "COPYING" doc) + #t)))))) (synopsis "Protocol headers for the SPICE protocol") (description "SPICE (the Simple Protocol for Independent Computing Environments) is a remote-display system built for virtual environments -- cgit v1.2.3 From 9927e5b11b88a85fffb959b515430c2312c8dff3 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 17 May 2020 19:16:58 +0200 Subject: build: Add a comment above the sysvinit section. * nix/local.mk (sysvinitservicedir): Add a comment. Signed-off-by: Tobias Geerinckx-Rice --- nix/local.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/nix/local.mk b/nix/local.mk index dbcdde8b0d..c136fb7202 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -175,6 +175,7 @@ etc/guix-%.service: etc/guix-%.service.in \ "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" +# The service script for sysvinit. sysvinitservicedir = $(sysconfdir)/init.d nodist_sysvinitservice_DATA = etc/init.d/guix-daemon -- cgit v1.2.3 From 39939e30cf77a3336a938f0d6df6a95a07cf9ebd Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 17 May 2020 19:16:59 +0200 Subject: guix-install.sh: Add xz to requirements. * etc/guix-install.sh (REQUIRE): Add xz to requirements list. Signed-off-by: Tobias Geerinckx-Rice --- etc/guix-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index bcce1d8869..4d457e7f2d 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -48,6 +48,7 @@ REQUIRE=( "groupadd" "tail" "tr" + "xz" ) PAS=$'[ \033[32;1mPASS\033[0m ] ' -- cgit v1.2.3 From dc1aede30a63d60708ca98e92724dc14a262b0ec Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 17 May 2020 19:17:00 +0200 Subject: guix-install.sh: Fix ‘systemctl not found’ error message at probe. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/guix-install.sh (chk_init_sys): Redirect systemctl errors to /dev/null. Signed-off-by: Tobias Geerinckx-Rice --- etc/guix-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 4d457e7f2d..bf15aede21 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -142,7 +142,7 @@ chk_init_sys() _msg "${INF}init system is: upstart" INIT_SYS="upstart" return 0 - elif [[ $(systemctl) =~ -\.mount ]]; then + elif [[ $(systemctl 2>/dev/null) =~ -\.mount ]]; then _msg "${INF}init system is: systemd" INIT_SYS="systemd" return 0 -- cgit v1.2.3 From 0459649e3ed9a5698bc33858aea3bb11cc749d5a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 23 May 2020 15:44:53 +0200 Subject: gnu: guile-gcrypt: Update to 0.3.0. * gnu/packages/gnupg.scm (guile-gcrypt): Update to 0.3.0. --- gnu/packages/gnupg.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index cf6f965b0d..daf4bc3b6e 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013, 2015, 2018 Andreas Enge ;;; Copyright © 2014, 2018 Eric Bavier ;;; Copyright © 2014, 2015, 2016 Mark H Weaver @@ -473,7 +473,7 @@ gpgpme starting with version 1.7.") (define-public guile-gcrypt (package (name "guile-gcrypt") - (version "0.2.1") + (version "0.3.0") (home-page "https://notabug.org/cwebber/guile-gcrypt") (source (origin (method git-fetch) @@ -482,7 +482,7 @@ gpgpme starting with version 1.7.") (commit (string-append "v" version)))) (sha256 (base32 - "0n232iyayc46f7hywmjw0jr7pbmmz5h4b04jskhkzz9gxz0ci99c")) + "0m29fg4pdfifnqqsa437zc5c1bhbfh62mc69ba25ak4x2cla41ll")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -510,7 +510,7 @@ gpgpme starting with version 1.7.") ("libgcrypt" ,libgcrypt))) (synopsis "Cryptography library for Guile using Libgcrypt") (description - "Guile-Gcrypt provides a Guile 2.x interface to a subset of the + "Guile-Gcrypt provides a Guile interface to a subset of the GNU Libgcrypt crytographic library. It provides modules for cryptographic hash functions, message authentication codes (MAC), public-key cryptography, strong randomness, and more. It is implemented using the foreign function -- cgit v1.2.3 From 197c07a84767ac885ae2cf1300e0933efe424431 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 23 May 2020 15:45:22 +0200 Subject: tests: Use a #:prefix for (gcrypt hash). * tests/packages.scm: Use #:prefix instead of #:hide for (gcrypt hash). This accomodates for 'sha512' syntax literal matches with Guile-Gcrypt 0.3.0, which exports 'sha512' in addition to 'sha256'. --- tests/packages.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/packages.scm b/tests/packages.scm index 4935d4503e..d8f0d677a3 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -29,7 +29,7 @@ #:renamer (lambda (name) (cond ((eq? name 'location) 'make-location) (else name)))) - #:use-module ((gcrypt hash) #:hide (sha256)) + #:use-module ((gcrypt hash) #:prefix gcrypt:) #:use-module (guix derivations) #:use-module (guix packages) #:use-module (guix grafts) @@ -515,8 +515,9 @@ (uri "unused://") (file-name "origin-sha512") (hash (content-hash - (bytevector-hash (string->utf8 "hello") - (hash-algorithm sha512)) + (gcrypt:bytevector-hash (string->utf8 "hello") + (gcrypt:lookup-hash-algorithm + 'sha512)) sha512)))) (drv (package-source-derivation %store source)) (output (derivation->output-path drv))) -- cgit v1.2.3 From 881eaae1abe39ea324ea9c757e84d15eb30f869f Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 21 May 2020 23:43:06 +0200 Subject: guix package: Support multiple profiles with '--list-installed'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/scripts/package.scm (process-query): List installed multiple profiles. * tests/guix-package-net.sh: Test it. Signed-off-by: Ludovic Courtès --- guix/scripts/package.scm | 20 +++++++++++--------- tests/guix-package-net.sh | 12 ++++++++++++ 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index a69efa365e..1246147798 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -675,12 +675,13 @@ doesn't need it." (define (process-query opts) "Process any query specified by OPTS. Return #t when a query was actually processed, #f otherwise." - (let* ((profiles (match (filter-map (match-lambda - (('profile . p) p) - (_ #f)) - opts) - (() (list %current-profile)) - (lst (reverse lst)))) + (let* ((profiles (delete-duplicates + (match (filter-map (match-lambda + (('profile . p) p) + (_ #f)) + opts) + (() (list %current-profile)) + (lst (reverse lst))))) (profile (match profiles ((head tail ...) head)))) (match (assoc-ref opts 'query) @@ -718,7 +719,8 @@ processed, #f otherwise." (('list-installed regexp) (let* ((regexp (and regexp (make-regexp* regexp regexp/icase))) - (manifest (profile-manifest profile)) + (manifest (concatenate-manifests + (map profile-manifest profiles))) (installed (manifest-entries manifest))) (leave-on-EPIPE (for-each (match-lambda @@ -729,8 +731,8 @@ processed, #f otherwise." name (or version "?") output path)))) ;; Show most recently installed packages last. - (reverse installed))) - #t)) + (reverse installed)))) + #t) (('list-available regexp) (let* ((regexp (and regexp (make-regexp* regexp regexp/icase))) diff --git a/tests/guix-package-net.sh b/tests/guix-package-net.sh index 48a94865e1..3876701fa2 100644 --- a/tests/guix-package-net.sh +++ b/tests/guix-package-net.sh @@ -1,6 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012, 2013, 2014, 2015, 2017, 2019 Ludovic Courtès # Copyright © 2013 Nikita Karetnikov +# Copyright © 2020 Simon Tournier # # This file is part of GNU Guix. # @@ -78,6 +79,17 @@ esac test "`guix package -p "$profile" -I 'g.*e' | cut -f1`" = "guile-bootstrap" +guix package --bootstrap -p "$profile_alt" -i gcc-bootstrap +installed="`guix package -p "$profile" -p "$profile_alt" -I | cut -f1 | xargs echo | sort`" +case "x$installed" in + "gcc-bootstrap guile-bootstrap make-boot0") + true;; + "*") + false;; +esac +test "`guix package -p "$profile_alt" -p "$profile" -I | wc -l`" = "3" +rm "$profile_alt" + # List generations. test "`guix package -p "$profile" -l | cut -f1 | grep guile | head -n1`" \ = " guile-bootstrap" -- cgit v1.2.3 From 7ae5d7d7953d268a2751d313fcd3b744717aa631 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 21 May 2020 23:32:19 +0200 Subject: gnu: libmediainfo: Update to 20.03. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (libmediainfo): Update to 20.03. Signed-off-by: Ludovic Courtès --- gnu/packages/video.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 422eb79941..fc7a134df8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3019,15 +3019,15 @@ practically any type of media.") (define-public libmediainfo (package (name "libmediainfo") - (version "0.7.95") + (version "20.03") (source (origin (method url-fetch) (uri (string-append "https://mediaarea.net/download/source/" - name "/" version"/" - name "_" version ".tar.bz2")) + name "/" version "/" + name "_" version ".tar.xz")) (sha256 (base32 - "1kchh6285b07z5nixv619hc9gml2ysdayicdiv30frrlqiyxqw4b")))) + "0wkzj5s34m8dvy7hif4h8f90q8ncrzd930gij1zzw3h5nw732j38")))) ;; TODO add a Big Buck Bunny webm for tests. (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 4c1f5ea34c4620499654eb9f5086b657055f516d Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 21 May 2020 23:37:13 +0200 Subject: gnu: mediainfo: Update to 20.03. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (mediainfo): Update to 20.03. Signed-off-by: Ludovic Courtès --- gnu/packages/video.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index fc7a134df8..1e36c6c313 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Alex McGrath +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -3077,7 +3078,7 @@ MPEG-2, MPEG-4, DVD (VOB)... (define-public mediainfo (package (name "mediainfo") - (version "18.12") + (version "20.03") (source (origin (method url-fetch) ;; Warning: This source has proved unreliable 1 time at least. @@ -3085,10 +3086,10 @@ MPEG-2, MPEG-4, DVD (VOB)... ;; happens again. (uri (string-append "https://mediaarea.net/download/source/" name "/" version "/" - name "_" version ".tar.bz2")) + name "_" version ".tar.xz")) (sha256 (base32 - "1ix95ilcjlawcq6phh25cgplm3riqa2ii7ql82g8yagqs4ldqp6a")))) + "1f1shnycf0f1fwka9k9s250l228xjkg0k4k73h8bpld8msighgnw")))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 964ba6567d00818f34bc96a949e81b73a1ef3570 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Thu, 14 May 2020 13:49:53 +0200 Subject: gnu: icedove: Add a desktop file. * gnu/packages/gnuzilla.scm (icedove)[phases]: Add install-desktop-file phase. Signed-off-by: Marius Bakke --- gnu/packages/gnuzilla.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 8a926681e0..7bf9850e97 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1344,6 +1344,32 @@ standards of the IceCat project.") (lambda _ (invoke "./mach" "build"))) (replace 'install (lambda _ (invoke "./mach" "install"))) + ;; Thunderbird doesn't provide any .desktop file. + ;; See https://bugzilla.mozilla.org/show_bug.cgi?id=1637575 + (add-after 'install 'install-desktop-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (apps (string-append out "/share/applications"))) + (mkdir-p apps) + (with-output-to-file (string-append apps "/icedove.desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ + Name=Icedove~@ + Exec=~a/bin/icedove~@ + Icon=icedove~@ + GenericName=Mail/News Client~@ + Categories=Network;Email;~@ + Terminal=false~@ + StartupNotify=true~@ + MimeType=x-scheme-handler/mailto;~@ + Type=Application~@ + Actions=ComposeMessage;~@ + [Desktop Action ComposeMessage]~@ + Name=Write new message~@ + Exec=~@*~a/bin/icedove -compose~%" + out)))) + #t)) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 01e81309c01b901cf46b034152ba7c0829aa9df8 Mon Sep 17 00:00:00 2001 From: Ryan Prior via Guix-patches via Date: Sun, 17 May 2020 18:41:48 +0000 Subject: gnu: Add python-importmagic. * gnu/packages/python-xyz.el (python-importmagic): New variable. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5c0f0bda82..7d8003a7fb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -77,6 +77,7 @@ ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Alex ter Weele ;;; Copyright © 2020 Matthew Kraai +;;; Copyright © 2020 Ryan Prior ;;; ;;; This file is part of GNU Guix. ;;; @@ -5896,6 +5897,25 @@ need to use the older and less efficient @code{pkg_resources} package.") ("python-contextlib2" ,python2-contextlib2-bootstrap) ("python-importlib-resources" ,python2-importlib-resources-bootstrap)))))) +(define-public python-importmagic + (package + (name "python-importmagic") + (version "0.1.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "importmagic" version)) + (sha256 + (base32 + "1n7qxa1snj06aw45mcfz7bxc46zp7fxj687140g2k6jcnyjmfxrz")))) + (build-system python-build-system) + (home-page "https://github.com/alecthomas/importmagic") + (synopsis "Library for adding, removing and managing Python imports") + (description + "Importmagic is a Python library for automatically managing imports by +finding unresolved symbols in Python code and their corresponding imports.") + (license license:bsd-3))) + (define-public python-jaraco-packaging (package (name "python-jaraco-packaging") -- cgit v1.2.3 From 1348e512375503e254f8d1f0c79a99754a94f0e8 Mon Sep 17 00:00:00 2001 From: Ryan Prior via Guix-patches via Date: Sun, 17 May 2020 18:41:54 +0000 Subject: gnu: Add python-sexpdata. * gnu/packages/python-xyz.scm (python-sexpdata): New variable. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7d8003a7fb..fb19523c17 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5768,6 +5768,25 @@ them as the version argument or in a SCM managed file.") (define-public python2-setuptools-scm (package-with-python2 python-setuptools-scm)) +(define-public python-sexpdata + (package + (name "python-sexpdata") + (version "0.0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sexpdata" version)) + (sha256 + (base32 + "1q4lsjyzzqrdv64l0pv4ij9nd8gqhvxqcrpxc2xpxs652sk2gj0s")))) + (build-system python-build-system) + (home-page "https://github.com/jd-boyd/sexpdata") + (synopsis "S-expression parser for Python") + (description + "Sexpdata is an S-expression parser/serializer. It has load and dump +functions like pickle, json or PyYAML module.") + (license license:bsd-3))) + (define-public python-pathlib2 (package (name "python-pathlib2") -- cgit v1.2.3 From c265d78640948410af824d26b981d3ebdebb8a02 Mon Sep 17 00:00:00 2001 From: Ryan Prior via Guix-patches via Date: Sun, 17 May 2020 18:41:59 +0000 Subject: gnu: Add python-epc. * gnu/packages/python-xyz.py (python-epc): New variable. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index fb19523c17..39424d0c14 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8825,6 +8825,29 @@ functions to find and load entry points.") (define-public python2-entrypoints (package-with-python2 python-entrypoints)) +(define-public python-epc + (package + (name "python-epc") + (version "0.0.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "epc" version)) + (sha256 + (base32 + "09bx1ln1bwa00917dndlgs4k589h8qx2x080xch5m58p92kjwkd1")))) + (build-system python-build-system) + (propagated-inputs + `(("python-sexpdata" ,python-sexpdata))) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/tkf/python-epc") + (synopsis "Remote procedure call (RPC) stack for Emacs Lisp and Python") + (description + "Python-EPC can call elisp functions from Python and Python functions +from elisp.") + (license license:gpl3))) + (define-public python-nbconvert (package (name "python-nbconvert") -- cgit v1.2.3 From 51443772b80c5ca51ccbe5cf05c5db4c216a7b66 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 19 May 2020 09:24:03 +0200 Subject: gnu: python-argcomplete: Update to 1.11.1. * gnu/packages/python-xyz.scm (python-argcomplete)[version]: Update to 1.11.1. [arguments]: Remove, obsolete. [inputs]: Remove as well. * gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Marius Bakke --- gnu/local.mk | 1 + .../patches/python-argcomplete-1.11.1-fish31.patch | 29 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 23 +++-------------- 3 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch diff --git a/gnu/local.mk b/gnu/local.mk index 575b18eb41..23d775284a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1412,6 +1412,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-CVE-2018-14647.patch \ %D%/packages/patches/python-aiohttp-3.6.2-no-warning-fail.patch \ %D%/packages/patches/python-alembic-exceptions-cause.patch \ + %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ %D%/packages/patches/python-cross-compile.patch \ diff --git a/gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch b/gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch new file mode 100644 index 0000000000..98f0ca1473 --- /dev/null +++ b/gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch @@ -0,0 +1,29 @@ +Upstream commit fixing testcases for fish>=3.1, see +https://github.com/kislyuk/argcomplete/commit/08bfc8a788e8081515d733e67be026d051c726f7 + +diff --git a/test/test.py b/test/test.py +index e91352b..2c34806 100755 +--- a/test/test.py ++++ b/test/test.py +@@ -28,6 +28,8 @@ + + BASH_VERSION = subprocess.check_output(['bash', '-c', 'echo $BASH_VERSION']).decode() + BASH_MAJOR_VERSION = int(BASH_VERSION.split('.')[0]) ++FISH_VERSION_STR = subprocess.check_output(['fish', '-c', 'echo -n $FISH_VERSION']).decode() ++FISH_VERSION_TUPLE = tuple(int(x) for x in FISH_VERSION_STR.split('.')) + + + class TempDir(object): +@@ -1258,8 +1260,11 @@ class TestFish(_TestSh, unittest.TestCase): + expected_failures = [ + 'test_parse_special_characters', + 'test_comp_point', +- 'test_special_characters_double_quoted' + ] ++ if FISH_VERSION_TUPLE < (3, 1): ++ expected_failures.extend([ ++ 'test_special_characters_double_quoted' ++ ]) + + skipped = [ + 'test_single_quotes_in_single_quotes', diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 39424d0c14..9aa5635ab8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13070,33 +13070,16 @@ PNG, JPEG, JPEG2000 and GIF files in pure Python.") (define-public python-argcomplete (package (name "python-argcomplete") - (version "1.10.3") + (version "1.11.1") (source (origin (method url-fetch) (uri (pypi-uri "argcomplete" version)) (sha256 (base32 - "02jkc44drb0yjz6x28lvg6rj607n8r2irdpdvyylm8xnycn54zx3")))) + "0h1przxffrhqvi46k40pzjsvdrq4zc3sl1pc96kkigqppq0vdrss")) + (patches (search-patches "python-argcomplete-1.11.1-fish31.patch")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'embed-tool-references - (lambda _ - (substitute* "argcomplete/bash_completion.d/python-argcomplete.sh" - ((" grep") - (string-append " " (which "grep"))) - ((" egrep") - (string-append " " (which "egrep"))) - (("elif which") - (string-append "elif " (which "which"))) - (("\\$\\(which") - (string-append "$(" (which "which")))) - #t))))) - (inputs - `(("grep" ,grep) - ("which" ,which))) (native-inputs `(("python-coverage" ,python-coverage) ("python-flake8" ,python-flake8) -- cgit v1.2.3 From 07b1f6dcee0be6297eabca6852e4f52efd437a20 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 21 May 2020 16:55:21 +0200 Subject: gnu: umockdev: Add 'gobject-introspection'. * gnu/packages/check.scm (umockdev)[native-inuputs]: Add 'gobject-introspection'. --- gnu/packages/check.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 12e01795ee..b279dc149d 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2538,6 +2538,7 @@ provides a simple way to achieve this.") #t))))) (native-inputs `(("vala" ,vala) + ("gobject-introspection" ,gobject-introspection) ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config) -- cgit v1.2.3 From 96ae71f56b245f2f526ddcde3e60530fd19a4720 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 21 May 2020 17:01:37 +0200 Subject: gnu: umockdev: Update to 0.14.1. * gnu/packages/check.scm (umockdev) Update to 0.14.1. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index b279dc149d..7d7fd189bc 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2518,7 +2518,7 @@ provides a simple way to achieve this.") (define-public umockdev (package (name "umockdev") - (version "0.13.2") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/martinpitt/umockdev/" @@ -2526,7 +2526,7 @@ provides a simple way to achieve this.") "umockdev-" version ".tar.xz")) (sha256 (base32 - "095v3abc321s584sga04y16lcmdzsdi88h24wcrm78v7vq484g74")))) + "1g78jcrvb7yyh0q5kv5409wjqf8nlfqnw1rknm3a247mcx317dpz")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6039031a1a5e1cabd380b8715334d5a8f600055f Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 21 May 2020 17:04:23 +0200 Subject: gnu: upower: Enable tests. * gnu/packages/gnome.scm (upower)[arguments]: Enable tests and add phases 'pre-check'. [native-inputs]: Add 'python-pygobject', 'python-dbus', 'python-dbusmock' and 'umockdev'. --- gnu/packages/gnome.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e94d65908d..5271fe5fbd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4159,10 +4159,14 @@ faster results and to avoid unnecessary server load.") #t)))) (build-system glib-or-gtk-build-system) (arguments - '( ;; The tests want to contact the system bus, which can't be done in the - ;; build environment. The integration test can run, but the last of - ;; the up-self-tests doesn't. Disable tests for now. - #:tests? #f + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + (let ((umockdev (string-append (assoc-ref inputs "umockdev") + "/lib"))) + (setenv "LD_LIBRARY_PATH" umockdev)) + #t))) #:configure-flags (list "--localstatedir=/var" (string-append "--with-udevrulesdir=" (assoc-ref %outputs "out") @@ -4173,6 +4177,12 @@ faster results and to avoid unnecessary server load.") ("intltool" ,intltool) ("python" ,python) + ;; For tests. + ("python-dbus" ,python-dbus) + ("python-dbusmock" ,python-dbusmock) + ("python-pygobject" ,python-pygobject) + ("umockdev" ,umockdev) + ;; For man pages. ("libxslt" ,libxslt) ;for 'xsltproc' ("libxml2" ,libxml2) ;for 'XML_CATALOG_FILES' -- cgit v1.2.3 From 899ffa1381afbf5f955aeba4839e920b3d910953 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Fri, 22 May 2020 00:34:41 +0200 Subject: gnu: deja-dup: Update to 40.6. * gnu/packages/gnome.scm (deja-dup): Update to 40.6. [origin]: Use gitlab.gnome.org since the project migrated away from launchpad. [home-page]: Use 'wiki.gnome.org' instead of 'launchpad.net'. [build-system]: Switch to 'meson-build-system' because upstream removed cmake support. [arguments]: Enable tests. Remove arguments 'modules', 'imported-modules' and 'test-target'. Use argument 'glib-or-gtk?'. Replace configure-flags to only adjust 'RUN_PATH'. Use standard phases for 'configure' and 'check'. Adjust and rename phase 'patch-lockfile-deletion' to 'patch-paths'. Add phases 'patch-libgpg-error' and 'skip-gtk-update-icon-cache'. [inputs]: Remove 'libpeas', 'gobject-introspection'. Replace 'python-2' and 'python2-pygobject' with python-3 versions. Add 'json-glib', 'libsoup' and 'libgpg-error'. [native-inputs]: Remove 'cmake-minimal' and 'intltool'. Add 'appstream-glib','desktop-file-utils', 'glib:bin' and 'gobject-introspection'. * gnu/packages/patches/deja-dup-use-ref-keyword-for-iter.patch: Delete file. --- gnu/packages/gnome.scm | 105 ++++++++++----------- .../deja-dup-use-ref-keyword-for-iter.patch | 41 -------- 2 files changed, 52 insertions(+), 94 deletions(-) delete mode 100644 gnu/packages/patches/deja-dup-use-ref-keyword-for-iter.patch diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5271fe5fbd..db4678e3ce 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -879,73 +879,72 @@ configuration files for the GNOME menu, as well as a simple menu editor.") (define-public deja-dup (package (name "deja-dup") - (version "34.3") + (version "40.6") (source (origin - (method url-fetch) - (uri "https://launchpadlibrarian.net/295170991/deja-dup-34.3.tar.xz") - (sha256 - (base32 - "1xqcr61hpbahbla7gdjn4ngjfz7w6f57y7f5pkb77yk05f60j2n9")) - (patches - (search-patches "deja-dup-use-ref-keyword-for-iter.patch")))) - (build-system glib-or-gtk-build-system) + (method url-fetch) + (uri (string-append "https://gitlab.gnome.org/World/deja-dup/-/archive/" + version "/deja-dup-" version ".tar.bz2")) + (sha256 + (base32 + "0lwazh6crby5wpy9fg6zvwy4plqbhs2f98bm5lbizjdlbh88n5q0")))) + (build-system meson-build-system) (arguments - `(#:modules ((guix build gnu-build-system) - ((guix build cmake-build-system) #:prefix cmake:) - (guix build glib-or-gtk-build-system) - (guix build utils)) - #:imported-modules (,@%glib-or-gtk-build-system-modules - (guix build cmake-build-system)) - #:test-target "test" - #:configure-flags (list (string-append - "-DCMAKE_INSTALL_FULL_DATADIR=" %output) - (string-append - "-DCMAKE_INSTALL_LIBEXECDIR=" %output)) + `(#:glib-or-gtk? #t + #:configure-flags + (list + ;; Otherwise, the RUNPATH will lack the final path component. + (string-append "-Dc_link_args=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib/deja-dup")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-lockfile-deletion - (lambda rest - (substitute* "libdeja/tools/duplicity/DuplicityInstance.vala" - (("/bin/rm") - (which "rm"))))) - (replace 'configure - (assoc-ref cmake:%standard-phases 'configure)) - (delete 'check) ;; Fails due to issues with DBus - (add-after 'install 'wrap-deja-dup - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((python (assoc-ref inputs "python")) - (python-path (getenv "PYTHONPATH")) - (duplicity (assoc-ref inputs "duplicity")) - (out (assoc-ref outputs "out"))) - (for-each - (lambda (program) - (wrap-program program - `("PATH" ":" prefix (,(string-append python "/bin") - ,(string-append duplicity "/bin")))) - (wrap-program program - `("PYTHONPATH" ":" prefix (,python-path)))) - - (find-files (string-append out "/bin"))) - #t)))))) + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((python (assoc-ref inputs "python"))) + (substitute* '("libdeja/tools/duplicity/DuplicityInstance.vala" + "libdeja/tests/scripts/instance-error.test") + (("/bin/rm") + (which "rm"))) + (substitute* "libdeja/tests/runner.vala" + (("/bin/sh") + (which "sh"))) + (substitute* "libdeja/tests/scripts/instance-error.test" + (("`which python3`") + (string-append python "/bin/python3")))))) + (add-after 'unpack 'patch-libgpg-error + (lambda* (#:key inputs #:allow-other-keys) + (let ((libgpg-error (assoc-ref inputs "libgpg-error"))) + (substitute* "meson.build" + (("(gpgerror_libs = ).*" _ var) + (format #f "~a '-L~a/lib -lgpg-error'\n" var libgpg-error)))) + #t)) + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "data/post-install.sh" + (("gtk-update-icon-cache") "true")) + #t))))) (inputs `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gobject-introspection" ,gobject-introspection) ("duplicity" ,duplicity) - ("python" ,python-2) - ("python-pygobject" ,python2-pygobject) + ("python" ,python) + ("python-pygobject" ,python-pygobject) ("gtk+" ,gtk+) + ("json-glib" ,json-glib) ("libnotify" ,libnotify) - ("libpeas" ,libpeas) + ("libgpg-error" ,libgpg-error) ("libsecret" ,libsecret) + ("libsoup" ,libsoup) ("packagekit" ,packagekit))) (native-inputs - `(("pkg-config" ,pkg-config) - ("vala" ,vala) + `(("appstream-glib" ,appstream-glib) + ("desktop-file-utils" ,desktop-file-utils) ("gettext" ,gettext-minimal) + ("glib" ,glib "bin") ; for glib-compile-schemas. + ("gobject-introspection" ,gobject-introspection) ("itstool" ,itstool) - ("intltool" ,intltool) - ("cmake" ,cmake-minimal))) - (home-page "https://launchpad.net/deja-dup") + ("pkg-config" ,pkg-config) + ("vala" ,vala))) + (home-page "https://wiki.gnome.org/Apps/DejaDup") (synopsis "Simple backup tool, for regular encrypted backups") (description "Déjà Dup is a simple backup tool, for regular encrypted backups. It diff --git a/gnu/packages/patches/deja-dup-use-ref-keyword-for-iter.patch b/gnu/packages/patches/deja-dup-use-ref-keyword-for-iter.patch deleted file mode 100644 index a03e0c5481..0000000000 --- a/gnu/packages/patches/deja-dup-use-ref-keyword-for-iter.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 5676766be5e845ccb6cdf46cfa8722497f151752 Mon Sep 17 00:00:00 2001 -From: Jeremy Bicha -Date: Fri, 16 Jun 2017 15:11:37 -0400 -Subject: Use 'ref' keyword for iter, requires vala 0.36 - - -diff --git a/deja-dup/widgets/ConfigList.vala b/deja-dup/widgets/ConfigList.vala -index 15de2d6..02cd81a 100644 ---- a/deja-dup/widgets/ConfigList.vala -+++ b/deja-dup/widgets/ConfigList.vala -@@ -333,7 +333,7 @@ public class ConfigList : ConfigWidget - - model.row_deleted.disconnect(write_to_config); - foreach (Gtk.TreeIter iter in iters) { -- (model as Gtk.ListStore).remove(iter); -+ (model as Gtk.ListStore).remove(ref iter); - } - model.row_deleted.connect(write_to_config); - -diff --git a/deja-dup/widgets/ConfigLocation.vala b/deja-dup/widgets/ConfigLocation.vala -index 869e2a8..d21c556 100644 ---- a/deja-dup/widgets/ConfigLocation.vala -+++ b/deja-dup/widgets/ConfigLocation.vala -@@ -397,12 +397,12 @@ public class ConfigLocation : ConfigWidget - if (uuid == saved_uuid) - return; - -- store.remove(iter); -+ store.remove(ref iter); - - if (--num_volumes == 0) { - Gtk.TreeIter sep_iter; - if (store.get_iter_from_string(out sep_iter, index_vol_sep.to_string())) { -- store.remove(sep_iter); -+ store.remove(ref sep_iter); - index_vol_sep = -2; - } - } --- -cgit v0.10.2 - -- cgit v1.2.3 From 79d7b5277f803d474f8934b1680ce598c9c27e2d Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 21 May 2020 15:54:02 +0200 Subject: gnu: dconf: Appease 'guix lint'. * gnu/packages/gnome.scm (dconf)[homepage]: Avoid permanent redirect. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index db4678e3ce..49fb2c8f0c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3436,7 +3436,7 @@ and RDP protocols.") ; or /etc/machine-id. #:glib-or-gtk? #t #:configure-flags '("-Denable-gtk-doc=true"))) - (home-page "https://developer.gnome.org/dconf") + (home-page "https://developer.gnome.org/dconf/") (synopsis "Low-level GNOME configuration system") (description "Dconf is a low-level configuration system. Its main purpose is to provide a backend to GSettings on platforms that don't already have -- cgit v1.2.3 From e24d311f9c4787333b136b8bad504ae74f679259 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sat, 23 May 2020 21:47:53 +0200 Subject: gnu: gnome-shell: Use libnma. * gnu/packages/gnome.scm (gnome-shell)[inputs]: Add 'libnma'. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 49fb2c8f0c..a568d54044 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7297,6 +7297,7 @@ properties, screen resolution, and other GNOME parameters.") ("libcroco" ,libcroco) ("libgnomekbd" ,libgnomekbd) ;for gkbd-keyboard-display ("libgweather" ,libgweather) + ("libnma" ,libnma) ("libsoup" ,libsoup) ("mesa-headers" ,mesa-headers) ("mutter" ,mutter) -- cgit v1.2.3 From 21d3b765d9f22cdc2d027531411af27216592ef4 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 23 May 2020 22:54:46 +0100 Subject: gnu: local.mk: Remove absent patch. This follows on from 899ffa1381afbf5f955aeba4839e920b3d910953. * gnu/local.mk (dist_patch_DATA): Remove packages/patches/deja-dup-use-ref-keyword-for-iter.patch. --- gnu/local.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/local.mk b/gnu/local.mk index 23d775284a..42707823eb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -860,7 +860,6 @@ dist_patch_DATA = \ %D%/packages/patches/dconf-meson-0.52.patch \ %D%/packages/patches/debops-constants-for-external-program-names.patch \ %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ - %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \ %D%/packages/patches/desmume-gcc6-fixes.patch \ %D%/packages/patches/desmume-gcc7-fixes.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ -- cgit v1.2.3 From b1affd477882b8df39a2cdcc3c419be9322bf778 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 24 May 2020 00:01:15 +0200 Subject: gnu: redshift-wayland: Install redshift.desktop. * gnu/packages/xdisorg.scm (redshift-wayland)[arguments]: New field. --- gnu/packages/xdisorg.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 1714cb8caf..acc74e328a 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1238,6 +1238,24 @@ color temperature should be set to match the lamps in your room.") (base32 "0nbkcw3avmzjg1jr1g9yfpm80kzisy55idl09b6wvzv2sz27n957")))) (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'install 'create-desktop-file + (lambda* (#:key outputs #:allow-other-keys) + ;; For the GeoClue provider to work, a .desktop file + ;; needs to be provided. A template is available, + ;; but it only gets installed when the GUI is enabled. + ;; Install it manually for this Wayland variant. + (let* ((out (assoc-ref outputs "out")) + (desktop-file + (string-append + out "/share/applications/redshift.desktop"))) + (mkdir-p (dirname desktop-file)) + (copy-file "data/applications/redshift.desktop.in" + desktop-file) + (substitute* desktop-file + (("^_") "")) + #t)))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From dfc426582f7e5a34a89015663cadbad3829f55e5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 May 2020 10:18:01 +0300 Subject: gnu: nano: Update to 4.9.3. * gnu/packages/nano.scm (nano): Update to 4.9.3. --- gnu/packages/nano.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index 099a953989..8ea84ab724 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -30,13 +30,13 @@ (define-public nano (package (name "nano") - (version "4.9.2") + (version "4.9.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) (sha256 - (base32 "1xifbn1xaklrrf7knxvqif0hy0wgnas7w0wfggay5kifjkm5x8nq")))) + (base32 "1d2i3wvsq5lvpxxinq51dcvd58xx7j0d0c2csz9hgvd06gq3hd3f")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 4492981706e0f2041053fdc728e29232855d8689 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 May 2020 16:09:36 +0200 Subject: gnu: pidgin: Fix build with Meson network-manager. This is a follow-up commit to 255ff74f3ab514a76068f6cfccc7f8dbcf8b7f3f: building network-manager with Meson breaks users of NetworkManager.pc. * gnu/packages/messaging.scm (pidgin)[source]: Add pidgin-libnm.patch. Force re-bootstrapping in a new snippet. [native-inputs]: Add autoconf, automake, and libtool. * gnu/packages/patches/pidgin-libnm.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/messaging.scm | 18 ++++++++-- gnu/packages/patches/pidgin-libnm.patch | 60 +++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/pidgin-libnm.patch diff --git a/gnu/local.mk b/gnu/local.mk index 42707823eb..bbe06d2b20 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1363,6 +1363,7 @@ dist_patch_DATA = \ %D%/packages/patches/perl-www-curl-remove-symbol.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ + %D%/packages/patches/pidgin-libnm.patch \ %D%/packages/patches/pinball-const-fix.patch \ %D%/packages/patches/pinball-cstddef.patch \ %D%/packages/patches/pinball-missing-separators.patch \ diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 57ff0835d1..ce542ad4f4 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -440,7 +440,16 @@ authentication.") version "/pidgin-" version ".tar.bz2")) (sha256 (base32 "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7")) - (patches (search-patches "pidgin-add-search-path.patch")))) + (patches (search-patches "pidgin-add-search-path.patch" + ;; Remove the snippet and bootstrapping + ;; native-inputs together with this patch. + "pidgin-libnm.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove stale generated file after applying pidgin-libnm.patch. + (delete-file "configure") + #t)))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -448,7 +457,12 @@ authentication.") ("intltool" ,intltool) ("gconf" ,gconf) ("python" ,python-2) - ("doxygen" ,doxygen))) + ("doxygen" ,doxygen) + + ;; For bootstrapping after applying pidgin-libnm.patch. + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (inputs `(("gtk+" ,gtk+-2) ("libgcrypt" ,libgcrypt) diff --git a/gnu/packages/patches/pidgin-libnm.patch b/gnu/packages/patches/pidgin-libnm.patch new file mode 100644 index 0000000000..d34af749af --- /dev/null +++ b/gnu/packages/patches/pidgin-libnm.patch @@ -0,0 +1,60 @@ +From: Tobias Geerinckx-Rice +Date: Sun, 24 May 2020 16:11:01 +0200 +Subject: [PATCH] gnu: pidgin: Find libnm. + +Copied verbatim from[0]. + +[0]: https://git.archlinux.org/svntogit/packages.git/plain/trunk/pidgin-nm-1.0.patch?h=packages/pidgin + +diff --git a/configure.ac b/configure.ac +index 04836fa..0a2d451 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1423,18 +1423,24 @@ fi + dnl Check for NetworkManager.h; if we don't have it, oh well + if test "x$enable_dbus" = "xyes" ; then + if test "x$enable_nm" = "xyes" ; then +- PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [ ++ PKG_CHECK_MODULES(NETWORKMANAGER, [libnm], [ + AC_SUBST(NETWORKMANAGER_CFLAGS) + AC_SUBST(NETWORKMANAGER_LIBS) + AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.]) + ], [ +- enable_nm=no +- if test "x$force_deps" = "xyes" ; then +- AC_MSG_ERROR([ ++ PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [ ++ AC_SUBST(NETWORKMANAGER_CFLAGS) ++ AC_SUBST(NETWORKMANAGER_LIBS) ++ AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.]) ++ ], [ ++ enable_nm=no ++ if test "x$force_deps" = "xyes" ; then ++ AC_MSG_ERROR([ + NetworkManager development headers not found. + Use --disable-nm if you do not need NetworkManager support. + ]) +- fi]) ++ fi]) ++ ]) + fi + else + enable_nm=no +diff --git a/libpurple/network.c b/libpurple/network.c +index c43e3c7..b17e439 100644 +--- a/libpurple/network.c ++++ b/libpurple/network.c +@@ -939,8 +939,13 @@ nm_update_state(NMState state) + #if NM_CHECK_VERSION(0,8,992) + case NM_STATE_DISCONNECTING: + #endif ++#if NM_CHECK_VERSION(1,0,0) ++ if (prev != NM_STATE_CONNECTED_GLOBAL && prev != NM_STATE_UNKNOWN) ++ break; ++#else + if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN) + break; ++#endif + if (ui_ops != NULL && ui_ops->network_disconnected != NULL) + ui_ops->network_disconnected(); + break; -- cgit v1.2.3 From 1576acbe09d2adc7e3ca46ade0df8009a26b489a Mon Sep 17 00:00:00 2001 From: Royce Strange Date: Sun, 24 May 2020 03:57:19 -0500 Subject: build: Add missing twinkle patch to gnu/local.mk. This follows up on e5463baf2ce21cd2abc7ac5576401ae7ee7eb28c. * gnu/local.mk (dist_patch_DATA): Add twinkle-bcg729.patch. Signed-off-by: Tobias Geerinckx-Rice --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/local.mk b/gnu/local.mk index bbe06d2b20..f4326d4db8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1540,6 +1540,7 @@ dist_patch_DATA = \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \ %D%/packages/patches/tomb-fix-errors-on-open.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ + %D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \ %D%/packages/patches/u-boot-DT-for-Pinebook-Pro.patch \ %D%/packages/patches/u-boot-add-boe-nv140fhmn49-display.patch \ -- cgit v1.2.3 From bdc7f72fe4391ede313a0388ddd17cbb053931c9 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 24 May 2020 20:48:14 +0100 Subject: gnu: go-github-com-kr-pretty: Fix source sha256. This follows on from 618df2e335acb49a27ca014b555ede34f79503f3, which left the hash suspiciously similar to the previous value. * gnu/packages/golang.scm (go-github-com-kr-pretty): Change the sha256 hash. --- gnu/packages/golang.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c6f47aa144..3ae59ad2b7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2810,7 +2810,7 @@ format in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "1pm4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp")))) + "1ywbfzz1h3a3qd8rpkiqwi1dm4w8ls9ijb4x1b7567grns9f0vnp")))) (build-system go-build-system) (propagated-inputs `(("go-github-com-kr-text" ,go-github-com-kr-text))) -- cgit v1.2.3 From 1157bee478294af2e2568f4a01a0411eb8fa6fc4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 May 2020 09:23:44 +0300 Subject: gnu: efl: Update to 1.24.1. * gnu/packages/enlightenment.scm (efl): Update to 1.24.1. [propagated-inputs]: Remove bullet. Add libpng. Move libtiff, libwebp, util-linux:lib ... [inputs]: ... to here. Add openjpeg. Remove libxp. [arguments]: In configure-flags disable scim, enable avahi, glib. Use setuid mount/umount binaries. Rename hardcode-libcurl-location to hardcode-dynamic-libraries and add pulseaudio, libsndfile. squash! efl-1.24.1 --- gnu/packages/enlightenment.scm | 47 +++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 32d8ea9c0d..42fd8fffd1 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Tomáš Čech ;;; Copyright © 2015 Daniel Pimentel -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2017 Nikita ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Timo Eisenmann @@ -69,7 +69,7 @@ (define-public efl (package (name "efl") - (version "1.23.3") + (version "1.24.1") (source (origin (method url-fetch) (uri (string-append @@ -77,7 +77,7 @@ version ".tar.xz")) (sha256 (base32 - "00b9lp3h65254kdb1ys15fv7p3ln7qsvf15jkw4kli5ymagadkjk")))) + "1xsbz5kl74cgzyzwmjy3p50m0iigvi53lklkp92v49k4j99zpak7")))) (build-system meson-build-system) (native-inputs `(("check" ,check) @@ -93,6 +93,7 @@ ("libraw" ,libraw) ("librsvg" ,librsvg) ("libspectre" ,libspectre) + ("libtiff" ,libtiff) ("libxau" ,libxau) ("libxcomposite" ,libxcomposite) ("libxcursor" ,libxcursor) @@ -102,18 +103,19 @@ ("libxi" ,libxi) ("libxfixes" ,libxfixes) ("libxinerama" ,libxinerama) - ("libxp" ,libxp) ("libxrandr" ,libxrandr) ("libxrender" ,libxrender) ("libxss" ,libxscrnsaver) ("libxtst" ,libxtst) + ("libwebp" ,libwebp) + ("openjpeg" ,openjpeg) ("poppler" ,poppler) + ("util-linux" ,util-linux "lib") ("wayland-protocols" ,wayland-protocols))) (propagated-inputs ;; All these inputs are in package config files in section ;; Requires.private. `(("avahi" ,avahi) - ("bullet" ,bullet) ("dbus" ,dbus) ("elogind" ,elogind) ("eudev" ,eudev) @@ -122,30 +124,32 @@ ("fribidi" ,fribidi) ("glib" ,glib) ("harfbuzz" ,harfbuzz) - ("luajit" ,luajit) ("libinput" ,libinput-minimal) ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) ("libsndfile" ,libsndfile) - ("libtiff" ,libtiff) - ("libwebp" ,libwebp) + ("libpng" ,libpng) ("libx11" ,libx11) ("libxkbcommon" ,libxkbcommon) + ("luajit" ,luajit) ("lz4" ,lz4) ("openssl" ,openssl) ("pulseaudio" ,pulseaudio) - ("util-linux" ,util-linux "lib") ("wayland" ,wayland) ("zlib" ,zlib))) (arguments `(#:configure-flags '("-Dsystemd=false" + "-Delogind=true" "-Dembedded-lz4=false" "-Devas-loaders-disabler=json" "-Dbuild-examples=false" + "-Decore-imf-loaders-disabler=scim" + "-Davahi=true" + "-Dglib=true" + "-Dmount-path=/run/setuid-programs/mount" + "-Dunmount-path=/run/setuid-programs/umount" ;(string-append "-Ddictionaries-hyphen-dir=" ; (assoc-ref %build-inputs "hyphen") ; "/share/hyphen") - "-Delogind=true" "-Dnetwork-backend=connman" ,@(match (%current-system) ("armhf-linux" @@ -153,22 +157,27 @@ (_ '("-Dopengl=full"))) ;; for wayland - "-Dwl-deprecated=true" ; ecore_wayland - "-Ddrm-deprecated=true" ; ecore_drm "-Dwl=true" "-Ddrm=true") #:tests? #f ; Many tests fail due to timeouts and network requests. #:phases (modify-phases %standard-phases - ;; If we don't hardcode the location of libcurl.so then we - ;; have to wrap the outputs of efl's dependencies in curl. - (add-after 'unpack 'hardcode-libcurl-location + ;; If we don't hardcode the location of libcurl.so and others then we + ;; have to wrap the outputs of efl's dependencies in those libraries. + (add-after 'unpack 'hardcode-dynamic-libraries (lambda* (#:key inputs #:allow-other-keys) - (let* ((curl (assoc-ref inputs "curl")) - (lib (string-append curl "/lib/"))) + (let ((curl (assoc-ref inputs "curl")) + (pulse (assoc-ref inputs "pulseaudio")) + (sndfile (assoc-ref inputs "libsndfile")) + (lib "/lib/")) (substitute* "src/lib/ecore_con/ecore_con_url_curl.c" (("libcurl.so.?" libcurl) ; libcurl.so.[45] - (string-append lib libcurl))) + (string-append curl lib libcurl))) + (substitute* "src/lib/ecore_audio/ecore_audio.c" + (("libpulse.so.0" libpulse) + (string-append pulse lib libpulse)) + (("libsndfile.so.1" libsnd) + (string-append sndfile lib libsnd))) #t))) (add-after 'unpack 'fix-install-paths (lambda _ -- cgit v1.2.3 From 75c5b027ae35f2382ae95023a1f70eb3c5a746cc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 May 2020 09:26:15 +0300 Subject: gnu: python-efl: Update to 1.24.0. * gnu/packages/enlightenment.scm (python-efl): Update to 1.24.0. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 42fd8fffd1..38e5dbf1cb 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -398,7 +398,7 @@ embedded systems.") (define-public python-efl (package (name "python-efl") - (version "1.23.0") + (version "1.24.0") (source (origin (method url-fetch) @@ -406,7 +406,7 @@ embedded systems.") "python/python-efl-" version ".tar.xz")) (sha256 (base32 - "16yn6a1b9167nfmryyi44ma40m20ansfpwgrvqzfvwix7qaz9pib")) + "1vk1cdd959gia4a9qzyq56a9zw3lqf9ck66k8c9g3c631mp5cfpy")) (modules '((guix build utils))) ;; Remove files generated by Cython (snippet -- cgit v1.2.3 From 2ae11cd0a43bfd8c0106afc620c2e5be1cecef78 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 11 May 2020 10:12:32 +0300 Subject: gnu: enlightenment: Update to 0.24.0. * gnu/packages/enlightenment.scm (enlightenment): Update to 0.24.0. [arguments]: Change configure-flags to hardcode efl binary locations. Remove custom 'fix-dot-desktop-creation phase. Update 'set-system-actions phase. * gnu/packages/patches/enlightenment-fix-setuid-path.patch: Update for new upstream version. * gnu/services/desktop.scm (enlightenment-setuid-programs): Same. --- gnu/packages/enlightenment.scm | 39 ++-- .../patches/enlightenment-fix-setuid-path.patch | 223 ++++----------------- gnu/services/desktop.scm | 29 +-- 3 files changed, 68 insertions(+), 223 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 38e5dbf1cb..08a52f9d92 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -292,7 +292,7 @@ Libraries with some extra bells and whistles.") (define-public enlightenment (package (name "enlightenment") - (version "0.23.1") + (version "0.24.0") (source (origin (method url-fetch) (uri @@ -300,27 +300,27 @@ Libraries with some extra bells and whistles.") "enlightenment/enlightenment-" version ".tar.xz")) (sha256 (base32 - "0d1cyl07w9pvi2pf029kablazks2q9aislzl46b6fq5m1465jc75")) + "01053hxdmyjfb6gmz1pqmw0llrgc4356np515h5vsqcn59mhvfz7")) (patches (search-patches "enlightenment-fix-setuid-path.patch")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Dsystemd=false") + `(#:configure-flags + (let ((efl (assoc-ref %build-inputs "efl"))) + (list "-Dsystemd=false" + "-Dpackagekit=false" + (string-append "-Dedje-cc=" efl "/bin/edje_cc") + (string-append "-Deldbus-codegen=" efl "/bin/eldbus-codegen") + (string-append "-Deet=" efl "/bin/eet"))) #:phases (modify-phases %standard-phases (delete 'bootstrap) ; We don't want to run the autogen script. - (add-after 'unpack 'fix-dot-desktop-creation - (lambda _ - (substitute* "data/session/meson.build" - (("HAVE_WAYLAND'.*") "HAVE_WAYLAND') == true\n")) - #t)) (add-before 'configure 'set-system-actions (lambda* (#:key inputs #:allow-other-keys) - (setenv "HOME" "/tmp") + (setenv "HOME" "/tmp") (let ((xkeyboard (assoc-ref inputs "xkeyboard-config")) (setxkbmap (assoc-ref inputs "setxkbmap")) (utils (assoc-ref inputs "util-linux")) (libc (assoc-ref inputs "libc")) - (bluez (assoc-ref inputs "bluez")) (bc (assoc-ref inputs "bc")) (efl (assoc-ref inputs "efl"))) ;; We need to patch the path to 'base.lst' to be able @@ -337,23 +337,22 @@ Libraries with some extra bells and whistles.") "src/modules/conf_intl/e_int_config_intl.c" "src/modules/wizard/page_010.c") (("locale -a") (string-append libc "/bin/locale -a"))) - (substitute* "src/bin/e_import_config_dialog.c" - (("%s/edje_cc -v %s %s %s\", e_prefix_bin_get\\(\\)") - (string-append efl "/bin/edje_cc -v %s %s %s\""))) (substitute* "src/modules/everything/evry_plug_apps.c" (("/usr/bin/") "")) + (substitute* '("src/bin/e_sys_main.c" + "src/bin/e_util_suid.h") + (("PATH=/bin:/usr/bin:/sbin:/usr/sbin") + (string-append "PATH=/run/setuid-programs:" + "/run/current-system/profile/bin:" + "/run/current-system/profile/sbin"))) (substitute* "src/modules/everything/evry_plug_calc.c" (("bc -l") (string-append bc "/bin/bc -l"))) (substitute* "data/etc/meson.build" (("/bin/mount") "/run/setuid-programs/mount") (("/bin/umount") "/run/setuid-programs/umount") - (("/usr/bin/eject") (string-append utils "/bin/eject")) - (("/usr/bin/l2ping") (string-append bluez "/bin/l2ling")) - (("/bin/rfkill") (string-append utils "/sbin/rfkill")) - (("SUSPEND = ''") "SUSPEND = '/run/current-system/profile/bin/loginctl suspend'") - (("HIBERNATE = ''") "HIBERNATE = '/run/current-system/profile/bin/loginctl hibernate'") - (("/sbin/shutdown -h now") "/run/current-system/profile/bin/loginctl poweroff now") - (("/sbin/shutdown -r now") "/run/current-system/profile/bin/loginctl reboot now")) + (("/usr/bin/eject") (string-append utils "/bin/eject"))) + (substitute* "src/bin/system/e_system_power.c" + (("systemctl") "loginctl")) #t)))))) (native-inputs `(("gettext" ,gettext-minimal) diff --git a/gnu/packages/patches/enlightenment-fix-setuid-path.patch b/gnu/packages/patches/enlightenment-fix-setuid-path.patch index c48f18c8ec..f2930845ba 100644 --- a/gnu/packages/patches/enlightenment-fix-setuid-path.patch +++ b/gnu/packages/patches/enlightenment-fix-setuid-path.patch @@ -1,34 +1,31 @@ diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c -index 00b0e5d84..98ab4518f 100644 +index 8b0aa6641..f15d2c2a2 100644 --- a/src/bin/e_auth.c +++ b/src/bin/e_auth.c -@@ -9,8 +9,7 @@ e_auth_begin(char *passwd) +@@ -11,9 +11,7 @@ e_auth_begin(char *passwd) + pwlen = strlen(passwd); + if (pwlen == 0) goto out; - if (strlen(passwd) == 0) goto out; - -- snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_ckpasswd", +- snprintf(buf, sizeof(buf), +- "%s/enlightenment/utils/enlightenment_ckpasswd pw", - e_prefix_lib_get()); + snprintf(buf, sizeof(buf), "/run/setuid-programs/enlightenment_ckpasswd"); + exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL); + if (!exe) goto out; + if (ecore_exe_send(exe, passwd, pwlen) != EINA_TRUE) goto out; +@@ -46,9 +44,7 @@ e_auth_polkit_begin(char *passwd, const char *cookie, unsigned int uid) + pwlen = strlen(passwd); + if (pwlen == 0) goto out; +- snprintf(buf, sizeof(buf), +- "%s/enlightenment/utils/enlightenment_ckpasswd pk", +- e_prefix_lib_get()); ++ snprintf(buf, sizeof(buf), "/run/setuid-programs/enlightenment_ckpasswd"); exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL); - if (ecore_exe_send(exe, passwd, strlen(passwd)) != EINA_TRUE) goto out; -diff --git a/src/bin/e_backlight.c b/src/bin/e_backlight.c -index 2bced6766..208e583ba 100644 ---- a/src/bin/e_backlight.c -+++ b/src/bin/e_backlight.c -@@ -521,8 +521,8 @@ _bl_sys_level_set(double val) - } - // fprintf(stderr, "SET: %1.3f\n", val); - snprintf(buf, sizeof(buf), -- "%s/enlightenment/utils/enlightenment_backlight %i %s", -- e_prefix_lib_get(), (int)(val * 1000.0), bl_sysval); -+ "/run/setuid-programs/enlightenment_backlight %i %s", -+ (int)(val * 1000.0), bl_sysval); - bl_sys_set_exe = ecore_exe_run(buf, NULL); - } - #endif // HAVE_EEZE || __FreeBSD_kernel__ + if (!exe) goto out; + snprintf(buf, sizeof(buf), "%s %u %s", cookie, uid, passwd); diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c -index 0fcffa249..c1921121d 100644 +index 9b10b3117..74e6b72ad 100644 --- a/src/bin/e_fm/e_fm_main_eeze.c +++ b/src/bin/e_fm/e_fm_main_eeze.c @@ -318,7 +318,7 @@ _e_fm_main_eeze_volume_eject(E_Volume *v) @@ -58,163 +55,29 @@ index 0fcffa249..c1921121d 100644 eeze_disk_mount_wrapper_set(v->disk, buf2); } v->guard = ecore_timer_loop_add(E_FM_MOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_mount_timeout, v); -diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c -index 671fbcd9a..90ee04cf1 100644 ---- a/src/bin/e_sys.c -+++ b/src/bin/e_sys.c -@@ -702,20 +702,16 @@ _e_sys_cb_timer(void *data EINA_UNUSED) - - e_init_status_set(_("Checking System Permissions")); - snprintf(buf, sizeof(buf), -- "%s/enlightenment/utils/enlightenment_sys -t halt", -- e_prefix_lib_get()); -+ "/run/setuid-programs/enlightenment_sys -t halt"); - _e_sys_halt_check_exe = ecore_exe_run(buf, NULL); - snprintf(buf, sizeof(buf), -- "%s/enlightenment/utils/enlightenment_sys -t reboot", -- e_prefix_lib_get()); -+ "/run/setuid-programs/enlightenment_sys -t reboot"); - _e_sys_reboot_check_exe = ecore_exe_run(buf, NULL); - snprintf(buf, sizeof(buf), -- "%s/enlightenment/utils/enlightenment_sys -t suspend", -- e_prefix_lib_get()); -+ "/run/setuid-programs/enlightenment_sys -t suspend"); - _e_sys_suspend_check_exe = ecore_exe_run(buf, NULL); - snprintf(buf, sizeof(buf), -- "%s/enlightenment/utils/enlightenment_sys -t hibernate", -- e_prefix_lib_get()); -+ "/run/setuid-programs/enlightenment_sys -t hibernate"); - _e_sys_hibernate_check_exe = ecore_exe_run(buf, NULL); - return ECORE_CALLBACK_CANCEL; - } -@@ -1134,8 +1130,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) - if (e_util_immortal_check()) return 0; - e_fm2_die(); - snprintf(buf, sizeof(buf), -- "%s/enlightenment/utils/enlightenment_sys halt", -- e_prefix_lib_get()); -+ "/run/setuid-programs/enlightenment_sys halt"); - if (_e_sys_exe) - { - if ((ecore_time_get() - _e_sys_begin_time) > 2.0) -@@ -1170,8 +1165,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) - if (e_util_immortal_check()) return 0; - e_fm2_die(); - snprintf(buf, sizeof(buf), -- "%s/enlightenment/utils/enlightenment_sys reboot", -- e_prefix_lib_get()); -+ "/run/setuid-programs/enlightenment_sys reboot"); - if (_e_sys_exe) - { - if ((ecore_time_get() - _e_sys_begin_time) > 2.0) -@@ -1204,8 +1198,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) - case E_SYS_SUSPEND: - /* /etc/acpi/sleep.sh force */ - snprintf(buf, sizeof(buf), -- "%s/enlightenment/utils/enlightenment_sys suspend", -- e_prefix_lib_get()); -+ "/run/setuid-programs/enlightenment_sys suspend"); - if (_e_sys_exe) - { - if ((ecore_time_get() - _e_sys_begin_time) > 2.0) -@@ -1265,8 +1258,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) - case E_SYS_HIBERNATE: - /* /etc/acpi/hibernate.sh force */ - snprintf(buf, sizeof(buf), -- "%s/enlightenment/utils/enlightenment_sys hibernate", -- e_prefix_lib_get()); -+ "/run/setuid-programs/enlightenment_sys hibernate"); - if (_e_sys_exe) - { - if ((ecore_time_get() - _e_sys_begin_time) > 2.0) -diff --git a/src/modules/bluez4/e_mod_main.c b/src/modules/bluez4/e_mod_main.c -index 4b5148634..47d34b07f 100644 ---- a/src/modules/bluez4/e_mod_main.c -+++ b/src/modules/bluez4/e_mod_main.c -@@ -49,8 +49,8 @@ _ebluez_l2ping_poller(void *data EINA_UNUSED) - - if (tmp) - { -- eina_strbuf_append_printf(buf, "%s/enlightenment/utils/enlightenment_sys l2ping %s", -- e_prefix_lib_get(), tmp); -+ eina_strbuf_append_printf(buf, "/run/setuid-programs/enlightenment_sys l2ping %s", -+ tmp); - autolock_exe = ecore_exe_run(eina_strbuf_string_get(buf), NULL); - } - -@@ -692,8 +692,7 @@ e_modapi_init(E_Module *m) - autolock_desklock = ecore_event_handler_add(E_EVENT_DESKLOCK, _ebluez_desklock, NULL); - - buf = eina_strbuf_new(); -- eina_strbuf_append_printf(buf, "%s/enlightenment/utils/enlightenment_sys -t l2ping", -- e_prefix_lib_get()); -+ eina_strbuf_append_printf(buf, "/run/setuid-programs/enlightenment_sys -t l2ping"); - autolock_exe = ecore_exe_run(eina_strbuf_string_get(buf), NULL); - eina_strbuf_free(buf); - -diff --git a/src/modules/bluez5/e_mod_main.c b/src/modules/bluez5/e_mod_main.c -index a581c466c..095d8f360 100644 ---- a/src/modules/bluez5/e_mod_main.c -+++ b/src/modules/bluez5/e_mod_main.c -@@ -321,8 +321,8 @@ ebluez5_rfkill_unblock(const char *name) - if (buf) - { - eina_strbuf_append_printf -- (buf, "%s/enlightenment/utils/enlightenment_sys rfkill-unblock %s", -- e_prefix_lib_get(), name); -+ (buf, "/run/setuid-programs/enlightenment_sys rfkill-unblock %s", -+ name); - _rfkill_exe = ecore_exe_run(eina_strbuf_string_get(buf), NULL); - eina_strbuf_free(buf); - } -diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c -index b66b365d8..bab0802cc 100644 ---- a/src/modules/cpufreq/e_mod_main.c -+++ b/src/modules/cpufreq/e_mod_main.c -@@ -1452,8 +1452,7 @@ e_modapi_init(E_Module *m) - } - E_CONFIG_LIMIT(cpufreq_config->poll_interval, 1, 1024); - -- snprintf(buf, sizeof(buf), "%s/%s/freqset", -- e_module_dir_get(m), MODULE_ARCH); -+ snprintf(buf, sizeof(buf), "/run/setuid-programs/freqset"); - cpufreq_config->set_exe_path = strdup(buf); - - if (stat(buf, &st) < 0) -diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c b/src/modules/sysinfo/cpuclock/cpuclock.c -index 938916e53..00d5067d0 100644 ---- a/src/modules/sysinfo/cpuclock/cpuclock.c -+++ b/src/modules/sysinfo/cpuclock/cpuclock.c -@@ -80,8 +80,7 @@ _cpuclock_set_governor(const char *governor) - char buf[4096 + 100], exe[4096]; - struct stat st; - -- snprintf(exe, 4096, "%s/%s/cpuclock_sysfs", -- e_module_dir_get(sysinfo_config->module), MODULE_ARCH); -+ snprintf(exe, 4096, "/run/setuid-programs/cpuclock_sysfs"); - if (stat(exe, &st) < 0) return; - - snprintf(buf, sizeof(buf), -@@ -108,8 +107,7 @@ _cpuclock_set_frequency(int frequency) - if (system(buf) != 0) - ERR("Error code from trying to run \"%s\"", buf); - #else -- snprintf(exe, 4096, "%s/%s/cpuclock_sysfs", -- e_module_dir_get(sysinfo_config->module), MODULE_ARCH); -+ snprintf(exe, 4096, "/run/setuid-programs/cpuclock_sysfs"); - if (stat(exe, &st) < 0) return; - snprintf(buf, sizeof(buf), - "%s %s %i", exe, "frequency", frequency); -@@ -127,8 +125,7 @@ _cpuclock_set_pstate(int min, int max, int turbo) - char buf[4096 + 100], exe[4096]; - struct stat st; +diff --git a/src/bin/e_start_main.c b/src/bin/e_start_main.c +index b2c439455..cb16c7bd4 100644 +--- a/src/bin/e_start_main.c ++++ b/src/bin/e_start_main.c +@@ -710,7 +710,7 @@ main(int argc, char **argv) + "E_ALERT_FONT_DIR=%s/data/fonts", eina_prefix_data_get(pfx)); + putenv(buf2); + snprintf(buf3, sizeof(buf3), +- "E_ALERT_SYSTEM_BIN=%s/enlightenment/utils/enlightenment_system", eina_prefix_lib_get(pfx)); ++ "E_ALERT_SYSTEM_BIN=/run/setuid-programs/enlightenment_system"); + putenv(buf3); -- snprintf(exe, 4096, "%s/%s/cpuclock_sysfs", -- e_module_dir_get(sysinfo_config->module), MODULE_ARCH); -+ snprintf(exe, 4096, "/run/setuid-programs/cpuclock_sysfs"); - if (stat(exe, &st) < 0) return; + if ((valgrind_mode || valgrind_tool) && +diff --git a/src/bin/e_system.c b/src/bin/e_system.c +index 1e7aabb64..dc0173219 100644 +--- a/src/bin/e_system.c ++++ b/src/bin/e_system.c +@@ -132,7 +132,7 @@ _system_spawn(void) + else _respawn_count = 0; + if (_respawn_count > 5) return; snprintf(buf, sizeof(buf), - "%s %s %i %i %i", exe, "pstate", min, max, turbo); --- -2.23.0 - +- "%s/enlightenment/utils/enlightenment_system", e_prefix_lib_get()); ++ "/run/setuid-programs/enlightenment_system"); + _system_exe = ecore_exe_pipe_run + (buf, ECORE_EXE_NOT_LEADER | ECORE_EXE_TERM_WITH_PARENT | + ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_WRITE, NULL); diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 93f2ae576c..9e45743586 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1036,29 +1036,12 @@ with the administrator's password." (match-record enlightenment-desktop-configuration (enlightenment) - (let ((module-arch (match (string-tokenize (%current-system) - (char-set-complement (char-set #\-))) - ((arch "linux") (string-append "linux-gnu-" arch)) - ((arch "gnu") (string-append "gnu-" arch))))) - (list (file-append enlightenment - "/lib/enlightenment/utils/enlightenment_sys") - (file-append enlightenment - "/lib/enlightenment/utils/enlightenment_backlight") - ;; TODO: Move this binary to a screen-locker service. - (file-append enlightenment - "/lib/enlightenment/utils/enlightenment_ckpasswd") - (file-append enlightenment - (string-append - "/lib/enlightenment/modules/cpufreq/" - module-arch "-" - (package-version enlightenment) - "/freqset")) - (file-append enlightenment - (string-append - "/lib/enlightenment/modules/sysinfo/" - module-arch "-" - (package-version enlightenment) - "/cpuclock_sysfs")))))) + (list (file-append enlightenment + "/lib/enlightenment/utils/enlightenment_sys") + (file-append enlightenment + "/lib/enlightenment/utils/enlightenment_system") + (file-append enlightenment + "/lib/enlightenment/utils/enlightenment_ckpasswd")))) (define enlightenment-desktop-service-type (service-type -- cgit v1.2.3 From 0cbb5390e4722d985d758cb788139fa86f7764c9 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 24 May 2020 22:27:32 +0200 Subject: doc: Update to the new 'grub-theme' procedure. This is a follow-up commit to 9cdb10d52e34f7e8fa3b6238fe268646a4bbb877: gnu: grub: Allow a PNG image and replace "aspect-ratio" with "resolution". * doc/guix.texi (Bootloader Configuration): Describe and use the 'grub-theme' procedure instead of the removed '%default-theme' variable. --- doc/guix.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 2b1f307c2d..aa2b316c90 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26983,14 +26983,14 @@ The GRUB @code{gfxmode} to set (a list of screen resolution strings, see @end table @end deftp -@defvr {Scheme Variable} %default-theme -This is the default GRUB theme used by the operating system if no +@deffn {Scheme Procedure} grub-theme +Return the default GRUB theme used by the operating system if no @code{theme} field is specified in @code{bootloader-configuration} record. It comes with a fancy background image displaying the GNU and Guix logos. -@end defvr +@end deffn For example, to override the default resolution, you may use something like @@ -27000,7 +27000,7 @@ like (bootloader-configuration ;; @dots{} (theme (grub-theme - (inherit %default-theme) + (inherit (grub-theme)) (gfxmode '("1024x786x32" "auto")))))) @end lisp -- cgit v1.2.3 From cf0abc23e8c8bb444f2f466434827ef068465ad8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 24 May 2020 22:37:03 +0200 Subject: gnu: emacs-auctex: Update to 12.2.2. * gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 12.2.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fe68a56fd6..18c19740e9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1758,14 +1758,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "12.2.0") + (version "12.2.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/auctex-" version ".tar")) (sha256 - (base32 "0j919l3q5sq6h1k1kmk4kyv0vkzl4f98fxcd64v34x5q1ahjhg48")))) + (base32 "1map25xn7r28aldhcz9n8pbfk2l3gvnxx8hgih3ax8hyvnfi6brh")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). -- cgit v1.2.3 From 9b572aba85696520956ea838c3fe08426b6ce88c Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen via Guix-patches via Date: Sun, 24 May 2020 20:58:23 +0200 Subject: gnu: pwsafe: Update to 3.52.0. * gnu/packages/password-utils.scm (pwsafe): Update to 3.52.0. [arguments]: Remove obsolete work-arounds. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/password-utils.scm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 4f5ac1029f..a59fb9dc75 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Amirouche Boubekki -;;; Copyright © 2018, 2019 Tim Gesthuizen +;;; Copyright © 2018, 2019, 2020 Tim Gesthuizen ;;; Copyright © 2019 Jens Mølgaard ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Guillaume Le Vaillant @@ -196,7 +196,7 @@ algorithms AES or Twofish.") (define-public pwsafe (package (name "pwsafe") - (version "3.50.0") + (version "3.52.0") (home-page "https://www.pwsafe.org/") (source (origin @@ -205,7 +205,7 @@ algorithms AES or Twofish.") (url "https://github.com/pwsafe/pwsafe.git") (commit version))) (sha256 - (base32 "01kfssd2vr64yh4dqhch58x36n3aj3hpj5n560f41rsxym69c6qs")) + (base32 "1ka7xsl63v0559fzf3pwc1iqr37gwr4vq5iaxa2hzar2g28hsxvh")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs @@ -232,15 +232,7 @@ algorithms AES or Twofish.") (display "find_package(GTest) add_subdirectory(src/test)\n" cmake-port) (close cmake-port) - #t))) - (add-after 'add-gtest 'patch-executables - (lambda* (#:key inputs #:allow-other-keys) - (chmod "src/test/OSTest.cpp" #o644) - (substitute* "src/os/unix/media.cpp" - (("/usr/bin/file") - (string-append (assoc-ref inputs "file") - "/bin/file"))) - #t))))) + #t)))))) (synopsis "Password safe with automatic input and key generation") (description "pwsafe is a password manager originally designed by Bruce Schneier. It offers a simple UI to manage passwords for different services. -- cgit v1.2.3 From 3142191da6f31efcb921fb7189a55f93b73643c8 Mon Sep 17 00:00:00 2001 From: Chris Bøg Date: Sun, 24 May 2020 12:44:44 +0200 Subject: doc: cookbook: Add subsection about session locking with xss-lock. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/guix-cookbook.texi (Session lock): New node. Signed-off-by: Ludovic Courtès --- doc/guix-cookbook.texi | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 2a605276e6..8651bc4429 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -1617,6 +1617,47 @@ Then you need to add the following code to a StumpWM configuration file (set-font (make-instance 'xft:font :family "DejaVu Sans Mono" :subfamily "Book" :size 11)) @end lisp +@node Session lock +@subsection Session lock +@cindex sessionlock + +Depending on your environment, locking the screen of your session might come built in +or it might be something you have to set up yourself. If you use a desktop environment +like GNOME or KDE, it's usually built in. If you use a plain window manager like +StumpWM or EXWM, you might have to set it up yourself. + +@node Xorg +@subsubsection Xorg + +If you use Xorg, you can use the utility +@uref{https://www.mankier.com/1/xss-lock, xss-lock} to lock the screen of your session. +xss-lock is triggered by DPMS which since Xorg 1.8 is auto-detected and enabled if +ACPI is also enabled at kernel runtime. + +To use xss-lock, you can simple execute it and put it into the background before +you start your window manager from e.g. your @file{~/.xsession}: + +@example +xss-lock -- slock & +exec stumpwm +@end example + +In this example, xss-lock uses @code{slock} to do the actual locking of the screen when +it determines it's appropriate, like when you suspend your device. + +For slock to be allowed to be a screen locker for the graphical session, it needs to +be made setuid-root so it can authenticate users, and it needs a PAM service. This +can be achieved by adding the following service to your @file{config.scm}: + +@lisp +(screen-locker-service slock) +@end lisp + +If you manually lock your screen, e.g. by directly calling slock when you want to lock +your screen but not suspend it, it's a good idea to notify xss-lock about this so no +confusion occurs. This can be done by executing @code{xset s activate} immediately +before you execute slock. + @node Setting up a bind mount @section Setting up a bind mount -- cgit v1.2.3 From b7e1e556b2d0dd6685f41abcf92bb7f0b28f72e9 Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Sat, 23 May 2020 18:50:38 -0400 Subject: gnu: guile-dsv: Wrap script. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile-dsv)[arguments]: Add "wrap program" phase. Import target-guile-effective-version from guile-build-system for use in new phase. Signed-off-by: Ludovic Courtès --- gnu/packages/guile-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index a1deee32d1..b1c1fd0f62 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2019 Timothy Sample ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2020 Evan Straw +;;; Copyright © 2020 Jack Hill ;;; ;;; This file is part of GNU Guix. ;;; @@ -467,7 +468,12 @@ you send to a FIFO file.") (inputs `(("guile" ,guile-2.2))) (propagated-inputs `(("guile2.2-lib" ,guile2.2-lib))) (arguments - '(#:phases (modify-phases %standard-phases + `(#:modules (((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%gnu-build-system-modules) + #:imported-modules ((guix build guile-build-system) + ,@%gnu-build-system-modules) + #:phases (modify-phases %standard-phases (add-before 'configure 'set-guilesitedir (lambda _ (substitute* "Makefile.in" @@ -482,6 +488,24 @@ $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) (("^guilesitedir =.*$") "guilesitedir = \ $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (guile-lib (assoc-ref inputs "guile2.2-lib")) + (version (target-guile-effective-version)) + (scm (string-append "/share/guile/site/" + version)) + (go (string-append "/lib/guile/" + version "/site-ccache"))) + (wrap-program (string-append bin "/dsv") + `("GUILE_LOAD_PATH" prefix + (,(string-append out scm) + ,(string-append guile-lib scm))) + `("GUILE_LOAD_COMPILED_PATH" prefix + (,(string-append out go) + ,(string-append guile-lib go))))) #t))))) (home-page "https://github.com/artyom-poptsov/guile-dsv") (synopsis "DSV module for Guile") -- cgit v1.2.3 From f81ce752b3395208f911387d95177ecf52d6edbc Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Sat, 23 May 2020 18:50:39 -0400 Subject: gnu: guile-dsv: Build with Guile 3.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile-dsv)[inputs]: Replace guile-2.2 with guile-3.0. [propagated-inputs]: Replace guile2.2-lib with guile-lib. [arguments]: Add "configure support guile3.0" phase. (guile2.2-dsv): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/guile-xyz.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index b1c1fd0f62..8dfce091ef 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -465,8 +465,8 @@ you send to a FIFO file.") ("automake" ,automake) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-2.2))) - (propagated-inputs `(("guile2.2-lib" ,guile2.2-lib))) + (inputs `(("guile" ,guile-3.0))) + (propagated-inputs `(("guile-lib" ,guile-lib))) (arguments `(#:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) @@ -474,6 +474,14 @@ you send to a FIFO file.") #:imported-modules ((guix build guile-build-system) ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases + ;; Support Guile 3.0 in configure from upstream commit + ;; 4c724577ccf19bb88580f72f2f6b166a0447ce3f + (add-before 'bootstrap 'configure-support-guile3.0 + (lambda _ + (substitute* "configure.ac" + (("GUILE_PKG.*") + "GUILE_PKG([3.0 2.0 2.2])")) + #t)) (add-before 'configure 'set-guilesitedir (lambda _ (substitute* "Makefile.in" @@ -493,7 +501,7 @@ $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) - (guile-lib (assoc-ref inputs "guile2.2-lib")) + (guile-lib (assoc-ref inputs "guile-lib")) (version (target-guile-effective-version)) (scm (string-append "/share/guile/site/" version)) @@ -515,6 +523,13 @@ delimiter-separated values (DSV) data format. Guile-DSV supports the Unix-style DSV format and RFC 4180 format.") (license license:gpl3+))) +(define-public guile2.2-dsv + (package + (inherit guile-dsv) + (name "guile2.2-dsv") + (inputs `(("guile" ,guile-2.2))) + (propagated-inputs `(("guile-lib" ,guile2.2-lib))))) + (define-public guile-fibers (package (name "guile-fibers") -- cgit v1.2.3 From c873980d187ea6f79a0e91c7d1baf5b301dc5035 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Wed, 20 May 2020 22:28:11 -0500 Subject: gnu: Add protonvpn-cli. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/vpn.scm (protonvpn-cli): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/vpn.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index da881493bf..8f7fb3b577 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 Ryan Prior ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,6 +56,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages python-web) #:use-module (gnu packages tls) #:use-module (gnu packages xml)) @@ -311,6 +313,40 @@ security protocol that utilizes SSL/TLS for key exchange. It is capable of traversing network address translators (@dfn{NAT}s) and firewalls.") (license license:gpl2))) +(define-public protonvpn-cli + (package + (name "protonvpn-cli") + (version "2.2.2") + (source + (origin + ;; PyPI has a ".whl" file but not a proper source release. + ;; Thus, fetch code from Git. + (method git-fetch) + (uri (git-reference + (url "https://github.com/ProtonVPN/linux-cli.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ixjb02kj4z79whm1izd8mrn2h0rp9cmw4im1qvp93rahqxdd4n8")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; no tests in repo + (native-inputs + `(("docopt" ,python-docopt))) + (inputs + `(("pythondialog" ,python-pythondialog) + ("requests" ,python-requests))) + (propagated-inputs + `(("openvpn" ,openvpn))) + (synopsis "Command-line client for ProtonVPN") + (description + "Official CLI for ProtonVPN, a secure point-to-point virtual private +networking service with a gratis tier. It can automatically find and connect +to the fastest servers or use TOR over VPN. The gratis tier offers unlimited +bandwidth for up to 10 devices.") + (home-page "https://github.com/ProtonVPN/linux-cli") + (license license:gpl3+))) + (define-public tinc (package (name "tinc") -- cgit v1.2.3 From 86ac14b2f37efbb6f4a3ed1c3e183fbc9496b7a5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 24 May 2020 22:05:11 +0200 Subject: gnu: protonvpn-cli: Tweak description. * gnu/packages/vpn.scm (protonvpn-cli)[description]: Tweak. --- gnu/packages/vpn.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 8f7fb3b577..dbfd11626a 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -340,10 +340,10 @@ traversing network address translators (@dfn{NAT}s) and firewalls.") `(("openvpn" ,openvpn))) (synopsis "Command-line client for ProtonVPN") (description - "Official CLI for ProtonVPN, a secure point-to-point virtual private -networking service with a gratis tier. It can automatically find and connect -to the fastest servers or use TOR over VPN. The gratis tier offers unlimited -bandwidth for up to 10 devices.") + "This is the official command-line interface for ProtonVPN, a secure +point-to-point virtual private networking (VPN) service with a gratis tier. +It can automatically find and connect to the fastest servers or use Tor over +VPN. The gratis tier offers unlimited bandwidth for up to 10 devices.") (home-page "https://github.com/ProtonVPN/linux-cli") (license license:gpl3+))) -- cgit v1.2.3 From c098c11be8eb9e0c12be42640721e3cb21c37628 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 20 May 2020 13:01:26 +0200 Subject: git: Add 'commit-relation'. * guix/git.scm (commit-relation): New procedure. * tests/git.scm ("commit-relation"): New test. --- guix/git.scm | 16 ++++++++++++++++ tests/git.scm | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/guix/git.scm b/guix/git.scm index 92121156cf..249d622756 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -43,6 +43,7 @@ url+commit->name latest-repository-commit commit-difference + commit-relation git-checkout git-checkout? @@ -405,6 +406,21 @@ that of OLD." (cons head result) (set-insert head visited))))))) +(define (commit-relation old new) + "Return a symbol denoting the relation between OLD and NEW, two commit +objects: 'ancestor (meaning that OLD is an ancestor of NEW), 'descendant, or +'unrelated, or 'self (OLD and NEW are the same commit)." + (if (eq? old new) + 'self + (let ((newest (commit-closure new))) + (if (set-contains? newest old) + 'ancestor + (let* ((seen (list->setq (commit-parents new))) + (oldest (commit-closure old seen))) + (if (set-contains? oldest new) + 'descendant + 'unrelated)))))) + ;;; ;;; Checkouts. diff --git a/tests/git.scm b/tests/git.scm index 052f8a79c4..4a806abcc3 100644 --- a/tests/git.scm +++ b/tests/git.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -122,4 +122,44 @@ (lset= eq? (commit-difference commit4 commit1 (list commit5)) (list commit2 commit3 commit4))))))) +(unless (which (git-command)) (test-skip 1)) +(test-equal "commit-relation" + '(self ;master3 master3 + ancestor ;master1 master3 + descendant ;master3 master1 + unrelated ;master2 branch1 + unrelated ;branch1 master2 + ancestor ;branch1 merge + descendant ;merge branch1 + ancestor ;master1 merge + descendant) ;merge master1 + (with-temporary-git-repository directory + '((add "a.txt" "A") + (commit "first commit") + (branch "hack") + (checkout "hack") + (add "1.txt" "1") + (commit "branch commit") + (checkout "master") + (add "b.txt" "B") + (commit "second commit") + (add "c.txt" "C") + (commit "third commit") + (merge "hack" "merge")) + (with-repository directory repository + (let ((master1 (find-commit repository "first")) + (master2 (find-commit repository "second")) + (master3 (find-commit repository "third")) + (branch1 (find-commit repository "branch")) + (merge (find-commit repository "merge"))) + (list (commit-relation master3 master3) + (commit-relation master1 master3) + (commit-relation master3 master1) + (commit-relation master2 branch1) + (commit-relation branch1 master2) + (commit-relation branch1 merge) + (commit-relation merge branch1) + (commit-relation master1 merge) + (commit-relation merge master1)))))) + (test-end "git") -- cgit v1.2.3 From 9b049de84ed101e2c0a5d071e76f424b3bc46bd9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 20 May 2020 15:55:37 +0200 Subject: channels: 'latest-channel-instances' doesn't leak internal state. * guix/channels.scm (latest-channel-instances): Remove 'previous-channels' argument. Introduce 'loop' and use it. --- guix/channels.scm | 69 +++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index f0174de767..e0a7a84f55 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -231,10 +231,9 @@ result is unspecified." #:select? (negate dot-git?)))) (channel-instance channel commit checkout)))) -(define* (latest-channel-instances store channels #:optional (previous-channels '())) +(define* (latest-channel-instances store channels) "Return a list of channel instances corresponding to the latest checkouts of -CHANNELS and the channels on which they depend. PREVIOUS-CHANNELS is a list -of previously processed channels." +CHANNELS and the channels on which they depend." ;; Only process channels that are unique, or that are more specific than a ;; previous channel specification. (define (ignore? channel others) @@ -245,38 +244,38 @@ of previously processed channels." (not (or (channel-commit a) (channel-commit b)))))))) - ;; Accumulate a list of instances. A list of processed channels is also - ;; accumulated to decide on duplicate channel specifications. - (define-values (resulting-channels instances) - (fold2 (lambda (channel previous-channels instances) - (if (ignore? channel previous-channels) - (values previous-channels instances) - (begin - (format (current-error-port) - (G_ "Updating channel '~a' from Git repository at '~a'...~%") - (channel-name channel) - (channel-url channel)) - (let ((instance (latest-channel-instance store channel))) - (let-values (((new-instances new-channels) - (latest-channel-instances - store - (channel-instance-dependencies instance) - previous-channels))) - (values (append (cons channel new-channels) - previous-channels) - (append (cons instance new-instances) - instances))))))) - previous-channels - '() ;instances - channels)) - - (let ((instance-name (compose channel-name channel-instance-channel))) - ;; Remove all earlier channel specifications if they are followed by a - ;; more specific one. - (values (delete-duplicates instances - (lambda (a b) - (eq? (instance-name a) (instance-name b)))) - resulting-channels))) + (let loop ((channels channels) + (previous-channels '())) + ;; Accumulate a list of instances. A list of processed channels is also + ;; accumulated to decide on duplicate channel specifications. + (define-values (resulting-channels instances) + (fold2 (lambda (channel previous-channels instances) + (if (ignore? channel previous-channels) + (values previous-channels instances) + (begin + (format (current-error-port) + (G_ "Updating channel '~a' from Git repository at '~a'...~%") + (channel-name channel) + (channel-url channel)) + (let ((instance (latest-channel-instance store channel))) + (let-values (((new-instances new-channels) + (loop (channel-instance-dependencies instance) + previous-channels))) + (values (append (cons channel new-channels) + previous-channels) + (append (cons instance new-instances) + instances))))))) + previous-channels + '() ;instances + channels)) + + (let ((instance-name (compose channel-name channel-instance-channel))) + ;; Remove all earlier channel specifications if they are followed by a + ;; more specific one. + (values (delete-duplicates instances + (lambda (a b) + (eq? (instance-name a) (instance-name b)))) + resulting-channels)))) (define* (checkout->channel-instance checkout #:key commit -- cgit v1.2.3 From 8d1d56578aa95118650ed2197bfb7fac40f4218a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 20 May 2020 17:57:54 +0200 Subject: git: 'update-cached-checkout' returns the commit relation. * guix/git.scm (update-cached-checkout): Add #:starting-commit parameter. Call 'commit-relation' when #:starting-commit is true. Always return the relation or #f as the third value. (latest-repository-commit): Adjust accordingly. * guix/import/opam.scm (get-opam-repository): Likewise. * tests/channels.scm ("latest-channel-instances includes channel dependencies") ("latest-channel-instances excludes duplicate channel dependencies"): Update mock of 'update-cached-checkout' accordingly. --- guix/channels.scm | 2 +- guix/git.scm | 22 +++++++++++++++++----- guix/import/opam.scm | 2 +- tests/channels.scm | 12 ++++++------ 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index e0a7a84f55..75b767a94c 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -218,7 +218,7 @@ result is unspecified." (and (string=? (basename file) ".git") (eq? 'directory (stat:type stat)))) - (let-values (((checkout commit) + (let-values (((checkout commit relation) (update-cached-checkout (channel-url channel) #:ref (channel-reference channel)))) (when (guix-channel? channel) diff --git a/guix/git.scm b/guix/git.scm index 249d622756..ab3b5075b1 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -262,14 +262,16 @@ definitely available in REPOSITORY, false otherwise." #:key (ref '(branch . "master")) recursive? + starting-commit (log-port (%make-void-port "w")) (cache-directory (url-cache-directory url (%repository-cache-directory) #:recursive? recursive?))) - "Update the cached checkout of URL to REF in CACHE-DIRECTORY. Return two + "Update the cached checkout of URL to REF in CACHE-DIRECTORY. Return three values: the cache directory name, and the SHA1 commit (a string) corresponding -to REF. +to REF, and the relation of the new commit relative to STARTING-COMMIT (if +provided) as returned by 'commit-relation'. REF is pair whose key is [branch | commit | tag | tag-or-commit ] and value the associated data: [ | | | ]. @@ -302,7 +304,17 @@ When RECURSIVE? is true, check out submodules as well, if any." (remote-fetch (remote-lookup repository "origin")))) (when recursive? (update-submodules repository #:log-port log-port)) - (let ((oid (switch-to-ref repository canonical-ref))) + + ;; Note: call 'commit-relation' from here because it's more efficient + ;; than letting users re-open the checkout later on. + (let* ((oid (switch-to-ref repository canonical-ref)) + (new (and starting-commit + (commit-lookup repository oid))) + (old (and starting-commit + (commit-lookup repository + (string->oid starting-commit)))) + (relation (and starting-commit + (commit-relation old new)))) ;; Reclaim file descriptors and memory mappings associated with ;; REPOSITORY as soon as possible. @@ -310,7 +322,7 @@ When RECURSIVE? is true, check out submodules as well, if any." 'repository-close!) (repository-close! repository)) - (values cache-directory (oid->string oid)))))) + (values cache-directory (oid->string oid) relation))))) (define* (latest-repository-commit store url #:key @@ -343,7 +355,7 @@ Log progress and checkout info to LOG-PORT." (format log-port "updating checkout of '~a'...~%" url) (let*-values - (((checkout commit) + (((checkout commit _) (update-cached-checkout url #:recursive? recursive? #:ref ref diff --git a/guix/import/opam.scm b/guix/import/opam.scm index ae7df8a8b5..9cda3da006 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -115,7 +115,7 @@ (define (get-opam-repository) "Update or fetch the latest version of the opam repository and return the path to the repository." - (receive (location commit) + (receive (location commit _) (update-cached-checkout "https://github.com/ocaml/opam-repository") location)) diff --git a/tests/channels.scm b/tests/channels.scm index 910088ba15..3578b57204 100644 --- a/tests/channels.scm +++ b/tests/channels.scm @@ -136,11 +136,11 @@ (url "test"))) (test-dir (channel-instance-checkout instance--simple))) (mock ((guix git) update-cached-checkout - (lambda* (url #:key ref) + (lambda* (url #:key ref starting-commit) (match url - ("test" (values test-dir "caf3cabba9e")) + ("test" (values test-dir "caf3cabba9e" #f)) (_ (values (channel-instance-checkout instance--no-deps) - "abcde1234"))))) + "abcde1234" #f))))) (with-store store (let ((instances (latest-channel-instances store (list channel)))) (and (eq? 2 (length instances)) @@ -155,11 +155,11 @@ (url "test"))) (test-dir (channel-instance-checkout instance--with-dupes))) (mock ((guix git) update-cached-checkout - (lambda* (url #:key ref) + (lambda* (url #:key ref starting-commit) (match url - ("test" (values test-dir "caf3cabba9e")) + ("test" (values test-dir "caf3cabba9e" #f)) (_ (values (channel-instance-checkout instance--no-deps) - "abcde1234"))))) + "abcde1234" #f))))) (with-store store (let ((instances (latest-channel-instances store (list channel)))) (and (= 2 (length instances)) -- cgit v1.2.3 From 872898f768ae6d3b41eb93c5e183624bd1d157ff Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 20 May 2020 22:15:54 +0200 Subject: channels: 'latest-channel-instances' guards against non-forward updates. * guix/channels.scm (latest-channel-instance): Add #:starting-commit and pass it to 'update-cached-checkout'. Return the commit relation as a second value. (ensure-forward-channel-update): New procedure. (latest-channel-instances): Add #:current-channels and #:validate-pull. [current-commit]: New procedure. Pass #:starting-commit to 'latest-channel-instance'. When the returned relation is true, call VALIDATE-PULL. (latest-channel-derivation): Add #:current-channels and #:validate-pull. Pass them to 'latest-channel-instances*'. * tests/channels.scm ("latest-channel-instances #:validate-pull"): New test. --- guix/channels.scm | 91 +++++++++++++++++++++++++++++++++++++++++++++++------- tests/channels.scm | 35 +++++++++++++++++++++ 2 files changed, 115 insertions(+), 11 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index 75b767a94c..70e2d7f07c 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -73,6 +73,7 @@ channel-instances->manifest %channel-profile-hooks channel-instances->derivation + ensure-forward-channel-update profile-channels @@ -212,15 +213,18 @@ result is unspecified." (loop rest))))) (define* (latest-channel-instance store channel - #:key (patches %patches)) - "Return the latest channel instance for CHANNEL." + #:key (patches %patches) + starting-commit) + "Return two values: the latest channel instance for CHANNEL, and its +relation to STARTING-COMMIT when provided." (define (dot-git? file stat) (and (string=? (basename file) ".git") (eq? 'directory (stat:type stat)))) (let-values (((checkout commit relation) (update-cached-checkout (channel-url channel) - #:ref (channel-reference channel)))) + #:ref (channel-reference channel) + #:starting-commit starting-commit))) (when (guix-channel? channel) ;; Apply the relevant subset of PATCHES directly in CHECKOUT. This is ;; safe to do because 'switch-to-ref' eventually does a hard reset. @@ -229,11 +233,51 @@ result is unspecified." (let* ((name (url+commit->name (channel-url channel) commit)) (checkout (add-to-store store name #t "sha256" checkout #:select? (negate dot-git?)))) - (channel-instance channel commit checkout)))) - -(define* (latest-channel-instances store channels) + (values (channel-instance channel commit checkout) + relation)))) + +(define (ensure-forward-channel-update channel start instance relation) + "Raise an error if RELATION is not 'ancestor, meaning that START is not an +ancestor of the commit in INSTANCE, unless CHANNEL specifies a commit. + +This procedure implements a channel update policy meant to be used as a +#:validate-pull argument." + (match relation + ('ancestor #t) + ('self #t) + (_ + (raise (apply make-compound-condition + (condition + (&message (message + (format #f (G_ "\ +aborting update of channel '~a' to commit ~a, which is not a descendant of ~a") + (channel-name channel) + (channel-instance-commit instance) + start)))) + + ;; Don't show the hint when the user explicitly specified a + ;; commit in CHANNEL. + (if (channel-commit channel) + '() + (list (condition + (&fix-hint + (hint (G_ "This could indicate that the channel has +been tampered with and is trying to force a roll-back, preventing you from +getting the latest updates. If you think this is not the case, explicitly +allow non-forward updates."))))))))))) + +(define* (latest-channel-instances store channels + #:key + (current-channels '()) + (validate-pull + ensure-forward-channel-update)) "Return a list of channel instances corresponding to the latest checkouts of -CHANNELS and the channels on which they depend." +CHANNELS and the channels on which they depend. + +CURRENT-CHANNELS is the list of currently used channels. It is compared +against the newly-fetched instances of CHANNELS, and VALIDATE-PULL is called +for each channel update and can choose to emit warnings or raise an error, +depending on the policy it implements." ;; Only process channels that are unique, or that are more specific than a ;; previous channel specification. (define (ignore? channel others) @@ -244,6 +288,13 @@ CHANNELS and the channels on which they depend." (not (or (channel-commit a) (channel-commit b)))))))) + (define (current-commit name) + ;; Return the current commit for channel NAME. + (any (lambda (channel) + (and (eq? (channel-name channel) name) + (channel-commit channel))) + current-channels)) + (let loop ((channels channels) (previous-channels '())) ;; Accumulate a list of instances. A list of processed channels is also @@ -257,7 +308,15 @@ CHANNELS and the channels on which they depend." (G_ "Updating channel '~a' from Git repository at '~a'...~%") (channel-name channel) (channel-url channel)) - (let ((instance (latest-channel-instance store channel))) + (let*-values (((current) + (current-commit (channel-name channel))) + ((instance relation) + (latest-channel-instance store channel + #:starting-commit + current))) + (when relation + (validate-pull channel current instance relation)) + (let-values (((new-instances new-channels) (loop (channel-instance-dependencies instance) previous-channels))) @@ -617,10 +676,20 @@ channel instances." (define latest-channel-instances* (store-lift latest-channel-instances)) -(define* (latest-channel-derivation #:optional (channels %default-channels)) +(define* (latest-channel-derivation #:optional (channels %default-channels) + #:key + (current-channels '()) + (validate-pull + ensure-forward-channel-update)) "Return as a monadic value the derivation that builds the profile for the -latest instances of CHANNELS." - (mlet %store-monad ((instances (latest-channel-instances* channels))) +latest instances of CHANNELS. CURRENT-CHANNELS and VALIDATE-PULL are passed +to 'latest-channel-instances'." + (mlet %store-monad ((instances + (latest-channel-instances* channels + #:current-channels + current-channels + #:validate-pull + validate-pull))) (channel-instances->derivation instances))) (define (profile-channels profile) diff --git a/tests/channels.scm b/tests/channels.scm index 3578b57204..3b141428c8 100644 --- a/tests/channels.scm +++ b/tests/channels.scm @@ -37,6 +37,7 @@ #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (srfi srfi-64) + #:use-module (ice-9 control) #:use-module (ice-9 match)) (test-begin "channels") @@ -178,6 +179,40 @@ "abc1234"))) instances))))))) +(unless (which (git-command)) (test-skip 1)) +(test-equal "latest-channel-instances #:validate-pull" + 'descendant + + ;; Make sure the #:validate-pull procedure receives the right values. + (let/ec return + (with-temporary-git-repository directory + '((add "a.txt" "A") + (commit "first commit") + (add "b.scm" "#t") + (commit "second commit")) + (with-repository directory repository + (let* ((commit1 (find-commit repository "first")) + (commit2 (find-commit repository "second")) + (spec (channel (url (string-append "file://" directory)) + (name 'foo))) + (new (channel (inherit spec) + (commit (oid->string (commit-id commit2))))) + (old (channel (inherit spec) + (commit (oid->string (commit-id commit1)))))) + (define (validate-pull channel current instance relation) + (return (and (eq? channel old) + (string=? (oid->string (commit-id commit2)) + current) + (string=? (oid->string (commit-id commit1)) + (channel-instance-commit instance)) + relation))) + + (with-store store + ;; Attempt a downgrade from NEW to OLD. + (latest-channel-instances store (list old) + #:current-channels (list new) + #:validate-pull validate-pull))))))) + (test-assert "channel-instances->manifest" ;; Compute the manifest for a graph of instances and make sure we get a ;; derivation graph that mirrors the instance graph. This test also ensures -- cgit v1.2.3 From 9744cc7b4636fafb772c94adb8f05961b5b39f16 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 20 May 2020 23:18:09 +0200 Subject: pull: Protect against downgrade attacks. * guix/scripts/pull.scm (%default-options): Add 'validate-pull'. (%options, show-help): Add '--allow-downgrades'. (warn-about-backward-updates): New procedure. (guix-pull): Pass #:current-channels and #:validate-pull to 'latest-channel-instances'. * guix/channels.scm (ensure-forward-channel-update): Add hint for when (channel-commit channel) is true. * doc/guix.texi (Invoking guix pull): Document '--allow-downgrades'. --- doc/guix.texi | 15 +++++++++++++++ guix/channels.scm | 36 ++++++++++++++++++++---------------- guix/scripts/pull.scm | 35 ++++++++++++++++++++++++++++++++--- 3 files changed, 67 insertions(+), 19 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index aa2b316c90..3d1b097447 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3900,6 +3900,21 @@ Use @var{profile} instead of @file{~/.config/guix/current}. Show which channel commit(s) would be used and what would be built or substituted but do not actually do it. +@item --allow-downgrades +Allow pulling older or unrelated revisions of channels than those +currently in use. + +@cindex downgrade attacks, protection against +By default, @command{guix pull} protects against so-called ``downgrade +attacks'' whereby the Git repository of a channel would be reset to an +earlier or unrelated revision of itself, potentially leading you to +install older, known-vulnerable versions of software packages. + +@quotation Note +Make sure you understand its security implications before using +@option{--allow-downgrades}. +@end quotation + @item --system=@var{system} @itemx -s @var{system} Attempt to build for @var{system}---e.g., @code{i686-linux}---instead of diff --git a/guix/channels.scm b/guix/channels.scm index 70e2d7f07c..84c47fc0d0 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -246,25 +246,29 @@ This procedure implements a channel update policy meant to be used as a ('ancestor #t) ('self #t) (_ - (raise (apply make-compound-condition - (condition - (&message (message - (format #f (G_ "\ + (raise (make-compound-condition + (condition + (&message (message + (format #f (G_ "\ aborting update of channel '~a' to commit ~a, which is not a descendant of ~a") - (channel-name channel) - (channel-instance-commit instance) - start)))) - - ;; Don't show the hint when the user explicitly specified a - ;; commit in CHANNEL. - (if (channel-commit channel) - '() - (list (condition - (&fix-hint - (hint (G_ "This could indicate that the channel has + (channel-name channel) + (channel-instance-commit instance) + start)))) + + ;; If the user asked for a specific commit, they might want + ;; that to happen nevertheless, so tell them about the + ;; relevant 'guix pull' option. + (if (channel-commit channel) + (condition + (&fix-hint + (hint (G_ "Use @option{--allow-downgrades} to force +this downgrade.")))) + (condition + (&fix-hint + (hint (G_ "This could indicate that the channel has been tampered with and is trying to force a roll-back, preventing you from getting the latest updates. If you think this is not the case, explicitly -allow non-forward updates."))))))))))) +allow non-forward updates.")))))))))) (define* (latest-channel-instances store channels #:key diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index dfe7ee7ad5..c386d81b8e 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -81,7 +81,8 @@ (multiplexed-build-output? . #t) (graft? . #t) (debug . 0) - (verbosity . 1))) + (verbosity . 1) + (validate-pull . ,ensure-forward-channel-update))) (define (show-help) (display (G_ "Usage: guix pull [OPTION]... @@ -94,6 +95,8 @@ Download and deploy the latest version of Guix.\n")) --commit=COMMIT download the specified COMMIT")) (display (G_ " --branch=BRANCH download the tip of the specified BRANCH")) + (display (G_ " + --allow-downgrades allow downgrades to earlier channel revisions")) (display (G_ " -N, --news display news compared to the previous generation")) (display (G_ " @@ -158,6 +161,10 @@ Download and deploy the latest version of Guix.\n")) (option '("branch") #t #f (lambda (opt name arg result) (alist-cons 'ref `(branch . ,arg) result))) + (option '("allow-downgrades") #f #f + (lambda (opt name arg result) + (alist-cons 'validate-pull warn-about-backward-updates + result))) (option '(#\p "profile") #t #f (lambda (opt name arg result) (alist-cons 'profile (canonicalize-profile arg) @@ -188,6 +195,21 @@ Download and deploy the latest version of Guix.\n")) %standard-build-options)) +(define (warn-about-backward-updates channel start instance relation) + "Warn about non-forward updates of CHANNEL from START to INSTANCE, without +aborting." + (match relation + ((or 'ancestor 'self) + #t) + ('descendant + (warning (G_ "rolling back channel '~a' from ~a to ~a~%") + (channel-name channel) start + (channel-instance-commit instance))) + ('unrelated + (warning (G_ "moving channel '~a' from ~a to unrelated commit ~a~%") + (channel-name channel) start + (channel-instance-commit instance))))) + (define* (display-profile-news profile #:key concise? current-is-newer?) "Display what's up in PROFILE--new packages, and all that. If @@ -749,7 +771,9 @@ Use '~/.config/guix/channels.scm' instead.")) (substitutes? (assoc-ref opts 'substitutes?)) (dry-run? (assoc-ref opts 'dry-run?)) (channels (channel-list opts)) - (profile (or (assoc-ref opts 'profile) %current-profile))) + (profile (or (assoc-ref opts 'profile) %current-profile)) + (current-channels (profile-channels profile)) + (validate-pull (assoc-ref opts 'validate-pull))) (cond ((assoc-ref opts 'query) (process-query opts profile)) ((assoc-ref opts 'generation) @@ -766,7 +790,12 @@ Use '~/.config/guix/channels.scm' instead.")) (ensure-default-profile) (honor-x509-certificates store) - (let ((instances (latest-channel-instances store channels))) + (let ((instances + (latest-channel-instances store channels + #:current-channels + current-channels + #:validate-pull + validate-pull))) (format (current-error-port) (N_ "Building from this channel:~%" "Building from these channels:~%" -- cgit v1.2.3 From e451612602c5ae8bca1e56492bbfa7b2fe434cbd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 24 May 2020 23:56:02 +0200 Subject: gnu: libgphoto2: Update to 2.5.25. * gnu/packages/photo.scm (libgphoto2): Update to 2.5.25. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 59947964a3..dfd45fd06b 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -228,14 +228,14 @@ data as produced by digital cameras.") (define-public libgphoto2 (package (name "libgphoto2") - (version "2.5.24") + (version "2.5.25") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/libgphoto/" version "/libgphoto2-" version ".tar.bz2")) (sha256 (base32 - "0cgvsk06c4kcfj16plc27nm7g16r9ci0y4k83sf3iyphd63mfg7x")))) + "0fkz2rx7xlmr6zl6f56hhxps6bx16dwcw5pyd8c2icf273s9h3kw")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 8bd0b533b30d7ee5e03aee99a2eb96d5b0b1c836 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 May 2020 00:12:06 +0200 Subject: gnu: libexif: Update to 0.6.22 [security fixes]. This fixes CVE-2020-13114, CVE-2020-13113, CVE-2020-13112, CVE-2020-0093, CVE-2019-9278, and CVE-2020-12767. * gnu/packages/patches/libexif-CVE-2016-6328.patch, gnu/packages/patches/libexif-CVE-2017-7544.patch, gnu/packages/patches/libexif-CVE-2018-20030.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/photo.scm (libexif): Update to 0.6.22. [source](uri): Adjust for upstream GitHub migration. --- gnu/local.mk | 3 - gnu/packages/patches/libexif-CVE-2016-6328.patch | 72 ------------- gnu/packages/patches/libexif-CVE-2017-7544.patch | 29 ------ gnu/packages/patches/libexif-CVE-2018-20030.patch | 120 ---------------------- gnu/packages/photo.scm | 14 +-- 5 files changed, 7 insertions(+), 231 deletions(-) delete mode 100644 gnu/packages/patches/libexif-CVE-2016-6328.patch delete mode 100644 gnu/packages/patches/libexif-CVE-2017-7544.patch delete mode 100644 gnu/packages/patches/libexif-CVE-2018-20030.patch diff --git a/gnu/local.mk b/gnu/local.mk index f4326d4db8..ef4c5d2dcb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1167,9 +1167,6 @@ dist_patch_DATA = \ %D%/packages/patches/libbonobo-activation-test-race.patch \ %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \ %D%/packages/patches/libdrm-symbol-check.patch \ - %D%/packages/patches/libexif-CVE-2016-6328.patch \ - %D%/packages/patches/libexif-CVE-2017-7544.patch \ - %D%/packages/patches/libexif-CVE-2018-20030.patch \ %D%/packages/patches/libextractor-exiv2.patch \ %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ diff --git a/gnu/packages/patches/libexif-CVE-2016-6328.patch b/gnu/packages/patches/libexif-CVE-2016-6328.patch deleted file mode 100644 index 67fee0f528..0000000000 --- a/gnu/packages/patches/libexif-CVE-2016-6328.patch +++ /dev/null @@ -1,72 +0,0 @@ -Fix CVE-2016-6328: - -https://bugzilla.redhat.com/show_bug.cgi?id=1366239 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-6328 - -Patch copied from upstream source repository: - -https://github.com/libexif/libexif/commit/41bd04234b104312f54d25822f68738ba8d7133d - -From 41bd04234b104312f54d25822f68738ba8d7133d Mon Sep 17 00:00:00 2001 -From: Marcus Meissner -Date: Tue, 25 Jul 2017 23:44:44 +0200 -Subject: [PATCH] fixes some (not all) buffer overreads during decoding pentax - makernote entries. - -This should fix: -https://sourceforge.net/p/libexif/bugs/125/ CVE-2016-6328 ---- - libexif/pentax/mnote-pentax-entry.c | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c -index d03d159..ea0429a 100644 ---- a/libexif/pentax/mnote-pentax-entry.c -+++ b/libexif/pentax/mnote-pentax-entry.c -@@ -425,24 +425,34 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, - case EXIF_FORMAT_SHORT: - { - const unsigned char *data = entry->data; -- size_t k, len = strlen(val); -+ size_t k, len = strlen(val), sizeleft; -+ -+ sizeleft = entry->size; - for(k=0; kcomponents; k++) { -+ if (sizeleft < 2) -+ break; - vs = exif_get_short (data, entry->order); - snprintf (val+len, maxlen-len, "%i ", vs); - len = strlen(val); - data += 2; -+ sizeleft -= 2; - } - } - break; - case EXIF_FORMAT_LONG: - { - const unsigned char *data = entry->data; -- size_t k, len = strlen(val); -+ size_t k, len = strlen(val), sizeleft; -+ -+ sizeleft = entry->size; - for(k=0; kcomponents; k++) { -+ if (sizeleft < 4) -+ break; - vl = exif_get_long (data, entry->order); - snprintf (val+len, maxlen-len, "%li", (long int) vl); - len = strlen(val); - data += 4; -+ sizeleft -= 4; - } - } - break; -@@ -455,5 +465,5 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, - break; - } - -- return (val); -+ return val; - } --- -2.16.0 - diff --git a/gnu/packages/patches/libexif-CVE-2017-7544.patch b/gnu/packages/patches/libexif-CVE-2017-7544.patch deleted file mode 100644 index c4ea373dc5..0000000000 --- a/gnu/packages/patches/libexif-CVE-2017-7544.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix CVE-2017-7544: - -https://sourceforge.net/p/libexif/bugs/130/ -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7544 - -Patch copied from upstream bug tracker: - -https://sourceforge.net/p/libexif/bugs/130/#489a - -Index: libexif/exif-data.c -=================================================================== -RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v -retrieving revision 1.131 -diff -u -r1.131 exif-data.c ---- a/libexif/exif-data.c 12 Jul 2012 17:28:26 -0000 1.131 -+++ b/libexif/exif-data.c 25 Jul 2017 21:34:06 -0000 -@@ -255,6 +255,12 @@ - exif_mnote_data_set_offset (data->priv->md, *ds - 6); - exif_mnote_data_save (data->priv->md, &e->data, &e->size); - e->components = e->size; -+ if (exif_format_get_size (e->format) != 1) { -+ /* e->format is taken from input code, -+ * but we need to make sure it is a 1 byte -+ * entity due to the multiplication below. */ -+ e->format = EXIF_FORMAT_UNDEFINED; -+ } - } - } - diff --git a/gnu/packages/patches/libexif-CVE-2018-20030.patch b/gnu/packages/patches/libexif-CVE-2018-20030.patch deleted file mode 100644 index 57e4746b58..0000000000 --- a/gnu/packages/patches/libexif-CVE-2018-20030.patch +++ /dev/null @@ -1,120 +0,0 @@ -https://github.com/libexif/libexif/commit/6aa11df549114ebda520dde4cdaea2f9357b2c89.patch - -NEWS section was removed -'12' -> '30' on line 79 - -From 6aa11df549114ebda520dde4cdaea2f9357b2c89 Mon Sep 17 00:00:00 2001 -From: Dan Fandrich -Date: Fri, 12 Oct 2018 16:01:45 +0200 -Subject: [PATCH] Improve deep recursion detection in - exif_data_load_data_content. - -The existing detection was still vulnerable to pathological cases -causing DoS by wasting CPU. The new algorithm takes the number of tags -into account to make it harder to abuse by cases using shallow recursion -but with a very large number of tags. This improves on commit 5d28011c -which wasn't sufficient to counter this kind of case. - -The limitation in the previous fix was discovered by Laurent Delosieres, -Secunia Research at Flexera (Secunia Advisory SA84652) and is assigned -the identifier CVE-2018-20030. ---- - NEWS | 1 + - libexif/exif-data.c | 45 +++++++++++++++++++++++++++++++++++++-------- - 2 files changed, 38 insertions(+), 8 deletions(-) - -diff --git a/libexif/exif-data.c b/libexif/exif-data.c -index e35403d..a6f9c94 100644 ---- a/libexif/exif-data.c -+++ b/libexif/exif-data.c -@@ -35,6 +35,7 @@ - #include - #include - -+#include - #include - #include - #include -@@ -350,6 +351,20 @@ if (data->ifd[(i)]->count) { \ - break; \ - } - -+/*! Calculate the recursion cost added by one level of IFD loading. -+ * -+ * The work performed is related to the cost in the exponential relation -+ * work=1.1**cost -+ */ -+static unsigned int -+level_cost(unsigned int n) -+{ -+ static const double log_1_1 = 0.09531017980432493; -+ -+ /* Adding 0.1 protects against the case where n==1 */ -+ return ceil(log(n + 0.1)/log_1_1); -+} -+ - /*! Load data for an IFD. - * - * \param[in,out] data #ExifData -@@ -357,13 +372,13 @@ if (data->ifd[(i)]->count) { \ - * \param[in] d pointer to buffer containing raw IFD data - * \param[in] ds size of raw data in buffer at \c d - * \param[in] offset offset into buffer at \c d at which IFD starts -- * \param[in] recursion_depth number of times this function has been -- * recursively called without returning -+ * \param[in] recursion_cost factor indicating how expensive this recursive -+ * call could be - */ - static void - exif_data_load_data_content (ExifData *data, ExifIfd ifd, - const unsigned char *d, -- unsigned int ds, unsigned int offset, unsigned int recursion_depth) -+ unsigned int ds, unsigned int offset, unsigned int recursion_cost) - { - ExifLong o, thumbnail_offset = 0, thumbnail_length = 0; - ExifShort n; -@@ -378,9 +393,20 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, - if ((((int)ifd) < 0) || ( ((int)ifd) >= EXIF_IFD_COUNT)) - return; - -- if (recursion_depth > 30) { -+ if (recursion_cost > 170) { -+ /* -+ * recursion_cost is a logarithmic-scale indicator of how expensive this -+ * recursive call might end up being. It is an indicator of the depth of -+ * recursion as well as the potential for worst-case future recursive -+ * calls. Since it's difficult to tell ahead of time how often recursion -+ * will occur, this assumes the worst by assuming every tag could end up -+ * causing recursion. -+ * The value of 170 was chosen to limit typical EXIF structures to a -+ * recursive depth of about 6, but pathological ones (those with very -+ * many tags) to only 2. -+ */ - exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", -- "Deep recursion detected!"); -+ "Deep/expensive recursion detected!"); - return; - } - -@@ -422,15 +448,18 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, - switch (tag) { - case EXIF_TAG_EXIF_IFD_POINTER: - CHECK_REC (EXIF_IFD_EXIF); -- exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_GPS_INFO_IFD_POINTER: - CHECK_REC (EXIF_IFD_GPS); -- exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_INTEROPERABILITY_IFD_POINTER: - CHECK_REC (EXIF_IFD_INTEROPERABILITY); -- exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, recursion_depth + 1); -+ exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, -+ recursion_cost + level_cost(n)); - break; - case EXIF_TAG_JPEG_INTERCHANGE_FORMAT: - thumbnail_offset = o; diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index dfd45fd06b..4904fa1db1 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -206,17 +206,17 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).") (define-public libexif (package (name "libexif") - (version "0.6.21") + (version "0.6.22") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/libexif/libexif/" - version "/libexif-" version ".tar.bz2")) - (patches (search-patches "libexif-CVE-2016-6328.patch" - "libexif-CVE-2017-7544.patch" - "libexif-CVE-2018-20030.patch")) + (uri (string-append + "https://github.com/libexif/libexif/releases" + "/download/libexif-" + (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) + "-release/libexif-" version ".tar.xz")) (sha256 (base32 - "06nlsibr3ylfwp28w8f5466l6drgrnydgxrm4jmxzrmk5svaxk8n")))) + "0mhcad5zab7fsn120rd585h8ncwkq904nzzrq8vcd72hzk4g2j2h")))) (build-system gnu-build-system) (home-page "https://libexif.github.io/") (synopsis "Read and manipulate EXIF data in digital photographs") -- cgit v1.2.3 From 632a001bce31c4286e9ed8f60e665f45b31f7970 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 09:01:48 +0300 Subject: gnu: enlightenment: Fix screen unlocking. Without this the password is never collected and checked. * gnu/packages/patches/enlightenment-fix-setuid-path.patch: Fix patch so that it collects the entered password. --- gnu/packages/patches/enlightenment-fix-setuid-path.patch | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/gnu/packages/patches/enlightenment-fix-setuid-path.patch b/gnu/packages/patches/enlightenment-fix-setuid-path.patch index f2930845ba..a0efb29857 100644 --- a/gnu/packages/patches/enlightenment-fix-setuid-path.patch +++ b/gnu/packages/patches/enlightenment-fix-setuid-path.patch @@ -1,26 +1,24 @@ diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c -index 8b0aa6641..f15d2c2a2 100644 +index 8b0aa6641..3dff0ad84 100644 --- a/src/bin/e_auth.c +++ b/src/bin/e_auth.c -@@ -11,9 +11,7 @@ e_auth_begin(char *passwd) - pwlen = strlen(passwd); +@@ -12,8 +12,7 @@ e_auth_begin(char *passwd) if (pwlen == 0) goto out; -- snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), - "%s/enlightenment/utils/enlightenment_ckpasswd pw", - e_prefix_lib_get()); -+ snprintf(buf, sizeof(buf), "/run/setuid-programs/enlightenment_ckpasswd"); ++ "/run/setuid-programs/enlightenment_ckpasswd pw"); exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL); if (!exe) goto out; if (ecore_exe_send(exe, passwd, pwlen) != EINA_TRUE) goto out; -@@ -46,9 +44,7 @@ e_auth_polkit_begin(char *passwd, const char *cookie, unsigned int uid) - pwlen = strlen(passwd); +@@ -47,8 +46,7 @@ e_auth_polkit_begin(char *passwd, const char *cookie, unsigned int uid) if (pwlen == 0) goto out; -- snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), - "%s/enlightenment/utils/enlightenment_ckpasswd pk", - e_prefix_lib_get()); -+ snprintf(buf, sizeof(buf), "/run/setuid-programs/enlightenment_ckpasswd"); ++ "/run/setuid-programs/enlightenment_ckpasswd pk"); exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL); if (!exe) goto out; snprintf(buf, sizeof(buf), "%s %u %s", cookie, uid, passwd); -- cgit v1.2.3 From 9813805b30dad444984111d5413b8ab7356f7908 Mon Sep 17 00:00:00 2001 From: Josh Marshall Date: Sun, 24 May 2020 18:47:53 -0400 Subject: Updating python-argon2-cffi to 20.1.0 Signed-off-by: Efraim Flashner --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index e6208ab3d9..fc451e83ef 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1365,14 +1365,14 @@ I/O-free core, and integration modules for different event loops.") (define-public python-argon2-cffi (package (name "python-argon2-cffi") - (version "19.2.0") + (version "20.1.0") (source (origin (method url-fetch) (uri (pypi-uri "argon2-cffi" version)) (sha256 (base32 - "18xxfw30gi3lwaz4vwb05iavzlrk3fa1x9fippzrgd3px8z65apz")) + "0zgr4mnnm0p4i99023safb0qb8cgvl202nly1rvylk2b7qnrn0nq")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "extras") #t)))) (build-system python-build-system) -- cgit v1.2.3 From 868a18642318edc87e38d04697647aba2ca93b34 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 25 May 2020 10:55:45 +0200 Subject: gnu: emacs-helm-emms: Update to 20200322. * gnu/packages/emacs-xyz.scm (emacs-helm-emms): Update to 20200322. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 18c19740e9..6e0f768dbe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16457,10 +16457,10 @@ you searched for and execute it, or view its documentation.") (license license:gpl3+)))) (define-public emacs-helm-emms - (let ((commit "b785cb845a98a643eba9d5d53c9c0b4e6810a3cd")) + (let ((commit "37e5aa029abfa5a5c48636314de8157142944fa2")) (package (name "emacs-helm-emms") - (version (git-version "1.3" "2" commit)) + (version (git-version "1.3" "3" commit)) (source (origin (method git-fetch) @@ -16470,7 +16470,7 @@ you searched for and execute it, or view its documentation.") (file-name (git-file-name name version)) (sha256 (base32 - "1595r09y3rmwd46nnhvjja3hb8j2ila295ijxv61cg52ws4wginh")))) + "0r1ai6xhzayyik30w2sx9n62bxxwm12vfmjspv0daqif9az8y3vg")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) -- cgit v1.2.3 From 607bfab5ec8f096c651bd44d4fbc8e568279327d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 14:16:38 +0300 Subject: gnu: efl: Update to 1.24.2. * gnu/packages/enlightenment.scm (efl): Update to 1.24.2. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 08a52f9d92..4d8c12ed3b 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -69,7 +69,7 @@ (define-public efl (package (name "efl") - (version "1.24.1") + (version "1.24.2") (source (origin (method url-fetch) (uri (string-append @@ -77,7 +77,7 @@ version ".tar.xz")) (sha256 (base32 - "1xsbz5kl74cgzyzwmjy3p50m0iigvi53lklkp92v49k4j99zpak7")))) + "0w3srvigg4kfi7xq76c7y4hnq5yr2gxrrsvlyj1g2wc1igz1vyg1")))) (build-system meson-build-system) (native-inputs `(("check" ,check) -- cgit v1.2.3 From 0b96705889df3d2fb9a14ec73213d137a256986c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 14:20:53 +0300 Subject: gnu: tensorflow: Fix build with python-3.8. * gnu/packages/machine-learning.scm (tensorflow)[arguments]: Also import python-version from python-build-system. Adjust 'python3.7-compatibility to also add python-3.8 compatibility. Adjust 'install-python to not hardcode the python version. --- gnu/packages/machine-learning.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 6552d171bf..cf00a84e86 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1403,7 +1403,11 @@ Python.") (list "CC=gcc") #:modules ((ice-9 ftw) (guix build utils) - (guix build cmake-build-system)) + (guix build cmake-build-system) + ((guix build python-build-system) + #:select (python-version))) + #:imported-modules (,@%cmake-build-system-modules + (guix build python-build-system)) #:phases (modify-phases %standard-phases (add-after 'unpack 'set-source-file-times-to-1980 @@ -1428,6 +1432,12 @@ Python.") ;; optional package. (substitute* "tensorflow/tools/pip_package/setup.py" ((".*'tensorboard >.*") "")) + + ;; Fix the build with python-3.8, taken from rejected upstream patch: + ;; https://github.com/tensorflow/tensorflow/issues/34197 + (substitute* (find-files "tensorflow/python" ".*\\.cc$") + (("(nullptr,)(\\ +/. tp_print)" _ _ tp_print) + (string-append "NULL, " tp_print))) #t)) (add-after 'python3.7-compatibility 'chdir (lambda _ (chdir "tensorflow/contrib/cmake") #t)) @@ -1617,16 +1627,19 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n"))) (invoke "make" "tf_python_build_pip_package") #t)) (add-after 'build-pip-package 'install-python - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (wheel (car (find-files "../build/tf_python/dist/" "\\.whl$")))) + (wheel (car (find-files "../build/tf_python/dist/" "\\.whl$"))) + (python-version (python-version + (assoc-ref inputs "python")))) (invoke "python" "-m" "pip" "install" wheel (string-append "--prefix=" out)) ;; XXX: broken RUNPATH, see fix-python-build phase. (delete-file (string-append - out "/lib/python3.7/site-packages/tensorflow/contrib/" + out "/lib/python" python-version + "/site-packages/tensorflow/contrib/" "seq2seq/python/ops/lib_beam_search_ops.so")) #t)))))) (native-inputs -- cgit v1.2.3 From 5856db313d7e6973506fc6272fdf3eb4efd1d109 Mon Sep 17 00:00:00 2001 From: Ryan Desfosses Date: Mon, 25 May 2020 13:40:20 +0200 Subject: gnu: Add emacs-interleave. * gnu/packages/emacs-xyz.scm (emacs-interleave): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6e0f768dbe..5dbb48bb0e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -71,6 +71,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 pinoaffe ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020 Ryan Desfosses ;;; ;;; This file is part of GNU Guix. ;;; @@ -6076,6 +6077,28 @@ the Hydra very seamless; it's like a minor mode that disables itself automatically.") (license license:gpl3+))) +(define-public emacs-interleave + (package + (name "emacs-interleave") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/rudolfochrist/interleave") + (commit (string-append "interleave-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0l5b681mrpk12lx5c16m7kc13p29z6zismwg1llsjg7cdmrmsrcb")))) + (build-system emacs-build-system) + (home-page "https://github.com/rudolfochrist/interleave") + (synopsis "Emacs minor mode to interleave notes and text books") + (description + "Interleave is a minor mode that presents a document viewer side +by side to an Org buffer with your notes relevant to the current page.") + (license license:gpl3+))) + (define-public emacs-ivy (package (name "emacs-ivy") -- cgit v1.2.3 From ba2104aaa378bda6075a2093a4fc4851505aa789 Mon Sep 17 00:00:00 2001 From: zimoun Date: Fri, 22 May 2020 02:03:42 +0200 Subject: doc: Fix typos. * doc/guix.texi: Fix typos. * doc/contributing.texi: Fix typos. Signed-off-by: Julien Lepiller --- doc/contributing.texi | 2 +- doc/guix.texi | 86 +++++++++++++++++++++++++-------------------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index 7b1f7e7c94..25b50e8e72 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -501,7 +501,7 @@ It is a good idea to strip commit identifiers in the @code{version} field to, say, 7 digits. It avoids an aesthetic annoyance (assuming aesthetics have a role to play here) as well as problems related to OS limits such as the maximum shebang length (127 bytes for the Linux -kernel.) It is best to use the full commit identifiers in +kernel). It is best to use the full commit identifiers in @code{origin}s, though, to avoid ambiguities. A typical package definition may look like this: diff --git a/doc/guix.texi b/doc/guix.texi index 3d1b097447..4dbbf96db9 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -609,7 +609,7 @@ you may have to run @code{su -} or @code{sudo -i}. As @code{root}, run: This creates @file{/gnu/store} (@pxref{The Store}) and @file{/var/guix}. The latter contains a ready-to-use profile for @code{root} (see next -step.) +step). Do @emph{not} unpack the tarball on a working Guix system since that would overwrite its own essential files. @@ -617,10 +617,10 @@ would overwrite its own essential files. The @option{--warning=no-timestamp} option makes sure GNU@tie{}tar does not emit warnings about ``implausibly old time stamps'' (such warnings were triggered by GNU@tie{}tar 1.26 and older; recent -versions are fine.) +versions are fine). They stem from the fact that all the files in the archive have their modification time set to zero (which -means January 1st, 1970.) This is done on purpose to make sure the +means January 1st, 1970). This is done on purpose to make sure the archive content is independent of its creation time, thus making it reproducible. @@ -705,7 +705,7 @@ there: That way, assuming @file{/usr/local/share/info} is in the search path, running @command{info guix} will open this manual (@pxref{Other Info Directories,,, texinfo, GNU Texinfo}, for more details on changing the -Info search path.) +Info search path). @item @cindex substitutes, authorization thereof @@ -1363,7 +1363,7 @@ build failed and the client specified @option{--keep-failed} (@pxref{Invoking guix build, @option{--keep-failed}}). The daemon listens for connections and spawns one sub-process for each session -started by a client (one of the @command{guix} sub-commands.) The +started by a client (one of the @command{guix} sub-commands). The @command{guix processes} command allows you to get an overview of the activity on your system by viewing each of the active sessions and clients. @xref{Invoking guix processes}, for more information. @@ -2292,7 +2292,7 @@ mkfs.ext4 -L my-root /dev/sda2 If you are instead planning to encrypt the root partition, you can use the Cryptsetup/LUKS utilities to do that (see @inlinefmtifelse{html, @uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}}, -@code{man cryptsetup}} for more information.) Assuming you want to +@code{man cryptsetup}} for more information). Assuming you want to store the root partition on @file{/dev/sda2}, the command sequence would be along these lines: @@ -2764,7 +2764,7 @@ Install the specified @var{package}s. Each @var{package} may specify either a simple package name, such as @code{guile}, or a package name followed by an at-sign and version number, such as @code{guile@@1.8.8} or simply @code{guile@@1.8} (in the latter -case, the newest version prefixed by @code{1.8} is selected.) +case, the newest version prefixed by @code{1.8} is selected). If no version number is specified, the newest available version will be selected. In addition, @var{package} @@ -3368,7 +3368,7 @@ When using HTTPS, the server's X.509 certificate is @emph{not} validated HTTPS clients such as Web browsers usually do. This is because Guix authenticates substitute information itself, as explained above, which is what we care about (whereas X.509 certificates are about -authenticating bindings between domain names and public keys.) +authenticating bindings between domain names and public keys). @node Proxy Settings @subsection Proxy Settings @@ -4578,7 +4578,7 @@ The main options are: @table @code @item --export -Export the specified store files or packages (see below.) Write the +Export the specified store files or packages (see below). Write the resulting archive to the standard output. Dependencies are @emph{not} included in the output, unless @@ -4595,7 +4595,7 @@ exported store items. Read an archive from the standard input, and import the files listed therein into the store. Abort if the archive has an invalid digital signature, or if it is signed by a public key not among the authorized -keys (see @option{--authorize} below.) +keys (see @option{--authorize} below). @item --missing Read a list of store file names from the standard input, one per line, @@ -4611,7 +4611,7 @@ to generate the key pair. The generated key pair is typically stored under @file{/etc/guix}, in @file{signing-key.pub} (public key) and @file{signing-key.sec} (private -key, which must be kept secret.) When @var{parameters} is omitted, +key, which must be kept secret). When @var{parameters} is omitted, an ECDSA key using the Ed25519 curve is generated, or, for Libgcrypt versions before 1.6.0, it is a 4096-bit RSA key. Alternatively, @var{parameters} can specify @@ -4927,7 +4927,7 @@ interpreted as packages that will be added to the environment directly. @item --pure Unset existing environment variables when building the new environment, except -those specified with @option{--preserve} (see below.) This has the effect of +those specified with @option{--preserve} (see below). This has the effect of creating an environment in which search paths only contain package inputs. @item --preserve=@var{regexp} @@ -4945,7 +4945,7 @@ guix environment --pure --preserve=^SLURM --ad-hoc openmpi @dots{} \ This example runs @command{mpirun} in a context where the only environment variables defined are @env{PATH}, environment variables whose name starts with @samp{SLURM}, as well as the usual ``precious'' variables (@env{HOME}, -@env{USER}, etc.) +@env{USER}, etc.). @item --search-paths Display the environment variable definitions that make up the @@ -4966,7 +4966,7 @@ directory is created that matches the current user's home directory, and The spawned process runs as the current user outside the container. Inside the container, it has the same UID and GID as the current user, unless -@option{--user} is passed (see below.) +@option{--user} is passed (see below). @item --network @itemx -N @@ -5867,7 +5867,7 @@ Lastly, @code{propagated-inputs} is similar to @code{inputs}, but the specified packages will be automatically installed alongside the package they belong to (@pxref{package-cmd-propagated-inputs, @command{guix package}}, for information on how @command{guix package} deals with -propagated inputs.) +propagated inputs). For example this is necessary when a C/C++ library needs headers of another library to compile, or when a pkg-config file refers to another @@ -7070,7 +7070,7 @@ argument. Return @code{#t} when @var{path} designates a valid store item and @code{#f} otherwise (an invalid item may exist on disk but still be invalid, for instance because it is the result of an aborted or failed -build.) +build). A @code{&store-protocol-error} condition is raised if @var{path} is not prefixed by the store directory (@file{/gnu/store}). @@ -7115,7 +7115,7 @@ directory in the store, but may produce more. @cindex dependencies, build-time The inputs of the derivations---i.e., its build-time dependencies---which may be other derivations or plain files in the store (patches, build scripts, -etc.) +etc.). @item The system type targeted by the derivation---e.g., @code{x86_64-linux}. @@ -7537,7 +7537,7 @@ The store monad---an alias for @code{%state-monad}. Values in the store monad encapsulate accesses to the store. When its effect is needed, a value of the store monad must be ``evaluated'' by -passing it to the @code{run-with-store} procedure (see below.) +passing it to the @code{run-with-store} procedure (see below). @end defvr @deffn {Scheme Procedure} run-with-store @var{store} @var{mval} [#:guile-for-build] [#:system (%current-system)] @@ -7675,7 +7675,7 @@ into gexps. For example, a useful type of high-level objects that can be inserted in a gexp is ``file-like objects'', which make it easy to add files to the store and to refer to them in derivations and such (see @code{local-file} and @code{plain-file} -below.) +below). To illustrate the idea, here is an example of a gexp: @@ -7846,7 +7846,7 @@ Like the above, but refers to native builds of the objects listed in @end table G-expressions created by @code{gexp} or @code{#~} are run-time objects -of the @code{gexp?} type (see below.) +of the @code{gexp?} type (see below). @end deffn @deffn {Scheme Syntax} with-imported-modules @var{modules} @var{body}@dots{} @@ -7892,7 +7892,7 @@ Return @code{#t} if @var{obj} is a G-expression. G-expressions are meant to be written to disk, either as code building some derivation, or as plain files in the store. The monadic procedures below allow you to do that (@pxref{The Store Monad}, for more -information about monads.) +information about monads). @deffn {Monadic Procedure} gexp->derivation @var{name} @var{exp} @ [#:system (%current-system)] [#:target #f] [#:graft? #t] @ @@ -8903,7 +8903,7 @@ guix build --log-file -e '(@@ (gnu packages guile) guile-2.0)' If a log is unavailable locally, and unless @option{--no-substitutes} is passed, the command looks for a corresponding log on one of the -substitute servers (as specified with @option{--substitute-urls}.) +substitute servers (as specified with @option{--substitute-urls}). So for instance, imagine you want to see the build log of GDB on MIPS, but you are actually on an @code{x86_64} machine: @@ -9142,7 +9142,7 @@ hash (@pxref{Invoking guix archive}). @item --exclude-vcs @itemx -x When combined with @option{--recursive}, exclude version control system -directories (@file{.bzr}, @file{.git}, @file{.hg}, etc.) +directories (@file{.bzr}, @file{.git}, @file{.hg}, etc.). @vindex git-fetch As an example, here is how you would compute the hash of a Git checkout, @@ -9675,7 +9675,7 @@ guix refresh -l -e '(@@@@ (gnu packages commencement) glibc-final)' @end example This command lists the dependents of the ``final'' libc (essentially all -the packages.) +the packages). @item --update @itemx -u @@ -9782,7 +9782,7 @@ be used when passing @command{guix refresh} one or more package names: @item --list-updaters @itemx -L -List available updaters and exit (see @option{--type} above.) +List available updaters and exit (see @option{--type} above). For each updater, display the fraction of packages it covers; at the end, display the fraction of packages covered by all these updaters. @@ -9846,7 +9846,7 @@ When this option is omitted, @command{guix refresh} uses @file{~/.config/guix/upstream/trustedkeys.kbx} as the keyring for upstream signing keys. OpenPGP signatures are checked against keys from this keyring; missing keys are downloaded to this keyring as well (see -@option{--key-download} below.) +@option{--key-download} below). You can export keys from your default GPG keyring into a keybox file using commands like this one: @@ -10258,7 +10258,7 @@ guix graph --type=reverse-package ocaml ...@: yields the graph of packages that @emph{explicitly} depend on OCaml (if you are also interested in cases where OCaml is an implicit dependency, see -@code{reverse-bag} below.) +@code{reverse-bag} below). Note that for core packages this can yield huge graphs. If all you want is to know the number of packages that depend on a given package, use @@ -10832,7 +10832,7 @@ When a difference is found between the hash of a locally-built item and that of a server-provided substitute, or among substitutes provided by different servers, the command displays it as in the example above and its exit code is 2 (other non-zero exit codes denote other kinds of -errors.) +errors). The one option that matters is: @@ -11158,7 +11158,7 @@ integration tool; their process identifier (PID) is given by the The @code{LockHeld} fields show which store items are currently locked by this session, which corresponds to store items being built or substituted (the @code{LockHeld} field is not displayed when @command{guix processes} is not -running as root.) Last, by looking at the @code{ChildProcess} field, we +running as root). Last, by looking at the @code{ChildProcess} field, we understand that these three builds are being offloaded (@pxref{Daemon Offload Setup}). @@ -11800,7 +11800,7 @@ variables. @defvr {Scheme Variable} %base-file-systems These are essential file systems that are required on normal systems, such as @code{%pseudo-terminal-file-system} and @code{%immutable-store} (see -below.) Operating system declarations should always contain at least +below). Operating system declarations should always contain at least these. @end defvr @@ -12629,7 +12629,7 @@ Since this is part of @code{%base-services}, you can use @code{modify-services} to customize the set of special files (@pxref{Service Reference, @code{modify-services}}). But the simple way to add a special file is @i{via} the @code{extra-special-file} procedure -(see below.) +(see below). @end defvr @deffn {Scheme Procedure} extra-special-file @var{file} @var{target} @@ -14940,7 +14940,7 @@ definition (@pxref{operating-system Reference, system-wide packages}). This is the type for the @uref{https://wiki.gnome.org/Projects/GDM/, GNOME Desktop Manager} (GDM), a program that manages graphical display servers and handles graphical user logins. Its value must be a @code{gdm-configuration} -(see below.) +(see below). @cindex session types (X11) @cindex X11 session types @@ -16211,7 +16211,7 @@ gnome-session``. Currently only GNOME has support for Wayland. @defvr {Scheme Variable} gnome-desktop-service-type This is the type of the service that adds the @uref{https://www.gnome.org, GNOME} desktop environment. Its value is a @code{gnome-desktop-configuration} -object (see below.) +object (see below). This service adds the @code{gnome} package to the system profile, and extends polkit with the actions from @code{gnome-settings-daemon}. @@ -16229,7 +16229,7 @@ The GNOME package to use. @defvr {Scheme Variable} xfce-desktop-service-type This is the type of a service to run the @uref{Xfce, https://xfce.org/} desktop environment. Its value is an @code{xfce-desktop-configuration} object -(see below.) +(see below). This service adds the @code{xfce} package to the system profile, and extends polkit with the ability for @code{thunar} to manipulate the file @@ -16249,7 +16249,7 @@ The Xfce package to use. @deffn {Scheme Variable} mate-desktop-service-type This is the type of the service that runs the @uref{https://mate-desktop.org/, MATE desktop environment}. Its value is a @code{mate-desktop-configuration} -object (see below.) +object (see below). This service adds the @code{mate} package to the system profile, and extends polkit with the actions from @@ -16563,7 +16563,7 @@ Users need to be in the @code{lp} group to access the D-Bus service. @defvr {Scheme Variable} gnome-keyring-service-type This is the type of the service that adds the @uref{https://wiki.gnome.org/Projects/GnomeKeyring, GNOME Keyring}. Its -value is a @code{gnome-keyring-configuration} object (see below.) +value is a @code{gnome-keyring-configuration} object (see below). This service adds the @code{gnome-keyring} package to the system profile and extends PAM with entries using @code{pam_gnome_keyring.so}, unlocking @@ -22310,10 +22310,10 @@ configuration: Note that ddclient needs to access credentials that are stored in a @dfn{secret file}, by default @file{/etc/ddclient/secrets} (see -@code{secret-file} below.) You are expected to create this file manually, in +@code{secret-file} below). You are expected to create this file manually, in an ``out-of-band'' fashion (you @emph{could} make this file part of the service configuration, for instance by using @code{plain-file}, but it will be -world-readable @i{via} @file{/gnu/store}.) See the examples in the +world-readable @i{via} @file{/gnu/store}). See the examples in the @file{share/ddclient} directory of the @code{ddclient} package. @c %start of fragment @@ -26388,7 +26388,7 @@ password, and which needs to access the @file{/etc/passwd} and obvious security reasons. To address that, these executables are @dfn{setuid-root}, meaning that they always run with root privileges (@pxref{How Change Persona,,, libc, The GNU C Library Reference Manual}, -for more info about the setuid mechanism.) +for more info about the setuid mechanism). The store itself @emph{cannot} contain setuid programs: that would be a security issue since any user on the system can write derivations that @@ -27525,7 +27525,7 @@ each other: Emit in Dot/Graphviz format to standard output the @dfn{service extension graph} of the operating system defined in @var{file} (@pxref{Service Composition}, for more information on service -extensions.) +extensions). The command: @@ -28086,7 +28086,7 @@ services and service types. This interface is provided by the @deffn {Scheme Procedure} service @var{type} [@var{value}] Return a new service of @var{type}, a @code{} object (see -below.) @var{value} can be any object; it represents the parameters of +below). @var{value} can be any object; it represents the parameters of this particular service instance. When @var{value} is omitted, the default value specified by @var{type} @@ -28642,7 +28642,7 @@ Occasionally, important security vulnerabilities are discovered in software packages and must be patched. Guix developers try hard to keep track of known vulnerabilities and to apply fixes as soon as possible in the @code{master} branch of Guix (we do not yet provide a ``stable'' branch -containing only security updates.) The @command{guix lint} tool helps +containing only security updates). The @command{guix lint} tool helps developers find out about vulnerable versions of software packages in the distribution: @@ -29089,7 +29089,7 @@ reason. Guix is based on the @uref{https://nixos.org/nix/, Nix package manager}, which was designed and implemented by Eelco Dolstra, with contributions from other people (see -the @file{nix/AUTHORS} file in Guix.) Nix pioneered functional package +the @file{nix/AUTHORS} file in Guix). Nix pioneered functional package management, and promoted unprecedented features, such as transactional package upgrades and rollbacks, per-user profiles, and referentially transparent build processes. Without this work, Guix would not exist. -- cgit v1.2.3 From 7384f40f400b66b6c0ee2f7d80628035d1494996 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 16:51:30 +0200 Subject: gnu: parallel: Update to 20200522. * gnu/packages/parallel.scm (parallel): Update to 20200522. --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 92f7b58128..575f87930f 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -54,14 +54,14 @@ (define-public parallel (package (name "parallel") - (version "20200422") + (version "20200522") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "0c2mr2rzsz0y24q4mbm2zmc2fz6bcda4gbc4qgg59sirrj8vzpjb")))) + (base32 "10is46v5dpccxibby0zikg1q68mdwpmgdpxk796zka93idd6id29")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From f8687cb21e6af7501b1537812bccca574b9d34b3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 14:09:18 +0200 Subject: gnu: dia: Update to 0.97.3-2.3cf7ec4 [fixes CVE-2019-19451]. * gnu/packages/gnome.scm (dia): Update to 0.97.3-2.3cf7ec4. [build-system]: Use Meson. [inputs]: Add graphene, libxslt, poppler, and python-2. Remove freetype, gdk-pixbuf, libart-lgpl, and pango. [native-inputs]: Add appstream-glib and docbook-xsl. Remove autoconf, automake, libtool, perl, and python-wrapper. --- gnu/packages/gnome.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a568d54044..dbaab157f5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1010,11 +1010,12 @@ useful as a tutorial and users' guide for new or less experienced users.") ;; This version from GNOME's repository includes fixes for compiling with ;; recent versions of the build tools. The latest activity on the ;; pre-GNOME version has been in 2014, while GNOME has continued applying - ;; fixes in 2016. - (let ((commit "fbc306168edab63db80b904956117cbbdc514ee4")) + ;; fixes since. + (let ((commit "3cf7ec4c2e5bca139a7f3e17f9fc9009c237fcc5") + (revision "2")) (package (name "dia") - (version (git-version "0.97.3" "1" commit)) + (version (git-version "0.97.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1023,24 +1024,23 @@ useful as a tutorial and users' guide for new or less experienced users.") (file-name (git-file-name name version)) (sha256 (base32 - "1b4bba0k8ph4cwgw8xjglss0p6n111bpd5app67lrq79mp0ad06l")))) - (build-system gnu-build-system) + "04r8dspa6nmicrifhi3sh46hqvyy88hzq37xx99q3q1mwsrpmwy8")))) + (build-system meson-build-system) (inputs - `(("freetype" ,freetype) - ("gdk-pixbuf" ,gdk-pixbuf) + `(("graphene" ,graphene) ("gtk+" ,gtk+-2) - ("libart-lgpl" ,libart-lgpl) ("libxml2" ,libxml2) - ("pango" ,pango))) + ("libxslt" ,libxslt) + ("poppler" ,poppler) + ;; Without Python 2, build fails: plug-ins/python/meson.build:4:0: + ;; ERROR: Unknown method "dependency" in object. + ("python-2" ,python-2))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("intltool" ,intltool) + `(("appstream-glib" ,appstream-glib) + ("docbook-xsl" ,docbook-xsl) ("glib" ,glib "bin") - ("libtool" ,libtool) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python-wrapper" ,python-wrapper))) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) (home-page "https://wiki.gnome.org/Apps/Dia") (synopsis "Diagram creation for GNOME") (description "Dia can be used to draw different types of diagrams, and -- cgit v1.2.3 From a422d9f3b67e49d8382b0c02688b24267e6cf1cc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 18:51:54 +0200 Subject: gnu: cataclysm-dda: Update to 0.E-2. * gnu/packages/games.scm (cataclysm-dda): Update to 0.E-2. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9e1a01fc04..7f9a08aa6b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -450,7 +450,7 @@ possible, while battling many vicious aliens.") (define-public cataclysm-dda (package (name "cataclysm-dda") - (version "0.E") + (version "0.E-2") (source (origin (method git-fetch) @@ -458,7 +458,7 @@ possible, while battling many vicious aliens.") (url "https://github.com/CleverRaven/Cataclysm-DDA.git") (commit version))) (sha256 - (base32 "0pbi0fw37zimzdklfj58s1ql0wlqq7dy6idkcsib3hn910ajaxan")) + (base32 "15l6w6lxays7qmsv0ci2ry53asb9an9dh7l7fc13256k085qcg68")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From c5e6a7fed81f16477b7de569bc0206a0514de375 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 19:12:55 +0200 Subject: gnu: denemo: Update to 2.4.0. * gnu/packages/music.scm (denemo): Update to 2.4.0. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 1d02e3abcf..9f30caf7af 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -384,14 +384,14 @@ many input formats and provides a customisable Vi-style user interface.") (define-public denemo (package (name "denemo") - (version "2.3.0") + (version "2.4.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/denemo/" "denemo-" version ".tar.gz")) (sha256 - (base32 "1blkcl3slbsq9jlhwcf2m9v9g38a0sjfhh9advgi2qr1gxri08by")))) + (base32 "145kq0zfgdadykl3i6na221i4s5wzdrcqq48amzyfarnrqk2rmpd")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 8a51e31f46ab33237e17ddca8b60c2ba37604898 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 19:20:05 +0200 Subject: gnu: wireshark: Update to 3.2.4. * gnu/packages/networking.scm (wireshark): Update to 3.2.4. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 4a2df4fd5a..962f0185b2 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -767,14 +767,14 @@ of the same name.") (define-public wireshark (package (name "wireshark") - (version "3.2.3") + (version "3.2.4") (source (origin (method url-fetch) (uri (string-append "https://www.wireshark.org/download/src/wireshark-" version ".tar.xz")) (sha256 - (base32 "1fpsfjrap7j84sy728yhcr2gad9nq3n5gq03mwrmxnc6ijwf81zh")))) + (base32 "1amqgn94g6h6cfnsccm2zb4c73pfv1qmzi1i6h1hnbcyhhg4czfi")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From 78763c1e7be07ed1c9306a6bee97d22e93c70dd2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 19:26:32 +0200 Subject: gnu: cmark: Use HTTPS home page URI. * gnu/packages/markup.scm (cmark)[home-page]: Use HTTPS URI. --- gnu/packages/markup.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 3cd7fb559c..7ae73da8a5 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -228,7 +228,7 @@ CommonMark to an abstract syntax tree (@dfn{AST}) and rendering the document as HTML, groff man, LaTeX, CommonMark, or an XML representation of the AST. The package also provides the command-line program @command{cmark} for parsing and rendering CommonMark.") - (home-page "http://commonmark.org") + (home-page "https://commonmark.org") ;; cmark is distributed with a BSD-2 license, but some components are Expat ;; licensed. The CommonMark specification is Creative Commons CC-BY-SA 4.0 ;; licensed. See 'COPYING' in the source distribution for more information. -- cgit v1.2.3 From 316928addfd5bc896b9705bff6b4529599728861 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 19:28:37 +0200 Subject: gnu: cppzmq: Use HTTPS home page URI. * gnu/packages/networking.scm (cppzmq)[home-page]: Use HTTPS URI. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 962f0185b2..39341e92fe 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -487,7 +487,7 @@ between different versions of ØMQ.") `(("pkg-config" ,pkg-config))) (inputs `(("zeromq" ,zeromq))) - (home-page "http://zeromq.org") + (home-page "https://zeromq.org") (synopsis "C++ bindings for the ØMQ messaging library") (description "This package provides header-only C++ bindings for ØMQ. The header -- cgit v1.2.3 From 9fc6a24c4621c3ccb8da6ba6867a8efa82283210 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 19:29:19 +0200 Subject: gnu: czmq: Use HTTPS home page URI. * gnu/packages/networking.scm (czmq)[home-page]: Use HTTPS URI. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 39341e92fe..f106d2bf72 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -456,7 +456,7 @@ more.") #t))))) (inputs `(("zeromq" ,zeromq))) - (home-page "http://zeromq.org") + (home-page "https://zeromq.org") (synopsis "High-level C bindings for ØMQ") (description "czmq provides bindings for the ØMQ core API that hides the differences -- cgit v1.2.3 From 09a3d34cf53348d870e360d650a880e5f0064355 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 19:30:59 +0200 Subject: gnu: gcompris: Use HTTPS home page URI. * gnu/packages/education.scm (gcompris)[home-page]: Use HTTPS URI. --- gnu/packages/education.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index d6c2cd02c3..980cec5443 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -114,7 +114,7 @@ ("texi2html" ,texi2html) ("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) - (home-page "http://gcompris.net") + (home-page "https://gcompris.net") (synopsis "Educational software suite") (description "GCompris is an educational software suite comprising of numerous activities for children aged 2 to 10. Some of the activities are -- cgit v1.2.3 From a2cddd7350bf924fc7cee2008a07d786083999c5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 18:07:00 +0200 Subject: gnu: libnftnl: Update to 1.1.6. * gnu/packages/linux.scm (libnftnl): Update to 1.1.6. [source]: Remove patch. * gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/linux.scm | 6 +-- .../libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch | 47 ---------------------- 3 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch diff --git a/gnu/local.mk b/gnu/local.mk index ef4c5d2dcb..6095c69085 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1119,7 +1119,6 @@ dist_patch_DATA = \ %D%/packages/patches/jsoncpp-fix-inverted-case.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ - %D%/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch \ %D%/packages/patches/libvirt-create-machine-cgroup.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f6acc086a7..2788f9d319 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5984,16 +5984,14 @@ re-use code and to avoid re-inventing the wheel.") (define-public libnftnl (package (name "libnftnl") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) (uri (string-append "mirror://netfilter.org/libnftnl/" "libnftnl-" version ".tar.bz2")) (sha256 - (base32 "1wqlxf76bkqf3qhka9sw32qhb2ni20q1k6rn3iril2kw482lvpk6")) - (patches - (search-patches "libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch")))) + (base32 "1jhyxsfrfqjascrm5lnxlcyzj6n0gc0qc1bp2asb7m61dxlmmsy1")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch b/gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch deleted file mode 100644 index df0571bf2b..0000000000 --- a/gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Tue, 10 Dec 2019 16:20:40 +0100 -Subject: gnu: libnftnl: Don't check NFTNL_FLOWTABLE_SIZE. - -Taken verbatim from the upstream commit[0] directly following the 1.1.5 -release. - -[0]: https://git.netfilter.org/libnftnl/commit/?id=b2388765e0c4405442faa13845419f6a35d0134c - -From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001 -From: Phil Sutter -Date: Mon, 2 Dec 2019 18:29:56 +0100 -Subject: tests: flowtable: Don't check NFTNL_FLOWTABLE_SIZE - -Marshalling code around that attribute has been dropped by commit -d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") so it's value is -lost during the test. - -Assuming that NFTNL_FLOWTABLE_SIZE will receive kernel support at a -later point, leave the test code in place but just comment it out. - -Fixes: d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") -Signed-off-by: Phil Sutter -Acked-by: Pablo Neira Ayuso ---- - tests/nft-flowtable-test.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/nft-flowtable-test.c b/tests/nft-flowtable-test.c -index 3edb00d..8ab8d4c 100644 ---- a/tests/nft-flowtable-test.c -+++ b/tests/nft-flowtable-test.c -@@ -33,9 +33,11 @@ static void cmp_nftnl_flowtable(struct nftnl_flowtable *a, struct nftnl_flowtabl - if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_USE) != - nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_USE)) - print_err("Flowtable use mismatches"); -+#if 0 - if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_SIZE) != - nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_SIZE)) - print_err("Flowtable size mismatches"); -+#endif - if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_FLAGS) != - nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_FLAGS)) - print_err("Flowtable flags mismatches"); --- -cgit v1.2.1 - -- cgit v1.2.3 From 18a91ab89760bed207ae22a69ec8e4a559ae3666 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 17:02:12 +0200 Subject: gnu: colordiff: Update to 1.0.19. * gnu/packages/patchutils.scm (colordiff): Update to 1.0.19. --- gnu/packages/patchutils.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 0c46a62bf7..0d58c21eee 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -163,7 +163,7 @@ refreshed, and more.") (define-public colordiff (package (name "colordiff") - (version "1.0.18") + (version "1.0.19") (source (origin (method url-fetch) @@ -172,8 +172,7 @@ refreshed, and more.") (string-append "http://www.colordiff.org/archive/colordiff-" version ".tar.gz"))) (sha256 - (base32 - "1q6n60n4b9fnzccxyxv04mxjsql4ddq17vl2c74ijvjdhpcfrkr9")))) + (base32 "069vzzgs7b44bmfh3ks2psrdb26s1w19gp9w4xxbgi7nhx6w3s26")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From ae58ebba8211f3593fb6d7214f5b80bc6aca5929 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:29:43 +0200 Subject: gnu: netcat-openbsd: Update to 1.217-1. * gnu/packages/admin.scm (netcat-openbsd): Update to 1.217-1. [arguments]: Remove obsolete #:configure-flags. --- gnu/packages/admin.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index cb8e73e95a..7ec68d1d64 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -718,7 +718,7 @@ would need and has several interesting built-in capabilities.") (define-public netcat-openbsd (package (name "netcat-openbsd") - (version "1.206-1") + (version "1.217-1") (source (origin (method git-fetch) (uri (git-reference @@ -727,14 +727,12 @@ would need and has several interesting built-in capabilities.") (file-name (git-file-name name version)) (sha256 (base32 - "08r3mmck3s5pbvwyq19wp5g8jqcxza3cm8nkc6jm7rqn4jdydc4z")))) + "0kcvi3pav2fdx5c22psjv5dggk4cmrqiaq2cklhqngsk4a7vrjan")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no test suite + `(#:tests? #f ; no test suite #:make-flags - (list "CC=gcc" - (string-append "CFLAGS=-I" (assoc-ref %build-inputs "libbsd") "/include") - "LDFLAGS=-lbsd") + (list "CC=gcc") #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From 3e0190a8502dc16b39e1d11a69f31efdf5b8c412 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 17:29:12 +0200 Subject: gnu: redkite: Update to 0.8.1. * gnu/packages/audio.scm (redkite): Update to 0.8.1. --- gnu/packages/audio.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 35c4001303..4f1667b9d5 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3988,7 +3988,7 @@ stream to one or more IceCast and/or ShoutCast servers.") (define-public redkite (package (name "redkite") - (version "0.8.0") + (version "0.8.1") (source (origin (method git-fetch) @@ -3997,8 +3997,7 @@ stream to one or more IceCast and/or ShoutCast servers.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1747w1kg8y9jbl11xi018d85dm38xk7843pz26sh0k5fdv87a10q")))) + (base32 "17kv2jc4jvn3sdicz3sf8dnf25wbvv7ijzkr0mm0sbrrjz6vrwz0")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no tests included -- cgit v1.2.3 From 083b24e23e1fb722b3a0ba94c94da6970722bc69 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 20:04:52 +0200 Subject: gnu: xonotic: Use HTTPS home page URI. * gnu/packages/games.scm (xonotic)[home-page]: Use HTTPS URI. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 7f9a08aa6b..ee7f001f20 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6664,7 +6664,7 @@ quotation from a collection of quotes.") ("pkg-config" ,pkg-config) ("libtool" ,libtool) ("gmp" ,gmp))) - (home-page "http://xonotic.org") + (home-page "https://xonotic.org") (synopsis "Fast-paced first-person shooter game") (description "Xonotic is a free, fast-paced first-person shooter. -- cgit v1.2.3 From 91e2170042324c0a8436605ac178f167c6e999f4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 20:06:43 +0200 Subject: gnu: xftwidth: Use HTTPS home page URI. * gnu/packages/xdisorg.scm (xftwidth)[home-page]: Use HTTPS URI. --- gnu/packages/xdisorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index acc74e328a..b717b36aed 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1573,13 +1573,13 @@ program for X11. It was designed to be fast, tiny and scriptable in any languag #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "DESTDIR=" out))))) + (home-page "https://github.com/vixus0/xftwidth") (synopsis "Calculator for determining pixel widths of displayed text using Xft fonts") (description "xftwidth is a small C program for calculating the pixel widths of displayed text using Xft fonts. It is especially useful in scripts for displaying text in graphical panels, menus, popups, and notification windows generated using dzen. These scripts are often used in conjunction with minimalistic tiling window managers such as herbstluftwm and bspwm.") - (home-page "http://github.com/vixus0/xftwidth") (license license:expat))) (define-public xcb-util-xrm -- cgit v1.2.3 From 950f16976aac61be406a802149899d56cbbca625 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 20:19:12 +0200 Subject: gnu: uget: Use HTTPS home page URI. * gnu/packages/bittorrent.scm (uget)[home-page]: Use HTTPS URI. --- gnu/packages/bittorrent.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 14f3815b52..cbdd901695 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -336,7 +336,7 @@ Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.") (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) - (home-page "http://ugetdm.com/") + (home-page "https://ugetdm.com/") (synopsis "Universal download manager with GTK+ interface") (description "uGet is portable download manager with GTK+ interface supporting -- cgit v1.2.3 From b2d35dd9aeb3f6c566d53bfc9534abfd57860a51 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 20:19:47 +0200 Subject: gnu: uget: Update to 2.2.0. * gnu/packages/bittorrent.scm (uget): Update to 2.2.0. --- gnu/packages/bittorrent.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index cbdd901695..947537b231 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -314,15 +314,15 @@ Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.") (define-public uget (package (name "uget") - (version "2.0.8") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/urlget/" - "uget%20%28stable%29/" version "/uget-" - version ".tar.gz")) - (sha256 - (base32 - "0919cf7lfk1djdl003cahqjvafdliv7v2l8r5wg95n4isqggdk75")))) + (version "2.2.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/urlget/" + "uget%20%28stable%29/" version "/uget-" + version ".tar.gz")) + (sha256 + (base32 "0rg2mr2cndxvnjib8zm5dp7y2hgbvnqkz2j2jmg0xlzfh9d34b2m")))) (build-system gnu-build-system) (inputs `(("curl" ,curl) -- cgit v1.2.3 From 0588668fa8ad226e965783240317286de8f77333 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 20:21:15 +0200 Subject: gnu: taskwarrior: Use HTTPS home page URI. * gnu/packages/task-management.scm (taskwarrior)[home-page]: Use HTTPS URI. --- gnu/packages/task-management.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index a0313c17c2..601a3616f7 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -52,7 +52,7 @@ (delete-file "src/cal") (delete-file "src/calendar") (delete-file "src/tw")))))) - (home-page "http://taskwarrior.org") + (home-page "https://taskwarrior.org") (synopsis "Command line task manager") (description "Taskwarrior is a command-line task manager following the Getting Things -- cgit v1.2.3 From 22e5a77af2be50cfa4744e5c11f625d264627fb8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 20:24:05 +0200 Subject: gnu: python2-renpy: Use HTTPS home page URI. * gnu/packages/game-development.scm (python2-renpy)[home-page]: Use HTTPS URI. --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index ac9c2ce864..188ff7d354 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1157,7 +1157,7 @@ developed mainly for Ren'py.") (native-inputs `(("python2-cython" ,python2-cython) ("xdg-utils" ,xdg-utils))) - (home-page "http://www.renpy.org/") + (home-page "https://www.renpy.org/") (synopsis "Ren'py python module") (description "This package contains the shared libraries and Python modules of Ren'py.") -- cgit v1.2.3 From 10052b7087a469451bf8ade979c472e5a40470a6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 20:24:17 +0200 Subject: gnu: renpy: Use HTTPS home page URI. * gnu/packages/game-development.scm (renpy)[home-page]: Use HTTPS URI. --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 188ff7d354..99c0711e1a 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1345,7 +1345,7 @@ if __name__ == \"__main__\": ("xorg-server" ,xorg-server))) (outputs (list "out" "tutorial" "the-question")) - (home-page "http://www.renpy.org/") + (home-page "https://www.renpy.org/") (synopsis "Visual Novel Engine") (description "Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell interactive stories that run on computers and -- cgit v1.2.3 From 9be18877d5c9fe49feb317b9026d5d3a32d98779 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 25 May 2020 14:40:47 -0400 Subject: gnu: OBS: Update to 25.0.8. * gnu/packages/video.scm (obs): Update to 25.0.8. [inputs]: Add mbedtls-apache. [arguments]: Set the version string in #:configure-flags. --- gnu/packages/video.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1e36c6c313..152f356914 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2423,7 +2423,7 @@ be used for realtime video capture via Linux-specific APIs.") (define-public obs (package (name "obs") - (version "25.0.7") + (version "25.0.8") (source (origin (method git-fetch) (uri (git-reference @@ -2432,10 +2432,12 @@ be used for realtime video capture via Linux-specific APIs.") (file-name (git-file-name name version)) (sha256 (base32 - "02ppkp1j5yxnxv663nz5wv4vbcg3k53l43xq94d1p1b3j4wxwq8b")))) + "0j2k65q3wfyfxhvkl6icz4qy0s3kfqhksizy2i3ah7yml266axbj")))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ; no tests + `(#:tests? #f ; no test suite + #:configure-flags + (list (string-append "-DOBS_VERSION_OVERRIDE=" ,version)))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -2449,6 +2451,7 @@ be used for realtime video capture via Linux-specific APIs.") ("jansson" ,jansson) ("libx264" ,libx264) ("libxcomposite" ,libxcomposite) + ("mbedtls" ,mbedtls-apache) ("mesa" ,mesa) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase) -- cgit v1.2.3 From 327452875a0a195e8fae1d51d22d807ce595ebd3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 20:54:09 +0300 Subject: gnu: tuir: Update to 1.29.0. * gnu/packages/syndication.scm (tuir): Update to 1.29.0. --- gnu/packages/syndication.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index acd7b63ef7..3d33ee521f 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -135,14 +135,14 @@ file system, and many more features.") (define-public tuir (package (name "tuir") - (version "1.28.3") + (version "1.29.0") (source (origin (method url-fetch) (uri (pypi-uri "tuir" version)) (sha256 (base32 - "1gpyjrl7jdfjq30m32nzh59ajv91gq19l93jjri2wsv5yrf90hdr")))) + "06xb030ibphbrz4nsxm8mh3g60ld8xfp6kc3j6vi1k4ls5s4h79i")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From fe95a0784c4d7ec1dc99fb1da1070f07aa40245d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 20:56:52 +0300 Subject: gnu: mpv-mpris: Update to 0.5. * gnu/packages/video.scm (mpv-mpris): Update to 0.5. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 152f356914..6529ae6507 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1530,7 +1530,7 @@ projects while introducing many more.") (define-public mpv-mpris (package (name "mpv-mpris") - (version "0.4") + (version "0.5") (source (origin (method git-fetch) @@ -1540,7 +1540,7 @@ projects while introducing many more.") (file-name (git-file-name name version)) (sha256 (base32 - "1fr3jvja8s2gdpx8qyk9r17977flms3qpm8zci62nd9r5wjdvr5i")))) + "07p6li5z38pkfd40029ag2jqx917vyl3ng5p2i4v5a0af14slcnk")))) (build-system copy-build-system) (arguments '(#:install-plan -- cgit v1.2.3 From 80008f80d5b32c6cc8ae8187c45aad9f2e266ac0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 20:58:26 +0300 Subject: gnu: font-gnu-unifont: Update to 13.0.02. * gnu/packages/fonts.scm (font-gnu-unifont): Update to 13.0.02. --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 9284609373..b77aaca059 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -677,7 +677,7 @@ for use at smaller text sizes"))) (define-public font-gnu-unifont (package (name "font-gnu-unifont") - (version "13.0.01") + (version "13.0.02") (source (origin (method url-fetch) @@ -687,7 +687,7 @@ for use at smaller text sizes"))) (string-append "mirror://gnu/unifont/unifont-" version "/unifont-" version ".tar.gz"))) (sha256 - (base32 "1svzm3xahb2m8r79ha9gb1z3zlckykx9d87cghswj7dxn9868j4b")))) + (base32 "1fg908qadh14kfbpzqfj3vgzlxgx68sdlwhl2prz7arq5r45dami")))) (build-system gnu-build-system) (outputs '("out" ; TrueType version "pcf" ; PCF (bitmap) version -- cgit v1.2.3 From 06df0f9fd9191c614485c1672ddb15156911e7f2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:00:47 +0300 Subject: gnu: perl-cgi: Update to 4.47. * gnu/packages/web.scm (perl-cgi): Update to 4.47. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f6fab8f036..c7bea4c5ae 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2607,7 +2607,7 @@ development server with Starman.") (define-public perl-cgi (package (name "perl-cgi") - (version "4.46") + (version "4.47") (source (origin (method url-fetch) @@ -2615,7 +2615,7 @@ development server with Starman.") "CGI-" version ".tar.gz")) (sha256 (base32 - "16225vmdsfa2y7i1ydv7634nd0qxxb0ccwnfszjq58rwqgfri2bq")))) + "1a9cylhqsm5icvbg09m21nj0xx4zy5gbk4p74npm1ch3qlryzyyr")))) (build-system perl-build-system) (native-inputs `(("perl-test-deep" ,perl-test-deep) -- cgit v1.2.3 From d84ddbb9c7af66dd0edfd847f0260e9a5e48083b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:05:35 +0300 Subject: gnu: quazip: Update to 0.9.1. * gnu/packages/compression.scm (quazip): Update to 0.9.1. --- gnu/packages/compression.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index d21d79962a..38adf35e33 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2015, 2017, 2018 Leo Famulari ;;; Copyright © 2015 Jeff Mickey -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -1942,7 +1942,7 @@ download times, and other distribution and storage costs.") (define-public quazip (package (name "quazip") - (version "0.9") + (version "0.9.1") (source (origin (method git-fetch) (uri (git-reference @@ -1951,7 +1951,7 @@ download times, and other distribution and storage costs.") (file-name (git-file-name name version)) (sha256 (base32 - "0psvf3d9akyyx3bckc9325nmbp97xiagf8la4vhca5xn2f430fbn")))) + "11icgwv2xyxhd1hm1add51xv54zwkcqkg85d1xqlgiigvbm196iq")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no test -- cgit v1.2.3 From 46731db2431a21766c5fdfa74aca9bd61b7c41a2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:20:30 +0300 Subject: gnu: perl-io-tty: Update to 1.14. * gnu/packages/perl.scm (perl-io-tty): Update to 1.14. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 220519cde1..d0605f1b28 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5268,14 +5268,14 @@ filehandles; in particular, IO::Scalar, IO::ScalarArray, and IO::Lines.") (define-public perl-io-tty (package (name "perl-io-tty") - (version "1.12") + (version "1.14") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-" version ".tar.gz")) (sha256 (base32 - "0399anjy3bc0w8xzsc3qx5vcyqryc9gc52lc7wh7i49hsdq8gvx2")))) + "1dcmxdhrapxvvzlfp6yzz7655f3c6x8jrw0md8ndp2qj27iy9wsi")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/IO-Tty") (synopsis "Perl interface to pseudo ttys") -- cgit v1.2.3 From 3e7d5cd399aa4fd832c8a767098ed3f597d2205f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:23:26 +0300 Subject: gnu: perl-timedate: Update to 2.33. * gnu/packages/perl.scm (perl-timedate): Update to 2.33. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index d0605f1b28..8b143ffde2 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -10034,14 +10034,14 @@ still work as expected.") (define-public perl-timedate (package (name "perl-timedate") - (version "2.32") + (version "2.33") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/A/AT/ATOOMIC/" "TimeDate-" version ".tar.gz")) (sha256 - (base32 "1mmk9dy4a26a4d4c5rswqqhxr0295j93bjbcx91d3qkmwfcs1v1l")))) + (base32 "1cjyc0yi873597r7xcp9yz0l1c46ik2kxwfrn00zbrlx0d5rrdn0")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/TimeDate") (synopsis "Date parsing/formatting subroutines") -- cgit v1.2.3 From 062585711e324db35fff46592f8876ae00b6063b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:33:33 +0300 Subject: gnu: python-llfuse: Update to 1.3.6. * gnu/packages/python-xyz.scm (python-llfuse): Update to 1.3.6. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9aa5635ab8..efd92beb9f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7940,13 +7940,13 @@ should be stored on various operating systems.") (define-public python-llfuse (package (name "python-llfuse") - (version "1.3.5") + (version "1.3.6") (source (origin (method url-fetch) (uri (pypi-uri "llfuse" version ".tar.bz2")) (sha256 (base32 - "1n7a90jww3ly49fm7x27m3xw3la3qfrnykcakga654g6kcyjlhbf")))) + "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii")))) (build-system python-build-system) (inputs `(("fuse" ,fuse) -- cgit v1.2.3 From 6115ab1d2099b29097ac3c9988a82bb42a2c70aa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:33:31 +0300 Subject: gnu: Add go-github-com-francoispqt-gojay. * gnu/packages/golang.scm (go-github-com-francoispqt-gojay): New variable. --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3ae59ad2b7..8dd276562a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3141,6 +3141,31 @@ network protocol.") (home-page "https://github.com/lucas-clemente/quic-go") (license license:expat))) +(define-public go-github-com-francoispqt-gojay + (package + (name "go-github-com-francoispqt-gojay") + (version "1.2.13") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/francoispqt/gojay") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ix95qdyajfmxhf9y52vjrih63f181pjs4v5as8905s4d5vmkd06")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/francoispqt/gojay")) + (propagated-inputs + `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify))) + (synopsis "JSON encoder/decoder with powerful stream API for Golang") + (description "GoJay is a performant JSON encoder/decoder for Golang. It has +a simple API and doesn't use reflection. It relies on small interfaces to +decode/encode structures and slices.") + (home-page "https://github.com/francoispqt/gojay") + (license license:expat))) + (define-public go-github-com-pkg-errors (package (name "go-github-com-pkg-errors") -- cgit v1.2.3 From e033700f17660ff936936cf89cc557b95d12bb13 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 May 2020 16:04:33 +0200 Subject: tests: Hide quoted (define-module ...) form from Geiser. * tests/gexp.scm (%extension-package): Split (define-module ...) form to fool Geiser. --- tests/gexp.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/gexp.scm b/tests/gexp.scm index e073a7b816..20ef8d2648 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -78,7 +78,8 @@ (mkdir-p out) (call-with-output-file (string-append out "/hg2g.scm") (lambda (port) - (write '(define-module (hg2g) + (define defmod 'define-module) ;fool Geiser + (write `(,defmod (hg2g) #:export (the-answer)) port) (write '(define the-answer 42) port))))))))) -- cgit v1.2.3 From abf43d4511566e97f09049aa8b29453a2ed5ed16 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 May 2020 16:06:03 +0200 Subject: gexp: Fix expansion for (file-append (local-file ...) ...). Fixes . Regression introduced in d03001a31a6d460b712825640dba11e3f1a53a14. * guix/gexp.scm (lower+expand-object): When LOWERED is not a struct and EXPAND is true, call EXPAND. * tests/gexp.scm ("file-append, raw store item"): New test. --- guix/gexp.scm | 4 +++- tests/gexp.scm | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index 78b8af6fbc..9e193c76c4 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -270,7 +270,9 @@ expand to file names, but it's possible to expand to a plain data type." (if (not expand) (loop lowered (lookup-expander lowered)) (return (expand obj lowered output))) - (return lowered))))))) ;self-quoting + (if (not expand) ;self-quoting + (return lowered) + (return (expand obj lowered output))))))))) (define-syntax define-gexp-compiler (syntax-rules (=> compiler expander) diff --git a/tests/gexp.scm b/tests/gexp.scm index 20ef8d2648..1beeb67c21 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -285,6 +285,20 @@ (((thing "out")) (eq? thing file)))))) +(test-assert "file-append, raw store item" + (let* ((obj (plain-file "example.txt" "Hello!")) + (a (file-append obj "/a")) + (b (file-append a "/b")) + (c (file-append b "/c")) + (exp #~(list #$c)) + (item (run-with-store %store (lower-object obj))) + (lexp (run-with-store %store (lower-gexp exp)))) + (and (equal? (lowered-gexp-sexp lexp) + `(list ,(string-append item "/a/b/c"))) + (equal? (lowered-gexp-sources lexp) + (list item)) + (null? (lowered-gexp-inputs lexp))))) + (test-assertm "with-parameters for %current-system" (mlet* %store-monad ((system -> (match (%current-system) ("aarch64-linux" "x86_64-linux") -- cgit v1.2.3 From 8c23d7a15e90481f0b4ab2ba9bd178d68e7affaa Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 May 2020 17:24:54 +0200 Subject: doc: Remove one use of 'file-append*'. * doc/build.scm (texinfo-manual-source)[build]: Use 'file-append', not 'file-append*', for 'htmlxref.cnf', to ensure it has the right basename. --- doc/build.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/build.scm b/doc/build.scm index def4bdf18a..7256fb9bb5 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -141,7 +141,7 @@ as well as images, OS examples, and translations." (date->string date "~B ~Y") version version)))))) - (install-file #$(file-append* documentation "/htmlxref.cnf") + (install-file #$(file-append documentation "/htmlxref.cnf") #$output) (for-each (lambda (texi) -- cgit v1.2.3 From f408d8d636ac24d576e9ee91a6c823e0874386ef Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 May 2020 17:33:04 +0200 Subject: self: Optimize 'file-append*' for 'local-file?'. * guix/self.scm (file-append*): Add 'local-file?' case. * guix/gexp.scm (local-file-select?): Export. --- guix/gexp.scm | 1 + guix/self.scm | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index 9e193c76c4..510a1d54c3 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -51,6 +51,7 @@ local-file-absolute-file-name local-file-name local-file-recursive? + local-file-select? plain-file plain-file? diff --git a/guix/self.scm b/guix/self.scm index a9568049b2..60fe6e6b01 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -213,7 +213,15 @@ record with the new file name." ;; itself. (local-file (string-append item "/" file) #:recursive? recursive?)) - ;; TODO: Add 'local-file?' case. + ((? local-file? base) + ;; Likewise, but with a . + (if (local-file-recursive? base) + (local-file (string-append (local-file-absolute-file-name base) + "/" file) + (basename file) + #:recursive? recursive? + #:select? (local-file-select? base)) + (file-append base file))) (_ ;; In this case, anything that refers to the result also depends on ITEM, ;; which isn't great. -- cgit v1.2.3 From 9e91983055e72f5f8380d9642d3495909c25e147 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Sun, 24 May 2020 17:23:59 +0200 Subject: gnu: qhull: Update to 2019.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (qhull): update to 2019.1 Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e62fb38086..dfc3729e48 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -227,15 +227,15 @@ programming languages.") (define-public qhull (package (name "qhull") - (version "2015.2") + (version "2019.1") (source (origin (method url-fetch) (uri (string-append "http://www.qhull.org/download/qhull-" (car (string-split version #\.)) - "-src-7.2.0.tgz")) + "-src-7.3.2.tgz")) (sha256 (base32 - "0dm4b2xr3asy6w74khq2zg4gf26zsy3qf9sq7pf7lmrvbj911c3q")))) + "1ys3vh3qq0v9lh452xb932vp63advds1pxk42lk7cc1niiar0y9b")))) (build-system cmake-build-system) (synopsis "Calculate convex hulls and related structures") (description -- cgit v1.2.3 From 2c402b1a156f13e6377671c1d0eb4437806b96ea Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 May 2020 22:58:31 +0200 Subject: gexp: The result of 'imported-files/derivation' is non-substitutable. * guix/gexp.scm (imported-files/derivation): Pass #:substitutable? #f to 'gexp->derivation'. --- guix/gexp.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/gexp.scm b/guix/gexp.scm index 510a1d54c3..67b6121313 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -1443,6 +1443,7 @@ to the source files instead of copying them." #:system system #:guile-for-build guile #:local-build? #t + #:substitutable? #f ;; Avoid deprecation warnings about the use of the _IO* ;; constants in (guix build utils). -- cgit v1.2.3 From 49143297fcf4b2ca1172924f25137b08b0eecf58 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 May 2020 22:59:22 +0200 Subject: compile: Do not optimize "gnu/tests/*". * guix/build/compile.scm (optimization-options): Add "gnu/tests/" to level 0. --- guix/build/compile.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/compile.scm b/guix/build/compile.scm index 63f24fa7d4..ea7e1d2d03 100644 --- a/guix/build/compile.scm +++ b/guix/build/compile.scm @@ -98,7 +98,8 @@ (define (override-option option value lst) `(,option ,value ,@(strip-option option lst))) - (cond ((string-contains file "gnu/packages/") + (cond ((or (string-contains file "gnu/packages/") + (string-contains file "gnu/tests/")) ;; Level 0 is good enough but partial evaluation helps preserve the ;; "macro writer's bill of rights". (override-option #:partial-eval? #t -- cgit v1.2.3 From a1a3bd5f1f9819fd8183a1c5c45c7c02952576da Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 May 2020 23:02:09 +0200 Subject: maint: 'authenticate' depends on a couple of .go files. * Makefile.am (authenticate): Add dependency on guix/{git,openpgp}.go. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 3113e6b042..5b64386b53 100644 --- a/Makefile.am +++ b/Makefile.am @@ -632,7 +632,7 @@ commit_v1_0_1 = d68de958b60426798ed62797ff7c96c327a672ac # Authenticate the current Git checkout by checking signatures on every commit # starting from $(commit_v1_0_1). -authenticate: +authenticate: guix/openpgp.go guix/git.go $(AM_V_at)echo "Authenticating Git checkout..." ; \ "$(top_builddir)/pre-inst-env" $(GUILE) \ --no-auto-compile -e git-authenticate \ -- cgit v1.2.3 From 1bbf7e137dd4e72d6d673e9842c5b3492aa6d25f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 25 May 2020 18:00:55 -0400 Subject: gnu: wxmaxima: Update to 20.04.0. * gnu/packages/maths.scm (wxmaxima): Update to 20.04.0. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index dfc3729e48..3424aaa15e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3183,7 +3183,7 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "20.03.1") + (version "20.04.0") (source (origin (method git-fetch) @@ -3192,7 +3192,7 @@ point numbers.") (commit (string-append "Version-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "09ciip0wkahps5jdsqqr72bwjrd15bacw38zp23v3hm71xfk8hky")))) + (base32 "0vrjxzfgmjdzm1rgl0crz4b4badl14jwh032y3xkcdvjl5j67lp3")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From dd070af55cd834e19348bc45aec3aa955ff42388 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:06:27 +0200 Subject: gnu: nethogs: Update to 0.8.6. * gnu/packages/networking.scm (nethogs): Update to 0.8.6. --- gnu/packages/networking.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f106d2bf72..0b6c6e7353 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1723,14 +1723,14 @@ the bandwidth, loss, and other parameters.") (define-public nethogs (package (name "nethogs") - (version "0.8.5") + (version "0.8.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/raboof/nethogs/archive/v" version ".tar.gz")) (sha256 (base32 - "1k4x8r7s4dgcb6n2rjn28h2yyij92mwm69phncl3597cdxr954va")) + "1875q9hx48g68pika7n51an879v3s10ir4sf95z6ggnl6m91sz1i")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (inputs @@ -1741,7 +1741,7 @@ the bandwidth, loss, and other parameters.") ,(string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No ./configure script. + (delete 'configure)))) ; no ./configure script. (home-page "https://github.com/raboof/nethogs") (synopsis "Per-process bandwidth monitor") (description "NetHogs is a small 'net top' tool for Linux. Instead of -- cgit v1.2.3 From 52dd58b56dbcc7610a26275fe9782151d664bb68 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:08:41 +0200 Subject: gnu: nethogs: Don't use unstable tarball. * gnu/packages/networking.scm (nethogs)[source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Don't try (and fail) to determine the version using git. --- gnu/packages/networking.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 0b6c6e7353..9f7548db9a 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1724,21 +1724,23 @@ the bandwidth, loss, and other parameters.") (package (name "nethogs") (version "0.8.6") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/raboof/nethogs/archive/v" - version ".tar.gz")) - (sha256 - (base32 - "1875q9hx48g68pika7n51an879v3s10ir4sf95z6ggnl6m91sz1i")) - (file-name (string-append name "-" version ".tar.gz")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/raboof/nethogs") + (commit (string-append "v" version)))) + (sha256 + (base32 "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs `(("libpcap" ,libpcap) ("ncurses" ,ncurses))) (arguments `(#:make-flags `("CC=gcc" - ,(string-append "PREFIX=" %output)) + ,(string-append "PREFIX=" %output) + ,(string-append "VERSION=" ,version)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no ./configure script. -- cgit v1.2.3 From 3102e8d37cbc77871e920e5328fa0045f09bf20b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:10:38 +0200 Subject: gnu: nethogs: Migrate to HASH. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (nethogs)[source]: Migrate to… : …this I guess. --- gnu/packages/networking.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9f7548db9a..617d7d6883 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1730,8 +1730,9 @@ the bandwidth, loss, and other parameters.") (uri (git-reference (url "https://github.com/raboof/nethogs") (commit (string-append "v" version)))) - (sha256 - (base32 "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9")) + (hash + (content-hash "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9" + sha256)) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From e8c1e27f8ea87bb3b401b4f37457533a562fbe66 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 22:12:58 +0200 Subject: gnu: balsa: Update to 2.6.1. * gnu/packages/mail.scm (balsa): Update to 2.6.1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8e72edc221..c374084e80 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2762,14 +2762,14 @@ tools and applications: (define-public balsa (package (name "balsa") - (version "2.6.0") + (version "2.6.1") (source (origin (method url-fetch) (uri (string-append "https://pawsa.fedorapeople.org/balsa/" name "-" version ".tar.bz2")) (sha256 - (base32 "0ycidvgy9npd6avxk88sf2ca609m7zb0hzrk1yajrgwb1rfqx68a")))) + (base32 "1xkxx801p7sbfkn0bh3cz85wra4xf1z1zhjqqc80z1z1nln7fhb4")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 8f3f2c9b1bf594392930094065666d901c774e7d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 22:13:01 +0200 Subject: gnu: balsa: Don't use NAME in source URI. * gnu/packages/mail.scm (balsa)[source]: Hard-code NAME. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c374084e80..101dcf52b4 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2767,7 +2767,7 @@ tools and applications: (origin (method url-fetch) (uri (string-append "https://pawsa.fedorapeople.org/balsa/" - name "-" version ".tar.bz2")) + "balsa-" version ".tar.bz2")) (sha256 (base32 "1xkxx801p7sbfkn0bh3cz85wra4xf1z1zhjqqc80z1z1nln7fhb4")))) (build-system gnu-build-system) -- cgit v1.2.3 From a9ef542552815e5509a55115154ea91fbb929031 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 22:16:37 +0200 Subject: gnu: fetchmail: Update to 6.4.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (fetchmail): Update to 6.4.5. [arguments]: Remove obsolete ‘create-test-environment’ phase. --- gnu/packages/mail.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 101dcf52b4..1a01393cf4 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -347,7 +347,7 @@ to run without any changes.") (define-public fetchmail (package (name "fetchmail") - (version "6.4.1") + (version "6.4.5") (source (origin (method url-fetch) @@ -355,21 +355,14 @@ to run without any changes.") (version-major+minor version) "/" "fetchmail-" version ".tar.xz")) (sha256 - (base32 "1859wvfc9fq72mwp4njdiy0x89hnddlfr3nix71qqglcs0fz2crz")))) + (base32 "073bjh8qbvww7f5gbd6pq640qspi7dc6cjndvm0h2jcl0a90c3yk")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl))) (arguments `(#:configure-flags (list (string-append "--with-ssl=" - (assoc-ref %build-inputs "openssl"))) - #:phases - (modify-phases %standard-phases - (add-before 'check 'create-test-environment - (lambda _ - ;; Fix ‘Cannot find absolute path for user's home directory’. - (setenv "HOME" "/tmp") - #t))))) + (assoc-ref %build-inputs "openssl"))))) (home-page "https://www.fetchmail.info/") (synopsis "Remote-mail retrieval and forwarding utility") (description -- cgit v1.2.3 From ebe9d865dde17ceecdafe8e000ff88542d47a344 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 22:46:46 +0200 Subject: gnu: cutter: Update to 1.10.3. * gnu/packages/engineering.scm (cutter): Update to 1.10.3. --- gnu/packages/engineering.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index be86848538..07f4d0cf96 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2175,7 +2175,7 @@ simulation.") (define-public cutter (package (name "cutter") - (version "1.10.1") + (version "1.10.3") (source (origin (method git-fetch) @@ -2184,8 +2184,7 @@ simulation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1gvsrcskcdd1hxrjpkpc657anmfs25f174vxk4wzvn385rnmrxd3")))) + (base32 "0qj8jyij02nif4jpirl09ygwnv8a9zi3vkb5sf5s8mg7qwlpnvyk")))) (build-system gnu-build-system) (arguments `(#:phases @@ -2194,8 +2193,8 @@ simulation.") (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (radare2 (assoc-ref inputs "radare2"))) - ;; fix pkg-config detection ./src/lib_radare2.pri:PREFIX=/usr/lib - ;; override `qmake PREFIX=` + ;; Fix pkg-config detection ./src/lib_radare2.pri:PREFIX=/usr/lib + ;; override `qmake PREFIX=`. (substitute* "./src/lib_radare2.pri" (("PREFIX") "R2PREFIX") (("R2PREFIX=/usr") (string-append "R2PREFIX=" radare2))) -- cgit v1.2.3 From 403aa3aaf248703f0c9faeec6d4a99171a5cd371 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 23:02:50 +0200 Subject: gnu: mc: Update to 4.8.24. * gnu/packages/mc.scm (mc): Update to 4.8.24. [source]: Use HTTPS. --- gnu/packages/mc.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm index 8ff4759127..56e563a132 100644 --- a/gnu/packages/mc.scm +++ b/gnu/packages/mc.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,14 +37,14 @@ (define-public mc (package (name "mc") - (version "4.8.23") + (version "4.8.24") (source (origin (method url-fetch) - (uri (string-append "http://ftp.midnight-commander.org/mc-" + (uri (string-append "https://ftp.midnight-commander.org/mc-" version ".tar.xz")) (sha256 - (base32 "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx")))) + (base32 "0ikd2yql44p7nagmb08dmjqdwadclnvgr7ri9pmzc2s5f301r7w5")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("perl" ,perl))) -- cgit v1.2.3 From 02d32b198268ed15928fa2f8a9379ada86fb13e2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 23:04:45 +0200 Subject: gnu: mutt: Update to 1.14.2. * gnu/packages/mail.scm (mutt): Update to 1.14.2. --- gnu/packages/mail.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 1a01393cf4..fa0b22cd9c 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -382,7 +382,7 @@ aliasing facilities to work just as they would on normal mail.") (define-public mutt (package (name "mutt") - (version "1.13.5") + (version "1.14.2") (source (origin (method url-fetch) (uri (list @@ -392,7 +392,7 @@ aliasing facilities to work just as they would on normal mail.") version ".tar.gz"))) (sha256 (base32 - "0lx65a44b03rbvcrz0y9syrik67fx3hvblxyyvz5l9bb7rdipmvc")) + "0cdcls0x6f2w99hkjz48hxhnx86w3bnyxzibchdc9yspih770bz2")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs @@ -416,8 +416,8 @@ aliasing facilities to work just as they would on normal mail.") "--with-sasl" "--with-sqlite3" ; required for Autocrypt "--with-idn2" ; recommended for Autocrypt - ;; so that mutt does not check whether the path - ;; exists, which it does not in the chroot + ;; So that mutt does not check whether the path + ;; exists, which it does not in the chroot. "--with-mailpath=/var/mail"))) (home-page "http://www.mutt.org/") (synopsis "Mail client") -- cgit v1.2.3 From ba40c10be712d10a0566409954285c5f7405f0d3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 23:11:30 +0200 Subject: gnu: batctl: Update to 2020.1. * gnu/packages/networking.scm (batctl): Update to 2020.1. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 617d7d6883..81d58d15e7 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2900,14 +2900,14 @@ maximum extent possible.") (define-public batctl (package (name "batctl") - (version "2020.0") + (version "2020.1") (source (origin (method url-fetch) (uri (string-append "https://downloads.open-mesh.org/batman/releases/batman-adv-" version "/batctl-" version ".tar.gz")) (sha256 - (base32 "01414ywhlb2b9ng9d5kd5rr1s7wzvi234j8hj6ra2spn92qykvv0")))) + (base32 "0fy252q1my3a57v6pfz8i97h6zv7v03di01dhwjkj47pqnx1rqm3")))) (inputs `(("libnl" ,libnl))) (native-inputs -- cgit v1.2.3 From 91982acc4fd6a36c5c53bd313e3c916a914e46ff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 23:13:28 +0200 Subject: gnu: haproxy: Update to 2.1.4. * gnu/packages/networking.scm (haproxy): Update to 2.1.4. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 81d58d15e7..b0c1440fd3 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3102,7 +3102,7 @@ cables.") (define-public haproxy (package (name "haproxy") - (version "2.1.3") + (version "2.1.4") (source (origin (method url-fetch) (uri (string-append "https://www.haproxy.org/download/" @@ -3110,7 +3110,7 @@ cables.") "/src/haproxy-" version ".tar.gz")) (sha256 (base32 - "0n8bw3d6gikr8c56ycrvksp1sl0b4yfzp19867cxkl3l0daqwrxv")))) + "1kcizs5r538chhpwqykdngxyqfi98i03akfjnii721npjvv0y0si")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 6302b5dafe74aeb17f447af0c76c0afb6888a747 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 23:18:22 +0200 Subject: gnu: nfs-utils: Update to 2.4.3. * gnu/packages/nfs.scm (nfs-utils): Update to 2.4.3. --- gnu/packages/nfs.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm index 45ed181b03..f3015ef79a 100644 --- a/gnu/packages/nfs.scm +++ b/gnu/packages/nfs.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,7 +46,7 @@ (define-public nfs-utils (package (name "nfs-utils") - (version "2.4.2") + (version "2.4.3") (source (origin (method url-fetch) (uri (string-append @@ -53,7 +54,7 @@ "/nfs-utils-" version ".tar.xz")) (sha256 (base32 - "0f0hm8jq1p5gra55v621qpbb3mryakaikzpy5znkvxym0dx76r24")))) + "16b5y82cjy1cvijg5zmdvivc6sfdlv2slyynxbwwyw43vpjzqrdg")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 91ef7e174215895e849db995ced77e92de41bf93 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 23:20:22 +0200 Subject: gnu: scrot: Update to 1.3. * gnu/packages/xdisorg.scm (scrot): Update to 1.3. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index b717b36aed..fec7b9a4ee 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -616,7 +616,7 @@ move windows, switch between desktops, etc.).") (define-public scrot (package (name "scrot") - (version "1.2") + (version "1.3") (source (origin (method git-fetch) @@ -626,7 +626,7 @@ move windows, switch between desktops, etc.).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "08gkdby0ysx2mki57z81zlm7vfnq9c1gq692xw67cg5vv2p3320w")))) + (base32 "0x70hd59ik37kqd8xqpwrz46np01jv324iz28x2s0kk36d7sblsj")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From c59c04d3b949577e7394daf3ec771de1c7339d0d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 23:23:38 +0200 Subject: gnu: xbanish: Update to 1.7. * gnu/packages/xdisorg.scm (xbanish): Update to 1.7. --- gnu/packages/xdisorg.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index fec7b9a4ee..5e4e275073 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -794,7 +794,7 @@ to find buttons, etc, on the screen to click on.") (define-public xbanish (package (name "xbanish") - (version "1.6") + (version "1.7") (home-page "https://github.com/jcs/xbanish") (source (origin (method git-fetch) @@ -803,14 +803,14 @@ to find buttons, etc, on the screen to click on.") (file-name (git-file-name name version)) (sha256 (base32 - "0vp8ja68hpmqkl61zyjar3czhmny1hbm74m8f393incfz1ymr3i8")))) + "0ic5f7zgc32p5g1wxas9y5h8dhik0pvsa8wmn6skdry56gw9vg9q")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;no tests + `(#:tests? #f ; no tests #:make-flags (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure)))) + (delete 'configure)))) ; no configure script (inputs `(("libx11" ,libx11) ("libxfixes" ,libxfixes) -- cgit v1.2.3 From 3dfb21f0d7fcdca0ec7f16029cbc5a63460664f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:34:20 +0200 Subject: gnu: lxappearance: Update to 0.6.3. * gnu/packages/lxde.scm (lxappearance): Update to 0.6.3. --- gnu/packages/lxde.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 14c4120d05..b9b78a1887 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2017 Nikita ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Brendan Tildesley -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 ison ;;; Copyright © 2018, 2019 Ludovic Courtès ;;; Copyright © 2018 Ricardo Wurmus @@ -104,14 +104,14 @@ libFM file management library."))) (define-public lxappearance (package (name "lxappearance") - (version "0.6.2") + (version "0.6.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/lxde/" "LXAppearance/" name "-" version ".tar.xz")) (sha256 (base32 - "07r0xbi6504zjnbpan7zrn7gi4j0kbsqqfpj8v2x94gr05p16qj4")))) + "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj")))) (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2))) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From cbec994ddef92cac0a6fd3640d443437b4ab3935 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:34:47 +0200 Subject: gnu: lxappearance: Don't use NAME in source URI. * gnu/packages/lxde.scm (lxappearance)[source]: Hard-code NAME. --- gnu/packages/lxde.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index b9b78a1887..55605a0d5f 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -105,13 +105,13 @@ libFM file management library."))) (package (name "lxappearance") (version "0.6.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/" - "LXAppearance/" name "-" version ".tar.xz")) - (sha256 - (base32 - "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj")))) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/lxde/" + "LXAppearance/lxappearance-" version ".tar.xz")) + (sha256 + (base32 "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj")))) (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2))) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 53bd021f1b3ff78150e75af28b13b2da08af6d36 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:39:47 +0200 Subject: gnu: lxsession: Update to 0.5.5. * gnu/packages/lxde.scm (lxsession): Update to 0.5.5. [source]: Remove upstreamed patch. * gnu/packages/patches/lxsession-use-gapplication.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/lxde.scm | 8 +- .../patches/lxsession-use-gapplication.patch | 152 --------------------- 3 files changed, 4 insertions(+), 157 deletions(-) delete mode 100644 gnu/packages/patches/lxsession-use-gapplication.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6095c69085..dc3e880603 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1233,7 +1233,6 @@ dist_patch_DATA = \ %D%/packages/patches/luit-posix.patch \ %D%/packages/patches/luminance-hdr-qt-printer.patch \ %D%/packages/patches/lvm2-static-link.patch \ - %D%/packages/patches/lxsession-use-gapplication.patch \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/mariadb-client-test-32bit.patch \ %D%/packages/patches/mars-install.patch \ diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 55605a0d5f..efd6c39453 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -518,16 +518,14 @@ in LXDE.") (define-public lxsession (package (name "lxsession") - (version "0.5.3") + (version "0.5.5") (source (origin (method url-fetch) (uri (string-append "https://downloads.sourceforge.net/lxde/" name "-" version ".tar.xz")) - (patches (search-patches "lxsession-use-gapplication.patch")) (sha256 - (base32 - "1a0zmyywwzdh59nc0l94cir18vhp633z4q2xfhn5zx11ajj45gwh")) + (base32 "0imv9nysip1j9lrb2z96kl05isjgp312323wnnd5b59h0ff0sgp4")) (modules '((guix build utils))) (snippet ;; Remove C files generated by Vala so we can build from source. @@ -560,6 +558,8 @@ in LXDE.") ("intltool" ,intltool) ("docbook-xsl" ,docbook-xsl) ("vala" ,vala) + + ;; For bootstrapping. ("autoconf" ,autoconf) ("automake" ,automake))) (synopsis "Lightweight X11 session manager") diff --git a/gnu/packages/patches/lxsession-use-gapplication.patch b/gnu/packages/patches/lxsession-use-gapplication.patch deleted file mode 100644 index 3f2269a42f..0000000000 --- a/gnu/packages/patches/lxsession-use-gapplication.patch +++ /dev/null @@ -1,152 +0,0 @@ -Upstream patch to remove libunique dependency, and use glib >= 2.28.0 -to handle unique apps both for GTK+ 2 and 3. -https://sourceforge.net/p/lxde/patches/539/ - - -From a7d3b40a79a7a16c1f5d50d2bd466570258dae29 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= -Date: Sun, 22 Jan 2017 01:09:59 +0100 -Subject: [PATCH] Use GApplication for unique app handling - -Remove libunique dependency, and use glib >= 2.28.0 to handle unique apps both for GTK+ 2 and 3. ---- - Makefile.am | 6 ------ - configure.ac | 7 +------ - lxclipboard/main.vala | 16 +--------------- - lxpolkit/main.vala | 16 +--------------- - 4 files changed, 3 insertions(+), 42 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index c2e1fe8..e3a3b97 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -90,9 +90,6 @@ if USE_GTK3 - lxclipboard_lxclipboard_VALAFLAGS += --define USE_GTK3 - else - lxclipboard_lxclipboard_VALAFLAGS += --define USE_GTK2 --lxclipboard_lxclipboard_VALAFLAGS += --pkg unique-1.0 --lxclipboard_lxclipboard_CPPFLAGS += $(UNIQUE_CFLAGS) --lxclipboard_lxclipboard_LDADD += $(UNIQUE_LIBS) - endif - - lxpolkit_lxpolkit_vala_SOURCES = \ -@@ -137,9 +134,6 @@ if USE_GTK3 - lxpolkit_lxpolkit_VALAFLAGS += --define USE_GTK3 - else - lxpolkit_lxpolkit_VALAFLAGS += --define USE_GTK2 --lxpolkit_lxpolkit_VALAFLAGS += --pkg unique-1.0 --lxpolkit_lxpolkit_CPPFLAGS += $(UNIQUE_CFLAGS) --lxpolkit_lxpolkit_LDADD += $(UNIQUE_LIBS) - endif - - lxsession_db_lxsession_db_SOURCES = \ -diff --git a/configure.ac b/configure.ac -index 06ddbb3..9126f4d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -45,7 +45,7 @@ PKG_CHECK_MODULES(X11, [x11]) - AC_SUBST(X11_CFLAGS) - AC_SUBST(X11_LIBS) - --PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0]) -+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.28.0]) - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - -@@ -79,11 +79,6 @@ else - CFLAGS="$CFLAGS -D USE_GTK2" - gtk_modules="gtk+-2.0 >= 2.6.0" - VALA_GTK_LIBS="gtk+-2.0" -- -- PKG_CHECK_MODULES(UNIQUE, [unique-1.0]) -- AC_SUBST(UNIQUE_CFLAGS) -- AC_SUBST(UNIQUE_LIBS) -- - fi - PKG_CHECK_MODULES(GTK, [$gtk_modules]) - AC_SUBST(GTK_CFLAGS) -diff --git a/lxclipboard/main.vala b/lxclipboard/main.vala -index bee4044..3d4a8d7 100644 ---- a/lxclipboard/main.vala -+++ b/lxclipboard/main.vala -@@ -17,9 +17,6 @@ - * MA 02110-1301, USA. - */ - using Gtk; --#if USE_GTK2 --using Unique; --#endif - - namespace Lxsession - { -@@ -28,17 +25,7 @@ namespace Lxsession - public static int main(string[] args) - { - Gtk.init (ref args); --#if USE_GTK2 -- Unique.App app = new Unique.App("org.lxde.lxclipboard", null); -- -- if(app.is_running) -- { -- message("lxclipboard is already running. Existing"); -- return 0; -- } --#endif --# if USE_GTK3 -- Gtk.Application app = new Gtk.Application ( -+ GLib.Application app = new GLib.Application ( - "org.lxde.lxclipboard", - GLib.ApplicationFlags.FLAGS_NONE); - app.register (); -@@ -48,7 +35,6 @@ namespace Lxsession - message("lxclipboard is already running. Existing"); - return 0; - } --#endif - - clipboard_start (); - -diff --git a/lxpolkit/main.vala b/lxpolkit/main.vala -index c0d6ae2..50c3cb7 100644 ---- a/lxpolkit/main.vala -+++ b/lxpolkit/main.vala -@@ -17,9 +17,6 @@ - * MA 02110-1301, USA. - */ - using Gtk; --#if USE_GTK2 --using Unique; --#endif - - const string GETTEXT_PACKAGE = "lxsession"; - -@@ -33,17 +30,7 @@ namespace Lxsession - Intl.bind_textdomain_codeset(GETTEXT_PACKAGE, "utf-8"); - - Gtk.init (ref args); --#if USE_GTK2 -- Unique.App app = new Unique.App("org.lxde.lxpolkit", null); -- -- if(app.is_running) -- { -- message(_("lxpolkit is already running. Existing")); -- return 0; -- } --#endif --# if USE_GTK3 -- Gtk.Application app = new Gtk.Application ( -+ GLib.Application app = new GLib.Application ( - "org.lxde.lxpolkit", - GLib.ApplicationFlags.FLAGS_NONE); - app.register (); -@@ -53,7 +40,6 @@ namespace Lxsession - message(_("lxpolkit is already running. Existing")); - return 0; - } --#endif - - policykit_agent_init(); - --- -2.11.0 - -- cgit v1.2.3 From 00c63b8d9dd264b930deeb496713ebce7d2bace2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:40:36 +0200 Subject: gnu: lxsession: Don't use NAME in source URI. * gnu/packages/lxde.scm (lxsession)[source]: Hard-code NAME. --- gnu/packages/lxde.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index efd6c39453..e2171da19f 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -523,7 +523,7 @@ in LXDE.") (origin (method url-fetch) (uri (string-append "https://downloads.sourceforge.net/lxde/" - name "-" version ".tar.xz")) + "lxsession-" version ".tar.xz")) (sha256 (base32 "0imv9nysip1j9lrb2z96kl05isjgp312323wnnd5b59h0ff0sgp4")) (modules '((guix build utils))) -- cgit v1.2.3 From 46b02378f07250caa09a3bc690014724956e1a4c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:44:45 +0200 Subject: gnu: lxpanel: Update to 0.10.0. * gnu/packages/lxde.scm (lxpanel): Update to 0.10.0. [inputs]: Add curl. --- gnu/packages/lxde.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index e2171da19f..0317d9ddc7 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages curl) #:use-module (gnu packages disk) #:use-module (gnu packages docbook) #:use-module (gnu packages file-systems) @@ -571,15 +572,14 @@ in LXDE.") (define-public lxpanel (package (name "lxpanel") - (version "0.9.3") + (version "0.10.0") (source (origin (method url-fetch) (uri (string-append "https://downloads.sourceforge.net/lxde/" name "-" version ".tar.xz")) (sha256 - (base32 - "1ccgv7jgl3y865cpb6w7baaz7468fxncm83bqxlwyni5bwhglb1l")))) + (base32 "0zis3b815p375s6mymhf5sn1a0c1xv0ixxzb0mh3fqhrby6cqy26")))) (build-system gnu-build-system) (arguments `(#:phases @@ -594,7 +594,8 @@ in LXDE.") #t)))))) (inputs ;; TODO: libindicator-0.3.0 - `(("gtk+-2" ,gtk+-2) + `(("curl" ,curl) + ("gtk+-2" ,gtk+-2) ("alsa-lib" ,alsa-lib) ("libwnck-2" ,libwnck-2) ("keybinder" ,keybinder) -- cgit v1.2.3 From 4f3e8733f90a8ec943a4b387a27e4002cdd2f324 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:45:00 +0200 Subject: gnu: lxpanel: Don't use NAME in source URI. * gnu/packages/lxde.scm (lxpanel)[source]: Hard-code NAME. --- gnu/packages/lxde.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 0317d9ddc7..c5eb3965ad 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -577,7 +577,7 @@ in LXDE.") (origin (method url-fetch) (uri (string-append "https://downloads.sourceforge.net/lxde/" - name "-" version ".tar.xz")) + "lxpanel-" version ".tar.xz")) (sha256 (base32 "0zis3b815p375s6mymhf5sn1a0c1xv0ixxzb0mh3fqhrby6cqy26")))) (build-system gnu-build-system) -- cgit v1.2.3 From 85343f4978cf68c5239f72fd81b30f6bb1e5ea0e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:46:44 +0200 Subject: gnu: lxrandr: Update to 0.3.2. * gnu/packages/lxde.scm (lxrandr): Update to 0.3.2. --- gnu/packages/lxde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index c5eb3965ad..1a1e254c79 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -126,7 +126,7 @@ able to change themes, icons, and fonts used by GTK+ applications.") (define-public lxrandr (package (name "lxrandr") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/lxde/LXRandR" @@ -135,7 +135,7 @@ able to change themes, icons, and fonts used by GTK+ applications.") name "-" version ".tar.xz")) (sha256 (base32 - "0khqi42paqg82jllb2kza4arf3fafzgq90fhyr3rw3d9hn23763d")))) + "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb")))) (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2))) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 4fa75903fc4146e3f2c94ba7bb1304229c2d413a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:47:13 +0200 Subject: gnu: lxrandr: Don't use NAME in source URI. * gnu/packages/lxde.scm (lxrandr)[source]: Hard-code NAME. --- gnu/packages/lxde.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 1a1e254c79..fbf32bf337 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -132,7 +132,7 @@ able to change themes, icons, and fonts used by GTK+ applications.") (uri (string-append "mirror://sourceforge/lxde/LXRandR" "%20%28monitor%20config%20tool%29/LXRandR%20" (version-major+minor version) ".x/" - name "-" version ".tar.xz")) + "lxrandr-" version ".tar.xz")) (sha256 (base32 "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb")))) -- cgit v1.2.3 From b5c6264188e8071a2ee521eb0257b3d9d34bffeb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 20:51:02 +0200 Subject: gnu: radare2: Remove pointless configure flag. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (radare2)[arguments]: Remove unrecognised ‘--without-nonpic’ from #:configure-flags. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 07f4d0cf96..6628a45482 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1364,8 +1364,8 @@ bindings for Python, Java, OCaml and more.") (mkdir-p (string-append (assoc-ref %outputs "out") "/lib")) #t))) #:configure-flags - (list "--with-sysmagic" "--with-syszip" "--with-openssl" - "--without-nonpic" "--with-rpath" "--with-syscapstone") + (list "--with-sysmagic" "--with-syszip" "--with-syscapstone" + "--with-openssl" "--with-rpath") #:make-flags (list "CC=gcc"))) (inputs -- cgit v1.2.3 From 655a0c65be6b3653c61310e730d5128670ffa5b1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 20:52:39 +0200 Subject: gnu: radare2: Use OUTPUTS keyword. * gnu/packages/engineering.scm (radare2)[arguments]: Substitute OUTPUTS for %OUTPUTS. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 6628a45482..9132743626 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1360,8 +1360,8 @@ bindings for Python, Java, OCaml and more.") #:phases (modify-phases %standard-phases (add-before 'configure 'mklibdir - (lambda* (#:key inputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref %outputs "out") "/lib")) + (lambda* (#:key inputs outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "out") "/lib")) #t))) #:configure-flags (list "--with-sysmagic" "--with-syszip" "--with-syscapstone" -- cgit v1.2.3 From 6454e5ac500264babc9df669885568d13f08be1c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 21:16:11 +0200 Subject: gnu: radare2: Remove impotent snippet. * gnu/packages/engineering.scm (radare2)[source]: Remove a snippet that does nothing. --- gnu/packages/engineering.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 9132743626..a46f244469 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1343,17 +1343,7 @@ bindings for Python, Java, OCaml and more.") (sha256 (base32 "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg")) - (file-name (git-file-name name version)) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "libr/asm/p/Makefile" - (("LDFLAGS\\+=") "LDFLAGS+=-Wl,-rpath=$(LIBDIR) ")) - (substitute* "libr/parse/p/Makefile" - (("LDFLAGS\\+=") "LDFLAGS+=-Wl,-rpath=$(LIBDIR) ")) - (substitute* "libr/bin/p/Makefile" - (("LDFLAGS\\+=") "LDFLAGS+=-Wl,-rpath=$(LIBDIR) ")) - #t)))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments '(#:tests? #f ; tests require git and network access -- cgit v1.2.3 From d01269d251ebdc4417374ea817f406c4ecd004a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 21:16:29 +0200 Subject: gnu: radare2: Update to 4.4.0. * gnu/packages/engineering.scm (radare2): Update to 4.4.0. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index a46f244469..3653f10aeb 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1334,7 +1334,7 @@ bindings for Python, Java, OCaml and more.") (define-public radare2 (package (name "radare2") - (version "4.2.1") + (version "4.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -1342,7 +1342,7 @@ bindings for Python, Java, OCaml and more.") (commit version))) (sha256 (base32 - "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg")) + "0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 95fd14df34660b09033df65e0c4740b8996224ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 May 2020 10:01:58 +0200 Subject: gnu: pianobar: Build with the default C standard. * gnu/packages/music.scm (pianobar)[arguments]: Remove CFLAGS from #:make-flags. --- gnu/packages/music.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 9f30caf7af..2c6be8eba8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2718,8 +2718,7 @@ tune-in sender list from @url{http://opml.radiotime.com}.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" "CFLAGS=-std=c99" - (string-append "PREFIX=" %output)) + #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs -- cgit v1.2.3 From 03ed699159a47f7c6de2c3e9713bf8facf70554e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 May 2020 13:25:44 +0200 Subject: gnu: perl-time-mock: Do not use "v" in version string. * gnu/packages/perl.scm (perl-time-mock)[version]: Remove "v" prefix. [source](uri): Adjust accordingly. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 8b143ffde2..7064e7fde1 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -10052,12 +10052,12 @@ time values and formatting dates into ASCII strings.") (define-public perl-time-mock (package (name "perl-time-mock") - (version "v0.0.2") + (version "0.0.2") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/EW/EWILHELM/" - "Time-Mock-" version ".tar.gz")) + "Time-Mock-v" version ".tar.gz")) (sha256 (base32 "0bwqyg8z98m8cjw1qcm4wg502n225k33j2fp8ywxkgfjdd1zgllv")))) -- cgit v1.2.3 From 3e5446e75255552a18379e7b6783355536fd7a21 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 May 2020 13:27:10 +0200 Subject: gnu: perl-file-find-object: Do not use "v" prefix in version string. * gnu/packages/perl.scm (perl-file-find-object)[version]: Remove "v" prefix. [source](uri): Adjust accordingly. --- gnu/packages/perl.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 7064e7fde1..b98bc5417a 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -10790,14 +10790,13 @@ such that being individual extensions would be wasteful.") (define-public perl-file-find-object (package (name "perl-file-find-object") - (version "v0.2.13") + (version "0.2.13") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-" - version - ".tar.gz")) + "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-v" + version ".tar.gz")) (sha256 (base32 "0gf13b76b824s73r5rp00v8xrd6dnb5yi5jjavfc394scqv6ldh4")))) -- cgit v1.2.3 From 9d7ecf1c82a4854e34d635381209d87d1ab37bb0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 May 2020 13:27:45 +0200 Subject: gnu: perl-getopt-long: Do not use "v" prefix in version string. * gnu/packages/perl.scm (perl-getopt-long)[version]: Remove "v" prefix. [source](uri): Adjust accordingly. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index b98bc5417a..e7d4ce8392 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4786,12 +4786,12 @@ back to a full directory scan if none of these are available.") (define-public perl-getopt-long (package (name "perl-getopt-long") - (version "v2.49.1") + (version "2.49.1") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/J/JV/JV/" - "Getopt-Long-" (substring version 1) ".tar.gz")) + "Getopt-Long-v" (substring version 1) ".tar.gz")) (sha256 (base32 "0bw8gbhj8s5gmkqvs3m7pk9arqhgqssrby4yimh29ah9alix9ylq")))) -- cgit v1.2.3 From 9da87078417bb16ad82652a7d2efd72185c28220 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 May 2020 13:32:53 +0200 Subject: gnu: emacsy-minimal: Do not use "v" prefix in version string. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (emacsy-minimal): Turn COMMIT binding into a "git describe" string. [version]: Drop first character of COMMIT. --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 8dfce091ef..8225604a0f 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2872,11 +2872,11 @@ in C using Gtk+-3 and WebKitGtk.") (license license:gpl3+))) (define-public emacsy-minimal - (let ((commit "d459ca1d3d09e7624e662bc4cfc3596850796fc6")) + (let ((commit "v0.4.1-28-gd459ca1")) (package (inherit emacsy) (name "emacsy-minimal") - (version (git-version "v0.4.1" "28" commit)) + (version (string-drop commit 1)) (source (origin (method git-fetch) (uri (git-reference -- cgit v1.2.3 From c1f3382e6f742ca17513e019e860bbc45f38f83c Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Mon, 25 May 2020 18:05:29 +0200 Subject: gnu: Add dump. * gnu/packages/backup.scm (dump): New variable. Signed-off-by: Marius Bakke --- gnu/packages/backup.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 0fe6676cc2..e79fe4a85e 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020 Marcin Karpezo ;;; ;;; This file is part of GNU Guix. ;;; @@ -1026,6 +1027,42 @@ stored previously can be read back in full at any time. The program is format-agnostic, so you can feed virtually any files to it.") (license license:gpl2+))) +(define-public dump + (package + (name "dump") + (version "0.4b46") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/dump/dump/" + version "/dump-" version ".tar.gz")) + (sha256 + (base32 + "15rg5y15ak0ppqlhcih78layvg7cwp6hc16p3c58xs8svlkxjqc0")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + `("--sysconfdir=/etc" + "--disable-readline" + "--disable-rmt"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("openssl" ,openssl-1.0) + ("zlib" ,zlib) + ("util-linux" ,util-linux "lib") + ("e2fsprogs" ,e2fsprogs))) + (home-page "https://dump.sourceforge.io/") + (synopsis "Ext2/3/4 filesystem dump/restore utilities") + (description "Dump examines files in a filesystem, determines which ones +need to be backed up, and copies those files to a specified disk, tape or +other storage medium. Subsequent incremental backups can then be layered on +top of the full backup. The restore command performs the inverse function of +dump; it can restore a full backup of a filesystem. Single files and +directory subtrees may also be restored from full or partial backups in +interractive mode.") + (license license:bsd-3))) + (define-public burp (package (name "burp") -- cgit v1.2.3 From dd003125f72c0e7d6e1f10b7ccd7969fe674c9c1 Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Mon, 25 May 2020 13:24:10 +0200 Subject: gnu: python-iml: Use HTTPS home page. * gnu/packages/machine-learning.scm (python-iml)[home-page]: s/http/https/ Signed-off-by: Marius Bakke --- gnu/packages/machine-learning.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index cf00a84e86..1b678d3d20 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1821,7 +1821,7 @@ advanced research.") ("numpy" ,python-numpy) ("pandas" ,python-pandas) ("scipy" ,python-scipy))) - (home-page "http://github.com/interpretable-ml/iml") + (home-page "https://github.com/interpretable-ml/iml") (synopsis "Interpretable Machine Learning (iML) package") (description "Interpretable ML (iML) is a set of data type objects, visualizations, and interfaces that can be used by any method designed to -- cgit v1.2.3 From d79c917f2dd7550c6737fede49c77679f0a83770 Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Mon, 25 May 2020 13:27:37 +0200 Subject: gnu: Add python-pytest-pycodestyle. * gnu/packages/python-check.scm (python-pytest-pycodestyle): New variable. Signed-off-by: Marius Bakke --- gnu/packages/python-check.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 22b9ea8df5..1071abdbad 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Edouard Klein ;;; ;;; This file is part of GNU Guix. ;;; @@ -337,6 +338,28 @@ testing framework.") framework.") (license license:expat))) +(define-public python-pytest-pycodestyle + (package + (name "python-pytest-pycodestyle") + (version "2.0.0") ;later versions require python-pytest~=5.4 + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-pycodestyle" version)) + (sha256 + (base32 + "02i5gl7pm9cwxk15sn29inz3n8flpj1r3p1l110h43f2na5w8h7z")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pycodestyle" ,python-pycodestyle))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/henry0312/pytest-pycodestyle") + (synopsis "Pytest plugin to run pycodestyle") + (description "This package provides a plugin to run @code{pycodestyle} +for the @code{pytest} framework.") + (license license:expat))) + (define-public python-codacy-coverage (package (name "python-codacy-coverage") -- cgit v1.2.3 From 0321c6ebeae35709cde65b2dccd0a3a6a5d6aeee Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 25 May 2020 15:39:10 -0700 Subject: gnu: diffoscope: Update to 145. * gnu/packages/diffoscope (diffoscope): Update to 145. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 1df8552a30..0c780932eb 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -70,7 +70,7 @@ #:use-module (ice-9 match)) (define-public diffoscope - (let ((version "143")) + (let ((version "145")) (package (name "diffoscope") (version version) @@ -82,7 +82,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0j58dqdk8ln8y0bcnfy37ljs37nkl56lzxqns396300ysln0qiwm")))) + "01n7q3q0hib4bd8gcq0yjghy5zhp0fh0bq1jxrn2ww8zyd4knmc3")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 2f04adf5c4e4be8e44e2bf753d4e0a87f9149c7e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 25 May 2020 17:01:50 -0700 Subject: gnu: disorderfs: Update to 0.5.10. * gnu/packages/file-systems (disorderfs): Update to 0.5.10. --- gnu/packages/file-systems.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 293322c76b..df6febb92e 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -323,7 +323,7 @@ from the jfsutils package. It is meant to be used in initrds.") (define-public disorderfs (package (name "disorderfs") - (version "0.5.9") + (version "0.5.10") (source (origin (method git-fetch) @@ -333,7 +333,7 @@ from the jfsutils package. It is meant to be used in initrds.") (file-name (git-file-name name version)) (sha256 (base32 - "0irgr9hkm9icx1s44m9382484yx8hddzjxbsz621ip9c946pif0g")))) + "0lsisx5118k0qk0b5klbxl03rvhycnznyfx05yxmjawh85bfhmlh")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 51a11b82a317d620026ca1bb2b7e6d29a1c1ee75 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 26 May 2020 00:52:55 +0200 Subject: gnu: mupdf: Don't use NAME in source URI. * gnu/packages/pdf.scm (mupdf)[source]: Hard-code NAME. --- gnu/packages/pdf.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 7906fd28da..6121fe650d 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -690,7 +690,7 @@ extracting content or merging files.") (origin (method url-fetch) (uri (string-append "https://mupdf.com/downloads/archive/" - name "-" version "-source.tar.xz")) + "mupdf-" version "-source.tar.xz")) (sha256 (base32 "1npmy92lkj41nnc14b4fpq7z62pminy94zsdbrczj22jpn283rvg")) -- cgit v1.2.3 From dc36bfec50de76aca1ea0d5714043b6ad9c52747 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 26 May 2020 02:20:44 +0200 Subject: gnu: nethogs: Use explicitly BASE32 source hash. Works around error: failed to load 'gnu/packages/networking.scm': ice-9/eval.scm:293:34: Wrong type to apply: # when manually building from git. * gnu/packages/networking.scm (nethogs)[source]: Use BASE32 explicitly. --- gnu/packages/networking.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b0c1440fd3..fd29370841 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1731,8 +1731,9 @@ the bandwidth, loss, and other parameters.") (url "https://github.com/raboof/nethogs") (commit (string-append "v" version)))) (hash - (content-hash "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9" - sha256)) + (content-hash + (base32 "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9") + sha256)) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 5f833e0495f00a72f8d34a63e8afbc531afdd22d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:41:22 +0300 Subject: gnu: go-github-com-blang-semver: Update version string. The commit was actually the tag for 3.3.0. * gnu/packages/golang.scm (go-github-com-blang-semver)[version]: Retag as 3.3.0. [source]: Update to use version string. --- gnu/packages/golang.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8dd276562a..31022ebf41 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -978,28 +978,26 @@ optimized for performance yet simple to use.") (license license:expat)))) (define-public go-github-com-blang-semver - (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9") - (revision "0")) - (package - (name "go-github-com-blang-semver") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/blang/semver.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/blang/semver")) - (home-page "https://github.com/blang/semver") - (synopsis "Semantic versioning library written in Go") - (description "Semver is a library for Semantic versioning written in Go.") - (license license:expat)))) + (package + (name "go-github-com-blang-semver") + (version "3.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/blang/semver.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/blang/semver")) + (home-page "https://github.com/blang/semver") + (synopsis "Semantic versioning library written in Go") + (description "Semver is a library for Semantic versioning written in Go.") + (license license:expat))) (define-public go-github-com-emicklei-go-restful (let ((commit "89ef8af493ab468a45a42bb0d89a06fccdd2fb22") -- cgit v1.2.3 From f6b4ca5a0a7ce9b3fa3af04b806520b9d6c69ea0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:43:48 +0300 Subject: gnu: go-github-com-blang-semver: Update to 4.0.0. * gnu/packages/golang.scm (go-github-com-blang-semver): Update to 4.0.0. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 31022ebf41..ce21412536 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -980,7 +980,7 @@ optimized for performance yet simple to use.") (define-public go-github-com-blang-semver (package (name "go-github-com-blang-semver") - (version "3.3.0") + (version "4.0.0") (source (origin (method git-fetch) @@ -990,7 +990,7 @@ optimized for performance yet simple to use.") (file-name (git-file-name name version)) (sha256 (base32 - "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2")))) + "14h9ys4n4kx9cbj42lkdf4i5k3nkll6sd62jcvl7cs565v6fiknz")))) (build-system go-build-system) (arguments '(#:import-path "github.com/blang/semver")) -- cgit v1.2.3 From b5a68ec8b97b3a3e54d3a1c3ffc161f91601de64 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:52:43 +0300 Subject: gnu: go-github-com-bkaradzic-go-lz4: Update version string. * gnu/packages/syncthing.scm (go-github-com-bkaradzic-go-lz4)[version]: Commit comes after the 1.0.0 release. --- gnu/packages/syncthing.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 99bdd7704b..a082e8a05f 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -232,7 +232,7 @@ configuration that is stored in a Go struct.") (revision "0")) (package (name "go-github-com-bkaradzic-go-lz4") - (version (git-version "0.0.0" revision commit)) + (version (git-version "1.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference -- cgit v1.2.3 From 1e07bd2aa7fd3a112a308ae6cf84603f2effe114 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:20:22 +0300 Subject: gnu: go-github-com-certifi-gocertifi: Update to 2020.02.11. * gnu/packages/tls.scm (go-github-com-certifi-gocertifi): Update to 2020.02.11. --- gnu/packages/tls.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index ec81b7bf07..f6746ebe21 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Leo Famulari -;;; Copyright © 2016, 2017, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2016, 2017, 2018 Nikita ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Ricardo Wurmus @@ -1021,25 +1021,23 @@ relatively simple Bash script.") (license license:expat))) (define-public go-github-com-certifi-gocertifi - (let ((commit "a5e0173ced670013bfb649c7e806bc9529c986ec") - (revision "1")) - (package - (name "go-github-com-certifi-gocertifi") - (version (git-version "2018.01.18" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/certifi/gocertifi") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1n9drccl3q1rr8wg3nf60slkf1lgsmz5ahifrglbdrc6har3rryj")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/certifi/gocertifi")) - (synopsis "X.509 TLS root certificate bundle for Go") - (description "This package is a Go language X.509 TLS root certificate bundle, + (package + (name "go-github-com-certifi-gocertifi") + (version "2020.02.11") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/certifi/gocertifi") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "018bsy1vclsdk2kns9f37giabibg3kggk3vpj0yr3dv0k72gzybk")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/certifi/gocertifi")) + (synopsis "X.509 TLS root certificate bundle for Go") + (description "This package is a Go language X.509 TLS root certificate bundle, derived from Mozilla's collection.") - (home-page "https://certifi.io") - (license license:mpl2.0)))) + (home-page "https://certifi.io") + (license license:mpl2.0))) -- cgit v1.2.3 From 4672f2c23cbbc75f83e548a5ef4246a3394bd9ca Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:08:35 +0300 Subject: gnu: go-github-com-stathat-go: Update version string. The commit was also tagged 1.0.0. * gnu/packages/syncthing.scm (go-github-com-stathat-go)[version]: Retag 1.0.0. [source]: Update to use version string. --- gnu/packages/syncthing.scm | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index a082e8a05f..740981e937 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -492,27 +492,25 @@ higher-level API for doing so.") (license isc))) (define-public go-github-com-stathat-go - (let ((commit "74669b9f388d9d788c97399a0824adbfee78400e") - (revision "0")) - (package - (name "go-github-com-stathat-go") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stathat/go") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1zzlsl24dyr202qkr2pay22m6d0gb7ssms77wgdx0r0clgm7dihw")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/stathat/go")) - (synopsis "Post statistics to StatHat") - (description "This is a Go package for posting to a StatHat account.") - (home-page "https://github.com/stathat/go") - (license expat)))) + (package + (name "go-github-com-stathat-go") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stathat/go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zzlsl24dyr202qkr2pay22m6d0gb7ssms77wgdx0r0clgm7dihw")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/stathat/go")) + (synopsis "Post statistics to StatHat") + (description "This is a Go package for posting to a StatHat account.") + (home-page "https://github.com/stathat/go") + (license expat))) (define-public go-github-com-rcrowley-go-metrics (let ((commit "cac0b30c2563378d434b5af411844adff8e32960") -- cgit v1.2.3 From 4ddd50c60817588b38ea1bf69e106c2bc7fda938 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:14:51 +0300 Subject: gnu: go-github-com-ccding-go-stun: Update version string. The commit was also tagged 0.1.1. * gnu/packages/syncthing.scm (go-github-com-ccding-go-stun)[version]: Change to tagged version. [source]: Update to use version string. --- gnu/packages/syncthing.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 740981e937..8ca5ab5680 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1035,29 +1035,27 @@ virtual connections from a single physical connection.") (license expat))) (define-public go-github-com-ccding-go-stun - (let ((commit "be486d185f3dfcb2dbf8429332da50a0da7f95a6") - (revision "2")) - (package - (name "go-github-com-ccding-go-stun") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ccding/go-stun.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1gr0rw1c1y7wh6913lyn5k4ig023by27i36bly6am8dwgrgp34ww")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/ccding/go-stun")) - (synopsis "STUN client implementation") - (description "Go-stun is a go implementation of the STUN client (RFC 3489 + (package + (name "go-github-com-ccding-go-stun") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ccding/go-stun.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gr0rw1c1y7wh6913lyn5k4ig023by27i36bly6am8dwgrgp34ww")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/ccding/go-stun")) + (synopsis "STUN client implementation") + (description "Go-stun is a go implementation of the STUN client (RFC 3489 and RFC 5389).") - (home-page "https://github.com/ccding/go-stun") - (license asl2.0)))) + (home-page "https://github.com/ccding/go-stun") + (license asl2.0))) (define-public go-github-com-cespare-xxhash (package -- cgit v1.2.3 From cbc139a791eb8a664c28c2d28033daa0baa102e3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:16:33 +0300 Subject: gnu: go-github-com-ccding-go-stun: Update to 0.1.2. * gnu/packages/syncthing.scm (go-github-com-ccding-go-stun): Update to 0.1.2. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 8ca5ab5680..179586023f 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1037,7 +1037,7 @@ virtual connections from a single physical connection.") (define-public go-github-com-ccding-go-stun (package (name "go-github-com-ccding-go-stun") - (version "0.1.1") + (version "0.1.2") (source (origin (method git-fetch) @@ -1047,7 +1047,7 @@ virtual connections from a single physical connection.") (file-name (git-file-name name version)) (sha256 (base32 - "1gr0rw1c1y7wh6913lyn5k4ig023by27i36bly6am8dwgrgp34ww")))) + "133r2s4h9vv5lmjd680my2c5973gfi0gg5cxcwzjwdjad83a2dm0")))) (build-system go-build-system) (arguments '(#:import-path "github.com/ccding/go-stun")) -- cgit v1.2.3 From 2de39dc723545e2e3dee9e8ef6a5f55db335c958 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:12:17 +0300 Subject: gnu: go-github-com-mitchellh-go-homedir: Update version string. The commit was actually at the 1.0.0 tag. * gnu/packages/golang.scm (go-github-com-mitchellh-go-homedir)[version]: Update to proper version. [source]: Update commit for git-fetch. --- gnu/packages/golang.scm | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ce21412536..cd6054de8c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2341,29 +2341,27 @@ statistics for wrapped connections.") (license license:expat)))) (define-public go-github-com-mitchellh-go-homedir - (let ((commit "ae18d6b8b3205b561c79e8e5f69bff09736185f4") - (revision "0")) - (package - (name "go-github-com-mitchellh-go-homedir") - (version (git-version "1.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mitchellh/go-homedir.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq")))) - (build-system go-build-system) - (arguments - (quote (#:import-path "github.com/mitchellh/go-homedir" - ;; TODO: Tests fail because it tries to access home. - #:tests? #f))) - (home-page "https://github.com/mitchellh/go-homedir") - (synopsis "Go library for detecting and expanding the user's home directory without cgo") - (description "This is a Go library for detecting the user's home + (package + (name "go-github-com-mitchellh-go-homedir") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mitchellh/go-homedir.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq")))) + (build-system go-build-system) + (arguments + (quote (#:import-path "github.com/mitchellh/go-homedir" + ;; TODO: Tests fail because it tries to access home. + #:tests? #f))) + (home-page "https://github.com/mitchellh/go-homedir") + (synopsis "Go library for detecting and expanding the user's home directory without cgo") + (description "This is a Go library for detecting the user's home directory without the use of @command{cgo}, so the library can be used in cross-compilation environments. @@ -2377,7 +2375,7 @@ package cannot cross compile. But 99% of the time the use for @command{os/user} is just to retrieve the home directory, which we can do for the current user without cgo. This library does that, enabling cross-compilation.") - (license license:expat)))) + (license license:expat))) (define-public go-github-com-multiformats-go-multiaddr (let ((commit "fe1c46f8be5af4aff4db286e08839295bd922efb") -- cgit v1.2.3 From c748f5262fa155e8986692c5cae7a584804d28ee Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:13:38 +0300 Subject: gnu: go-github-com-mitchellh-go-homedir: Update to 1.1.0. * gnu/packages/golang.scm (go-github-com-mitchellh-go-homedir): Update to 1.1.0. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index cd6054de8c..fa62a9ad15 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2343,7 +2343,7 @@ statistics for wrapped connections.") (define-public go-github-com-mitchellh-go-homedir (package (name "go-github-com-mitchellh-go-homedir") - (version "1.0.0") + (version "1.1.0") (source (origin (method git-fetch) @@ -2353,7 +2353,7 @@ statistics for wrapped connections.") (file-name (git-file-name name version)) (sha256 (base32 - "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq")))) + "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1")))) (build-system go-build-system) (arguments (quote (#:import-path "github.com/mitchellh/go-homedir" -- cgit v1.2.3 From 369aab196d6df12fe6552ad84fcd2db80be0fcbe Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:18:17 +0300 Subject: gnu: go-github-com-mitchellh-go-homedir: Enable tests. * gnu/packages/golang.scm (go-github-com-mitchellh-go-homedir) [arguments]: Enable tests. Add custom phase to set HOME environment variable. --- gnu/packages/golang.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index fa62a9ad15..44481ed08f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2356,9 +2356,13 @@ statistics for wrapped connections.") "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1")))) (build-system go-build-system) (arguments - (quote (#:import-path "github.com/mitchellh/go-homedir" - ;; TODO: Tests fail because it tries to access home. - #:tests? #f))) + `(#:import-path "github.com/mitchellh/go-homedir" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-home-directory + (lambda _ + (setenv "HOME" "/") + #t))))) (home-page "https://github.com/mitchellh/go-homedir") (synopsis "Go library for detecting and expanding the user's home directory without cgo") (description "This is a Go library for detecting the user's home -- cgit v1.2.3 From 28d60279c94eea9d0ca59e217f0c1647ef93a8db Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:07:44 +0300 Subject: gnu: go-github-com-kr-text: Update to 0.2.0. * gnu/packages/golang.scm (go-github-com-kr-text): Update to 0.2.0. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 44481ed08f..c8948f0877 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2824,7 +2824,7 @@ format in Go.") (define-public go-github-com-kr-text (package (name "go-github-com-kr-text") - (version "0.1.0") + (version "0.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -2833,7 +2833,7 @@ format in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1")))) + "0hf58ypz6rxsw6nx3i856whir9lvy4sdx946wbw1nfaf2rdmr9vx")))) (build-system go-build-system) (arguments '(#:import-path "github.com/kr/text")) -- cgit v1.2.3 From f5c9d2611f460be9827f8af339827ad494c45a5a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:54:55 +0300 Subject: gnu: go-github-com-lib-pq: Update to 1.5.2. * gnu/packages/syncthing.scm (go-github-com-lib-pq): Update to 1.5.2. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 179586023f..f660cb0eee 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -416,7 +416,7 @@ address of the default LAN gateway.") (define-public go-github-com-lib-pq (package (name "go-github-com-lib-pq") - (version "1.2.0") + (version "1.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -425,7 +425,7 @@ address of the default LAN gateway.") (file-name (git-file-name name version)) (sha256 (base32 - "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz")))) + "1wjw5pfjgc63n9934mgvg8hr1v9381mcdz62jkn9xqxqcv6b95lw")))) (build-system go-build-system) (arguments `(#:import-path "github.com/lib/pq" -- cgit v1.2.3 From 37b0793d516c1b604ee312b5e156837484ca4b04 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:04:44 +0300 Subject: gnu: go-github-com-oschwald-maxminddb-golang: Update to 1.6.0. * gnu/packages/syncthing.scm (go-github-com-oschwald-maxminddb-golang): Update to 1.6.0. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index f660cb0eee..057f0ce2bd 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -468,7 +468,7 @@ GeoLite2 and GeoIP2 databases in Go.") (define-public go-github-com-oschwald-maxminddb-golang (package (name "go-github-com-oschwald-maxminddb-golang") - (version "1.4.0") + (version "1.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -477,7 +477,7 @@ GeoLite2 and GeoIP2 databases in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "100wd5qv00pkcm6cb8c4x5gavc9jnn7drh6xrqh85hzci4rils66")))) + "1xdqaazxddnajh0qic1c70skad44kxxr7m46fypbnawn61v3f7gc")))) (build-system go-build-system) (propagated-inputs `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) -- cgit v1.2.3 From a2b7abcd97caec8e2f16a8d9f68171f9622136e1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:06:25 +0300 Subject: gnu: go-github-com-go-asn1-ber-asn1-ber: Update to 1.4.1. * gnu/packages/syncthing.scm (go-github-com-go-asn1-ber-asn1-ber): Update to 1.4.1. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 057f0ce2bd..6eff80dded 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -943,7 +943,7 @@ server tools for Prometheus metrics.") (define-public go-github-com-go-asn1-ber-asn1-ber (package (name "go-github-com-go-asn1-ber-asn1-ber") - (version "1.3.1") + (version "1.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -952,7 +952,7 @@ server tools for Prometheus metrics.") (file-name (git-file-name name version)) (sha256 (base32 - "0dxfmgk84fn0p6pz3i0cspynh6rly5pfk9wghm1q07mx99npln02")))) + "0d7yl1f7ak0djkflw8wx1wlhym2whg7bh57m419arfym9ncwrhg1")))) (build-system go-build-system) (arguments '(#:import-path "github.com/go-asn1-ber/asn1-ber")) -- cgit v1.2.3 From f913f7d9e5293ac2eb7015457bcc7fac8dfe7e2f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:12:12 +0300 Subject: gnu: go-github-com-beorn7-perks-quantile: Update to 1.0.1. * gnu/packages/syncthing.scm (go-github-com-beorn7-perks-quantile): Update to 1.0.1. --- gnu/packages/syncthing.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 6eff80dded..6ae7b7b024 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -747,30 +747,28 @@ notification library in Go.") (license expat)))) (define-public go-github-com-beorn7-perks-quantile - (let ((commit "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9") - (revision "0")) - (package - (name "go-github-com-beorn7-perks-quantile") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/beorn7/perks.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/beorn7/perks/quantile" - #:unpack-path "github.com/beorn7/perks")) - (synopsis "Compute approximate quantiles over an unbounded data stream") - (description "Perks contains the Go package @code{quantile} that computes + (package + (name "go-github-com-beorn7-perks-quantile") + (version "1.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/beorn7/perks.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/beorn7/perks/quantile" + #:unpack-path "github.com/beorn7/perks")) + (synopsis "Compute approximate quantiles over an unbounded data stream") + (description "Perks contains the Go package @code{quantile} that computes approximate quantiles over an unbounded data stream within low memory and CPU bounds.") - (home-page "https://github.com/beorn7/perks") - (license expat)))) + (home-page "https://github.com/beorn7/perks") + (license expat))) (define-public go-github-com-prometheus-client-model (let ((commit "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016") -- cgit v1.2.3 From a63077f0032ad904fc7ae57dd79742fe2913a1d2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:21:54 +0300 Subject: gnu: go-github-com-maruel-panicparse: Update to 1.4.1. * gnu/packages/golang.scm (go-github-com-maruel-panicparse): Update to 1.4.1. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c8948f0877..e11c52b0e4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3191,7 +3191,7 @@ error handling primitives in Go.") (define-public go-github-com-maruel-panicparse (package (name "go-github-com-maruel-panicparse") - (version "1.3.0") + (version "1.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -3200,7 +3200,7 @@ error handling primitives in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "13qkn7f64yln8jdmma37h6ra4c7anxkp3vfgvfyb6lb07dpr1ibq")))) + "0sff44kqmpwzpa6h84fssdsv9glfm8bjjcnspsr64qzmqxpbc7m4")))) (build-system go-build-system) (arguments '(#:import-path "github.com/maruel/panicparse")) -- cgit v1.2.3 From 3d2e2bf6b85b5d54e331b8572050a395be87d134 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 May 2020 09:49:11 +0300 Subject: gnu: go-github-com-prometheus-procfs: Update to 0.0.11. * gnu/packages/syncthing.scm (go-github-com-prometheus-procfs): Update to 0.0.11. [propagated-inputs]: Add go-golang-org-x-sys. --- gnu/packages/syncthing.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 6ae7b7b024..be7496e7ca 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -878,7 +878,7 @@ Prometheus metrics.") (define-public go-github-com-prometheus-procfs (package (name "go-github-com-prometheus-procfs") - (version "0.0.4") + (version "0.0.11") (source (origin (method git-fetch) (uri (git-reference @@ -887,13 +887,15 @@ Prometheus metrics.") (file-name (git-file-name name version)) (sha256 (base32 - "1z5jq5rjala0a0di4nwk1rai0z9f73qwqj6mgcbpjbg2qknlb544")))) + "1msc8bfywsmrgr2ryqjdqwkxiz1ll08r3qgvaka2507z1wpcpj2c")))) (build-system go-build-system) (arguments '(#:import-path "github.com/prometheus/procfs" ;; The tests require Go modules, which are not yet supported in Guix's ;; Go build system. #:tests? #f)) + (propagated-inputs + `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) (synopsis "Go library for reading @file{/proc}") (description "The @code{procfs} Go package provides functions to retrieve system, kernel, and process metrics from the @file{/proc} pseudo file system.") -- cgit v1.2.3 From 681ac9a66c26d2c739e41f03228f8c63fc0df482 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 May 2020 09:49:50 +0300 Subject: gnu: go-github-com-prometheus-procfs: Re-indent. * gnu/packages/syncthing.scm (go-github-com-prometheus-procfs): Re-indent the package. --- gnu/packages/syncthing.scm | 48 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index be7496e7ca..bb264df717 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -876,31 +876,31 @@ Prometheus metrics.") (license asl2.0))) (define-public go-github-com-prometheus-procfs - (package - (name "go-github-com-prometheus-procfs") - (version "0.0.11") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/prometheus/procfs.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1msc8bfywsmrgr2ryqjdqwkxiz1ll08r3qgvaka2507z1wpcpj2c")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/prometheus/procfs" - ;; The tests require Go modules, which are not yet supported in Guix's - ;; Go build system. - #:tests? #f)) - (propagated-inputs - `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) - (synopsis "Go library for reading @file{/proc}") - (description "The @code{procfs} Go package provides functions to retrieve + (package + (name "go-github-com-prometheus-procfs") + (version "0.0.11") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prometheus/procfs.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1msc8bfywsmrgr2ryqjdqwkxiz1ll08r3qgvaka2507z1wpcpj2c")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/prometheus/procfs" + ;; The tests require Go modules, which are not yet supported in Guix's + ;; Go build system. + #:tests? #f)) + (propagated-inputs + `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) + (synopsis "Go library for reading @file{/proc}") + (description "The @code{procfs} Go package provides functions to retrieve system, kernel, and process metrics from the @file{/proc} pseudo file system.") - (home-page "https://github.com/prometheus/procfs") - (license asl2.0))) + (home-page "https://github.com/prometheus/procfs") + (license asl2.0))) (define-public go-github-com-prometheus-client-golang (package -- cgit v1.2.3 From 8b2a637dcd7d5e8e4e5e765e89196f542fbddac4 Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Mon, 25 May 2020 19:44:57 +0200 Subject: gnu: stumpish: Update to 0.0.1-2.920f8fc. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f9db2dbe4d..b4d6fe74c1 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1661,8 +1661,8 @@ productive, customizable lisp based systems.") (delete 'create-symlinks))))))) (define-public stumpish - (let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91") - (revision "1")) + (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") + (revision "2")) (package (name "stumpish") (version (git-version "0.0.1" revision commit)) ;no upstream release @@ -1674,7 +1674,7 @@ productive, customizable lisp based systems.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn")))) + (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) (inputs `(("bash" ,bash) ("rlwrap" ,rlwrap))) -- cgit v1.2.3 From 7b7c3c081d7bbccd72dbfa583d3e40e61d94a47b Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Mon, 25 May 2020 19:44:58 +0200 Subject: gnu: sbcl-ttf-fonts: Update to 0.0.1-2.920f8fc. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index b4d6fe74c1..a2b788e276 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1701,8 +1701,8 @@ productive, customizable lisp based systems.") (deprecated-package "sbcl-stumpwm-with-slynk" stumpwm+slynk)) (define-public sbcl-stumpwm-ttf-fonts - (let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91") - (revision "1")) + (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") + (revision "2")) (package (name "sbcl-ttf-fonts") (version (git-version "0.0.1" revision commit)) ;no upstream release @@ -1714,7 +1714,7 @@ productive, customizable lisp based systems.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn")))) + (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) (inputs `(("stumpwm" ,stumpwm "lib") ("clx-truetype" ,sbcl-clx-truetype))) -- cgit v1.2.3 From 40dab17631a7467fe751907e01a00b97a617388d Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Mon, 25 May 2020 19:44:59 +0200 Subject: gnu: sbcl-pass: Update to 0.0.1-2.920f8fc. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a2b788e276..b139e37748 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1732,8 +1732,8 @@ rendering.") (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) (define-public sbcl-stumpwm-pass - (let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91") - (revision "1")) + (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") + (revision "2")) (package (name "sbcl-pass") (version (git-version "0.0.1" revision commit)) ;no upstream release @@ -1745,7 +1745,7 @@ rendering.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn")))) + (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) (inputs `(("stumpwm" ,stumpwm "lib"))) (build-system asdf-build-system/sbcl) -- cgit v1.2.3 From 546f21c22f4b6add9f72b820019f4a35f9311448 Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Mon, 25 May 2020 19:45:00 +0200 Subject: gnu: sbcl-globalwindows: Update to 0.0.1-2.920f8fc. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index b139e37748..4678ec524a 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1762,8 +1762,8 @@ password-store into StumpWM.") (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) (define-public sbcl-stumpwm-globalwindows - (let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91") - (revision "1")) + (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") + (revision "2")) (package (name "sbcl-globalwindows") (version (git-version "0.0.1" revision commit)) ;no upstream release @@ -1775,7 +1775,7 @@ password-store into StumpWM.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn")))) + (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) (inputs `(("stumpwm" ,stumpwm "lib"))) (build-system asdf-build-system/sbcl) -- cgit v1.2.3 From dfd4a29889fe8dae55cefa069f2e176e421611f8 Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Mon, 25 May 2020 19:45:01 +0200 Subject: gnu: sbcl-swm-gaps: Update to 0.0.1-2.920f8fc. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 4678ec524a..2e975354c3 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1792,8 +1792,8 @@ windows in the current X session.") (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) (define-public sbcl-stumpwm-swm-gaps - (let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91") - (revision "1")) + (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") + (revision "2")) (package (name "sbcl-swm-gaps") (version (git-version "0.0.1" revision commit)) ;no upstream release @@ -1805,7 +1805,7 @@ windows in the current X session.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn")))) + (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) (inputs `(("stumpwm" ,stumpwm "lib"))) (build-system asdf-build-system/sbcl) -- cgit v1.2.3 From edb0366c16fee4767a1d007b6c38f11080910b50 Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Mon, 25 May 2020 19:45:02 +0200 Subject: gnu: emacs-stumpwm-mode: Update to 0.0.1-3.920f8fc. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5dbb48bb0e..b99acb7815 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -72,6 +72,7 @@ ;;; Copyright © 2020 pinoaffe ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Ryan Desfosses +;;; Copyright © 2020 Marcin Karpezo ;;; ;;; This file is part of GNU Guix. ;;; @@ -15460,8 +15461,8 @@ bookmarks and history.") (license license:gpl3+))) (define-public emacs-stumpwm-mode - (let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91") - (revision "2")) + (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") + (revision "3")) (package (name "emacs-stumpwm-mode") (version (git-version "0.0.1" revision commit)) @@ -15473,7 +15474,7 @@ bookmarks and history.") (file-name (git-file-name name version)) (sha256 (base32 - "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn")))) + "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 1b4fa7851b39f087a6433e8b5e22c479ca1da289 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 20 May 2020 16:09:53 +0200 Subject: image: Add partition offset support. * gnu/image.scm (partition-offset): New procedure, ()[offset]: new field. * gnu/system/image.scm (system-disk-image): Apply the partition offset. --- gnu/image.scm | 2 ++ gnu/system/image.scm | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/image.scm b/gnu/image.scm index b05fc69dc5..3a02692950 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -22,6 +22,7 @@ partition? partition-device partition-size + partition-offset partition-file-system partition-label partition-uuid @@ -47,6 +48,7 @@ partition? (device partition-device (default #f)) (size partition-size) + (offset partition-offset (default #f)) (file-system partition-file-system (default "ext4")) (label partition-label (default #f)) (uuid partition-uuid (default #f)) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 571b7af5f3..adc2b3c221 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -243,11 +243,17 @@ used in the image." ;; Return the genimage partition configuration for PARTITION. (let ((label (partition-label partition)) (dos-type (partition->dos-type partition)) - (image (partition-image partition))) + (image (partition-image partition)) + (offset (partition-offset partition))) #~(format #f "~/partition ~a { ~/~/partition-type = ~a ~/~/image = \"~a\" - ~/}" #$label #$dos-type #$image))) + ~/~/offset = \"~a\" + ~/}" + #$label + #$dos-type + #$image + #$(or offset 0)))) (let* ((format (image-format image)) (image-type (format->image-type format)) -- cgit v1.2.3 From 16f9124d1fec7b40cdac189346e0d5021e43122b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 20 May 2020 16:12:14 +0200 Subject: build: image: Add support for EXT2 and EXT3 file-systems. * gnu/build/image.scm (make-ext4-image): Rename to ... (make-ext-image): ... it, and pass the file-system type to mke2fs, (make-partition-image): Adapt to call "make-ext-image" if the partition file-system is prefixed by "ext". --- gnu/build/image.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index fe8e11aa1b..23fc56571f 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -63,16 +63,18 @@ take the partition metadata size into account, take a 25% margin." (* 1.25 (file-size root))) -(define* (make-ext4-image partition target root - #:key - (owner-uid 0) - (owner-gid 0)) - "Handle the creation of EXT4 partition images. See 'make-partition-image'." +(define* (make-ext-image partition target root + #:key + (owner-uid 0) + (owner-gid 0)) + "Handle the creation of EXT2/3/4 partition images. See +'make-partition-image'." (let ((size (partition-size partition)) + (fs (partition-file-system partition)) (label (partition-label partition)) (uuid (partition-uuid partition)) (options "lazy_itable_init=1,lazy_journal_init=1")) - (invoke "mke2fs" "-t" "ext4" "-d" root + (invoke "mke2fs" "-t" fs "-d" root "-L" label "-U" (uuid->string uuid) "-E" (format #f "root_owner=~a:~a,~a" owner-uid owner-gid options) @@ -105,8 +107,8 @@ ROOT directory to populate the image." (let* ((partition (sexp->partition partition-sexp)) (type (partition-file-system partition))) (cond - ((string=? type "ext4") - (make-ext4-image partition target root)) + ((string-prefix? "ext" type) + (make-ext-image partition target root)) ((string=? type "vfat") (make-vfat-image partition target root)) (else -- cgit v1.2.3 From 15135a5e134f119c5467f0509f09dace60c63832 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 20 May 2020 16:17:52 +0200 Subject: gnu: grub: Allow "grub-bios-setup" to operate on raw disk-images. * gnu/packages/patches/grub-setup-root.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/bootloaders.scm (grub): Apply it. --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 1 + gnu/packages/patches/grub-setup-root.patch | 124 +++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 gnu/packages/patches/grub-setup-root.patch diff --git a/gnu/local.mk b/gnu/local.mk index dc3e880603..7d23b04723 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1041,6 +1041,7 @@ dist_patch_DATA = \ %D%/packages/patches/gromacs-tinyxml2.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ %D%/packages/patches/grub-efi-fat-serial-number.patch \ + %D%/packages/patches/grub-setup-root.patch \ %D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \ %D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 0f0d3b4b62..5273412adf 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -96,6 +96,7 @@ "0zgp5m3hmc9jh8wpjx6czzkh5id2y8n1k823x2mjvm2sk6b28ag5")) (patches (search-patches "grub-efi-fat-serial-number.patch" + "grub-setup-root.patch" "grub-verifiers-Blocklist-fallout-cleanup.patch")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/patches/grub-setup-root.patch b/gnu/packages/patches/grub-setup-root.patch new file mode 100644 index 0000000000..1abe9c383a --- /dev/null +++ b/gnu/packages/patches/grub-setup-root.patch @@ -0,0 +1,124 @@ +This patch is taken from OpenWrt, see: + +https://github.com/openwrt/openwrt/blob/master/package/boot/grub2/patches/100-grub_setup_root.patch. + +It allows to use grub-bios-setup on a raw disk-images, without root permissions. + +--- a/util/grub-setup.c ++++ b/util/grub-setup.c +@@ -87,6 +87,8 @@ static struct argp_option options[] = { + N_("install even if problems are detected"), 0}, + {"skip-fs-probe",'s',0, 0, + N_("do not probe for filesystems in DEVICE"), 0}, ++ {"root-device", 'r', N_("DEVICE"), 0, ++ N_("use DEVICE as the root device"), 0}, + {"verbose", 'v', 0, 0, N_("print verbose messages."), 0}, + {"allow-floppy", 'a', 0, 0, + /* TRANSLATORS: The potential breakage isn't limited to floppies but it's +@@ -130,6 +132,7 @@ struct arguments + char *core_file; + char *dir; + char *dev_map; ++ char *root_dev; + int force; + int fs_probe; + int allow_floppy; +@@ -178,6 +181,13 @@ argp_parser (int key, char *arg, struct + arguments->dev_map = xstrdup (arg); + break; + ++ case 'r': ++ if (arguments->root_dev) ++ free (arguments->root_dev); ++ ++ arguments->root_dev = xstrdup (arg); ++ break; ++ + case 'f': + arguments->force = 1; + break; +@@ -313,7 +323,7 @@ main (int argc, char *argv[]) + GRUB_SETUP_FUNC (arguments.dir ? : DEFAULT_DIRECTORY, + arguments.boot_file ? : DEFAULT_BOOT_FILE, + arguments.core_file ? : DEFAULT_CORE_FILE, +- dest_dev, arguments.force, ++ arguments.root_dev, dest_dev, arguments.force, + arguments.fs_probe, arguments.allow_floppy, + arguments.add_rs_codes); + +--- a/util/setup.c ++++ b/util/setup.c +@@ -252,13 +252,12 @@ identify_partmap (grub_disk_t disk __att + void + SETUP (const char *dir, + const char *boot_file, const char *core_file, +- const char *dest, int force, ++ char *root, const char *dest, int force, + int fs_probe, int allow_floppy, + int add_rs_codes __attribute__ ((unused))) /* unused on sparc64 */ + { + char *core_path; + char *boot_img, *core_img, *boot_path; +- char *root = 0; + size_t boot_size, core_size; + grub_uint16_t core_sectors; + grub_device_t root_dev = 0, dest_dev, core_dev; +@@ -307,7 +306,10 @@ SETUP (const char *dir, + + core_dev = dest_dev; + +- { ++ if (root) ++ root_dev = grub_device_open(root); ++ ++ if (!root_dev) { + char **root_devices = grub_guess_root_devices (dir); + char **cur; + int found = 0; +@@ -320,6 +322,8 @@ SETUP (const char *dir, + char *drive; + grub_device_t try_dev; + ++ if (root_dev) ++ break; + drive = grub_util_get_grub_dev (*cur); + if (!drive) + continue; +--- a/include/grub/util/install.h ++++ b/include/grub/util/install.h +@@ -191,13 +191,13 @@ grub_install_get_image_target (const cha + void + grub_util_bios_setup (const char *dir, + const char *boot_file, const char *core_file, +- const char *dest, int force, ++ char *root, const char *dest, int force, + int fs_probe, int allow_floppy, + int add_rs_codes); + void + grub_util_sparc_setup (const char *dir, + const char *boot_file, const char *core_file, +- const char *dest, int force, ++ char *root, const char *dest, int force, + int fs_probe, int allow_floppy, + int add_rs_codes); + +--- a/util/grub-install.c ++++ b/util/grub-install.c +@@ -1712,7 +1712,7 @@ main (int argc, char *argv[]) + /* Now perform the installation. */ + if (install_bootsector) + grub_util_bios_setup (platdir, "boot.img", "core.img", +- install_drive, force, ++ NULL, install_drive, force, + fs_probe, allow_floppy, add_rs_codes); + break; + } +@@ -1738,7 +1738,7 @@ main (int argc, char *argv[]) + /* Now perform the installation. */ + if (install_bootsector) + grub_util_sparc_setup (platdir, "boot.img", "core.img", +- install_drive, force, ++ NULL, install_drive, force, + fs_probe, allow_floppy, + 0 /* unused */ ); + break; -- cgit v1.2.3 From 1dbd0005a1312e88f449626142895f1ffb0bee60 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 20 May 2020 16:22:17 +0200 Subject: system: image: Fix disk-image cross-compilation. * gnu/system/image.scm (system-disk-image): Use the native version of the helper packages (e2fsprogs, dosfstools, mtools, genimage, coreutils and findutils). --- gnu/system/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index adc2b3c221..6b5a36ffc6 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -232,7 +232,7 @@ used in the image." (type (partition-file-system partition)) (image-builder (with-imported-modules* - (let ((inputs '#$(list e2fsprogs dosfstools mtools))) + (let ((inputs '#+(list e2fsprogs dosfstools mtools))) (set-path-environment-variable "PATH" '("bin" "sbin") inputs) (make-partition-image #$(partition->gexp partition) #$output @@ -275,7 +275,7 @@ image ~a { (let* ((substitutable? (image-substitutable? image)) (builder (with-imported-modules* - (let ((inputs '#$(list genimage coreutils findutils))) + (let ((inputs '#+(list genimage coreutils findutils))) (set-path-environment-variable "PATH" '("bin" "sbin") inputs) (genimage #$(image->genimage-cfg image) #$output)))) (image-dir (computed-file "image-dir" builder))) -- cgit v1.2.3 From 5d31933e0b8520ee831e71dcd0ede6ec3de5216e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 10 Apr 2020 13:51:07 +0100 Subject: gnu: Add python2-pyatspi. This will enable updating python2-dogtail to 0.9.11. * gnu/packages/gnome.scm (python2-pyatspi): New variable. --- gnu/packages/gnome.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dbaab157f5..fdbec60881 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8860,6 +8860,14 @@ accessibility infrastructure.") (license license:lgpl2.0) (properties '((upstream-name . "pyatspi"))))) +(define-public python2-pyatspi + (package + (inherit python-pyatspi) + (name "python2-pyatspi") + (inputs + `(("python" ,python-2) + ("python-pygobject" ,python2-pygobject))))) + (define-public orca (package (name "orca") -- cgit v1.2.3 From 06fe35cf0c27545e8d995aaf35b7b11987f4ed67 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 15 Apr 2020 18:43:55 +0100 Subject: gnu: python-pyatspi: Propagate python-pygobject. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As python-pygobject is required at runtime. * gnu/packages/gnome.scm (python-pyatspi)[inputs]: Move python-pygobject to… [propagated-inputs]: …here. (python2-pyatspi)[inputs]: Move python2-pygobject to… [propagated-inputs]: …here. --- gnu/packages/gnome.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fdbec60881..94a649779e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8849,8 +8849,9 @@ from gi.repository import Atspi")) (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("python" ,python) - ("python-pygobject" ,python-pygobject))) + `(("python" ,python))) + (propagated-inputs + `(("python-pygobject" ,python-pygobject))) (synopsis "Python client bindings for D-Bus AT-SPI") (home-page "https://wiki.linuxfoundation.org/accessibility\ /atk/at-spi/at-spi_on_d-bus") @@ -8865,8 +8866,9 @@ accessibility infrastructure.") (inherit python-pyatspi) (name "python2-pyatspi") (inputs - `(("python" ,python-2) - ("python-pygobject" ,python2-pygobject))))) + `(("python" ,python-2))) + (propagated-inputs + `(("python-pygobject" ,python2-pygobject))))) (define-public orca (package -- cgit v1.2.3 From cf7381612c3bf2fd89fd03a53e85ed6eb9e9f9f8 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 10 Apr 2020 13:51:14 +0100 Subject: gnu: python2-dogtail: Update to 0.9.11. There are newer releases on a gitlab.com repository compared to PyPI. Make an attempt at getting the tests to work, they don't yet I believe because DBus isn't working properly. This update is a step towards getting a Python 3 variant of the package, which can be used to test virt-manager. * gnu/packages/python-xyz.scm (python2-dogtail): Update to 0.9.11. [source]: Switch from PyPI to gitlab.com, as gitlab.com contains newer releases. [arguments]: Replace the check phase, and update comment about disabling the tests. [propagated-inputs,native-inputs]: Add relevant packages. [home-page]: Change to https://gitlab.com/dogtail/dogtail/ --- gnu/packages/python-xyz.scm | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index efd92beb9f..0cbb5e81e3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1753,18 +1753,42 @@ Python 3.3+.") ;; spaces in indentation" with Python 3. (package (name "python2-dogtail") - (version "0.9.9") + (version "0.9.11") (source (origin (method url-fetch) - (uri (pypi-uri "dogtail" version)) + (uri + (string-append + "https://gitlab.com/dogtail/dogtail/-/raw/released/" + "dogtail-" version ".tar.gz")) (sha256 (base32 - "0p5wfssvzr9w0bvhllzbbd8fnp4cca2qxcpcsc33dchrmh5n552x")))) + "0sr38z7b2n12bvfd4xw4b5dnnhkn5zl3h0ymmnnzavcihfqia6l0")))) (build-system python-build-system) - (arguments `(#:python ,python-2 - #:tests? #f)) ; invalid command "test" - ;; Currently no offical homepage. - (home-page "https://pypi.org/project/dogtail/") + (arguments + `(#:python ,python-2 + #:tests? #f ; TODO Launching dbus for the tests + ; fails + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + (invoke "dbus-run-session" "--" "nosetests" "-v" "tests/")) + #t))))) + (propagated-inputs + `(("python-pygobject" ,python2-pygobject) + ("python-pycairo" ,python2-pycairo) + ("python-pyatspi" ,python2-pyatspi))) + (native-inputs + `(("python-nose" ,python2-nose) + ("gtk+" ,gtk+) + ("xvfb" ,xorg-server) + ("dbus" ,dbus) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gobject-introspection" ,gobject-introspection))) + (home-page "https://gitlab.com/dogtail/dogtail/") (synopsis "GUI test tool and automation framework written in Python") (description "Dogtail is a GUI test tool and automation framework written in Python. -- cgit v1.2.3 From c4b0131010c7bb864198318fc44b10b038c80b55 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 10 Apr 2020 13:54:25 +0100 Subject: gnu: python2-dogtail: Switch to Python 3, and add Python 2 variant. * gnu/packages/python-xyz.scm (python2-dogtail): Rename to python-dogtail. [name]: Change python2-dogtail to python-dogtail. [arguments]: Remove #:python. [propagated-inputs,native-inputs]: Switch Python 2 packages to Python 3 variants. (python2-dogtail): New variable. --- gnu/packages/python-xyz.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0cbb5e81e3..b359ffc955 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1748,11 +1748,9 @@ Python 3.3+.") (define-public python2-pyicu (package-with-python2 python-pyicu)) -(define-public python2-dogtail - ;; Python 2 only, as it leads to "TabError: inconsistent use of tabs and - ;; spaces in indentation" with Python 3. +(define-public python-dogtail (package - (name "python2-dogtail") + (name "python-dogtail") (version "0.9.11") (source (origin (method url-fetch) @@ -1765,8 +1763,7 @@ Python 3.3+.") "0sr38z7b2n12bvfd4xw4b5dnnhkn5zl3h0ymmnnzavcihfqia6l0")))) (build-system python-build-system) (arguments - `(#:python ,python-2 - #:tests? #f ; TODO Launching dbus for the tests + `(#:tests? #f ; TODO Launching dbus for the tests ; fails #:phases (modify-phases %standard-phases @@ -1778,11 +1775,11 @@ Python 3.3+.") (invoke "dbus-run-session" "--" "nosetests" "-v" "tests/")) #t))))) (propagated-inputs - `(("python-pygobject" ,python2-pygobject) - ("python-pycairo" ,python2-pycairo) - ("python-pyatspi" ,python2-pyatspi))) + `(("python-pygobject" ,python-pygobject) + ("python-pycairo" ,python-pycairo) + ("python-pyatspi" ,python-pyatspi))) (native-inputs - `(("python-nose" ,python2-nose) + `(("python-nose" ,python-nose) ("gtk+" ,gtk+) ("xvfb" ,xorg-server) ("dbus" ,dbus) @@ -1797,6 +1794,9 @@ applications. dogtail scripts are written in Python and executed like any other Python program.") (license license:gpl2+))) +(define-public python2-dogtail + (package-with-python2 python-dogtail)) + (define-public python-empy (package (name "python-empy") -- cgit v1.2.3 From 20f524a44b1a9728045be1198ff795697557796c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 10 Apr 2020 16:53:37 +0100 Subject: gnu: virt-manager: Work towards enabling some tests. * gnu/packages/virtualization.scm (virt-manager)[arguments]: Set #:test-target to "test_ui", replace the 'check phase. [native-inputs]: Add some inputs required for running tests. --- gnu/packages/virtualization.scm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 32113a0f2c..05ce96c974 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -655,9 +655,10 @@ virtualization library.") (build-system python-build-system) (arguments `(#:use-setuptools? #f ; uses custom distutils 'install' command - ;; Some of the tests seem to require network access to install virtual - ;; machines. - #:tests? #f + #:test-target "test_ui" + #:tests? #f ; TODO The tests currently fail + ; RuntimeError: Loop condition wasn't + ; met #:imported-modules ((guix build glib-or-gtk-build-system) ,@%python-build-system-modules) #:modules ((ice-9 match) @@ -704,6 +705,16 @@ virtualization library.") ,(filter identity paths)))) bin-files)) #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + ;; Dogtail requires that Assistive Technology support be enabled + (setenv "GTK_MODULES" "gail:atk-bridge") + (invoke "dbus-run-session" "--" "python" "setup.py" "test_ui")) + #t)) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'install 'glib-or-gtk-wrap @@ -732,7 +743,14 @@ virtualization library.") ("gobject-introspection" ,gobject-introspection) ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("perl" ,perl) ; pod2man - ("intltool" ,intltool))) + ("intltool" ,intltool) + ;; The following are required for running the tests + ;; ("python-dogtail" ,python-dogtail) + ;; ("xvfb" ,xorg-server-for-tests) + ;; ("dbus" ,dbus) + ;; ("at-spi2-core" ,at-spi2-core) + ;; ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + )) (home-page "https://virt-manager.org/") (synopsis "Manage virtual machines") (description -- cgit v1.2.3 From 1dd7b87f101ce99b37be5c769904c1aa2f6a0615 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 26 May 2020 13:05:22 +0200 Subject: image: Set offset default to zero. * gnu/image.scm ()[offset]: Set to zero by default. * gnu/system/image.scm (system-disk-image): Adapt accordingly. --- gnu/image.scm | 2 +- gnu/system/image.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/image.scm b/gnu/image.scm index 3a02692950..b434ed50e3 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -48,7 +48,7 @@ partition? (device partition-device (default #f)) (size partition-size) - (offset partition-offset (default #f)) + (offset partition-offset (default 0)) (file-system partition-file-system (default "ext4")) (label partition-label (default #f)) (uuid partition-uuid (default #f)) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 6b5a36ffc6..cb770a17e8 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -253,7 +253,7 @@ used in the image." #$label #$dos-type #$image - #$(or offset 0)))) + #$offset))) (let* ((format (image-format image)) (image-type (format->image-type format)) -- cgit v1.2.3 From 9b0d54b2797d4efed0e104e1237d197863839a43 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 26 May 2020 11:47:01 +0200 Subject: gnu: monero: Update to 0.16.0.0. * gnu/packages/finance.scm (monero): Update to 0.16.0.0. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 92a00240f3..92a0b758a9 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -547,7 +547,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch ;; the system's dynamically linked library. (package (name "monero") - (version "0.15.0.5") + (version "0.16.0.0") (source (origin (method git-fetch) @@ -568,7 +568,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch #t)) (sha256 (base32 - "06zzwa0y8ic6x3y2fy501788r51p4klanyvmm76ywrwf087njlkv")))) + "0x74h5z0nxxxip97ibc854pqmrgd8r4d6w62m424f66i8gbzfskh")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From 51bd1f5b07415f63cb5d402a73187855550858b4 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 26 May 2020 14:19:11 +0200 Subject: gnu: monero-gui: Update to 0.16.0.0. * gnu/packages/finance.scm (monero-gui): Update to 0.16.0.0. [native-inputs]: Add monero-source. [inputs]: Add libgcrypt. [arguments]: Add 'get-monero-extra-files' phase. --- gnu/packages/finance.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 92a0b758a9..3e23fcceea 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -666,7 +666,7 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.15.0.4") + (version "0.16.0.0") (source (origin (method git-fetch) @@ -676,14 +676,16 @@ the Monero command line client and daemon.") (file-name (git-file-name name version)) (sha256 (base32 - "12m5fgnxkr11q2arx1m5ccpxqm5ljcvm6l547dwqn297zs5jim4z")))) + "06vdrsj5y9k0zn32hspyxc7sw1kkyrvi3chzkdbnxk9jvyj8k4ld")))) (build-system qt-build-system) (native-inputs - `(("pkg-config" ,pkg-config) + `(("monero-source" ,(package-source monero)) + ("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs `(("boost" ,boost) ("hidapi" ,hidapi) + ("libgcrypt" ,libgcrypt) ("libsodium" ,libsodium) ("libunwind" ,libunwind) ("libusb" ,libusb) @@ -705,7 +707,16 @@ the Monero command line client and daemon.") `(#:tests? #f ; No tests #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-makefile-vars + (add-after 'unpack 'get-monero-extra-files + ;; Some headers and GnuPG public keys of the monero package source + ;; code are required to build the GUI. + (lambda* (#:key inputs #:allow-other-keys) + (invoke "tar" "-xv" "--wildcards" "--strip-components=1" + "-C" "monero" + "-f" (assoc-ref inputs "monero-source") + "*.asc" "*.h") + #t)) + (add-after 'get-monero-extra-files 'fix-makefile-vars (lambda _ (substitute* "src/zxcvbn-c/makefile" (("\\?=") "=")) -- cgit v1.2.3 From e91c29a491267a832b2739a8f171e6e1bf263a95 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 26 May 2020 14:45:39 +0200 Subject: gnu: txr: Update to 238. * gnu/packages/lisp.scm (txr): Update to 238. [arguments]: Don't hardcode "cc=gcc" in configure-flags. --- gnu/packages/lisp.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3ae8dab141..21e1a0449b 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -806,7 +806,7 @@ enough to play the original mainframe Zork all the way through.") (define-public txr (package (name "txr") - (version "235") + (version "238") (source (origin (method git-fetch) @@ -815,12 +815,15 @@ enough to play the original mainframe Zork all the way through.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0kpqk2x0sz7sqxsrhasq0xnljjlnxwhh4xjx2nii0zy2jkv4vsbn")))) + (base32 "0asdq4n828xb1m31s7f47mqcbjqkzxz11bwnw8v3f2249m93ync4")))) (build-system gnu-build-system) (arguments - '(#:configure-flags - (list "cc=gcc" - (string-append "--prefix=" (assoc-ref %outputs "out"))) + `(#:configure-flags + (let ((target ,(%current-target-system))) + (list (string-append "cc=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "--prefix=" (assoc-ref %outputs "out")))) #:test-target "tests" #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 6ac7526e488ad3dd73080d1c00efe2066b1bf0a2 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 26 May 2020 16:01:33 +0200 Subject: services: Fix permissions of directory /var/spool/cups/tmp. Fixes . * gnu/services/cups.scm (%cups-activation): Fix permissions of directory /var/spool/cups/tmp. --- gnu/services/cups.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index c3c6d2f1be..16d6f76c1a 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -869,7 +869,7 @@ IPP specifications.") (use-modules (guix build utils)) (define (mkdir-p/perms directory owner perms) (mkdir-p directory) - (chown "/var/run/cups" (passwd:uid owner) (passwd:gid owner)) + (chown directory (passwd:uid owner) (passwd:gid owner)) (chmod directory perms)) (define (build-subject parameters) (string-concatenate -- cgit v1.2.3 From bd3716f6fee127562935d86ff7f641197366769c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 26 May 2020 16:25:25 +0200 Subject: image: Add partition file-system options support. * gnu/image.scm ()[file-system-options]: New field, (partition-file-system-options): new exported procedure. * gnu/system/image.scm (partition->gexp): Adapt accordingly. * gnu/build/image.scm (sexp->partition): Also adapt accordingly, (make-ext-image): and pass file-system options to mke2fs. --- gnu/build/image.scm | 28 ++++++++++++++++------------ gnu/image.scm | 19 +++++++++++-------- gnu/system/image.scm | 1 + 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index 23fc56571f..b37ea9332a 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -47,9 +47,10 @@ "Take SEXP, a tuple as returned by 'partition->gexp', and turn it into a record." (match sexp - ((size file-system label uuid) + ((size file-system file-system-options label uuid) (partition (size size) (file-system file-system) + (file-system-options file-system-options) (label label) (uuid uuid))))) @@ -71,19 +72,22 @@ take the partition metadata size into account, take a 25% margin." 'make-partition-image'." (let ((size (partition-size partition)) (fs (partition-file-system partition)) + (fs-options (partition-file-system-options partition)) (label (partition-label partition)) (uuid (partition-uuid partition)) - (options "lazy_itable_init=1,lazy_journal_init=1")) - (invoke "mke2fs" "-t" fs "-d" root - "-L" label "-U" (uuid->string uuid) - "-E" (format #f "root_owner=~a:~a,~a" - owner-uid owner-gid options) - target - (format #f "~ak" - (size-in-kib - (if (eq? size 'guess) - (estimate-partition-size root) - size)))))) + (journal-options "lazy_itable_init=1,lazy_journal_init=1")) + (apply invoke + `("mke2fs" "-t" ,fs "-d" ,root + "-L" ,label "-U" ,(uuid->string uuid) + "-E" ,(format #f "root_owner=~a:~a,~a" + owner-uid owner-gid journal-options) + ,@fs-options + ,target + ,(format #f "~ak" + (size-in-kib + (if (eq? size 'guess) + (estimate-partition-size root) + size))))))) (define* (make-vfat-image partition target root) "Handle the creation of VFAT partition images. See 'make-partition-image'." diff --git a/gnu/image.scm b/gnu/image.scm index b434ed50e3..0a92d168e9 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -24,6 +24,7 @@ partition-size partition-offset partition-file-system + partition-file-system-options partition-label partition-uuid partition-flags @@ -46,14 +47,16 @@ (define-record-type* partition make-partition partition? - (device partition-device (default #f)) - (size partition-size) - (offset partition-offset (default 0)) - (file-system partition-file-system (default "ext4")) - (label partition-label (default #f)) - (uuid partition-uuid (default #f)) - (flags partition-flags (default '())) - (initializer partition-initializer (default #f))) + (device partition-device (default #f)) + (size partition-size) + (offset partition-offset (default 0)) + (file-system partition-file-system (default "ext4")) + (file-system-options partition-file-system-options + (default '())) + (label partition-label (default #f)) + (uuid partition-uuid (default #f)) + (flags partition-flags (default '())) + (initializer partition-initializer (default #f))) ;;; diff --git a/gnu/system/image.scm b/gnu/system/image.scm index cb770a17e8..a1214dd20a 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -117,6 +117,7 @@ 'make-partition-image'." #~'(#$@(list (partition-size partition)) #$(partition-file-system partition) + #$(partition-file-system-options partition) #$(partition-label partition) #$(and=> (partition-uuid partition) uuid-bytevector))) -- cgit v1.2.3 From a933ee559127561a0d628a5f9c6ede9ba1ab2ebb Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 25 May 2020 23:57:52 +0200 Subject: gnu: ffmpeg: Update to 4.2.3. * gnu/packages/video.scm (ffmpeg): Update to 4.2.3. Signed-off-by: Leo Famulari --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6529ae6507..e541016010 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -930,7 +930,7 @@ operate properly.") (define-public ffmpeg (package (name "ffmpeg") - (version "4.2.2") + (version "4.2.3") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" @@ -939,7 +939,7 @@ operate properly.") (patches (search-patches "ffmpeg-prefer-dav1d.patch")) (sha256 (base32 - "176jn1lcdf0gk7sa5l2mv0faqp5dsqdhx1gqcrgymqhfmdal4xfb")))) + "0cddkb5sma9dzy8i59sfls19rhjlq40zn9mh3x666dqkxl5ckxlx")))) (build-system gnu-build-system) (inputs `(("dav1d" ,dav1d) -- cgit v1.2.3 From c827c52ac355a28f0e64c293a2b2a653ad3809d9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 26 May 2020 14:18:01 -0400 Subject: gnu: DarkIce: Update to 1.4. * gnu/packages/audio.scm (darkice): Update to 1.4. [source]: Update URL. Remove obsolete patch. * gnu/packages/patches/darkice-workaround-fpermissive-error.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/audio.scm | 12 ++--- .../darkice-workaround-fpermissive-error.patch | 62 ---------------------- 3 files changed, 6 insertions(+), 69 deletions(-) delete mode 100644 gnu/packages/patches/darkice-workaround-fpermissive-error.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7d23b04723..3d5653b0b1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -851,7 +851,6 @@ dist_patch_DATA = \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \ %D%/packages/patches/date-output-pkg-config-files.patch \ - %D%/packages/patches/darkice-workaround-fpermissive-error.patch \ %D%/packages/patches/datefudge-gettimeofday.patch \ %D%/packages/patches/dbacl-include-locale.h.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 4f1667b9d5..893c56514c 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3930,15 +3930,15 @@ other Gnaural instances, allowing synchronous sessions between many users.") (define-public darkice (package (name "darkice") - (version "1.3") + (version "1.4") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/darkice/darkice/" - version "/darkice-" version ".tar.gz")) + (uri (string-append "https://github.com/rafael2k/darkice/releases/" + "download/v" version "/darkice-" + version ".tar.gz")) (sha256 - (base32 "1rlxds7ssq7nk2in4s46xws7xy9ylxsqgcz85hxjgh17lsm0y39c")) - (patches - (search-patches "darkice-workaround-fpermissive-error.patch")))) + (base32 + "05yq7lggxygrkd76yiqby3msrgdn082p0qlvmzzv9xbw8hmyra76")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("lame" ,lame) diff --git a/gnu/packages/patches/darkice-workaround-fpermissive-error.patch b/gnu/packages/patches/darkice-workaround-fpermissive-error.patch deleted file mode 100644 index 5ee29147c2..0000000000 --- a/gnu/packages/patches/darkice-workaround-fpermissive-error.patch +++ /dev/null @@ -1,62 +0,0 @@ -Copied from Debian: - - -From 1e2eb18d349f205c70cb2836232825442359b6e3 Mon Sep 17 00:00:00 2001 -From: belette -Date: Wed, 26 Oct 2016 02:43:43 +0200 -Subject: Cast float* in SRC lib calls to delete fpermissive compilation error - ---- - darkice/trunk/src/FaacEncoder.cpp | 2 +- - darkice/trunk/src/OpusLibEncoder.cpp | 2 +- - darkice/trunk/src/VorbisLibEncoder.cpp | 2 +- - darkice/trunk/src/aacPlusEncoder.cpp | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - ---- a/src/FaacEncoder.cpp -+++ b/src/FaacEncoder.cpp -@@ -164,7 +164,7 @@ FaacEncoder :: write ( const void * buf, - if ( converter ) { - unsigned int converted; - #ifdef HAVE_SRC_LIB -- src_short_to_float_array ((short *) b, converterData.data_in, samples); -+ src_short_to_float_array ((short *) b, (float *) converterData.data_in, samples); - converterData.input_frames = nSamples; - converterData.data_out = resampledOffset + (resampledOffsetSize * channels); - int srcError = src_process (converter, &converterData); ---- a/src/OpusLibEncoder.cpp -+++ b/src/OpusLibEncoder.cpp -@@ -403,7 +403,7 @@ OpusLibEncoder :: write ( const void * buf, - #ifdef HAVE_SRC_LIB - (void)inCount; - converterData.input_frames = processed; -- src_short_to_float_array (shortBuffer, converterData.data_in, totalSamples); -+ src_short_to_float_array (shortBuffer, (float *) converterData.data_in, totalSamples); - int srcError = src_process (converter, &converterData); - if (srcError) - throw Exception (__FILE__, __LINE__, "libsamplerate error: ", src_strerror (srcError)); ---- a/src/VorbisLibEncoder.cpp -+++ b/src/VorbisLibEncoder.cpp -@@ -337,7 +337,7 @@ VorbisLibEncoder :: write ( const void * buf, - int converted; - #ifdef HAVE_SRC_LIB - converterData.input_frames = nSamples; -- src_short_to_float_array (shortBuffer, converterData.data_in, totalSamples); -+ src_short_to_float_array (shortBuffer, (float *) converterData.data_in, totalSamples); - int srcError = src_process (converter, &converterData); - if (srcError) - throw Exception (__FILE__, __LINE__, "libsamplerate error: ", src_strerror (srcError)); ---- a/src/aacPlusEncoder.cpp -+++ b/src/aacPlusEncoder.cpp -@@ -155,7 +155,7 @@ aacPlusEncoder :: write ( const void * buf, - if ( converter ) { - unsigned int converted; - #ifdef HAVE_SRC_LIB -- src_short_to_float_array ((short *) b, converterData.data_in, samples); -+ src_short_to_float_array ((short *) b, (float *) converterData.data_in, samples); - converterData.input_frames = nSamples; - converterData.data_out = resampledOffset + (resampledOffsetSize * channels); - int srcError = src_process (converter, &converterData); --- -2.11.0 - -- cgit v1.2.3 From 41701f4b2394036dc3d6616c349d0374516cd7fb Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:40:44 -0500 Subject: gnu: netsurf-buildsystem: Update to 1.9. * gnu/packages/web.scm (netsurf-buildsystem): Update to 1.9. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c7bea4c5ae..da392937d5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4735,7 +4735,7 @@ tools they trust (e.g. wget).") (define netsurf-buildsystem (package (name "netsurf-buildsystem") - (version "1.7") + (version "1.9") (source (origin (method url-fetch) @@ -4743,7 +4743,7 @@ tools they trust (e.g. wget).") "buildsystem-" version ".tar.gz")) (sha256 (base32 - "1q23aaycv35ma5471l1gxib8lfq2s9kprrkaqgfc926d04rlbmhw")))) + "0alsmaig9ln8dgllb3z63gq90fiz75jz0ic71fi0k0k898qix14k")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) (arguments -- cgit v1.2.3 From 3f0f147a5f21791be3e57b4f117887db3590262e Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:43:15 -0500 Subject: gnu: hubbub: Update to 0.3.7. * gnu/packages/web.scm (hubbub): Update to 0.3.7. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index da392937d5..de28c3c711 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4799,7 +4799,7 @@ C. It is developed as part of the NetSurf project.") (define-public hubbub (package (name "hubbub") - (version "0.3.6") + (version "0.3.7") (source (origin (method url-fetch) @@ -4807,7 +4807,7 @@ C. It is developed as part of the NetSurf project.") "libhubbub-" version "-src.tar.gz")) (sha256 (base32 - "1x3v7xvagx85v9h3pypzc86rcxs4mij87mmcqkp8pq50q6awfmnp")) + "1dimfyblmym98qa1b80c5jslv2zk8r44xbdrgrsrw1n9wr9y4yly")) (patches (search-patches "hubbub-sort-entities.patch")))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From b0228793704298c2d40154ed63fd75e95b9b1180 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:43:46 -0500 Subject: gnu: libwapcaplet: Update to 0.4.3. * gnu/packages/web.scm (libwapcaplet): Update to 0.4.3. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index de28c3c711..a2e4c80fe2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4938,7 +4938,7 @@ commenting.") (define-public libwapcaplet (package (name "libwapcaplet") - (version "0.4.2") + (version "0.4.3") (source (origin (method url-fetch) @@ -4946,7 +4946,7 @@ commenting.") "libwapcaplet-" version "-src.tar.gz")) (sha256 (base32 - "1fjwzbn7j8bi1b9bvwxsy3i2cr6byq2s2d29866801pjnf528g86")))) + "0p0c2q9lsj4vs97aa7vjllfhw33zv3dpysdkjblzhib6dpfs2alv")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From 1953b48966379c9e324c3fa05d959a3cdc15807e Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:44:13 -0500 Subject: gnu: libcss: Update to 0.9.1. * gnu/packages/web.scm (libcss): Update to 0.9.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a2e4c80fe2..95d11bcf43 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4964,7 +4964,7 @@ developed as part of the Netsurf project.") (define-public libcss (package (name "libcss") - (version "0.9.0") + (version "0.9.1") (source (origin (method url-fetch) @@ -4972,7 +4972,7 @@ developed as part of the Netsurf project.") "libcss-" version "-src.tar.gz")) (sha256 (base32 - "1vw9j3d2mr4wbvs8fyqmgslkbxknvac10456775hflxxcivbm3xr")))) + "1p66sdiiqm7w4jkq23hsf08khsnmq93hshh9f9m8sbirjdpf3p6j")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From a1c6bab52acf244e7f2410837ee2d1ffa4631ee9 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:47:14 -0500 Subject: gnu: libdom: Update to 0.4.1. * gnu/packages/web.scm (libdom): Update to 0.4.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 95d11bcf43..adef56d9d1 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5032,7 +5032,7 @@ in which the loaded data is arranged in memory.") (define-public libdom (package (name "libdom") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) @@ -5040,7 +5040,7 @@ in which the loaded data is arranged in memory.") "libdom-" version "-src.tar.gz")) (sha256 (base32 - "1ixkqsl3f7dl1kajksm0c231w1v5xy8z6hm3v67hgm9nh4qcvfcy")))) + "0jpg5hx3y0mdxk5szd47dyijqimd2321brbqk2620pp5f4j0gvlq")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From 82441f35c2d52fb1bce8545145a88086853bc97f Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:47:51 -0500 Subject: gnu: libnsbmp: Update to 0.1.6. * gnu/packages/web.scm (libnsbmp): Update to 0.1.6. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index adef56d9d1..278fd5d263 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5099,7 +5099,7 @@ project.") (define-public libnsbmp (package (name "libnsbmp") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) @@ -5107,7 +5107,7 @@ project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "0lib2m07d1i0k80m4blkwnj0g7rha4jbm5vrgd0wwbkyfa0hvk35")))) + "0krjg69a2amxjsahdgm3wmy9ngnyr3gfs2a1zhdlbvb0z1jr7i3r")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit v1.2.3 From 2f3cf0b655c553097f7caafcc0ecd4279860add6 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:48:18 -0500 Subject: gnu: libnslog: Update to 0.1.3. * gnu/packages/web.scm (libnslog): Update to 0.1.3. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 278fd5d263..4bf1199c2a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5145,7 +5145,7 @@ C. It is developed as part of the NetSurf project.") (define-public libnslog (package (name "libnslog") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) @@ -5153,7 +5153,7 @@ C. It is developed as part of the NetSurf project.") "libnslog-" version "-src.tar.gz")) (sha256 (base32 - "1ggs6xvxp8fbg5w8pifalipm458ygr9ab6j2yvj8fnnmxwvdh4jd")))) + "1l2k0kdv9iv18svhv360vszjavhl4g09cp8a8yb719pgsylxr67w")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From 7c91bca9a14345a4eb782665f20d3d3d7b1bd965 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:48:41 -0500 Subject: gnu: libnsutils: Update to 0.1.0. * gnu/packages/web.scm (libnsutils): Update to 0.1.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4bf1199c2a..bebfa0eb53 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5173,7 +5173,7 @@ client applications. It is developed as part of the NetSurf project.") (define-public libnsutils (package (name "libnsutils") - (version "0.0.5") + (version "0.1.0") (source (origin (method url-fetch) @@ -5181,7 +5181,7 @@ client applications. It is developed as part of the NetSurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "09w1rixps1iiq6wirjwxmd6h87llvjzvw565rahjb3rlyhcplfqf")))) + "1w5fyy2i60a3v3if3iqcn9sy9sycx6966rcx53v85gja6hb6a33r")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit v1.2.3 From a7597d2dce8377390896ba5222eb4dfb7e3f69be Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:49:16 -0500 Subject: gnu: libnspsl: Update to 0.1.6. * gnu/packages/web.scm (libnspsl): Update to 0.1.6. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bebfa0eb53..4f5646df24 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5196,7 +5196,7 @@ developed as part of the NetSurf project.") (define-public libnspsl (package (name "libnspsl") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) @@ -5204,7 +5204,7 @@ developed as part of the NetSurf project.") "libnspsl-" version "-src.tar.gz")) (sha256 (base32 - "0siq8zjfxv75i9fw6q5hkaijpdm1w3zskd5qk6vsvz8cqan4vifd")))) + "02q28n5i6fwqcz1nn167rb71k1q95mx38mfah6zi1lvqrc2q5ifk")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit v1.2.3 From 981d80b331afc39365ccf393684b9b94cd0eaec0 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:49:48 -0500 Subject: gnu: nsgenbind: Update to 0.8. * gnu/packages/web.scm (nsgenbind): Update to 0.8. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4f5646df24..68b0336781 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5219,7 +5219,7 @@ Public Suffix List. It is developed as part of the NetSurf project.") (define-public nsgenbind (package (name "nsgenbind") - (version "0.7") + (version "0.8") (source (origin (method url-fetch) @@ -5227,7 +5227,7 @@ Public Suffix List. It is developed as part of the NetSurf project.") "nsgenbind-" version "-src.tar.gz")) (sha256 (base32 - "0rplmky4afsjwiwh7grkmcdmzg86zksa55j93dvq92f91yljwqqq")))) + "1cqwgwca49jvmijwiyaab2bwxicgxdrnlpinf8kp3nha02nm73ad")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From 5c133ca561acfc1a1b9fe6dfc03d2bd12784242c Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:50:10 -0500 Subject: gnu: netsurf: Update to 3.10. * gnu/packages/web.scm (netsurf): Update to 3.10. * gnu/packages/patches/netsurf-system-utf8proc.patch: Adjust to new source. --- gnu/packages/patches/netsurf-system-utf8proc.patch | 51 +++------------------- gnu/packages/web.scm | 4 +- 2 files changed, 9 insertions(+), 46 deletions(-) diff --git a/gnu/packages/patches/netsurf-system-utf8proc.patch b/gnu/packages/patches/netsurf-system-utf8proc.patch index a2ee52ca05..04bf828f37 100644 --- a/gnu/packages/patches/netsurf-system-utf8proc.patch +++ b/gnu/packages/patches/netsurf-system-utf8proc.patch @@ -1,50 +1,13 @@ -Use upstream utf8proc package, as suggested in -http://source.netsurf-browser.org/libutf8proc.git/commit/?id=770e329cceaf0620c7b482589a9b17ed1d19c16d +Fix include directory for system utf8proc. -Work around upstream's lack of a pkg-config file and update API. - ---- netsurf-3.6/Makefile -+++ netsurf-3.6/Makefile -@@ -527,10 +527,9 @@ - $(eval $(call pkg_config_find_and_add,libcss,CSS)) - $(eval $(call pkg_config_find_and_add,libdom,DOM)) - $(eval $(call pkg_config_find_and_add,libnsutils,nsutils)) --$(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc)) - - # Common libraries without pkg-config support --LDFLAGS += -lz -+LDFLAGS += -lz -lutf8proc +--- netsurf-3.10/utils/idna.c ++++ netsurf-3.10/utils/idna.c +@@ -167,7 +167,7 @@ - # Optional libraries with pkgconfig + #ifdef WITH_UTF8PROC ---- netsurf-3.8/utils/idna.c -+++ netsurf-3.8/utils/idna.c -@@ -27,7 +27,7 @@ - #include - #include - #include -#include +#include - #include "netsurf/inttypes.h" - ---- netsurf-3.8/test/Makefile -+++ netsurf-3.8/test/Makefile -@@ -142,14 +142,15 @@ - -Itest -Iinclude -Icontent/handlers -Ifrontends -I. -I.. \ - -Dnsgtk \ - $(SAN_FLAGS) \ -- $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) \ -+ $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils) \ - $(LIB_CFLAGS) - TESTCFLAGS := $(BASE_TESTCFLAGS) \ - $(COV_CFLAGS) \ - $(COV_CPPFLAGS) - - TESTLDFLAGS := -L$(TESTROOT) \ -- $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) -lz \ -+ $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils) \ -+ $(LDFLAGS) \ - $(SAN_FLAGS) \ - $(LIB_LDFLAGS)\ - $(COV_LDFLAGS) + int32_t idna_contexto[] = { + /* CONTEXTO codepoints which have a rule defined */ diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 68b0336781..d8290ff53a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5247,7 +5247,7 @@ w3c webidl files and a binding configuration file.") (define-public netsurf (package (name "netsurf") - (version "3.9") + (version "3.10") (source (origin (method url-fetch) @@ -5255,7 +5255,7 @@ w3c webidl files and a binding configuration file.") "releases/source/netsurf-" version "-src.tar.gz")) (sha256 (base32 - "1hzcm2s2wh5sapgr000lg63hcdbj6hyajxl43xa1x80kc5piqbyp")) + "0plra64c5xyiw12yx2q13brxsv8apmany97zqa2lcqckw4ll8j1n")) (patches (search-patches "netsurf-system-utf8proc.patch" "netsurf-y2038-tests.patch" "netsurf-longer-test-timeout.patch" -- cgit v1.2.3 From cfdefb863c274ecdbd452836364e68e1028c7bb1 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 15:15:10 -0500 Subject: gnu: netsurf: Remove tabulations in source. * gnu/packages/web.scm (netsurf): Remove tabulations. --- gnu/packages/web.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d8290ff53a..66774c4a2d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5322,18 +5322,18 @@ w3c webidl files and a binding configuration file.") (display (read-line in 'concat) out) (sxml->xml (let rec ((sxml (xml->sxml in - #:default-entity-handler - (lambda (port name) - (string-append "" - (symbol->string name) - ""))))) + #:default-entity-handler + (lambda (port name) + (string-append "" + (symbol->string name) + ""))))) ;; We'd like to use sxml-match here, but it can't ;; match against generic tag symbols... (match sxml (`(div (@ (class "links")) . ,rest) '()) - (`(ENTITY ,ent) - `(*ENTITY* ,ent)) + (`(ENTITY ,ent) + `(*ENTITY* ,ent)) ((x ...) (map rec x)) (x x))) -- cgit v1.2.3 From ddcfc467968d8367e62cb24cbc9e89bb5af0fe6d Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sat, 4 Apr 2020 09:05:21 +0200 Subject: gnu: kmod: Update to 27. * gnu/packages/linux.scm (kmod): Update to version 27. [native-inputs]: Add 'automake' and 'autoconf'. [arguments]: Add phase 'disable-tests'. Add configure flag '--disable-test-modules'. Enable tests. --- gnu/packages/linux.scm | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 22249e1cf1..fb1ed8d5b7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -43,6 +43,7 @@ ;;; Copyright © 2020 Chris Marusich ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -2937,7 +2938,7 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") (define-public kmod (package (name "kmod") - (version "26") + (version "27") (source (origin (method url-fetch) (uri @@ -2945,19 +2946,29 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") "kmod-" version ".tar.xz")) (sha256 (base32 - "17dvrls70nr3b3x1wm8pwbqy4r8a5c20m0dhys8mjhsnpg425fsp")) + "035wzfzjx4nwidk747p8n085mgkvy531ppn16krrajx2dkqzply1")) (patches (search-patches "kmod-module-directory.patch")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("pkg-config" ,pkg-config))) (inputs `(("xz" ,xz) ("zlib" ,zlib))) (arguments - `(#:tests? #f ; FIXME: Investigate test failures - #:configure-flags '("--with-xz" "--with-zlib") + `(#:configure-flags '("--with-xz" "--with-zlib" + "--disable-test-modules") #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-tests + (lambda _ + ;; XXX: These tests need '--sysconfdir=/etc' to pass. + (substitute* "Makefile.am" + (("testsuite/test-modprobe") "") + (("testsuite/test-depmod") "") + (("testsuite/test-blacklist") "")) + #t)) (add-after 'install 'install-modprobe&co (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 312d9a332053118ca002f4d1e3aa43ea588e593c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 May 2020 01:26:59 +0200 Subject: gnu: kmod: Disable tests in 'Makefile.in' instead of 'Makefile.am'. This avoids a build failure because the package was bootstrapped with an older version of Automake. By substituting the .in file we avoid triggering the Autoconf machinery. * gnu/packages/linux.scm (kmod)[arguments]: Change the 'disable-tests' phase to substitute "Makefile.in" instead of "Makefile.am". [native-inputs]: Remove AUTOMAKE and AUTOCONF. --- gnu/packages/linux.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fb1ed8d5b7..3fd902e340 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2950,9 +2950,7 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") (patches (search-patches "kmod-module-directory.patch")))) (build-system gnu-build-system) (native-inputs - `(("automake" ,automake) - ("autoconf" ,autoconf) - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (inputs `(("xz" ,xz) ("zlib" ,zlib))) @@ -2964,7 +2962,7 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") (add-after 'unpack 'disable-tests (lambda _ ;; XXX: These tests need '--sysconfdir=/etc' to pass. - (substitute* "Makefile.am" + (substitute* "Makefile.in" (("testsuite/test-modprobe") "") (("testsuite/test-depmod") "") (("testsuite/test-blacklist") "")) -- cgit v1.2.3 From f020f8c42421f54eb04d42bfce0699cc2922ec39 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 22:50:50 +0200 Subject: gnu: libinput: Update to 1.15.5. * gnu/packages/freedesktop.scm (libinput): Update to 1.15.5. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index f00cb1e076..be028e4880 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -185,14 +185,14 @@ freedesktop.org project.") ;; Updating this will rebuild over 700 packages through libinput-minimal. (package (name "libinput") - (version "1.15.2") + (version "1.15.5") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" "libinput-" version ".tar.xz")) (sha256 (base32 - "0ivpb4sghl80cs7jg3xrs53kckif6wy81cny3a8mry94nszky74p")))) + "15ww4jl3lcxyi8m8idg8canklbqv729gnwpkz7r98c1w8a7zq3m9")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false") -- cgit v1.2.3 From e24e345c5bd71710ed59f9df5aa58bc638826e85 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 22:51:06 +0200 Subject: gnu: MariaDB: Update to 10.1.45. * gnu/packages/databases.scm (mariadb): Update to 10.1.45. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f563ae8b5d..0a9814846f 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -679,7 +679,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.44") + (version "10.1.45") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.com/MariaDB" @@ -687,7 +687,7 @@ Language.") version ".tar.gz")) (sha256 (base32 - "0fah6d50hldq0farxwr8mj3jnniwdz0d1wsha07nx37fc79h7wi1")) + "1mfs0x4c0z7d306n128dxdawk3llk25vxif5zwl20fv1z5qhz3wx")) (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 4cff2303369c71e559f0be53909d68c806a33917 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 22:51:29 +0200 Subject: gnu: postgresql: Update to 10.13. * gnu/packages/databases.scm (postgresql): Update to 10.13. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 0a9814846f..a87a458abf 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -959,14 +959,14 @@ developed in C/C++ to MariaDB and MySQL databases.") (define-public postgresql (package (name "postgresql") - (version "10.12") + (version "10.13") (source (origin (method url-fetch) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "1rsab4zf4rx7pvvhlwhb04kb95aiad9cwazc4ksbvg2gij47z3rq")) + "1qal0yp7a90yzya7hl56gsmw5fvacplrdhpn7h9gnbyr1i2iyw2d")) (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 36c50eab98dc2c56ea93d39107e128a175252586 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 22:51:50 +0200 Subject: gnu: ImageMagick: Update to 6.9.11-11. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.11-11. --- gnu/packages/imagemagick.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 6fc7e6d201..ccc0cfb493 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -48,14 +48,14 @@ ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.10-95") + (version "6.9.11-11") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "0fcbcad95wn0q0pdfl0qgycm30f3a7xhskc0r5icldq6v6l4b3is")))) + "1b67rrppvm04aqr76qky5h2a0j2d161h8kwa04fv611w5xwandr2")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" -- cgit v1.2.3 From 44c95fa650b1fd259bfd6b7d5961b2e0391c77db Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 22:52:34 +0200 Subject: gnu: qpdf: Update to 10.0.1. * gnu/packages/pdf.scm (qpdf): Update to 10.0.1. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 7906fd28da..8d29b9cf22 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -749,14 +749,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files (define-public qpdf (package (name "qpdf") - (version "9.1.1") + (version "10.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version "/qpdf-" version ".tar.gz")) (sha256 (base32 - "0dj27wb9xg6pg95phbflfvy9rwxn1gh3kc4n175g0pf41r0zrim2")))) + "0yw2cpw7ygfd6jlgpwbi8vsnvv9p55zxp9h17x77z2qq733pf8jx")))) (build-system gnu-build-system) (arguments `(#:disallowed-references (,perl) -- cgit v1.2.3 From 6e8dd0b5daff210beb7ab78057f40900bccf956f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 22:53:03 +0200 Subject: gnu: utf8proc: Update to 2.5.0. * gnu/packages/textutils.scm (utf8proc): Update to 2.5.0. [native-inputs]: Update test data to Unicode 13. --- gnu/packages/textutils.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index c2184de46b..ddafd4cc34 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -140,7 +140,7 @@ libenca and several charset conversion libraries and tools.") (define-public utf8proc (package (name "utf8proc") - (version "2.4.0") + (version "2.5.0") (source (origin (method git-fetch) @@ -149,23 +149,23 @@ libenca and several charset conversion libraries and tools.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1i42hqwc8znqii9brangwkxk5cyc2lk95ip405fg88zr7z2ncr34")))) + (base32 "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq")))) (build-system gnu-build-system) (native-inputs ;test data that is otherwise downloaded with curl `(("NormalizationTest.txt" ,(origin (method url-fetch) - (uri (string-append "https://www.unicode.org/Public/12.1.0/ucd/" + (uri (string-append "https://www.unicode.org/Public/13.0.0/ucd/" "NormalizationTest.txt")) (sha256 - (base32 "0hb97k9xv1lr847hwz0719ksqy39s47xw6k01dgs1368jdibvawc")))) + (base32 "07g0ya4f6zfzvpp24ccxkb2yq568kh83gls85rjl950nv5fya3nn")))) ("GraphemeBreakTest.txt" ,(origin (method url-fetch) - (uri (string-append "https://www.unicode.org/Public/12.1.0/ucd/" + (uri (string-append "https://www.unicode.org/Public/13.0.0/ucd/" "auxiliary/GraphemeBreakTest.txt")) (sha256 - (base32 "0qc90ppmrwfn3y9cdn8jcjrn7qpdf0fhxkwh945yp4rvh37mbgcm")))) + (base32 "07f8rrvcsq4pibdz6zxggxy8w7zjjqyw2ggclqlhalyv45yv7prj")))) ;; For tests. ("perl" ,perl))) -- cgit v1.2.3 From 167a147d06bbcbdfdd57b85ed6fbd5a785157695 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 22:53:39 +0200 Subject: gnu: libva: Update to 2.7.1. * gnu/packages/video.scm (libva): Update to 2.7.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e0eb2db84a..7d86d6a71e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -839,7 +839,7 @@ libebml is a C++ library to read and write EBML files.") (define-public libva (package (name "libva") - (version "2.6.1") + (version "2.7.1") (source (origin (method url-fetch) @@ -851,7 +851,7 @@ libebml is a C++ library to read and write EBML files.") (string-append "https://www.freedesktop.org/software/vaapi/releases/" "libva/libva-" version "/libva-" version ".tar.bz2"))) (sha256 - (base32 "19df3r02k1p4cbyvifkdjyc8q7hi23f5b3x3390z52l25mjfnmvc")))) + (base32 "014av7ayyc624xfmr63xhbgg7nw8fynsswj1g2wmk4lnkyfz23x0")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From bbe81cdaed559e9d6897ed9a8e3e25d887b5612d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 22:54:01 +0200 Subject: gnu: mesa: Update to 20.0.7. * gnu/packages/gl.scm (mesa): Update to 20.0.7. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index e024dd2756..4ea6515013 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -233,7 +233,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "19.3.4") + (version "20.0.7") (source (origin (method url-fetch) @@ -245,7 +245,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1r4giqq7q7zqbn23lbw7v5vswagxx8qj6ij2w8bsb697mvk6g90x")) + "0y517qpdg6v6dsdgzb365p03m30511sbyh8pq0mcvhvjwy7javpy")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) -- cgit v1.2.3 From 3b14288d022986f8b3c4561771c75230398cefb9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 22:57:45 +0200 Subject: gnu: libical: Update to 3.0.8. * gnu/packages/calendar.scm (libical): Update to 3.0.8. [source](patches): Remove. --- gnu/packages/calendar.scm | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 104d61148a..71b4827578 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -110,7 +110,7 @@ the library for handling time zones and leap seconds.") (define-public libical (package (name "libical") - (version "3.0.7") + (version "3.0.8") (source (origin (method url-fetch) (uri (string-append @@ -118,22 +118,7 @@ the library for handling time zones and leap seconds.") version "/libical-" version ".tar.gz")) (sha256 (base32 - "1z33wzaazbd7drl6qbh1750whd78xl2cg0gjnxyya9m83vgndgha")) - (patches - ;; Add a patch slated for 3.0.8 which preserves backwards- - ;; compatibility in the icalattach_new_from_data() function, - ;; which accidentally changed in 3.0.7 and could break some uses. - ;; https://gitlab.gnome.org/GNOME/evolution-data-server/issues/185 - ;; http://lists.infradead.org/pipermail/libical-devel/2020-January/000907.html - (list (origin - (method url-fetch) - (uri (string-append - "https://github.com/libical/libical/commit/" - "ae394010c889e4c185160da5e81527849f9de350.patch")) - (file-name "libical-3.0.7-preserve-icalattach-api.patch") - (sha256 - (base32 - "0v8qcxn8a6sh78grzxd61j9478928dx38l5mf8mkdrbxv47vmvvp"))))))) + "0vr8s7hn8204lyc4ys5bs3j5qss4lmc9ffly2m1a59avyz5cmzh9")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; test suite appears broken -- cgit v1.2.3 From e634d959472cee7d53dfdc52d1d36cabc25f4ba2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 22:58:10 +0200 Subject: gnu: mesa: Build with LLVM 10. * gnu/packages/gl.scm (mesa)[inputs]: Change from LLVM-9 to LLVM-10. * gnu/packages/gl.scm (mesa-opencl)[native-inputs]: Change from CLANG-9 to CLANG-10. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 4ea6515013..a04f750f8e 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -270,7 +270,7 @@ also known as DXTn or DXTC) for Mesa.") ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") ;; Note: update the 'clang' input of mesa-opencl when bumping this. - `(("llvm" ,llvm-9))) + `(("llvm" ,llvm-10))) (_ `())) ("makedepend" ,makedepend) @@ -437,7 +437,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") `(("libclc" ,libclc) ,@(package-inputs mesa))) (native-inputs - `(("clang" ,clang-9) + `(("clang" ,clang-10) ,@(package-native-inputs mesa))))) (define-public mesa-opencl-icd -- cgit v1.2.3 From c96bb2e3dc826dd37f6ac29966831446bd59e964 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 23:03:41 +0200 Subject: gnu: cups-filters: Update to 1.27.4. * gnu/packages/cups.scm (cups-filters): Update to 1.27.4. [arguments]: Remove obsolete patch-for-poppler phase. --- gnu/packages/cups.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index b253d0604e..441fccdafa 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -59,7 +59,7 @@ (define-public cups-filters (package (name "cups-filters") - (version "1.27.1") + (version "1.27.4") (source(origin (method url-fetch) (uri @@ -67,7 +67,7 @@ "cups-filters-" version ".tar.xz")) (sha256 (base32 - "0dpn4rkmrdprkhlnpih5dzrn4fxzj20k42d516kx4qx0g5l74lrm")) + "110b1xhb5vfpcx0zq9kkas7pj281skx5dpnnr22idx509jfdzj8b")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output @@ -125,12 +125,6 @@ (("/usr/local/lib/cups/filter") (string-append out "/lib/cups/filter"))) #t))) - (add-after 'unpack 'patch-for-poppler - (lambda _ - (substitute* "filter/pdf.cxx" - (("GooString \\*field_name;" m) - (string-append "const " m))) - #t)) (add-after 'install 'wrap-filters (lambda* (#:key inputs outputs #:allow-other-keys) ;; Some filters expect to find 'gs' in $PATH. We cannot -- cgit v1.2.3 From 0ab39ce2db76930316f5c15f22da4aa49ea48495 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 23:04:01 +0200 Subject: gnu: CUPS: Update to 2.3.3. * gnu/packages/cups.scm (cups-minimal): Update to 2.3.3. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 441fccdafa..0487dc5216 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -182,7 +182,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") (define-public cups-minimal (package (name "cups-minimal") - (version "2.3.1") + (version "2.3.3") (source (origin (method url-fetch) @@ -190,7 +190,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") version "/cups-" version "-source.tar.gz")) (sha256 (base32 - "1kkpmj17205j8w9hdff2bfpk6lwdmr3gx0j4r35nhgvya24rvjhv")))) + "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From a947f71cd9c7495df77f1b897c253b89eb727bd9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 23:04:17 +0200 Subject: gnu: GTK+: Update to 3.24.20. * gnu/packages/gtk.scm (gtk+): Update to 3.24.20. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3e2cb30246..fdb69621b4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -759,7 +759,7 @@ application suites.") (define-public gtk+ (package (inherit gtk+-2) (name "gtk+") - (version "3.24.14") + (version "3.24.20") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -767,7 +767,7 @@ application suites.") name "-" version ".tar.xz")) (sha256 (base32 - "120yz5gxqbv7sgdbcy4i0b6ixm8jpjzialdrqs0gv15q7bwnjk8w")) + "1wqxkd3xnqwihcawncp9mkf9bv5a5fg5i4ahm6klpl782vvnkb1d")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (propagated-inputs -- cgit v1.2.3 From 1e03f8f4a3dbc65dd13835f418acf82f51608d6d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 23:04:39 +0200 Subject: gnu: python-pycairo: Update to 1.19.1. * gnu/packages/gtk.scm (python-pycairo): Update to 1.19.1. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fdb69621b4..a0387cf7bf 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1288,7 +1288,7 @@ printing and other features typical of a source code editor.") (define-public python-pycairo (package (name "python-pycairo") - (version "1.19.0") + (version "1.19.1") (source (origin (method url-fetch) @@ -1296,7 +1296,7 @@ printing and other features typical of a source code editor.") version "/pycairo-" version ".tar.gz")) (sha256 (base32 - "176i283glkpycka8wwyndwld0zp1yn9xj9rpvllqgja698vsjnsg")))) + "111fav9m1iagw3nh2ws2vzkjh34r97yl7rdlpvsngsqg521k251c")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From d708be82a70a2de9ead189456de84828a186b7d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 23:04:57 +0200 Subject: gnu: python-cffi: Update to 1.14.0. * gnu/packages/libffi.scm (python-cffi): Update to 1.14.0. --- gnu/packages/libffi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index b0098389c0..3b71d9e26a 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -76,13 +76,13 @@ conversions for values passed between the two languages.") (define-public python-cffi (package (name "python-cffi") - (version "1.13.2") + (version "1.14.0") (source (origin (method url-fetch) (uri (pypi-uri "cffi" version)) (sha256 - (base32 "0iikq5rn9a405n94c7s2j6kq3jv5qs9q4xyik8657b2py27ix6jr")))) + (base32 "1dn279gw5ql8i5n3s5v4rnv96rhhjjfn7xq729qbl5bs2954yf1d")))) (build-system python-build-system) (inputs `(("libffi" ,libffi))) -- cgit v1.2.3 From ee3a5e07a006454558ed439f0d3448243da52638 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 23:05:18 +0200 Subject: gnu: python-certifi: Update to 2020.4.5.1. * gnu/packages/python-crypto.scm (python-certifi): Update to 2020.4.5.1. [arguments]: New field. Explicitly disable tests. --- gnu/packages/python-crypto.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index e6208ab3d9..5399e32936 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -448,14 +448,15 @@ risk.") (define-public python-certifi (package (name "python-certifi") - (version "2019.3.9") + (version "2020.4.5.1") (source (origin (method url-fetch) (uri (pypi-uri "certifi" version)) (sha256 (base32 - "1bnpw7hrf9i1l9gfxjnzi45hkrvzz0pyn9ia8m4mw7sxhgb08qdj")))) + "06b5gfs7wmmipln8f3z928d2mmx2j4b3x7pnqmj6cvmyfh8v7z2i")))) (build-system python-build-system) + (arguments '(#:tests? #f)) ;no tests (home-page "https://certifi.io/") (synopsis "Python CA certificate bundle") (description -- cgit v1.2.3 From 6144e2d7a06c495e23049de1652c2a68bc0ad5ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 23:05:42 +0200 Subject: gnu: python-cryptography: Update to 2.9.2. * gnu/packages/python-crypto.scm (python-cryptography-vectors, python-cryptography): Update to 2.9.2. --- gnu/packages/python-crypto.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 5399e32936..d6279351fb 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -470,14 +470,14 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography-vectors (package (name "python-cryptography-vectors") - (version "2.7") + (version "2.9.2") (source (origin (method url-fetch) (uri (pypi-uri "cryptography_vectors" version)) (sha256 (base32 - "1g38zw90510azyfrj6mxbslx2gp9yrnv5dac0w2819k9ssdznbgi")))) + "1d4iykcv7cn9j399hczlxm5pzxmqy6d80h3j16dkjwlmv3293b4r")))) (build-system python-build-system) (home-page "https://github.com/pyca/cryptography") (synopsis "Test vectors for the cryptography package") @@ -492,14 +492,14 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography (package (name "python-cryptography") - (version "2.7") + (version "2.9.2") (source (origin (method url-fetch) (uri (pypi-uri "cryptography" version)) (sha256 (base32 - "1inlnr36kl36551c9rcad99jmhk81v33by3glkadwdcgmi17fd76")))) + "0af25w5mkd6vwns3r6ai1w5ip9xp0ms9s261zzssbpadzdr05hx0")))) (build-system python-build-system) (inputs `(("openssl" ,openssl))) -- cgit v1.2.3 From da1eb6db1332454bab7c2f255573c9999297e9bd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 23:06:11 +0200 Subject: gnu: python-pyopenssl: Update to 19.1.0. * gnu/packages/python-crypto.scm (python-pyopenssl): Update to 19.1.0. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index d6279351fb..1b682c184a 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -541,14 +541,14 @@ message digests and key derivation functions.") (define-public python-pyopenssl (package (name "python-pyopenssl") - (version "19.0.0") + (version "19.1.0") (source (origin (method url-fetch) (uri (pypi-uri "pyOpenSSL" version)) (sha256 (base32 - "007j40y7x3k8xj54dy2qnij9lldfp71k9mkflhd9vqbdiwrndjmf")))) + "01wmsq6w0frzbr3zps4ga9kmqjidp2h317jwpq1g9ah24r5lj94s")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 21cbde9f44bee99c70a6e41695037679649365ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 23:06:35 +0200 Subject: gnu: python-urllib3: Update to 1.25.9. * gnu/packages/python-web.scm (python-urllib3): Update to 1.25.9. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 88ba88e2e2..e2f0aec41f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1648,14 +1648,14 @@ authenticated session objects providing things like keep-alive.") (define-public python-urllib3 (package (name "python-urllib3") - (version "1.25.3") + (version "1.25.9") (source (origin (method url-fetch) (uri (pypi-uri "urllib3" version)) (sha256 (base32 - "0cij8qcvvpj62g1q8n785qjkdymfh4b7vf45si4sw64l41rr3rfv")))) + "09rmjqm5syhhc8fx3v06h3yv6cqy0b1081jg8wm5grpwpr72j61h")))) (build-system python-build-system) (arguments `(#:tests? #f)) (propagated-inputs -- cgit v1.2.3 From 45f01bc0078468a768db7ea406c266724e512ec0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 23:06:58 +0200 Subject: gnu: python-requests: Update to 2.23.0. * gnu/packages/python-web.scm (python-requests): Update to 2.23.0. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e2f0aec41f..dec75e188c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1435,13 +1435,13 @@ WebSocket usage in Python programs.") (define-public python-requests (package (name "python-requests") - (version "2.22.0") + (version "2.23.0") (source (origin (method url-fetch) (uri (pypi-uri "requests" version)) (sha256 (base32 - "1d5ybh11jr5sm7xp6mz8fyc7vrp4syifds91m7sj60xalal0gq0i")))) + "1rhpg0jb08v0gd7f19jjiwlcdnxpmqi1fhvw7r4s9avddi4kvx5k")))) (build-system python-build-system) (propagated-inputs `(("python-certifi" ,python-certifi) -- cgit v1.2.3 From 691b1538f820b3e7e3ed1039c4d37572dfe3d1aa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 23:07:15 +0200 Subject: gnu: python-cython: Update to 0.29.17. * gnu/packages/python-xyz.scm (python-cython): Update to 0.29.17. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 657ebabe93..bd2a5a61aa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3969,14 +3969,14 @@ provides additional functionality on the produced Mallard documents.") (define-public python-cython (package (name "python-cython") - (version "0.29.16") + (version "0.29.17") (source (origin (method url-fetch) (uri (pypi-uri "Cython" version)) (sha256 (base32 - "01gs10myw0rw4jsikvqs0859fg7gficxhv508cxvnb4l9wl5a9r3")))) + "1wnaz40hdw4mg5acz5gqb6bhjhn4cvfxg0xdzfy7aa6qn665hqb3")))) (build-system python-build-system) ;; we need the full python package and not just the python-wrapper ;; because we need libpython3.3m.so -- cgit v1.2.3 From 5899fdb7ced9e63cc26fe2681311b3b09441cec6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 23:07:34 +0200 Subject: gnu: python-pycparser: Update to 2.20. * gnu/packages/python-xyz.scm (python-pycparser): Update to 2.20. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bd2a5a61aa..4f6f7b2fe9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5290,14 +5290,14 @@ a general image processing tool.") (define-public python-pycparser (package (name "python-pycparser") - (version "2.19") + (version "2.20") (source (origin (method url-fetch) (uri (pypi-uri "pycparser" version)) (sha256 (base32 - "1cr5dcj9628lkz1qlwq3fv97c25363qppkmcayqvd05dpy573259")))) + "1w0m3xvlrzq4lkbvd1ngfm8mdw64r1yxy6n7djlw6qj5d0km6ird")))) (outputs '("out" "doc")) (build-system python-build-system) (native-inputs -- cgit v1.2.3 From ab5acfa04a70ae6e5a27908cc4d456c955e873e2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 23:07:50 +0200 Subject: gnu: python-idna: Update to 2.9. * gnu/packages/python-xyz.scm (python-idna): Update to 2.9. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4f6f7b2fe9..532089537b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8400,14 +8400,14 @@ versions of Python.") (define-public python-idna (package (name "python-idna") - (version "2.8") + (version "2.9") (source (origin (method url-fetch) (uri (pypi-uri "idna" version)) (sha256 (base32 - "01rlkigdxg17sf9yar1jl8n18ls59367wqh59hnawlyg53vb6my3")))) + "1jxp2pdi8y4asi7ka1zhx3yx09kv8kzj533f0ds7viz49b0x323m")))) (build-system python-build-system) (home-page "https://github.com/kjd/idna") (synopsis "Internationalized domain names in applications") -- cgit v1.2.3 From 7f73f962ef632dd8b3715324c6bfef5f4ec4da6d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 23:08:06 +0200 Subject: gnu: python-mako: Update to 1.1.2. * gnu/packages/python-xyz.scm (python-mako): Update to 1.1.2. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 532089537b..3f7a266295 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10043,14 +10043,14 @@ python-xdo for newer bindings.)") (define-public python-mako (package (name "python-mako") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (pypi-uri "Mako" version)) (sha256 (base32 - "193mds7lv91pphnvn6c1n55rhjkgq94asdzgrsb2fiqx7rrsd119")))) + "17bd6r9ynp4hyfckkia0bb8gpd98f42jfl5rmzdpbld59bbcaf9i")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 8aeef3c7bdf278003892e608842200d3a35211c7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 23:23:15 +0200 Subject: gnu: NSS: Update to 3.52. * gnu/packages/nss.scm (nss): Update to 3.52. * gnu/packages/certs.scm (nss-certs): Likewise. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/nss.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 2328012083..cbf1c5cd5e 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -76,7 +76,7 @@ (define-public nss-certs (package (name "nss-certs") - (version "3.50") + (version "3.52") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ "nss-" version ".tar.gz"))) (sha256 (base32 - "19rv0vp9nmvn6dy29qsv8f4v7wn5kizrpm59vbszahsjfwcz6p8q")))) + "0q8m9jf6zgkbhx71myjb7y0gcl5ib3gj6qkl9yvdqpd6vl6fn2ha")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index e423bdd3a2..e0a29aa74e 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -72,7 +72,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.50") + (version "3.52") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -83,7 +83,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "19rv0vp9nmvn6dy29qsv8f4v7wn5kizrpm59vbszahsjfwcz6p8q")) + "0q8m9jf6zgkbhx71myjb7y0gcl5ib3gj6qkl9yvdqpd6vl6fn2ha")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")) -- cgit v1.2.3 From f2ff01bb8e794ead5d31548505c840caf6a9aa39 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 May 2020 01:40:13 +0200 Subject: gnu: pcre2: Update to 10.35. * gnu/packages/pcre.scm (pcre2): Update to 10.35. --- gnu/packages/pcre.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index ce2a6e91db..ab48168567 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -89,14 +89,14 @@ POSIX regular expression API.") (define-public pcre2 (package (name "pcre2") - (version "10.34") + (version "10.35") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pcre/pcre2/" version "/pcre2-" version ".tar.bz2")) (sha256 (base32 - "1jlqnzcz2yi70dm40wyfa9w8is9z2kh4dl8zjnv3vqd9mgzp7i3l")))) + "04s6kmk9qdd4rjz477h547j4bx7hfz0yalpvrm381rqc5ghaijww")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) ("readline" ,readline) -- cgit v1.2.3 From beec29da921345c2e46852c531161fb5ddd3076f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 14 May 2020 22:54:27 +0200 Subject: gnu: json-c: Update to 0.14. * gnu/packages/web.scm (json-c): Update to 0.14. [source](modules, snippet): Remove. [build-system]: Change to CMAKE-BUILD-SYSTEM. (json-c-0.13): New public variable. (json-c-0.12): Inherit from JSON-C-0.13. * gnu/packages/cryptsetup.scm (cryptsetup-static)[inputs]: Stick with JSON-C-0.13. * gnu/packages/linux.scm (multipath-tools)[inputs]: Likewise. * gnu/packages/security-token.scm (yubikey-personalization, libu2f-host, libu2f-server)[inputs]: Likewise. * gnu/packages/syndication.scm (newsboat)[inputs]: Likewise. --- gnu/packages/cryptsetup.scm | 4 ++-- gnu/packages/linux.scm | 2 +- gnu/packages/security-token.scm | 6 +++--- gnu/packages/syndication.scm | 2 +- gnu/packages/web.scm | 39 ++++++++++++++++++++++++++------------- 5 files changed, 33 insertions(+), 20 deletions(-) diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index d4c039ac04..bd6e046452 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -58,7 +58,7 @@ `(("pkg-config" ,pkg-config))) (inputs `(("argon2" ,argon2) - ("json-c" ,json-c) + ("json-c" ,json-c-0.13) ;XXX update this for cryptsetup >= 2.3 ("libgcrypt" ,libgcrypt) ("lvm2" ,lvm2) ; device-mapper ("popt" ,popt) @@ -138,7 +138,7 @@ files). This assumes LIBRARY uses Libtool." (inherit (static-library libgcrypt)) (propagated-inputs `(("libgpg-error-host" ,(static-library libgpg-error))))))) - `(("json-c" ,json-c) + `(("json-c" ,json-c-0.13) ("libgcrypt" ,libgcrypt-static) ("lvm2" ,lvm2-static) ("util-linux" ,util-linux "static") diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3fd902e340..b45b3725d4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4243,7 +4243,7 @@ arrays when needed.") ("pkg-config" ,pkg-config) ("valgrind" ,valgrind))) (inputs - `(("json-c" ,json-c) + `(("json-c" ,json-c-0.13) ("libaio" ,libaio) ("liburcu" ,liburcu) ("lvm2" ,lvm2) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 2ab8a85702..d742c6255c 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -357,7 +357,7 @@ and other operations. It includes a library and a command-line tool.") (assoc-ref %outputs "out") "/lib/udev/rules.d")))) (inputs - `(("json-c" ,json-c) + `(("json-c" ,json-c-0.13) ("libusb" ,libusb) ;; The library "libyubikey" is also known as "yubico-c". ("libyubikey" ,libyubikey))) @@ -457,7 +457,7 @@ PCSC API Python wrapper module.") "/xml/dtd/docbook/docbookx.dtd"))) #t))))) (inputs - `(("json-c" ,json-c) + `(("json-c" ,json-c-0.13) ("hidapi" ,hidapi))) (native-inputs `(("help2man" ,help2man) @@ -497,7 +497,7 @@ operations.") (list "--enable-gtk-doc" "--enable-tests"))) (inputs - `(("json-c" ,json-c) + `(("json-c" ,json-c-0.13) ("libressl" ,libressl))) (native-inputs `(("autoconf" ,autoconf) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 5bc3d19a92..658050c54d 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -57,7 +57,7 @@ ("asciidoc" ,asciidoc))) (inputs `(("curl" ,curl) - ("json-c" ,json-c) + ("json-c" ,json-c-0.13) ("libxml2" ,libxml2) ("ncurses" ,ncurses) ("stfl" ,stfl) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index eabc3c0197..1ccab7777b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -768,7 +768,7 @@ data.") (define-public json-c (package (name "json-c") - (version "0.13.1") + (version "0.14") (source (origin (method url-fetch) (uri (string-append @@ -776,7 +776,29 @@ data.") version ".tar.gz")) (sha256 (base32 - "0ws8dz9nk8q2c0gbf66kg2r6mrkl7kamd3gpdv9zsyrz9n6n0zmq")) + "0w381krr99q5a2rypx4g437fa7gzgl82i64sgnrs6g5jr44dwxxk")))) + (build-system cmake-build-system) + (home-page "https://github.com/json-c/json-c/wiki") + (synopsis "JSON implementation in C") + (description + "JSON-C implements a reference counting object model that allows you to +easily construct JSON objects in C, output them as JSON-formatted strings and +parse JSON-formatted strings back into the C representation of JSON objects. +It aims to conform to RFC 7159.") + (license license:x11))) + +;; TODO: Remove these old versions when all dependents have been updated. +(define-public json-c-0.13 + (package + (inherit json-c) + (version "0.13.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://s3.amazonaws.com/json-c_releases/releases/json-c-" + version ".tar.gz")) + (sha256 + (base32 "0ws8dz9nk8q2c0gbf66kg2r6mrkl7kamd3gpdv9zsyrz9n6n0zmq")) (modules '((guix build utils))) (snippet '(begin @@ -786,20 +808,11 @@ data.") (set-file-time "config.h.in" (stat "aclocal.m4")) #t)))) - (build-system gnu-build-system) - (home-page "https://github.com/json-c/json-c/wiki") - (synopsis "JSON implementation in C") - (description - "JSON-C implements a reference counting object model that allows you to -easily construct JSON objects in C, output them as JSON-formatted strings and -parse JSON-formatted strings back into the C representation of JSON objects. -It aims to conform to RFC 7159.") - (license license:x11))) + (build-system gnu-build-system))) -;; TODO: remove this old version when all dependents have been updated. (define-public json-c-0.12 (package - (inherit json-c) + (inherit json-c-0.13) (version "0.12.1") (source (origin (method url-fetch) -- cgit v1.2.3 From 5e46b563c8ca3adf0f04b33de8774b7606994d02 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 20:36:59 +0200 Subject: gnu: python-jinja2: Update to 2.11.2. * gnu/packages/python-xyz.scm (python-jinja2): Update to 2.11.2. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3f7a266295..f965c2e9de 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2992,14 +2992,14 @@ for Python.") (define-public python-jinja2 (package (name "python-jinja2") - (version "2.11.1") + (version "2.11.2") (source (origin (method url-fetch) (uri (pypi-uri "Jinja2" version)) (sha256 (base32 - "0l72c11n959yzb8d3ankckb6yhjhm6x729zm7rkpk040qzxpy64k")))) + "1c1v3djnr0ymp5xpy1h3h60abcaqxdlm4wsqmls9rxby88av5al9")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 9d3965edca29f80667374da45214cc6f22a85be4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 19:11:28 +0200 Subject: gnu: KDE Frameworks: Update to 5.70. * gnu/packages/patches/kinit-kdeinit-extra_libs.patch: Adjust for upstream changes. * gnu/packages/kde-frameworks.scm (extra-cmake-modules, attica, bluez-qt, breeze-icons, kapidox, karchive, kcalendarcore, kcodecs, kconfig, kcoreaddons, kdbusaddons, kdnssd, kguiaddons, kholidays, ki18n, kidletime, kirigami, kitemmodels, kitemviews, kplotting, ksyntaxhighlighting, kwidgetsaddons, kwindowsystem, modemmanager-qt, networkmanager-qt, oxygen-icons, prison, qqc2-desktop-style, solid, sonnet, threadweaver, kactivities, kauth, kcompletion, kcontacts, kcrash, kdoctools, kfilemetadata, kimageformats, kjobwidgets, knotifications, kpackage, kpty, kunitconversion, syndication, baloo, kactivities-stats, kbookmarks, kcmutils, kconfigwidgets, kdeclarative, kded, kdesignerplugin, kdesu, kdewebkit, kemoticons, kglobalaccel, kiconthemes, kinit, knewstuff, knotifyconfig ,kparts, kpeople, krunner, kservice, ktextwidgets, kwallet, kxmlgui, kxmlrpcclient, purpose, kde-frameworkintegration, kdelibs4support, khtml, kjs, kjsembed, kmediaplayer, kross): Update to 5.70.0. (kwayland)[inputs]: Add QTWAYLAND. (kparts)[arguments]: New field. (kinit)[inputs]: Add KDBUSADDONS. (kcmutils)[inputs]: Add KGUIADDONS. (krunner)[native-inputs]: Add DBUS. [arguments]: Run tests with "dbus-launch". (baloo)[arguments]: Remove broken test substitution. Disable one other test. (ktexteditor, plasma-framework): Update to 5.70.1. (kio): Likewise. [inputs]: Move KWINDOWSYSTEM ... [propagated-inputs]: ... here. --- gnu/packages/kde-frameworks.scm | 360 +++++++++++---------- .../patches/kinit-kdeinit-extra_libs.patch | 10 +- 2 files changed, 197 insertions(+), 173 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 0c31709329..f2b794df52 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -80,7 +81,7 @@ (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -89,7 +90,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "14h7519bfkwzh58lxgxrj5jlfhfnrakhjcm6lmhafnkg5h56m4kr")))) + "10c5xs5shk0dcshpdxg564ay5y8hgmvfvmlhmhjf0dy79kcah3c3")))) (build-system cmake-build-system) (native-inputs `(("qtbase" ,qtbase))) ; For tests (needs qmake) @@ -224,7 +225,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") (define-public attica (package (name "attica") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -233,7 +234,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "0dvsjwl2c3liiicv2m8p1m7hlc3fcapsj5pfirmdm1l38wcayr60")))) + "1njw1sifykyqldb5idaywdzi3xg7a6bvzkrvazwmyixd0npq12dx")))) (build-system cmake-build-system) (arguments `(#:phases @@ -264,7 +265,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") (define-public bluez-qt (package (name "bluez-qt") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -273,7 +274,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") name "-" version ".tar.xz")) (sha256 (base32 - "179am9czhb9mcirmja5bxjmqil3qg81v56n8rmkkp5q50qpln4dh")))) + "1kqhps4qyvqm0qmk7fb3w41bib898amipchf8csdzacw4bzpri9k")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -297,7 +298,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") (define-public breeze-icons (package (name "breeze-icons") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -306,7 +307,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") name "-" version ".tar.xz")) (sha256 (base32 - "17kil9dlh8w5r29arrjbv47b7jxz45kqzpg06zw3vz70bdgbb995")))) + "0lqglrjgjb4ralgmr7lb9k7acmn8q4jm18s4p3gbgd9iswyqgsbm")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -326,7 +327,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") (define-public kapidox (package (name "kapidox") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -335,7 +336,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "0cwprhpz731bqqhr6vra6lc76k5i4pm3m9j0q21km9wm2djfmk19")))) + "1irl25pf60frzrmm1ksgjq6y8kn3rd5snliq69l4c42yznl9qv1j")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; has no test target @@ -368,7 +369,7 @@ documentation.") (define-public karchive (package (name "karchive") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -377,7 +378,7 @@ documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "0ypykybxl9dz57rgsfihx4rfhzhphidypb2f5nwrw1f6vlqkawzs")))) + "0z8asn357pdbv4g9g0x18p72wskca1qanxljyix7wzc5rsi63wzm")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -402,7 +403,7 @@ GZip format, via a subclass of QIODevice.") (define-public kcalendarcore (package (name "kcalendarcore") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -411,7 +412,7 @@ GZip format, via a subclass of QIODevice.") name "-" version ".tar.xz")) (sha256 (base32 - "1cqqwpd6faz7sd6jrda564xxvwr231b175h2w3ilxx6hvz9yrps3")))) + "1y1f8gc1g9yn9kgmn53f1zvkizasfs667dfin3fyci657r5qwpw2")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -463,7 +464,7 @@ and the older vCalendar.") (define-public kcodecs (package (name "kcodecs") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -472,7 +473,7 @@ and the older vCalendar.") name "-" version ".tar.xz")) (sha256 (base32 - "0w5q37lqdzyl84723kg9sh9xxn2g2wv0xfxpy3218hmc9364s89h")))) + "0y9n2a5n18pasdmrp0xb84hla9l27yj2x3k4p1c041sd9nkwixpk")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -499,7 +500,7 @@ Internet).") (define-public kconfig (package (name "kconfig") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -508,7 +509,7 @@ Internet).") name "-" version ".tar.xz")) (sha256 (base32 - "1ya0fvrrfiw4a5wkydcjpnkkyq3ampxy5h210dm04qim6a9x8rb1")))) + "1s3h4hfpw7c0894cifj66bj1yhx8g94ckvl71jm7qqsb5x5h6y9n")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -564,7 +565,7 @@ propagate their changes to their respective configuration files.") (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -573,7 +574,7 @@ propagate their changes to their respective configuration files.") name "-" version ".tar.xz")) (sha256 (base32 - "1w658wfksxglr0fjpa2p8gmjbvpd2knzhk3byk2s9dwil7i7cvjd")))) + "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -621,7 +622,7 @@ many more.") (define-public kdbusaddons (package (name "kdbusaddons") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -630,7 +631,7 @@ many more.") name "-" version ".tar.xz")) (sha256 (base32 - "11zwr89v0k4m1235rzr39z4cbfdwn5zg34abs62nfnr8vmba62qv")) + "1vz2hg5p8wvfk0pi8v25zqzcn8yj7ykakxjyipmadvi02c1h8gic")) (patches (search-patches "kdbusaddons-kinit-file-name.patch")))) (build-system cmake-build-system) (native-inputs @@ -666,7 +667,7 @@ as well as an API to create KDED modules.") (define-public kdnssd (package (name "kdnssd") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -675,7 +676,7 @@ as well as an API to create KDED modules.") name "-" version ".tar.xz")) (sha256 (base32 - "1bn9c6ii1n6ns478i3lp7yzga7dbcqvdb43rfzmz7gndnmh853gm")))) + "0wadknnf472rqg2xnqzs5v23qzqfr336wj6d96yg2ayqm0chbppy")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -694,7 +695,7 @@ infrastructure.") (define-public kguiaddons (package (name "kguiaddons") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -703,7 +704,7 @@ infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "0k22kargqxf0j09wzk1x90b526npj8a0210ilk0n1k6spc8xa6mr")))) + "1yndjdhb9zzlhh74xccpys38balm5dma56sx6bwwfrga1phq0g5l")))) (build-system qt-build-system) ;; TODO: Build packages for the Python bindings. Ideally this will be ;; done for all versions of python guix supports. Requires python, @@ -724,7 +725,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (define-public kholidays (package (name "kholidays") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -732,7 +733,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1035kh0na4hwp4pnsi8p1nd7r114d4bgdnjr0g2hwmy868vx0a67")))) + (base32 "1rifx51yk24sk578h08s1bwpqb61rnyyks33zpl82lcdnl1ljp26")))) (build-system cmake-build-system) (arguments `(#:phases @@ -759,7 +760,7 @@ other special events for a geographical region.") (define-public ki18n (package (name "ki18n") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -768,7 +769,7 @@ other special events for a geographical region.") name "-" version ".tar.xz")) (sha256 (base32 - "1fdp0bdvqbqzbxynbg3bcdridr8j3qnm9spyrrdg5q95sz99a4s9")))) + "1f952488492sm904i1iwgjp2gc7z07312mlshw4ckh2801y0qclc")))) (build-system cmake-build-system) (propagated-inputs `(("gettext" ,gettext-minimal) @@ -802,7 +803,7 @@ translation scripting.") (define-public kidletime (package (name "kidletime") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -811,7 +812,7 @@ translation scripting.") name "-" version ".tar.xz")) (sha256 (base32 - "0zd51lsz23rqwk4lnzs5653sanprgr80p33yk8gmgsihgyfbjv0r")))) + "0vbxs80a8kh2xbxclx8zwl7acynsasa7i0cs171fxr26d0dmmhm5")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -833,7 +834,7 @@ or user activity.") ;; plasma-framework which is tier 3. (package (name "kirigami") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -842,7 +843,7 @@ or user activity.") "kirigami2-" version ".tar.xz")) (sha256 (base32 - "1v76d1xgmi9kkxiwq4y6rzaxs1hwwm95pw490m09rgqhli7180yv")))) + "0akkyif6n9l7hw4cj6nkf1zwgnd7vqi1gyiqmn588rspgl91zf1w")))) (properties `((upstream-name . "kirigami2"))) (build-system cmake-build-system) (native-inputs @@ -869,7 +870,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") (define-public kitemmodels (package (name "kitemmodels") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -878,7 +879,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") name "-" version ".tar.xz")) (sha256 (base32 - "10bhg0db9gdg2hlc02ngg1i2q7a99862d5973hxqzf620d28p5rd")))) + "0x7y5shg2pp490hvmkz81b8j01cha9j1001q34m7pnyf0n3zknzc")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -920,7 +921,7 @@ model to observers (define-public kitemviews (package (name "kitemviews") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -929,7 +930,7 @@ model to observers name "-" version ".tar.xz")) (sha256 (base32 - "15h0w16wgj94kxz4vgjb34i3pyx5w1f2npj86j4d2sa0mxxpmqyz")))) + "04vlmkvc3y5h7cpb6kdv9gha5axxkimhqh44mdg2ncyn4sas6j68")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -946,7 +947,7 @@ to flat and hierarchical lists.") (define-public kplotting (package (name "kplotting") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -955,7 +956,7 @@ to flat and hierarchical lists.") name "-" version ".tar.xz")) (sha256 (base32 - "11kpq34j37c1gsvj5nxhkc31bw8gw2n7nkqsfx87jw9f4v2vhmr9")))) + "1wj4n2a8iz9ml1y0012xkpsx3dfp5gl2dn80sifrzvkxjxrhwach")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -974,7 +975,7 @@ pixel units.") (define-public ksyntaxhighlighting (package (name "ksyntaxhighlighting") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -983,7 +984,7 @@ pixel units.") "syntax-highlighting-" version ".tar.xz")) (sha256 (base32 - "08y0m4wcq1sbxvlga3w72waj5xckh5jra5x7rvnp87dl38qxhacs")))) + "12jn7lqsp86329spai7n1n8i65nwhxh8gp33wkq543h7w3i2a3jb")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1023,7 +1024,7 @@ integration with a custom editor as well as a ready-to-use (define-public kwayland (package (name "kwayland") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1032,13 +1033,14 @@ integration with a custom editor as well as a ready-to-use name "-" version ".tar.xz")) (sha256 (base32 - "03z8hiw0mrhl3f0y7ypc46ic0w5vlp56prbqbk448jin5hakkkdg")))) + "0hrpbfzixjpnfy9q5x66q1fff0p7n80rrs127zzdv68pyi6456ry")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) (inputs `(("qtbase" ,qtbase) + ("qtwayland" ,qtwayland) ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (arguments @@ -1063,7 +1065,7 @@ represented by a QPoint or a QSize.") (define-public kwidgetsaddons (package (name "kwidgetsaddons") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1072,7 +1074,7 @@ represented by a QPoint or a QSize.") name "-" version ".tar.xz")) (sha256 (base32 - "1nzgv3v3kyq5jm2b9xri6qjawspr9ycxhskfvj8kkgr46dr35qyc")))) + "03l37lh219np7pqfa56r2v7n5s5xg4rjq005qng4b5izd95ri56j")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1104,7 +1106,7 @@ configuration pages, message boxes, and password requests.") (define-public kwindowsystem (package (name "kwindowsystem") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1113,7 +1115,7 @@ configuration pages, message boxes, and password requests.") name "-" version ".tar.xz")) (sha256 (base32 - "0nbkb8pkrbbp1s892ndzhakzri3qxpw48kibgb0rqz6i0azfxrz8")))) + "0a68cj0bsl5a9sxfd969khznycrn9p6grp2b08hqacxqdknzs0wh")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1167,7 +1169,7 @@ lower level classes for interaction with the X Windowing System.") (define-public modemmanager-qt (package (name "modemmanager-qt") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1176,7 +1178,7 @@ lower level classes for interaction with the X Windowing System.") name "-" version ".tar.xz")) (sha256 (base32 - "0yv5q71cyyy04051ny5lr7n35pw391gxr6l324n6c0z7kgc560ad")))) + "0ydq1l823jgp0yrrpqi1zdk5dsg65ydk1x082qwsa9a0vzs0np3x")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1205,7 +1207,7 @@ messages.") (define-public networkmanager-qt (package (name "networkmanager-qt") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1214,7 +1216,7 @@ messages.") name "-" version ".tar.xz")) (sha256 (base32 - "0ydfz6ikya1h8gg9c716y8lmy45iqnx0gaghkm0vz3c3ckx99l9g")))) + "1h2kdw5vs7mn3n7bvqwm36a48ra9iap6384kanz14zjbankj04c1")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1244,7 +1246,7 @@ which are used in DBus communication.") (define-public oxygen-icons (package (name "oxygen-icons") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1253,7 +1255,7 @@ which are used in DBus communication.") name "5" "-" version ".tar.xz")) (sha256 (base32 - "0rh9bysiisnpz3c92hyba98f58dlmwf9zhbbb4vmab0qvm5d3q9g")))) + "1rjsnz0g7zyzgii26sk370adb6jcyvr2lm8qi23fvqimifngqm2c")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1269,7 +1271,7 @@ which are used in DBus communication.") (define-public prison (package (name "prison") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) @@ -1277,7 +1279,7 @@ which are used in DBus communication.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0spkm5j2qmwl374xrbm054rjv4rcqwsz0wl5v2nyrfq2ma4bzzw5")))) + (base32 "1qflivvb593d2npc218xkdn3w5zvl7x8v1b52ydnggsxzbgkqvb4")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1294,7 +1296,7 @@ provides uniform access to generation of barcodes with data.") (define-public qqc2-desktop-style (package (name "qqc2-desktop-style") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1303,7 +1305,7 @@ provides uniform access to generation of barcodes with data.") name "-" version ".tar.xz")) (sha256 (base32 - "1sz2735fn5665pyb5v70y2fmw2mkziq83di4h06pwday9vf2r6l5")))) + "1n47cl082zqdw6ykil04rw6bws4fn1m8wfx4vxv1aqj9warbdks3")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1328,7 +1330,7 @@ feel.") (define-public solid (package (name "solid") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1337,7 +1339,7 @@ feel.") name "-" version ".tar.xz")) (sha256 (base32 - "0i124kyhd1hfnajp0hnqma35ycr3bh60z39gc6byhxb75p59swnl")))) + "0alng7ciw6xji0s2zrk8dsx1p0p9shrrfzl8wnkwygc5chnhysz7")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1367,7 +1369,7 @@ system.") (define-public sonnet (package (name "sonnet") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1376,7 +1378,7 @@ system.") name "-" version ".tar.xz")) (sha256 (base32 - "0gqxmyxmwn2rs9f8x2z8pfmbx0mvkyh7nalnsmfqkph8f0fja9ig")))) + "0b88h5fw1n8zyrg0vq3lj2jbjjyh0mk64lj6ab3643kxzqxbn30w")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1396,7 +1398,7 @@ ASpell and HUNSPELL.") (define-public threadweaver (package (name "threadweaver") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1405,7 +1407,7 @@ ASpell and HUNSPELL.") name "-" version ".tar.xz")) (sha256 (base32 - "0z2906nmamvcg85jip98wq834rjs3nc1qlv3q182gw1cnh4nbdag")))) + "0y1q0wy073lf11g4jrp4bdw4kpj4ibqfscsxj6zlh8ban9zlf389")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1426,7 +1428,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." (define-public kactivities (package (name "kactivities") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1435,7 +1437,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." name "-" version ".tar.xz")) (sha256 (base32 - "03h5r7z2a449hfvaj3zk1n7dhpj49liy5q60fb4nxz4yjkgca27s")))) + "1whsp0f87lrcn61s9rfhy0aj68hm6zgfa38mq6frlkcjksi0z1vn")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1471,7 +1473,7 @@ with other frameworks.") (define-public kauth (package (name "kauth") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1480,7 +1482,7 @@ with other frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "08gkgmxaxqpavsqdmcgs4i8j63pg5qld7agd58irpw29pgq1fj9c")))) + "0nmdz7ra3hpg0air4lfkzilv7cwx3zxs29k7sh8l3i1fs3qpjwxm")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -1518,7 +1520,7 @@ utilities.") (define-public kcompletion (package (name "kcompletion") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1527,7 +1529,7 @@ utilities.") name "-" version ".tar.xz")) (sha256 (base32 - "10ggypg09acc19gkvxsigfsaq8s5vqv64ada307blpzy8j74bisb")))) + "1pjgya8wi28jx63hcdi9v5f5487gzbkw2j1iganhd7bhcb8s7zpy")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1546,7 +1548,7 @@ integrated it into your application's other widgets.") (define-public kcontacts (package (name "kcontacts") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1555,7 +1557,7 @@ integrated it into your application's other widgets.") name "-" version ".tar.xz")) (sha256 (base32 - "0xs5c5l4vck5i6879jax1nf93if02f9hyfkn60l36cxbphnbpw0h")))) + "182ma11z3kqxq3cwy7kwprfqkb9bcmn44w7k9vixbid4pv5wa0lb")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1590,7 +1592,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca. (define-public kcrash (package (name "kcrash") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1599,7 +1601,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca. name "-" version ".tar.xz")) (sha256 (base32 - "1xl3bzxfchfafcplil3g07gq1a3fnwx1i40bxp4jfsgb8d8slfwc")))) + "11sy9hrjpvybqi53qjrnncy9mzifrb3vqxi2d12ldjzqyqd8pirp")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1617,7 +1619,7 @@ application crashes.") (define-public kdoctools (package (name "kdoctools") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1626,7 +1628,7 @@ application crashes.") name "-" version ".tar.xz")) (sha256 (base32 - "1zna9szii2r9agwfqbglk904zzpr3fyrz6x5v2rxrm3c9m110sm4")))) + "0g0k83np2xaxk05spf14h5fvzy0n7kbcwx1sa9wjh570f6jx87am")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1674,7 +1676,7 @@ from DocBook files.") (define-public kfilemetadata (package (name "kfilemetadata") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1683,7 +1685,7 @@ from DocBook files.") name "-" version ".tar.xz")) (sha256 (base32 - "11wvddb7nqdyi5rin3xa0p32lmvc62yw47hwcdzc01lkfbxdn050")))) + "18n1a5857090a1c1rxzd07sxs652gl6wr3n99sp8rxmvkghn9zsj")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1728,7 +1730,7 @@ by applications to write metadata.") (define-public kimageformats (package (name "kimageformats") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1737,7 +1739,7 @@ by applications to write metadata.") name "-" version ".tar.xz")) (sha256 (base32 - "15y339by7jvsbmfqb33s3ain7sfhx3789xy2xjpkh5f2f9v29r2b")))) + "0pk4b725wapzdxv1mm6ddqcl6z8ffcpr32i5vrhrin8awi5gx13s")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1782,7 +1784,7 @@ formats.") (define-public kjobwidgets (package (name "kjobwidgets") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1791,7 +1793,7 @@ formats.") name "-" version ".tar.xz")) (sha256 (base32 - "0pg055ampm69yr1vn03s1ys3p18raj8f5pcg0hg9hb4sjkyrr3pn")))) + "13kdczzyyh17hf6vlhh4li5bn4yq5bab5xa8mm63r9rynxihgclf")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1810,7 +1812,7 @@ asynchronous jobs.") (define-public knotifications (package (name "knotifications") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1819,7 +1821,7 @@ asynchronous jobs.") name "-" version ".tar.xz")) (sha256 (base32 - "1rknfn50kq6ng7gclgg0n4qyhv2grc7xcf3gcax3bbyy46gajsl8")))) + "01bn23xw2n53h9nl99lm3cjnqs8s66bmwkzf6fkpg9rzkykizbyc")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1856,7 +1858,7 @@ covers feedback and persistent events.") (define-public kpackage (package (name "kpackage") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1865,7 +1867,7 @@ covers feedback and persistent events.") name "-" version ".tar.xz")) (sha256 (base32 - "1h57kicsjkisysd2mmd5q9q5m421xqcv3p8vkjlqxkph5sa7y2q5")) + "03rp7p7i8ihz5wg58gjs638jk7xbszknfiy2j3r979snc57g95mv")) ;; Default to: external paths/symlinks can be followed by a ;; package (patches (search-patches "kpackage-allow-external-paths.patch")))) @@ -1917,7 +1919,7 @@ were traditional plugins.") (define-public kpty (package (name "kpty") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1926,7 +1928,7 @@ were traditional plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "10v61016kd1q41n4dwac1nsiixji64i5y501nx0hphpjkjbaklkr")))) + "1hp6iilr2asf2269linfazjv4yjg7rsi8wydxx53yyr99r0bgmah")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1954,7 +1956,7 @@ and communicating with them using a pty.") (define-public kunitconversion (package (name "kunitconversion") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -1963,7 +1965,7 @@ and communicating with them using a pty.") name "-" version ".tar.xz")) (sha256 (base32 - "0yzq2jxja9wnhz91cyli2mnw32xynnzbf1lr0hk6vi8a1w2mkrzz")))) + "0sp4gfzpf40cdi0xnff9sn7b75z88j0589svz4rv77q5m137cgnn")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1991,7 +1993,7 @@ gallons).") (define-public syndication (package (name "syndication") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2000,7 +2002,7 @@ gallons).") name "-" version ".tar.xz")) (sha256 (base32 - "1d0k6x11giylfkr183sm307n4v6rjpwkqp7y9wfhimjrcprwf2g6")))) + "1n3x8s1z4kd30xirfr07hi87vwhk4rilb5kslcjcgp5n9c0imcpv")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2024,7 +2026,7 @@ between feed formats.") (define-public baloo (package (name "baloo") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2033,7 +2035,7 @@ between feed formats.") name "-" version ".tar.xz")) (sha256 (base32 - "1qhqv19glg98146cyc7ykq02b5b9m936xcml1w1p8fx32cp2zbch")))) + "1cf5pp9hn3pqypwyzh63ksasap3n7qz6n3y2xgb83ss3fra90pjf")))) (build-system cmake-build-system) (propagated-inputs `(("kcoreaddons" ,kcoreaddons) @@ -2074,11 +2076,15 @@ between feed formats.") (display "[testMoveFile]\n*\n"))) #t)) (add-after 'unpack 'remove-failing-test - ;; This test fails on i686 and aarch64 (lambda _ + ;; FIXME: kinotifytest broke in 5.70.0 with commit 73183acf00 and + ;; seems like an oversight. Reverting the commit makes it pass, + ;; but causes other problems. Since just the test file names are + ;; broken, disabling it should be safe. Try enabling for > 5.70.0. (substitute* "autotests/unit/file/CMakeLists.txt" - (("^\\s*ecm_add_test\\(.* TEST_NAME metadatamovertest .*" line) - (string-append "# " line))) + ;; The test only runs on GNU/Linux, piggy-back on the check. + (("CMAKE_SYSTEM_NAME MATCHES \"Linux\"" all) + (string-append all " AND NOT TRUE"))) #t)) (replace 'check (lambda _ @@ -2094,7 +2100,7 @@ maintaining an index of the contents of your files.") (define-public kactivities-stats (package (name "kactivities-stats") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2103,7 +2109,7 @@ maintaining an index of the contents of your files.") name "-" version ".tar.xz")) (sha256 (base32 - "187fyl92pnkn317pi1pkmf7bv5z6aqdhqa6b8531xgl06gyigy45")))) + "1cnfdnxkw9hwbqdzdygp2vzwxqwqhxyipzwdcgar0clgnf7zi7wx")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2124,7 +2130,7 @@ by which applications, and what documents have been linked to which activity.") (define-public kbookmarks (package (name "kbookmarks") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2133,7 +2139,7 @@ by which applications, and what documents have been linked to which activity.") name "-" version ".tar.xz")) (sha256 (base32 - "011r2ms57ycz5kma0q35cji4isj0lskrxrambk11jibs1xjdis2v")))) + "1i5vcyvyc9whmflbcg2kc562ch93yscfic1c1n9z347g26jmgras")))) (build-system cmake-build-system) (propagated-inputs `(("kwidgetsaddons" ,kwidgetsaddons))) @@ -2167,7 +2173,7 @@ using the XBEL format.") (define-public kcmutils (package (name "kcmutils") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2176,7 +2182,7 @@ using the XBEL format.") name "-" version ".tar.xz")) (sha256 (base32 - "1q12n9sfgrm2f8bspsl5i9gbv4jwl25w5id9m9rnnr87hck35g68")))) + "08f4yr546brl1dppp0khvsw9ihmh9a7rp505913pdhi0sklaiimz")))) (build-system cmake-build-system) (propagated-inputs `(("kconfigwidgets" ,kconfigwidgets) @@ -2203,6 +2209,7 @@ using the XBEL format.") ("kconfig" ,kconfig) ("kcoreaddons" ,kcoreaddons) ("kdeclarative" ,kdeclarative) + ("kguiaddons" ,kguiaddons) ("kiconthemes" ,kiconthemes) ("kitemviews" ,kitemviews) ("ki18n" ,ki18n) @@ -2220,7 +2227,7 @@ KCModules can be created with the KConfigWidgets framework.") (define-public kconfigwidgets (package (name "kconfigwidgets") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2229,7 +2236,7 @@ KCModules can be created with the KConfigWidgets framework.") name "-" version ".tar.xz")) (sha256 (base32 - "098xdfvnyz9bdkc6iyq5r2s4vkfdhbrri4015yzbs73j4f2wcxz5")))) + "195dw7nyr3fp78y3vfnyjh0hwgwk46f80wdcm8dck5rkscl3v9xz")))) (build-system qt-build-system) (propagated-inputs `(("kauth" ,kauth) @@ -2267,7 +2274,7 @@ their settings.") (define-public kdeclarative (package (name "kdeclarative") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2276,7 +2283,7 @@ their settings.") name "-" version ".tar.xz")) (sha256 (base32 - "027wnrmr79fxkf4jpdpfhp7smdai2wn9y71l1h4kgqgwfq8anwy8")))) + "1vq9pkrb0zsphi2sfx7cyy1kb6pklzjkmqdf5202z8vydlkc4549")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -2330,7 +2337,7 @@ that offer bindings to some of the Frameworks.") (define-public kded (package (name "kded") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2339,7 +2346,7 @@ that offer bindings to some of the Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "0kjr6ff1g6xyas5si9b7zilcqcx4mgfkzfpq2c59fz1wd8q8fl05")))) + "0zqd33vy4ny7g9as3bhd75qi1chz1nlqq133pgw8kjanvghwwnk9")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2363,7 +2370,7 @@ started on demand.") (define-public kdesignerplugin (package (name "kdesignerplugin") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2372,7 +2379,7 @@ started on demand.") name "-" version ".tar.xz")) (sha256 (base32 - "1w7glszd82iyw6kxzmp0568rm3qfadi7vw7gfxg4c15w5ikkvxn9")))) + "0dr6gcag2yzx8fvxis4x403jrcisywds95cywmiyz3pb5727cak2")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2406,7 +2413,7 @@ ini-style description files.") (define-public kdesu (package (name "kdesu") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2415,7 +2422,7 @@ ini-style description files.") name "-" version ".tar.xz")) (sha256 (base32 - "038m0sdpnsy50m3g78sfg7wk26933rh3578qsnapw2cyimx8ypxx")))) + "17k29g7jwgqj5xdmr509438b9sq65zx8khdr4viybjf5xpi0cf5m")))) (build-system cmake-build-system) (propagated-inputs `(("kpty" ,kpty))) @@ -2437,7 +2444,7 @@ with su and ssh respectively.") (define-public kdewebkit (package (name "kdewebkit") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2446,7 +2453,7 @@ with su and ssh respectively.") name "-" version ".tar.xz")) (sha256 (base32 - "1s3bmn1ck7xvc7a6gv7ywv9161hdahiiw20aq88s4qkm2s5wyy6v")))) + "0y9ja3znkvzdbjfs91dwr4cmvl9fk97zpz2lkf0f9zhm2nw6q008")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2470,7 +2477,7 @@ engine WebKit via QtWebKit.") (define-public kemoticons (package (name "kemoticons") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2479,7 +2486,7 @@ engine WebKit via QtWebKit.") name "-" version ".tar.xz")) (sha256 (base32 - "0li1lz5kqlczvgq6b2x3nkr0hl96a337ab83fq9wxp5sx440d6sd")))) + "11v1srn3nii4j7cn4f19qvdw96pczwxhanzxlg4a9gf8kmnp5gxr")))) (build-system cmake-build-system) (propagated-inputs `(("kservice" ,kservice))) @@ -2510,7 +2517,7 @@ emoticons coming from different providers.") (define-public kglobalaccel (package (name "kglobalaccel") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2519,7 +2526,7 @@ emoticons coming from different providers.") name "-" version ".tar.xz")) (sha256 (base32 - "1xpfvwnrj81mk3di02n37b469gxzmnk89icmcz6wwyk54m86fw76")))) + "0hmqigc8myiwwh7m6y2cm4vn0d3kmrhia179hyb84vpvvn3lm93z")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2546,7 +2553,7 @@ window does not need focus for them to be activated.") (define-public kiconthemes (package (name "kiconthemes") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2555,7 +2562,7 @@ window does not need focus for them to be activated.") name "-" version ".tar.xz")) (sha256 (base32 - "18p4np4chykpy2ck8c76999nh8gdj75hjfakg1pakdqhlash9q6w")))) + "09bqpf3drqyfc81vgab9bsh1wm5qbzdwqjlczhax38660nnvh0r9")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2594,7 +2601,7 @@ in applications using the KDE Frameworks.") (define-public kinit (package (name "kinit") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2603,7 +2610,7 @@ in applications using the KDE Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "06p0i9674nzam0f4ac2jrl9pgkycz0lc0kdn24ds2rlh85cqvjwx")) + "1x4whs8p1daxjfp4ksf70rxrv7fx3w17s5wh6446039wzz9bv6ki")) ;; Use the store paths for other packages and dynamically loaded ;; libs (patches (search-patches "kinit-kdeinit-extra_libs.patch" @@ -2636,6 +2643,7 @@ in applications using the KDE Frameworks.") ("kconfigwidgets" ,kconfigwidgets) ("kcoreaddons" ,kcoreaddons) ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) ("kdoctools" ,kdoctools) ("kio" ,kio) ("kitemviews" ,kitemviews) @@ -2663,7 +2671,7 @@ consumption.") (define-public kio (package (name "kio") - (version "5.63.0") + (version "5.70.1") (source (origin (method url-fetch) (uri (string-append @@ -2672,7 +2680,7 @@ consumption.") name "-" version ".tar.xz")) (sha256 (base32 - "048gq6j8di6nzsacpr8j40kw6y5607zgwqr21ahcnnb0gd2sly4l")) + "1f33jdjjx6k1d5fab35x8xakc4ny9fyfrgkbib60xncc82lz2h5l")) (patches (search-patches "kio-search-smbd-on-PATH.patch")))) (build-system cmake-build-system) (propagated-inputs @@ -2683,6 +2691,7 @@ consumption.") ("kitemviews" ,kitemviews) ("kjobwidgets" ,kjobwidgets) ("kservice" ,kservice) + ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) ("solid" ,solid))) (native-inputs @@ -2705,7 +2714,6 @@ consumption.") ("ktextwidgets" ,ktextwidgets) ("kwallet" ,kwallet) ("kwidgetsaddons" ,kwidgetsaddons) - ("kwindowsystem" ,kwindowsystem) ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("qtbase" ,qtbase) @@ -2757,7 +2765,7 @@ KIO enabled infrastructure.") (define-public knewstuff (package (name "knewstuff") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2766,7 +2774,7 @@ KIO enabled infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "0pkm7qapkd9xypmhsjfwlgq0l4nfgya5b23lv3zkci8lrbssaqsv")))) + "1hpxj4nawh57w8l64gjplb5mk5fpxiffm4x49kg75m637rxy19fq")))) (build-system cmake-build-system) (propagated-inputs `(("attica" ,attica) @@ -2813,7 +2821,7 @@ specification.") (define-public knotifyconfig (package (name "knotifyconfig") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2822,7 +2830,7 @@ specification.") name "-" version ".tar.xz")) (sha256 (base32 - "1d90gsnxy3kqd6f1bkhflrdwwx3w65sw4c7nfpkdxxhlqhzc9zr4")))) + "1d483qrgyamwsqvcl70klv1g8744hn8z1h2j3qfydcvlwz8jy0gj")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2855,7 +2863,7 @@ notifications which can be embedded in your application.") (define-public kparts (package (name "kparts") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2864,8 +2872,18 @@ notifications which can be embedded in your application.") name "-" version ".tar.xz")) (sha256 (base32 - "0md0349r4mdm2r04p5s3pgm17v4w40r3kz58lzp6qfcw25b969nw")))) + "1gfaxr856zrsjxzdxw1sj12s6aib6r703jgf7yvsl8kilg8l2gsk")))) (build-system qt-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-partloader-test + (lambda _ + (substitute* "autotests/CMakeLists.txt" + ;; XXX: PartLoaderTest wants to create a .desktop file + ;; in the common locations and test that MIME types work. + ;; The setup required for this is extensive, skip for now. + (("partloadertest\\.cpp") "")) + #t))))) (propagated-inputs `(("kio" ,kio) ("ktextwidgets" ,ktextwidgets) @@ -2899,7 +2917,7 @@ widgets with a user-interface defined in terms of actions.") (define-public kpeople (package (name "kpeople") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2908,7 +2926,7 @@ widgets with a user-interface defined in terms of actions.") name "-" version ".tar.xz")) (sha256 (base32 - "1q2hh2i8hd638p907g0srdxmxm9h2ay91dmhslqzcgwnlhln4gfl")))) + "1dhvly19pj9lx78g7mc89scibzmra1vhv4zz33222zidkbrf9ryl")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2935,7 +2953,7 @@ to easily extend the contacts collection.") (define-public krunner (package (name "krunner") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -2944,12 +2962,15 @@ to easily extend the contacts collection.") name "-" version ".tar.xz")) (sha256 (base32 - "0gjqwzsg865gha8k7hda28hsrbfzhw9jz610lkqff5713lqbcn5a")))) + "0fhb26vi9z1mky79kq12qq4g4ghz3530cx84n5l3sdgkd6nfsyqf")))) (build-system cmake-build-system) (propagated-inputs `(("plasma-framework" ,plasma-framework))) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules))) + `(("extra-cmake-modules" ,extra-cmake-modules) + + ;; For tests. + ("dbus" ,dbus))) (inputs `(("kauth" ,kauth) ("kbookmarks" ,kbookmarks) @@ -2993,7 +3014,10 @@ to easily extend the contacts collection.") (lambda _ (display "[testMatch]\n*\n") (display "[testMulti]\n*\n"))) - #t))))) + #t)) + (replace 'check + (lambda _ + (invoke "dbus-launch" "ctest" ".")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Framework for Plasma runners") (description "The Plasma workspace provides an application called KRunner @@ -3005,7 +3029,7 @@ typed.") (define-public kservice (package (name "kservice") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -3014,7 +3038,7 @@ typed.") name "-" version ".tar.xz")) (sha256 (base32 - "1rdapw9wirfq6pyaza0k7sg6q21rv3cfyalpzrwfrk5gkgpqxzwk")))) + "0g49p5331f7dl46rvi43akmjm1jx70w9797j6d17jy7z9s9sqikw")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -3064,7 +3088,7 @@ types or handled by application specific code.") (define-public ktexteditor (package (name "ktexteditor") - (version "5.63.0") + (version "5.70.1") (source (origin (method url-fetch) (uri (string-append @@ -3073,7 +3097,7 @@ types or handled by application specific code.") "ktexteditor-" version ".tar.xz")) (sha256 (base32 - "0vfl6rr3624n8v29z07z5c0nh5af5kfg28cnp5ksfvfnssxfzfqa")))) + "0k10yj1ia1w1mznj4g5nvp65p226zcvgwxc85ycn2w8lbkknidf7")))) (build-system cmake-build-system) (propagated-inputs `(("kparts" ,kparts))) @@ -3145,7 +3169,7 @@ library.") (define-public ktextwidgets (package (name "ktextwidgets") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -3154,7 +3178,7 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "1qb1mad5bg19xwykzpwk2b3s505ka4jkg0fsi56ri57wq8gv4qha")))) + "1609rlwba674kr9whawk93vb1b14b5ly7wvir7kjyjp4j715f47w")))) (build-system qt-build-system) (propagated-inputs `(("ki18n" ,ki18n) @@ -3185,7 +3209,7 @@ It supports rich text as well as plain text.") (define-public kwallet (package (name "kwallet") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -3194,7 +3218,7 @@ It supports rich text as well as plain text.") name "-" version ".tar.xz")) (sha256 (base32 - "1dp3mrgl0h6wqp4wcqpvnvkacwkrrn5lrv6bdl008kx1y594s28g")))) + "1ps6ywcirv7xcisvwfcpvk53wm7m8y5lrz4nhkm36rizrdglw19r")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -3227,7 +3251,7 @@ the passwords on KDE work spaces.") (define-public kxmlgui (package (name "kxmlgui") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -3236,7 +3260,7 @@ the passwords on KDE work spaces.") name "-" version ".tar.xz")) (sha256 (base32 - "0x0mfapgl8w4xal8lamh3v27a9kdb7qyaxdn48gja4x85pkvi87i")))) + "0cvzcq2dcz89c0ffhvfb820hfmqa87mfdbjvrqjwdysc9lr8zx8f")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -3280,7 +3304,7 @@ descriptions for integrating actions from plugins.") (define-public kxmlrpcclient (package (name "kxmlrpcclient") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -3289,7 +3313,7 @@ descriptions for integrating actions from plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "0k82cyxjipqpky7gs0zb5s1bc6jf22d5vwpwyiqjy32da63mc89c")))) + "1cmfv2w9yfi8jhj5nawfz7kw8jbr1k5cr3n5xv3z59pg2vazsx8b")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio))) @@ -3323,7 +3347,7 @@ setUrl, setUserAgent and call.") (define-public plasma-framework (package (name "plasma-framework") - (version "5.63.0") + (version "5.70.1") (source (origin (method url-fetch) (uri (string-append @@ -3332,7 +3356,7 @@ setUrl, setUserAgent and call.") name "-" version ".tar.xz")) (sha256 (base32 - "0p0ziqw70lklx59d0nij3p9yi1vdacdfyrrp7zf74iwxd7598hci")))) + "06cxajsxj62g3c37ssrrcaxb9a12zbyp2kvrjqym329k5vd89272")))) (build-system cmake-build-system) (propagated-inputs `(("kpackage" ,kpackage) @@ -3393,7 +3417,7 @@ script engines.") (define-public purpose (package (name "purpose") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -3402,7 +3426,7 @@ script engines.") name "-" version ".tar.xz")) (sha256 (base32 - "1mc5z131z9da6qjhlxqz64ys4fgq38iryna58f8l04x8f9igjn8f")))) + "1pxlx2hgj42zsisws8f486n8sg0vn5a5mhb85prifwkaw0rqzgah")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -3459,7 +3483,7 @@ need.") (define-public kde-frameworkintegration (package (name "kde-frameworkintegration") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) (uri (string-append @@ -3468,7 +3492,7 @@ need.") "frameworkintegration-" version ".tar.xz")) (sha256 (base32 - "0n8n6lnzswi2q848qy2b4rcvkd0y1dywlk6hdmcnn8dfbxy6b050")))) + "1lvccvhhkzdv1hw627kw3ds18gfq4bxdhlvh959piqxq5gh9d2n0")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3516,7 +3540,7 @@ workspace.") (define-public kdelibs4support (package (name "kdelibs4support") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) @@ -3525,7 +3549,7 @@ workspace.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "17mywcmgp1yzdipwwaypbkxiyybk1w0sps50jv1bl0f23ya19mlc")))) + (base32 "0imkibjlfc0jshdzr05fz5dy2xmfhvgsfan9b1r35spwsn5qkawx")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -3632,7 +3656,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (define-public khtml (package (name "khtml") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) @@ -3641,7 +3665,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "15f77r6dxkkvi2vxvxlwa7qz3whmz229g79bgadiwffmzxja0ywd")))) + (base32 "1jh0g6xv57hyclnh54x0f72lby1gvlisan23y7mzlqf67aky52s5")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3683,7 +3707,7 @@ technology and using KJS for JavaScript support.") (define-public kjs (package (name "kjs") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) @@ -3692,7 +3716,7 @@ technology and using KJS for JavaScript support.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "16zsan9c8kba5m70h34y544id7gig2bcbcs4s90s27pckijkkarp")))) + (base32 "0s3n0pdz59p5v967zrxcas3lb94k5bv9vi8058fi0l20nwwlcgh5")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3716,7 +3740,7 @@ support.") (define-public kjsembed (package (name "kjsembed") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) @@ -3725,7 +3749,7 @@ support.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "00sr6lv1nai2y6aawvqwnx4pbx8pw9b1jrpa0klc014gc42l6i7b")))) + (base32 "0976faazhxhhi1wpvpcs8hwb2knz0z7j44v3ay3hw73rq4p3bipm")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3745,7 +3769,7 @@ QObjects, so you can script your applications.") (define-public kmediaplayer (package (name "kmediaplayer") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) @@ -3754,7 +3778,7 @@ QObjects, so you can script your applications.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "19v53h3lkys3ryrjacrdng9ak91g03b9s986xhnw1r84zy242kdm")))) + (base32 "0lrm4y727nhwaivl37zpmnrwx048gfhyjw19m6q5z9p37lk43jja")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -3783,7 +3807,7 @@ KParts instead.") (define-public kross (package (name "kross") - (version "5.63.0") + (version "5.70.0") (source (origin (method url-fetch) @@ -3792,7 +3816,7 @@ KParts instead.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "0paipgkxbm6vwgqj38rlr37vgmf1rx0cl2mka8zdbndl76ng5hgc")))) + (base32 "12b527l12rcf421p613ydbacilp9v9iy90ma35w21sdf9a15k675")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) diff --git a/gnu/packages/patches/kinit-kdeinit-extra_libs.patch b/gnu/packages/patches/kinit-kdeinit-extra_libs.patch index c3c4ce1161..1271f3df7d 100644 --- a/gnu/packages/patches/kinit-kdeinit-extra_libs.patch +++ b/gnu/packages/patches/kinit-kdeinit-extra_libs.patch @@ -42,12 +42,12 @@ pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch extern "C" { static void secondary_child_handler(int) -@@ -1689,7 +1693,7 @@ +@@ -1673,7 +1673,7 @@ + #if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) { - const int extrasCount = sizeof(extra_libs) / sizeof(extra_libs[0]); - for (int i = 0; i < extrasCount; i++) { -- const QString extra = findSharedLib(QString::fromLatin1(extra_libs[i])); -+ const QString extra = QString::fromLatin1(extra_libs[i]); + for (const char *extra_lib : extra_libs) { +- const QString extra = findSharedLib(QString::fromLatin1(extra_lib)); ++ const QString extra = QString::fromLatin1(extra_lib); if (!extra.isEmpty()) { QLibrary l(extra); l.setLoadHints(QLibrary::ExportExternalSymbolsHint); -- cgit v1.2.3 From 8d1ab36a56b4fda3f89c81816cb25729ba95176d Mon Sep 17 00:00:00 2001 From: TomZ Date: Thu, 23 Apr 2020 00:21:31 +0200 Subject: gnu: Qt: Update to 5.14.2. * gnu/packages/qt.scm (qtsvg, qtimageformats, qtx11extras, qtxmlpatterns, qtconnectivity, qtwebsockets, qtsensors, qtmultimedia, qtserialport, qtserialbus, qtwebchannel, qtwebview, qtlocation, qttools, qtscript, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects, qtgamepad, qtscxml, qtpurchasing, qtcharts, qtdatavis3d, qtnetworkauth, qtspeech, qtwebengine): Update to 5.14.2. (qtcanvas3d): Remove variable. Upstream deprecated it. (qtbase)[source](patches): Remove qtbase-QTBUG-81715.patch. [arguments]: Drop X11lib substitution: patched dir no longer exists. (qtwayland)[arguments]: Disable two tests, and add phase to prevent fatal DBus warnings. (qtwebglplugin)[inputs]: Add ZLIB. (qtremoteobjects): Disable some tests that fail due to missing network. (qtdeclarative)[native-inputs]: Add VULKAN-HEADERS. (qtwebengine)[source](snippet): Adjust list of preserved files. [inputs]: Add VULKAN-HEADERS. * gnu/packages/patches/qtbase-QTBUG-81715.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Co-authored-by: Marius Bakke --- gnu/local.mk | 1 - gnu/packages/patches/qtbase-QTBUG-81715.patch | 40 ----- gnu/packages/patches/qtbase-use-TZDIR.patch | 4 +- gnu/packages/qt.scm | 250 +++++++++++++------------- 4 files changed, 123 insertions(+), 172 deletions(-) delete mode 100644 gnu/packages/patches/qtbase-QTBUG-81715.patch diff --git a/gnu/local.mk b/gnu/local.mk index 66f658fe43..3aaa16401d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1442,7 +1442,6 @@ dist_patch_DATA = \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ - %D%/packages/patches/qtbase-QTBUG-81715.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ diff --git a/gnu/packages/patches/qtbase-QTBUG-81715.patch b/gnu/packages/patches/qtbase-QTBUG-81715.patch deleted file mode 100644 index 70b83b97d2..0000000000 --- a/gnu/packages/patches/qtbase-QTBUG-81715.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8a3fde00bf53d99e9e4853e8ab97b0e1bcf74915 Mon Sep 17 00:00:00 2001 -From: Joerg Bornemann -Date: Wed, 29 Jan 2020 11:06:35 +0100 -Subject: [PATCH] Fix qt5_make_output_file macro for paths containing dots - -Commit 89bd5a7e broke CMake projects that use dots in their build -paths, because the used regular expression matches the directory part -of the path as well. - -The regex wants to achieve the same as get_filename_component(... -NAME_WLE) which is available since CMake 3.14. Re-implement the -NAME_WLE functionality for older CMake versions by using multiple -get_filename_component calls. - -Fixes: QTBUG-81715 -Task-number: QTBUG-80295 -Change-Id: I2ef053300948f6e1b2c0c5eafac35105f193d4e6 -Reviewed-by: Alexandru Croitor ---- - -diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 7735e51..b3da640 100644 ---- a/src/corelib/Qt5CoreMacros.cmake -+++ b/src/corelib/Qt5CoreMacros.cmake -@@ -59,7 +59,14 @@ - set(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}") - string(REPLACE ".." "__" _outfile ${_outfile}) - get_filename_component(outpath ${_outfile} PATH) -- string(REGEX REPLACE "\\.[^.]*$" "" _outfile ${_outfile}) -+ if(CMAKE_VERSION VERSION_LESS "3.14") -+ get_filename_component(_outfile_ext ${_outfile} EXT) -+ get_filename_component(_outfile_ext ${_outfile_ext} NAME_WE) -+ get_filename_component(_outfile ${_outfile} NAME_WE) -+ string(APPEND _outfile ${_outfile_ext}) -+ else() -+ get_filename_component(_outfile ${_outfile} NAME_WLE) -+ endif() - file(MAKE_DIRECTORY ${outpath}) - set(${outfile} ${outpath}/${prefix}${_outfile}.${ext}) - endmacro() diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patch index 11c737d844..b6c377b133 100644 --- a/gnu/packages/patches/qtbase-use-TZDIR.patch +++ b/gnu/packages/patches/qtbase-use-TZDIR.patch @@ -4,8 +4,8 @@ important to be able to update it fast. Based on a patch fron NixOS. =================================================================== ---- qtbase-opensource-src-5.9.4.orig/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ qtbase-opensource-src-5.9.4/src/corelib/tools/qtimezoneprivate_tz.cpp +--- qtbase-opensource-src-5.14.2.orig/src/corelib/time/qtimezoneprivate_tz.cpp ++++ qtbase-opensource-src-5.15.2/src/corelib/time/qtimezoneprivate_tz.cpp @@ -70,7 +70,11 @@ // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c312efa1f9..73d538360d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020 Mike Rosset ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Kei Kebreau +;;; Copyright © 2020 TomZ ;;; ;;; This file is part of GNU Guix. ;;; @@ -352,7 +353,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtbase (package (name "qtbase") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -361,11 +362,10 @@ developers using C++ or QML, a CSS & JavaScript like language.") version ".tar.xz")) (sha256 (base32 - "0pb68d30clksdhgy8n6rrs838bb3qcsfq4pv463yy2nr4p5kk2di")) + "12mjsahlma9rw3vz9a6b5h2s6ylg8b34hxc2vnlna5ll429fgfa8")) ;; Use TZDIR to avoid depending on package "tzdata". (patches (search-patches "qtbase-use-TZDIR.patch" - "qtbase-moc-ignore-gcc-macro.patch" - "qtbase-QTBUG-81715.patch")) + "qtbase-moc-ignore-gcc-macro.patch")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 @@ -571,14 +571,6 @@ developers using C++ or QML, a CSS & JavaScript like language.") "src/network/kernel/qhostinfo_unix.cpp") (("^\\s*(lib.setFileName\\(QLatin1String\\(\")(resolv\"\\)\\);)" _ a b) (string-append a glibc "/lib/lib" b)))) - ;; X11/locale (compose path) - (substitute* "src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp" - ;; Don't search in /usr/…/X11/locale, … - (("^\\s*m_possibleLocations.append\\(QStringLiteral\\(\"/usr/.*/X11/locale\"\\)\\);" line) - (string-append "// " line)) - ;; … but use libx11's path - (("^\\s*(m_possibleLocations.append\\(QStringLiteral\\()X11_PREFIX \"(/.*/X11/locale\"\\)\\);)" _ a b) - (string-append a "\"" (assoc-ref inputs "libx11") b))) ;; libGL (substitute* "src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp" (("^\\s*(QLibrary lib\\(QLatin1String\\(\")(GL\"\\)\\);)" _ a b) @@ -618,7 +610,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (define-public qtsvg (package (inherit qtbase) (name "qtsvg") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -627,7 +619,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") version ".tar.xz")) (sha256 (base32 - "1f3vqv3s83gjillhgi0wghyf3825fgy1ffhvkxhdk673shb0kxjb")))) + "18dmfc8s428fzbk7k5vl3212b25455ayrz7s716nwyiy3ahgmmy7")))) (propagated-inputs `()) (native-inputs `(("perl" ,perl))) (inputs @@ -693,7 +685,7 @@ HostData=lib/qt5 (define-public qtimageformats (package (inherit qtsvg) (name "qtimageformats") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -702,7 +694,7 @@ HostData=lib/qt5 version ".tar.xz")) (sha256 (base32 - "02zpcbx71dz6xvga07dnzqwdfz9pjmy673n706fj8pxq9zi9xlcv")) + "132g4rlm61pdcpcrclr1rwpbrxn7va4wjfb021mh8pn1cl0wlgkk")) (modules '((guix build utils))) (snippet '(begin @@ -724,7 +716,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (define-public qtx11extras (package (inherit qtsvg) (name "qtx11extras") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -733,7 +725,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) version ".tar.xz")) (sha256 (base32 - "15hb90n47khsp3qnzyjd3mh8gi9qvy07dqdr4qspiww43r5mz293")))) + "0njlh6d327nll7d8qaqrwr5x15m9yzgyar2j45qigs1f7ah896my")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -748,7 +740,7 @@ from within Qt 5."))) (define-public qtxmlpatterns (package (inherit qtsvg) (name "qtxmlpatterns") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -757,7 +749,7 @@ from within Qt 5."))) version ".tar.xz")) (sha256 (base32 - "0ys1kf0zdn8gak1ik9p7i7bdyfz2frvklcyz013s9wm1550h20lh")))) + "1dyg1z4349k04yyzn8xbp4f5qjgm60gz6wgzp80khpilcmk8g6i1")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f) ; TODO: Enable the tests @@ -779,7 +771,7 @@ xmlpatternsvalidator."))) (define-public qtdeclarative (package (inherit qtsvg) (name "qtdeclarative") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -788,7 +780,7 @@ xmlpatternsvalidator."))) version ".tar.xz")) (sha256 (base32 - "1gg9xbv8ah4p55ws97brwn0csl0k3j1x6zdknrrsnh7j6nh0bp2w")))) + "0l0nhc2si6dl9r4s1bs45z90qqigs8jnrsyjjdy38q4pvix63i53")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -797,7 +789,8 @@ xmlpatternsvalidator."))) ("pkg-config" ,pkg-config) ("python" ,python) ("python-wrapper" ,python-wrapper) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg) + ("vulkan-headers" ,vulkan-headers))) (inputs `(("mesa" ,mesa) ("qtbase" ,qtbase))) @@ -811,7 +804,7 @@ with JavaScript and C++."))) (define-public qtconnectivity (package (inherit qtsvg) (name "qtconnectivity") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -820,7 +813,7 @@ with JavaScript and C++."))) version ".tar.xz")) (sha256 (base32 - "06h71pd5w5prh722mcbgmx7l71xvh5xpjrlbg17yblx0n6wlhwb4")))) + "0a5wzin635b926b8prdwfazgy1vhyf8m6an64wp2lpkp78z7prmb")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -835,7 +828,7 @@ with Bluetooth and NFC."))) (define-public qtwebsockets (package (inherit qtsvg) (name "qtwebsockets") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -844,7 +837,7 @@ with Bluetooth and NFC."))) version ".tar.xz")) (sha256 (base32 - "05rv52pp5zg4g14zh7c6jc77l426056b8xyr40ps6cpmb0jkrlbg")))) + "116amx4mnv50k0fpswgpr5x8wjny8nbffrjmld01pzhkhfqn4vph")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -862,7 +855,7 @@ consume data received from the server, or both."))) (define-public qtsensors (package (inherit qtsvg) (name "qtsensors") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -871,7 +864,7 @@ consume data received from the server, or both."))) version ".tar.xz")) (sha256 (base32 - "0h77h34rn6cgy5qiqq163pj3bhbka1ydkfgjcx01ns1g9sgym6ib")))) + "0qccpgbhyg9k4x5nni7xm0pyvaqia3zrcd42cn7ksf5h21lwmkxw")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:parallel-tests? _ #f) #f) ; can lead to race condition @@ -895,7 +888,7 @@ recognition API for devices."))) (define-public qtmultimedia (package (inherit qtsvg) (name "qtmultimedia") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -904,7 +897,7 @@ recognition API for devices."))) version ".tar.xz")) (sha256 (base32 - "07fvnjywn3hkrxfbxasmy83jr6jq9lf1grasfwij54hz6y0smg98")) + "1sczzcvk3c5gczz53yvp8ma6gp8aixk5pcq7wh344c9md3g8xkbs")) (modules '((guix build utils))) (snippet '(begin @@ -946,7 +939,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (define-public qtwayland (package (inherit qtsvg) (name "qtwayland") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -955,7 +948,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) version ".tar.xz")) (sha256 (base32 - "1ib61zh6jrab3yz592p47ldfgphi4i184kqf14vhwn31akibh6pw")) + "0al3yypy3fin62n8d1859jh0mn0fbpa161l7f37hgd4gf75365nk")) (modules '((guix build utils))) (snippet ;; The examples try to build and cause the build to fail @@ -966,13 +959,21 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) `(modify-phases ,phases - (add-before 'check 'set-ld-library-path - ;; - ;; - ;; Make the uninstalled libQt5WaylandClient.so.5 available to the - ;; wayland platform plugin. + (add-after 'unpack 'disable-failing-tests (lambda _ - (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/lib")) + ;; FIXME: tst_seatv4::animatedCursor() fails for no good + ;; reason and breaks these two tests. + (substitute* "tests/auto/client/seatv4/tst_seatv4.cpp" + (((string-append "QVERIFY\\(!cursorSurface\\(\\)->" + "m_waitingFrameCallbacks\\.empty\\(\\)\\);")) + "") + (("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);") + "")) + #t)) + (add-before 'check 'set-test-environment + (lambda _ + ;; Do not fail just because /etc/machine-id is missing. + (setenv "DBUS_FATAL_WARNINGS" "0") #t)))))) (native-inputs `(("glib" ,glib) @@ -998,7 +999,7 @@ compositor libraries."))) (define-public qtserialport (package (inherit qtsvg) (name "qtserialport") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1007,7 +1008,7 @@ compositor libraries."))) version ".tar.xz")) (sha256 (base32 - "07vjv3p7n7n5v15wdpi8x5sbnvyjqdh85qfzf9mz8l6ppqp2hk12")))) + "08ga9a1lwj83872nxablk602z1dq0la6jqsiicvd7m1sfbfpgnd6")))) (native-inputs `(("perl" ,perl))) (inputs `(("qtbase" ,qtbase) @@ -1032,7 +1033,7 @@ interacting with serial ports from within Qt."))) (define-public qtserialbus (package (inherit qtsvg) (name "qtserialbus") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1041,7 +1042,7 @@ interacting with serial ports from within Qt."))) version ".tar.xz")) (sha256 (base32 - "1bkyk1v7bcq657n88a6675lj55vl9y8v46h4kf27v58yjzgiw842")))) + "14bahg82jciciqkl74q9hvf3a8kp3pk5v731vp2416k4b8bn4xqb")))) (inputs `(("qtbase" ,qtbase) ("qtserialport" ,qtserialport))) @@ -1053,7 +1054,7 @@ and others."))) (define-public qtwebchannel (package (inherit qtsvg) (name "qtwebchannel") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1062,7 +1063,7 @@ and others."))) version ".tar.xz")) (sha256 (base32 - "0xff3fbbpcl0kkq0rg9npj127ycirygicbkxlf0v593sjpjp5bmh")))) + "0x7q66994pw6cd0f505bmirw1sssqs740zaw8lyqqqr32m2ch7bx")))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative) @@ -1077,7 +1078,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (define-public qtwebglplugin (package (inherit qtsvg) (name "qtwebglplugin") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1086,7 +1087,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) version ".tar.xz")) (sha256 (base32 - "0fswnmhb8fm7wqgzv8cjy1j2sgb5mhx80jl411laawn7bf2ysjg0")))) + "05rl657848fsprsnabdqb5z363c6drjc32k59223vl351f8ihhgb")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1100,7 +1101,8 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) `(("mesa" ,mesa) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) - ("qtwebsockets" ,qtwebsockets))) + ("qtwebsockets" ,qtwebsockets) + ("zlib" ,zlib))) (synopsis "QPA plugin for running an application via a browser using streamed WebGL commands") (description "Qt back end that uses WebGL for rendering. It allows Qt @@ -1112,7 +1114,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (define-public qtwebview (package (inherit qtsvg) (name "qtwebview") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1121,7 +1123,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) version ".tar.xz")) (sha256 (base32 - "1rvvkg6dl34hklllnlzlcffik746f15lzxdnwggc97dmx8n2vy6k")))) + "0jzzcm7z5njkddzfhmyjz4dbbzq8h93980cci4479zc4xq9r47y6")))) (native-inputs `(("perl" ,perl))) (inputs @@ -1135,7 +1137,7 @@ native APIs where it makes sense."))) (define-public qtlocation (package (inherit qtsvg) (name "qtlocation") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1144,7 +1146,7 @@ native APIs where it makes sense."))) version ".tar.xz")) (sha256 (base32 - "07vq4aycayq2bg8yi4awidb25xyvws2ajbnrmad3rnpg1fw0bsfi")))) + "1k3m8zhbv04yrqvj7jlnh8f9xczdsmla59j9gcwsqvbg76y0hxy3")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1165,7 +1167,7 @@ positioning and geolocation plugins."))) (define-public qttools (package (inherit qtsvg) (name "qttools") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1174,7 +1176,7 @@ positioning and geolocation plugins."))) version ".tar.xz")) (sha256 (base32 - "0j1rl368sjknsmwp2f7bwqcb0sx13l3l4dxbm70873si9l8rf2l6")))) + "1iakl3hlyg51ri1czmis8mmb257b0y1zk2a2knybd3mq69wczc2v")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1193,7 +1195,7 @@ that helps in Qt development."))) (define-public qtscript (package (inherit qtsvg) (name "qtscript") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1202,7 +1204,7 @@ that helps in Qt development."))) version ".tar.xz")) (sha256 (base32 - "06a02230mj4bd8qvjaf2q97grzbj1c1rq36x7236fnhjsikbq7fa")) + "1zlvg3hc6h70d789g3kv6dxbwswzkskkm00bdgl01grwrdy4izg9")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs `(("perl" ,perl) @@ -1217,7 +1219,7 @@ ECMAScript and Qt."))) (define-public qtquickcontrols (package (inherit qtsvg) (name "qtquickcontrols") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1226,7 +1228,7 @@ ECMAScript and Qt."))) version ".tar.xz")) (sha256 (base32 - "1rar337vv0dx52r2gxwiwy1axn0fpy79rka09xizjlxsdg3vnf0h")))) + "0qa4dlhn3iv9yvaic8hw86v6h8rn9sgq8xjfdaym04pfshfyypfm")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1241,7 +1243,7 @@ can be used to build complete interfaces in Qt Quick."))) (define-public qtquickcontrols2 (package (inherit qtsvg) (name "qtquickcontrols2") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1250,7 +1252,7 @@ can be used to build complete interfaces in Qt Quick."))) version ".tar.xz")) (sha256 (base32 - "0dx2jag6l5a80220fvmf49z1psliqf1ijqx6jsvvzv81mpjjd59s")))) + "0q0mk2mjlf9ll0gdrdzxy8096s6g9draaqiwrlvdpa7lv14x7xzs")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1266,7 +1268,7 @@ not available."))) (define-public qtgraphicaleffects (package (inherit qtsvg) (name "qtgraphicaleffects") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1275,7 +1277,7 @@ not available."))) version ".tar.xz")) (sha256 (base32 - "1knapc14a80cn2f5bbfj7lhq9flr3v0gwjg9ka7xl8y642235w02")))) + "03xmwhapv0b2qj661iaqqrvhxc7qiid0acrp6rj85824ha2pyyj8")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1293,7 +1295,7 @@ coloring, and many more."))) (define-public qtgamepad (package (inherit qtsvg) (name "qtgamepad") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1302,7 +1304,7 @@ coloring, and many more."))) version ".tar.xz")) (sha256 (base32 - "150y7bc755l9y8w7nkg3gfw5n6rlj9hhq0ibc9g1xgllpr18qqq7")))) + "00wd3h465waxdghg2vdhs5pkj0xikwjn88l12477dksm8zdslzgp")))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) @@ -1323,7 +1325,7 @@ and mobile applications targeting TV-like form factors."))) (define-public qtscxml (package (inherit qtsvg) (name "qtscxml") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1332,7 +1334,7 @@ and mobile applications targeting TV-like form factors."))) version ".tar.xz")) (sha256 (base32 - "1dpvjkvwc3fj86vay8q8vzym73cix7ri2ianx87ck0gqjny51adg")) + "141pfschv6zmcvvn3pi7f5vb4nf96zpngy80f9bly1sn58syl303")) (modules '((guix build utils))) (snippet '(begin @@ -1354,7 +1356,7 @@ also contains functionality to support data models and executable content."))) (define-public qtpurchasing (package (inherit qtsvg) (name "qtpurchasing") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1363,7 +1365,7 @@ also contains functionality to support data models and executable content."))) version ".tar.xz")) (sha256 (base32 - "0xjsn7p629ni68vk4xlw2cvcs53ipcqv1pa4hck0nabddcgcnzkg")))) + "0lg8x7g7dkf95xwxq8b4yw4ypdz68igkscya96xwbklg3q08gc39")))) (inputs `(("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative))) @@ -1371,49 +1373,10 @@ also contains functionality to support data models and executable content."))) (description "The Qt Purchasing module provides and in-app API for purchasing goods and services."))) -(define-public qtcanvas3d - (package (inherit qtsvg) - (name "qtcanvas3d") - (version "5.12.7") - (source (origin - (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases/qt/" - (version-major+minor version) "/" version - "/submodules/" name "-everywhere-src-" - version ".tar.xz")) - (sha256 - (base32 - "0l0c1p6jwz5rygyxslfw7jw3wbd23w5n9zg04aqlh5g15qx52fmn")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "examples/canvas3d/3rdparty") - #t)))) - (arguments - (substitute-keyword-arguments (package-arguments qtsvg) - ;; Building the tests depends on the bundled 3rd party javascript files, - ;; and the test phase fails to import QtCanvas3D, causing the phase to - ;; fail, so we skip building them for now. - ((#:phases phases) - `(modify-phases ,phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "qmake" "QT_BUILD_PARTS = libs tools" - (string-append "PREFIX=" out))))))) - ((#:tests? _ #f) #f))) ; TODO: Enable the tests - (native-inputs `()) - (inputs - `(("qtbase" ,qtbase) - ("qtdeclarative" ,qtdeclarative))) - (synopsis "Qt Canvas 3D module") - (description "The Qt Canvas 3D module provides a way to make WebGL-like 3D -drawing calls from Qt Quick JavaScript."))) - (define-public qtcharts (package (inherit qtsvg) (name "qtcharts") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1422,7 +1385,7 @@ drawing calls from Qt Quick JavaScript."))) version ".tar.xz")) (sha256 (base32 - "0pyg2lpxmhf4amj57zihp5ry0y9m39xq5hbcx4hqj78bdm96ah23")))) + "1drvm15i6n10b6a1acgarig120ppvqh3r6fqqdn8i3blx81m5cmd")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1440,7 +1403,7 @@ selecting one of the charts themes.") (define-public qtdatavis3d (package (inherit qtsvg) (name "qtdatavis3d") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1449,7 +1412,7 @@ selecting one of the charts themes.") version ".tar.xz")) (sha256 (base32 - "09wbv4g29sq5z2fphk2910albr3iv3l14nch3ml77w6drw9mgzq7")))) + "080fkpxg70m3c697wfnkjhca58b7r1xsqd559jzb21985pdh6g3j")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:tests? _ #f) #f))) ; TODO: Enable the tests @@ -1467,7 +1430,7 @@ customized by using themes or by adding custom items and labels to them.") (define-public qtnetworkauth (package (inherit qtsvg) (name "qtnetworkauth") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1476,7 +1439,7 @@ customized by using themes or by adding custom items and labels to them.") version ".tar.xz")) (sha256 (base32 - "0sspni7zllhspk70yjj2d0li9r4rs3iflnksj8mvjx2yl9qpryyb")))) + "0pi6p7bq54kzij2p69cgib7n55k69jsq0yqq09yli645s4ym202g")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1496,7 +1459,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (define-public qtremoteobjects (package (inherit qtsvg) (name "qtremoteobjects") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1505,7 +1468,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) version ".tar.xz")) (sha256 (base32 - "03qjj7l63wn1zqkmlja9yrnc38rf6b3apnmsn0kw0h61x72awskd")))) + "1mhlws5w0igf5hw0l90p6dz6k7w16dqfbnk2li0zxdmayk2039m6")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) @@ -1516,6 +1479,10 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (substitute* "tests/auto/qml/qml.pro" (("integration") "# integration") (("usertypes") "# usertypes")) + ;; disable failing tests: they need network + (substitute* "tests/auto/auto.pro" + (("integration_multiprocess proxy_multiprocess integration_external restart") + "integration_multiprocess")) #t)))))) (inputs `(("qtbase" ,qtbase) @@ -1529,7 +1496,7 @@ processes or computers."))) (define-public qtspeech (package (inherit qtsvg) (name "qtspeech") - (version "5.12.7") + (version "5.14.2") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases/qt/" @@ -1538,7 +1505,7 @@ processes or computers."))) version ".tar.xz")) (sha256 (base32 - "0q30m9l28zsdzdmny7wjskd2fjfrgh1l595wir6bhwhil95g3i0c")))) + "1nn6kspbp8hfkz1jhzc1qx1m9z7r1bgkdqgi9n4vl1q25yk8x7jy")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) @@ -1573,7 +1540,7 @@ message."))) version ".tar.xz")) (sha256 (base32 - "1yj6pcj945fpbc7nihav0plxpx8ikylmxjy7wqdv5znslgf59dw3")) + "0iy9lsl6zxlkca6x2p1506hbj3wmhnaipg23z027wfccbnkxcsg1")) (modules '((ice-9 ftw) (ice-9 match) (srfi srfi-1) @@ -1582,7 +1549,8 @@ message."))) (snippet '(begin (let ((preserved-third-party-files - '("base/third_party/dmg_fp" + '("base/third_party/cityhash" + "base/third_party/dmg_fp" "base/third_party/dynamic_annotations" "base/third_party/icu" "base/third_party/libevent" @@ -1591,23 +1559,30 @@ message."))) "base/third_party/symbolize" "base/third_party/xdg_mime" "base/third_party/xdg_user_dirs" - "net/third_party/http2" "net/third_party/mozilla_security_manager" "net/third_party/nss" - "net/third_party/spdy" - "net/third_party/quic" + "net/third_party/quiche" + "net/third_party/uri_template" "third_party/abseil-cpp" "third_party/angle" "third_party/angle/src/common/third_party/base" "third_party/angle/src/common/third_party/smhasher" + "third_party/angle/src/common/third_party/xxhash" "third_party/angle/src/third_party/compiler" + "third_party/axe-core" "third_party/blink" "third_party/boringssl" "third_party/boringssl/src/third_party/fiat" + "third_party/boringssl/src/third_party/sike" + "third_party/boringssl/linux-x86_64/crypto/third_party/sike" + "third_party/boringssl/linux-aarch64/crypto/third_party/sike" "third_party/breakpad" "third_party/brotli" "third_party/ced" + "third_party/cld_3" "third_party/crc32c" + "third_party/dav1d" + "third_party/dawn" "third_party/ffmpeg" "third_party/googletest" "third_party/hunspell" @@ -1615,11 +1590,13 @@ message."))) "third_party/icu" "third_party/inspector_protocol" "third_party/jinja2" + "third_party/jsoncpp" "third_party/jstemplate" "third_party/khronos" "third_party/leveldatabase" "third_party/libaddressinput" "third_party/libjingle_xmpp" + "third_party/libjpeg" "third_party/libpng" "third_party/libsrtp" "third_party/libsync" @@ -1632,11 +1609,14 @@ message."))) "third_party/libyuv" "third_party/lss" "third_party/markupsafe" - "third_party/mesa" "third_party/metrics_proto" "third_party/modp_b64" + "third_party/nasm" + "third_party/one_euro_filter" "third_party/opus" "third_party/ots" + "third_party/perfetto" + "third_party/pffft" "third_party/ply" "third_party/polymer" "third_party/protobuf" @@ -1644,14 +1624,25 @@ message."))) "third_party/re2" "third_party/rnnoise" "third_party/skia" + "third_party/skia/include/third_party/skcms/skcms.h" + "third_party/skia/include/third_party/vulkan" "third_party/skia/third_party/gif" "third_party/skia/third_party/skcms" + "third_party/skia/third_party/vulkanmemoryallocator" "third_party/smhasher" "third_party/snappy" "third_party/sqlite" + "third_party/usb_ids" "third_party/usrsctp" "third_party/web-animations-js" "third_party/webrtc" + "third_party/webrtc/common_audio/third_party/fft4g" + "third_party/webrtc/common_audio/third_party/spl_sqrt_floor" + "third_party/webrtc/modules/third_party/fft" + "third_party/webrtc/modules/third_party/g711" + "third_party/webrtc/modules/third_party/g722" + "third_party/webrtc/rtc_base/third_party/base64" + "third_party/webrtc/rtc_base/third_party/sigslot" "third_party/webrtc_overrides" "third_party/widevine/cdm/widevine_cdm_common.h" "third_party/widevine/cdm/widevine_cdm_version.h" @@ -1661,7 +1652,8 @@ message."))) "url/third_party/mozilla" "v8/src/third_party/utf8-decoder" "v8/src/third_party/valgrind" - "v8/third_party/antlr4" + "v8/src/third_party/siphash" + "v8/third_party/v8/builtins" "v8/third_party/inspector_protocol")) (protected (make-regexp "\\.(gn|gyp)i?$"))) (define preserved-club @@ -1690,9 +1682,9 @@ message."))) (list (string-join (list-head dirs delim) "/")) (list-tail dirs delim)))) (define (remove-loudly file) - (format #t "deleting ~a...~%" file) - (force-output) - (delete-file file)) + (format #t "deleting ~a...~%" file) + (force-output) + (delete-file file)) (define (delete-unwanted-files child stat flag base level) (match flag ((or 'regular 'symlink 'stale-symlink) @@ -1741,9 +1733,8 @@ message."))) "third_party/analytics/google-analytics-bundle.js" (lambda (port) (const #t))))) - ;; Do not enable support for loading the Widevine DRM plugin. - (substitute* "src/core/config/common.pri" + (substitute* "src/buildtools/config/common.pri" (("enable_widevine=true") "enable_widevine=false")) #t))))) @@ -1806,6 +1797,7 @@ message."))) ("snappy" ,snappy) ("udev" ,eudev) ("valgrind" ,valgrind) + ("vulkan-headers" ,vulkan-headers) ("xcb-util" ,xcb-util))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) -- cgit v1.2.3 From 2d2713596205129403b3864d33b1af6763d450cf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 19 May 2020 10:36:31 +0200 Subject: gnu: Mesa: Fix ineffective substitution on i686-linux. This is a follow-up to commit ee345ae62c8b899186b65b61a2376b5adb938520. * gnu/packages/gl.scm (mesa)[arguments]: Adjust substitution to use the correct file name. --- gnu/packages/gl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index a04f750f8e..de9e6090df 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -359,7 +359,7 @@ also known as DXTn or DXTC) for Mesa.") ;; report: . `((add-after 'unpack 'disable-failing-test (lambda _ - (substitute* "src/gallium/tests/unit/meson.build" + (substitute* "src/util/tests/format/meson.build" (("'u_format_test',") "")) #t))) '()) -- cgit v1.2.3 From 8ab211dbdb7df000a64aceadfe7b53488819d245 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 May 2020 21:08:04 +0200 Subject: gnu: NSS: Update to 3.52.1 [fixes CVE-2020-12399]. * gnu/packages/nss.scm (nss): Update to 3.52.1. * gnu/packages/certs.scm (nss-certs): Likewise. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/nss.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index cbf1c5cd5e..7f4dca5f56 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -76,7 +76,7 @@ (define-public nss-certs (package (name "nss-certs") - (version "3.52") + (version "3.52.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ "nss-" version ".tar.gz"))) (sha256 (base32 - "0q8m9jf6zgkbhx71myjb7y0gcl5ib3gj6qkl9yvdqpd6vl6fn2ha")))) + "0y4jb9095f7bbgw7d7kvzm4c3g4p5i6y68fwhb8wlkpb7b1imj5w")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index e0a29aa74e..b19ad7e1e9 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -72,7 +72,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.52") + (version "3.52.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -83,7 +83,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "0q8m9jf6zgkbhx71myjb7y0gcl5ib3gj6qkl9yvdqpd6vl6fn2ha")) + "0y4jb9095f7bbgw7d7kvzm4c3g4p5i6y68fwhb8wlkpb7b1imj5w")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")) -- cgit v1.2.3 From 0c8a51c7d28befa49e596421de22c0b4fef100f0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 May 2020 22:09:21 +0200 Subject: gnu: cogl: Fix build with Mesa 20. * gnu/packages/gnome.scm (cogl)[arguments]: Add phase to adjust header includes. --- gnu/packages/gnome.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 938efbcdf3..e0e1ed1804 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4486,6 +4486,17 @@ throughout GNOME for API documentation).") "/lib/libGL.so")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-build-with-mesa-20 + (lambda _ + ;; Work around a problem with Mesa 20 where some macros used by + ;; Cogl went missing from eglext.h. This can likely be removed + ;; for newer versions of Cogl or Mesa. + ;; https://gitlab.gnome.org/GNOME/cogl/-/merge_requests/19 + (substitute* '("configure" + "cogl/winsys/cogl-winsys-egl-kms.c") + (("#include " all) + (string-append all "\n#include \n"))) + #t)) (add-before 'check 'start-xorg-server (lambda* (#:key tests? inputs #:allow-other-keys) (if tests? -- cgit v1.2.3 From a64eeaf75585b1871526a226f8cf02064668b74d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 May 2020 22:10:02 +0200 Subject: gnu: gstreamer: Increase test timeouts. Fixes . Reported by Steffen Rytter Postas . * gnu/packages/gstreamer.scm (%common-gstreamer-phases): New variable. (gstreamer, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-editing-services)[arguments]: Use it. --- gnu/packages/gstreamer.scm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 7596796d68..69fb1d8ae4 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -104,6 +104,17 @@ arrays of data.") ;; under the 3-clause BSD license, the rest is under 2-clause BSD license. (license (list license:bsd-2 license:bsd-3)))) +;; Increase the test timeouts to accommodate slow or busy machines. +(define %common-gstreamer-phases + '((add-after 'unpack 'increase-test-timeout + (lambda _ + (substitute* "tests/check/meson.build" + (("'CK_DEFAULT_TIMEOUT', '20'") + "'CK_DEFAULT_TIMEOUT', '60'") + (("timeout ?: 3 \\* 60") + "timeout: 9 * 60")) + #t)))) + (define-public gstreamer (package (name "gstreamer") @@ -122,6 +133,7 @@ arrays of data.") (arguments `(#:phases (modify-phases %standard-phases + ,@%common-gstreamer-phases ;; FIXME: Since switching to the meson-build-system, two tests ;; started failing on i686. See ;; . @@ -220,12 +232,13 @@ This package provides the core library and elements.") ("gobject-introspection" ,gobject-introspection) ("python-wrapper" ,python-wrapper))) (arguments - '(#:configure-flags '("-Dgl=disabled" + `(#:configure-flags '("-Dgl=disabled" ;; FIXME: Documentation fails to build without ;; enabling GL above, which causes other problems. "-Ddoc=false") #:phases (modify-phases %standard-phases + ,@%common-gstreamer-phases (add-before 'configure 'patch (lambda _ (substitute* "tests/check/libs/pbutils.c" @@ -284,6 +297,7 @@ for the GStreamer multimedia library.") (arguments `(#:phases (modify-phases %standard-phases + ,@%common-gstreamer-phases ,@(if (string-prefix? "arm" (or (%current-target-system) (%current-system))) ;; FIXME: These tests started failing on armhf after switching to Meson. @@ -332,6 +346,7 @@ developers consider to have good quality code and correct functionality.") (arguments `(#:phases (modify-phases %standard-phases + ,@%common-gstreamer-phases ,@(if (string-prefix? "arm" (or (%current-target-system) (%current-system))) ;; Disable test that fails on ARMv7. @@ -421,6 +436,9 @@ par compared to the rest.") (base32 "1jpvc32x6q01zjkfgh6gmq6aaikiyfwwnhj7bmvn52syhrdl202m")))) (build-system meson-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + ,@%common-gstreamer-phases))) (inputs `(("gst-plugins-base" ,gst-plugins-base) ("liba52" ,liba52) @@ -492,7 +510,9 @@ compression formats through the use of the libav library.") (build-system meson-build-system) (arguments ;; FIXME: 16/22 failing tests. - `(#:tests? #f)) + `(#:tests? #f + #:phases (modify-phases %standard-phases + ,@%common-gstreamer-phases))) (inputs `(("gst-plugins-base" ,gst-plugins-base) ("libxml2" ,libxml2))) -- cgit v1.2.3 From 936b7906b0943cf6e2a2c7859f3ffd1778cfd7c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 14:37:13 +0200 Subject: gnu: spirv-headers: Update to 1.5.3. * gnu/packages/vulkan.scm (spirv-headers): Update to 1.5.3. --- gnu/packages/vulkan.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 6a2c219aac..ce05dc389e 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,7 +43,7 @@ (define-public spirv-headers (package (name "spirv-headers") - (version "1.3.7") + (version "1.5.3") (source (origin (method git-fetch) @@ -51,18 +52,11 @@ (commit version))) (sha256 (base32 - "0m56smanfcczjfif4yfcqhjj4d4sc088kwg6dgia8fwdsjavdm4d")) - (file-name (git-file-name name version)))) + "069sivqajp7z4p44lmrz23lvf237xpkjxd4lzrg27836pwqcz9bj")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;; No tests - #:phases (modify-phases %standard-phases - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "cmake" "-E" "copy_directory" - "../source/include/spirv" - (string-append (assoc-ref outputs "out") - "/include/spirv"))))))) + `(#:tests? #f)) ;no tests (home-page "https://github.com/KhronosGroup/SPIRV-Headers") (synopsis "Machine-readable files from the SPIR-V Registry") (description -- cgit v1.2.3 From cce94247461ae1622c55efdfc4312a8db5e84300 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 14:47:19 +0200 Subject: gnu: spirv-tools: Update to 2020.2. * gnu/packages/vulkan.scm (spirv-tools): Update to 2020.2. [arguments]: Remove #:tests?. --- gnu/packages/vulkan.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index ce05dc389e..58bd7a5932 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -75,7 +75,7 @@ and for the GLSL.std.450 extended instruction set. (define-public spirv-tools (package (name "spirv-tools") - (version "2019.2") + (version "2020.2") (source (origin (method git-fetch) @@ -83,12 +83,11 @@ and for the GLSL.std.450 extended instruction set. (url "https://github.com/KhronosGroup/SPIRV-Tools") (commit (string-append "v" version)))) (sha256 - (base32 "0zwz6qg8g8165h7cw52agryjrdb29gbmsbziw3pwiddfkyma8vvg")) + (base32 "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; FIXME: Tests fail. - #:configure-flags (list (string-append "-DSPIRV-Headers_SOURCE_DIR=" + `(#:configure-flags (list (string-append "-DSPIRV-Headers_SOURCE_DIR=" (assoc-ref %build-inputs "spirv-headers"))))) (inputs `(("spirv-headers" ,spirv-headers))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 8a37a214cab94490d2376eb262d8f5389775b1b0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 14:48:11 +0200 Subject: gnu: spirv-tools: Do not build static libraries. * gnu/packages/vulkan.scm (spirv-tools)[arguments]: Add "-DBUILD_SHARED_LIBS=ON" in #:configure-flags. --- gnu/packages/vulkan.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 58bd7a5932..32c11a7a41 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -87,8 +87,10 @@ and for the GLSL.std.450 extended instruction set. (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - `(#:configure-flags (list (string-append "-DSPIRV-Headers_SOURCE_DIR=" - (assoc-ref %build-inputs "spirv-headers"))))) + `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" + (string-append + "-DSPIRV-Headers_SOURCE_DIR=" + (assoc-ref %build-inputs "spirv-headers"))))) (inputs `(("spirv-headers" ,spirv-headers))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) -- cgit v1.2.3 From f3d3726e44cc0dc1678bdb97cffe3b9c6ad8f513 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 14:57:57 +0200 Subject: gnu: glslang: Update to 8.13.3743. * gnu/packages/vulkan.scm (glslang): Update to 8.13.3743. [arguments]: Remove #:phases. [native-inputs]: Remove BISON. Add PYTHON. --- gnu/packages/vulkan.scm | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 32c11a7a41..1c662575b7 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -105,7 +105,7 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (define-public glslang (package (name "glslang") - (version "7.11.3214") + (version "8.13.3743") (source (origin (method git-fetch) @@ -114,21 +114,14 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (commit version))) (sha256 (base32 - "0dqjga0lcza006fhac26zp2plbq4gx8a6nsmrwkqlzji6lw1jins")) + "0d20wfpp2fmbnz1hnsjr9xc62lxpj86ik2qyviqbni0pqj212cry")) (file-name (string-append name "-" version "-checkout")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;; No tests - ;; glslang tries to set CMAKE_INSTALL_PREFIX manually. Remove the - ;; offending line. - #:phases (modify-phases %standard-phases - (add-after 'patch-source-shebangs 'fix-cmakelists - (lambda _ - (substitute* "CMakeLists.txt" - (("set.*CMAKE_INSTALL_PREFIX.*") "")) - #t))))) - (native-inputs `(("bison" ,bison) - ("pkg-config" ,pkg-config))) + '(#:tests? #f)) ;FIXME: requires bundled SPIRV-Tools + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python))) (home-page "https://github.com/KhronosGroup/glslang") (synopsis "OpenGL and OpenGL ES shader front end and validator") (description -- cgit v1.2.3 From 1c5b9c3d96bcb8e9488a6b8b8961eafe730f8863 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 15:02:04 +0200 Subject: gnu: glslang: Build shared libraries. * gnu/packages/vulkan.scm (glslang)[arguments]: Add #:configure-flags. --- gnu/packages/vulkan.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 1c662575b7..675d9d6a26 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -118,7 +118,8 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (file-name (string-append name "-" version "-checkout")))) (build-system cmake-build-system) (arguments - '(#:tests? #f)) ;FIXME: requires bundled SPIRV-Tools + '(#:tests? #f ;FIXME: requires bundled SPIRV-Tools + #:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) -- cgit v1.2.3 From d840f3b74cb77367299d09382fe15a810d9c3c04 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 15:28:37 +0200 Subject: gnu: vulkan-headers: Update to 1.2.141. * gnu/packages/vulkan.scm (vulkan-headers): Update to 1.2.141. (vulkan-loader, vulkan-tools)[version]: Do not inherit from VULKAN-HEADERS. --- gnu/packages/vulkan.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 675d9d6a26..2ed32f1118 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -138,7 +138,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-headers (package (name "vulkan-headers") - (version "1.1.121") + (version "1.2.141") (source (origin (method git-fetch) @@ -148,7 +148,7 @@ interpretation of the specifications for these languages.") (file-name (git-file-name name version)) (sha256 (base32 - "0hbgbdxj7lrm37phb0pkq5zgss3h21znj3mivnyva5f60i2wgr73")))) + "10nmx6y4llllfcczyfz76amd0vkqv09dj952d19zkzmmgcval7zq")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; No tests. @@ -162,7 +162,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-loader (package (name "vulkan-loader") - (version (package-version vulkan-headers)) + (version "1.1.121") (source (origin (method git-fetch) @@ -210,7 +210,7 @@ and the ICD.") (define-public vulkan-tools (package (name "vulkan-tools") - (version (package-version vulkan-headers)) + (version "1.1.121") (source (origin (method git-fetch) -- cgit v1.2.3 From cc8550ef120200b4bd27000b3deed41febc64c4c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 15:30:39 +0200 Subject: gnu: vulkan-loader: Update to 1.2.140. * gnu/packages/vulkan.scm (vulkan-loader): Update to 1.2.140. [arguments]: Remove #:phases. --- gnu/packages/vulkan.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 2ed32f1118..30a89499fc 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -162,7 +162,7 @@ interpretation of the specifications for these languages.") (define-public vulkan-loader (package (name "vulkan-loader") - (version "1.1.121") + (version "1.2.140") (source (origin (method git-fetch) @@ -172,17 +172,10 @@ interpretation of the specifications for these languages.") (file-name (git-file-name name version)) (sha256 (base32 - "1gbrppfxrncvva30fikgzm7f15xs527sb4lf1sswdyxj3h5cw741")))) + "0rhyz0qgp0i7pcx6wlvgwy7j33d4cs0xx39f0b6igpfk0vk70r1w")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-spirv-tools-commit-id - (lambda* (#:key inputs #:allow-other-keys) - ;; Remove lines trying to build in a git commit id. - (substitute* "CMakeLists.txt" ((".*spirv_tools_commit_id.h.*") "")) - #t))) #:configure-flags (list "-DBUILD_TESTS=OFF" ; FIXME: Needs 'googletest' submodule. (string-append "-DCMAKE_INSTALL_LIBDIR=" -- cgit v1.2.3 From 6a8fca140d69141c91ea167e66d4daaad611261c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 16:57:46 +0200 Subject: gnu: vulkan-loader: Enable tests. * gnu/packages/vulkan.scm (vulkan-loader)[arguments]: Remove #:tests? and #:configure-flags. Add #:phases to unpack googletest and disable tests that cannot run in the build container. [native-inputs]: Add (PACKAGE-SOURCE GOOGLETEST). --- gnu/packages/vulkan.scm | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 30a89499fc..22391316c0 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -175,16 +175,29 @@ interpretation of the specifications for these languages.") "0rhyz0qgp0i7pcx6wlvgwy7j33d4cs0xx39f0b6igpfk0vk70r1w")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh". - #:configure-flags (list - "-DBUILD_TESTS=OFF" ; FIXME: Needs 'googletest' submodule. - (string-append "-DCMAKE_INSTALL_LIBDIR=" - (assoc-ref %outputs "out") "/lib")))) - (native-inputs `(("libxrandr" ,libxrandr) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("vulkan-headers" ,vulkan-headers) - ("wayland" ,wayland))) + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'unpack-googletest + (lambda* (#:key inputs #:allow-other-keys) + (let ((gtest (assoc-ref inputs "googletest:source"))) + (when gtest + (copy-recursively gtest "external/googletest")) + #t))) + (add-after 'unpack 'disable-loader-tests + (lambda _ + ;; Many tests require a Vulkan driver. Skip those. + (substitute* "tests/loader_validation_tests.cpp" + ((".*= vkCreateInstance.*" all) + (string-append "GTEST_SKIP();\n" all)) + (("TEST_F.*InstanceExtensionEnumerated.*" all) + (string-append all "\nGTEST_SKIP();\n"))) + #t))))) + (native-inputs + `(("googletest:source" ,(package-source googletest)) + ("libxrandr" ,libxrandr) + ("pkg-config" ,pkg-config) + ("python" ,python) + ("vulkan-headers" ,vulkan-headers) + ("wayland" ,wayland))) (home-page "https://github.com/KhronosGroup/Vulkan-Loader") (synopsis "Khronos official ICD loader and validation layers for Vulkan") -- cgit v1.2.3 From f26bceb470a8135f0cb0080eda1617a935d58b7c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 17:04:32 +0200 Subject: gnu: vulkan-tools: Update to 1.2.140. * gnu/packages/vulkan.scm (vulkan-tools): Update to 1.2.140. --- gnu/packages/vulkan.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 22391316c0..732d5545fb 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -216,7 +216,7 @@ and the ICD.") (define-public vulkan-tools (package (name "vulkan-tools") - (version "1.1.121") + (version "1.2.140") (source (origin (method git-fetch) @@ -226,7 +226,7 @@ and the ICD.") (file-name (git-file-name name version)) (sha256 (base32 - "1jndlz3n35zlz44p1b4cgl2alvsmgrqnkxdn5mpahg0zb8dgwmm8")))) + "08dk0q77kpycn4vv19jh3ig73gbq3psan246a7fss0nfxpiddg0j")))) (build-system cmake-build-system) (inputs `(("glslang" ,glslang) @@ -238,7 +238,7 @@ and the ICD.") ("python" ,python) ("vulkan-headers" ,vulkan-headers))) (arguments - `(#:tests? #f ; No tests. + `(#:tests? #f ;no tests #:configure-flags (list (string-append "-DGLSLANG_INSTALL_DIR=" (assoc-ref %build-inputs "glslang"))))) (home-page -- cgit v1.2.3 From 4c5e45eb6bf1ad50ee2d0b5c854e81f6ce8de523 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 17:38:36 +0200 Subject: gnu: shaderc: Update to 2020.0. * gnu/packages/vulkan.scm (shaderc): Update to 2020.0. [build-system]: Change to CMAKE-BUILD-SYSTEM. [arguments]: Move custom configure invokation to #:configure-flags. Add phase to prevent using bundled code. [inputs]: Add GLSLANG, SPIRV-HEADERS, and SPIRV-TOOLS. [native-inputs]: Remove CMAKE-MINIMAL, GLSLANG:SOURCE, SPIRV-HEADERS:SOURCE, and SPIRV-TOOLS:SOURCE. --- gnu/packages/vulkan.scm | 71 ++++++++++++++++++------------------------------- 1 file changed, 26 insertions(+), 45 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 732d5545fb..a96b33c74f 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -253,7 +253,7 @@ API.") (define-public shaderc (package (name "shaderc") - (version "2019.0") + (version "2020.0") (source (origin (method git-fetch) @@ -263,56 +263,37 @@ API.") (file-name (git-file-name name version)) (sha256 (base32 - "1l5mmyxhzsbp0a6y2d86i8jmf46c6bjgjkdgkr5l8hmhflmm7gi2")))) - (build-system meson-build-system) + "1kqqvsvib01bsmfbdy3fbwwpvkcdlfb6k71kjvzb3crql7w0rxff")))) + (build-system cmake-build-system) (arguments `(#:tests? #f ; FIXME: Tests fail. + #:configure-flags '("-DSHADERC_SKIP_TESTS=ON") #:phases (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; Remove various lines and touch build-version.inc or - ;; configuring won't work. - (invoke "touch" "glslc/src/build-version.inc") - (substitute* "CMakeLists.txt" (("..PYTHON_EXE..*") "")) - (substitute* "CMakeLists.txt" - ((".*update_build_version.py..*") "")) - (substitute* "CMakeLists.txt" - ((".*add_custom_target.build-version.*") "")) - (substitute* "CMakeLists.txt" - ((".*spirv-tools_SOURCE_DIR.*glslang_SOURCE_DIR.*") - "")) - (substitute* "CMakeLists.txt" - ((".*Update build-version.inc.*") "")) - (substitute* "CMakeLists.txt" ((".*--check.*") "")) - (substitute* "glslc/src/main.cc" ((".*build-version.inc.*") - "\"1\"")) - (invoke "cmake" "-GNinja" "-DCMAKE_BUILD_TYPE=Release" - "-DSHADERC_SKIP_TESTS=ON" - "-DCMAKE_INSTALL_LIBDIR=lib" - (string-append "-DCMAKE_INSTALL_PREFIX=" - out))))) - (add-after 'unpack 'unpack-sources - (lambda* (#:key inputs #:allow-other-keys) - (let ((spirv-tools-source (assoc-ref inputs "spirv-tools-source")) - (spirv-headers-source (assoc-ref inputs "spirv-headers-source")) - (glslang-source (assoc-ref inputs "glslang-source"))) - (copy-recursively spirv-tools-source "third_party/spirv-tools") - (copy-recursively spirv-headers-source - (string-append "third_party/spirv-tools" - "/external/spirv-headers")) - (copy-recursively glslang-source "third_party/glslang") - #t)))))) + (add-after 'unpack 'do-not-look-for-bundled-sources + (lambda _ + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(third_party\\)") + "")) + + ;; Do not attempt to use git to encode version information. + (substitute* "glslc/CMakeLists.txt" + (("add_dependencies\\(glslc_exe build-version\\)") + "")) + (call-with-output-file "glslc/src/build-version.inc" + (lambda (port) + (format port "\"~a\"\n\"~a\"\n\"~a\"~%" + ,version + ,(package-version spirv-tools) + ,(package-version glslang)))) + #t))))) (inputs - `(("googletest" ,googletest) - ("python" ,python))) + `(("glslang" ,glslang) + ("python" ,python) + ("spirv-headers" ,spirv-headers) + ("spirv-tools" ,spirv-tools))) (native-inputs - `(("cmake" ,cmake-minimal) - ("glslang-source" ,(package-source glslang)) - ("pkg-config" ,pkg-config) - ("spirv-headers-source" ,(package-source spirv-headers)) - ("spirv-tools-source" ,(package-source spirv-tools)))) + `(("pkg-config" ,pkg-config))) (home-page "https://github.com/google/shaderc") (synopsis "Tools for shader compilation") (description "Shaderc is a collection of tools, libraries, and tests for -- cgit v1.2.3 From 18ac48364cb7e17da120b4b296aa06de5f159497 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 17:52:15 +0200 Subject: gnu: shaderc: Enable (some) tests. * gnu/packages/vulkan.scm (shaderc)[arguments]: Remove #:tests?. Add substitution to use "spirv-dis" from inputs instead of bundled. --- gnu/packages/vulkan.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index a96b33c74f..59dbfae11d 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -266,7 +266,8 @@ API.") "1kqqvsvib01bsmfbdy3fbwwpvkcdlfb6k71kjvzb3crql7w0rxff")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; FIXME: Tests fail. + `(;; FIXME: Skip most of the tests, because enabling system gtest breaks + ;; the build: . #:configure-flags '("-DSHADERC_SKIP_TESTS=ON") #:phases (modify-phases %standard-phases @@ -276,6 +277,10 @@ API.") (("add_subdirectory\\(third_party\\)") "")) + (substitute* "glslc/test/CMakeLists.txt" + (("\\$") + (which "spirv-dis"))) + ;; Do not attempt to use git to encode version information. (substitute* "glslc/CMakeLists.txt" (("add_dependencies\\(glslc_exe build-version\\)") -- cgit v1.2.3 From 0df5bdf81cb3b3b8aa0694ca0a20fedd65ee4723 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 18:53:14 +0200 Subject: gnu: Mesa: Install scripts to a separate output. * gnu/packages/gl.scm (mesa)[outputs]: New field. [arguments]: Add phase 'split-outputs'. --- gnu/packages/gl.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 3d94ddb23f..3d8d2687c4 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -289,6 +289,7 @@ also known as DXTn or DXTC) for Mesa.") ("python" ,python-wrapper) ("python-mako" ,python-mako) ("which" ,(@ (gnu packages base) which)))) + (outputs '("out" "bin")) (arguments `(#:configure-flags '(,@(match (%current-system) @@ -382,6 +383,26 @@ also known as DXTn or DXTC) for Mesa.") (("\"gbm_dri\\.so") (string-append "\"" out "/lib/dri/gbm_dri.so"))) #t))) + (add-after 'install 'split-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + ,@(match (%current-system) + ((or "i686-linux" "x86_64-linux") + ;; Install the Vulkan overlay control script to a separate + ;; output to prevent a reference on Python, saving ~70 MiB + ;; on the closure size. + '((copy-recursively (string-append out "/bin") + (string-append bin "/bin")) + (delete-file-recursively (string-append out "/bin")))) + (_ + ;; XXX: On architectures without the Vulkan overlay layer + ;; just create an empty file because outputs can not be + ;; added conditionally. + '((mkdir-p (string-append bin "/bin")) + (call-with-output-file (string-append bin "/bin/.empty") + (const #t))))) + #t))) (add-after 'install 'symlinks-instead-of-hard-links (lambda* (#:key outputs #:allow-other-keys) ;; All the drivers and gallium targets create hard links upon -- cgit v1.2.3 From 90c4298eede94cd353fc3dd0e3099af7b5ba7283 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 19:02:22 +0200 Subject: gnu: Mesa: Remove unused input. * gnu/packages/gl.scm (mesa)[inputs]: Remove MAKEDEPEND. --- gnu/packages/gl.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 3d8d2687c4..01fb3368d9 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -273,7 +273,6 @@ also known as DXTn or DXTC) for Mesa.") `(("llvm" ,llvm-10))) (_ `())) - ("makedepend" ,makedepend) ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (native-inputs -- cgit v1.2.3 From 577041e60b1d1816b1bc1fa9862ad7c7ea64c33d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 19:21:42 +0200 Subject: gnu: Mesa: Remove obsolete phase. * gnu/packages/gl.scm (mesa)[arguments]: Remove 'patch-create_test_cases' phase. --- gnu/packages/gl.scm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 01fb3368d9..ad8f06b0dc 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -347,12 +347,6 @@ also known as DXTn or DXTC) for Mesa.") (guix build meson-build-system)) #:phases (modify-phases %standard-phases - (add-after - 'unpack 'patch-create_test_cases - (lambda _ - (substitute* "src/intel/genxml/gen_pack_header.py" - (("/usr/bin/env python2") (which "python"))) - #t)) ,@(if (string-prefix? "i686" (or (%current-target-system) (%current-system))) ;; Disable new test from Mesa 19 that fails on i686. Upstream -- cgit v1.2.3 From 5a746104e3c91400099377fcc4bd763b9e91fb96 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 19:51:01 +0200 Subject: gnu: Mesa: Fix substitutions for absolute library references. * gnu/packages/gl.scm (mesa)[arguments]: In the 'fix-dlopen-libnames' phase, adjust substitutions so that they patch the correct files. --- gnu/packages/gl.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index ad8f06b0dc..788fe7c5c4 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -357,16 +357,16 @@ also known as DXTn or DXTC) for Mesa.") (("'u_format_test',") "")) #t))) '()) - (add-before - 'configure 'fix-dlopen-libnames + (add-before 'configure 'fix-dlopen-libnames (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) ;; Remain agnostic to .so.X.Y.Z versions while doing ;; the substitutions so we're future-safe. - (substitute* "src/glx/dri_common.c" - (("dlopen\\(\"libGL\\.so") - (string-append "dlopen(\"" out "/lib/libGL.so"))) - (substitute* "src/egl/drivers/dri2/egl_dri2.c" + (substitute* "src/glx/meson.build" + (("-DGL_LIB_NAME=\"lib@0@\\.so\\.@1@\"") + (string-append "-DGL_LIB_NAME=\"" out + "/lib/lib@0@.so.@1@\""))) + (substitute* "src/gbm/backends/dri/gbm_dri.c" (("\"libglapi\\.so") (string-append "\"" out "/lib/libglapi.so"))) (substitute* "src/gbm/main/backend.c" -- cgit v1.2.3 From 51f3b34913442afbc638a6e3331a18df1a9e5d97 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 20:43:56 +0200 Subject: gnu: vkquake: Fix build with newer Vulkan headers. * gnu/packages/games.scm (vkquake)[arguments]: Add phase 'patch-for-new-vulkan'. --- gnu/packages/games.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 111e1e0579..970cdbe613 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5807,6 +5807,14 @@ some graphical niceities, and numerous bug-fixes and other improvements.") (string-append "LDFLAGS=-Wl,-rpath=" vulkanlib) "-CQuake")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-for-new-vulkan + (lambda _ + ;; Mimic upstream commit a869a22d9b51c68e for + ;; compatibility with newer vulkan-headers. + (substitute* "Quake/gl_rmisc.c" + (("VK_DYNAMIC_STATE_RANGE_SIZE") + "3")) + #t)) (delete 'configure) (add-after 'unpack 'fix-makefile-paths (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From d92f9d341eae2d808e322897689d895745142c3d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 21:03:02 +0200 Subject: gnu: vkd3d: Fix build with newer Vulkan headers. * gnu/packages/vulkan.scm (vkd3d)[arguments]: Add phase 'patch-for-new-vulkan'. --- gnu/packages/vulkan.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 59dbfae11d..d5f5be6816 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -322,7 +322,16 @@ shader compilation.") (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--with-spirv-tools"))) + `(#:configure-flags '("--with-spirv-tools") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-for-new-vulkan + (lambda _ + ;; Mimic upstream commit 8e7bf8a5c3e0047 for + ;; compatibility with newer vulkan-headers. + (substitute* "libs/vkd3d/vkd3d_private.h" + (("VK_PIPELINE_BIND_POINT_RANGE_SIZE") + "2u")) + #t))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 3f46f041150bffaf48b51aae3f5c8162726a809b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 May 2020 21:53:42 +0200 Subject: gnu: libdrm: Update to 2.4.101. * gnu/packages/patches/libdrm-symbol-check.patch: Delete file. * gnu/packages/patches/libdrm-realpath-virtio.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.101. [source](uri): Adjust for new .tar.xz tarball. [source](patches): Adjust patch list as above. --- gnu/local.mk | 2 +- gnu/packages/patches/libdrm-realpath-virtio.patch | 42 +++++ gnu/packages/patches/libdrm-symbol-check.patch | 215 ---------------------- gnu/packages/xdisorg.scm | 22 +-- 4 files changed, 53 insertions(+), 228 deletions(-) create mode 100644 gnu/packages/patches/libdrm-realpath-virtio.patch delete mode 100644 gnu/packages/patches/libdrm-symbol-check.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2bfd0956ca..7c83412fd4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1166,7 +1166,7 @@ dist_patch_DATA = \ %D%/packages/patches/libbase-use-own-logging.patch \ %D%/packages/patches/libbonobo-activation-test-race.patch \ %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \ - %D%/packages/patches/libdrm-symbol-check.patch \ + %D%/packages/patches/libdrm-realpath-virtio.patch \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ %D%/packages/patches/libexif-CVE-2018-20030.patch \ diff --git a/gnu/packages/patches/libdrm-realpath-virtio.patch b/gnu/packages/patches/libdrm-realpath-virtio.patch new file mode 100644 index 0000000000..b7d85160b4 --- /dev/null +++ b/gnu/packages/patches/libdrm-realpath-virtio.patch @@ -0,0 +1,42 @@ +Only check for for relative path on virtio devices. Otherwise it could +break driver loading in some circumstances, notably the IceCat sandbox. + +https://gitlab.freedesktop.org/mesa/drm/-/issues/39 + +Taken from upstream: +https://gitlab.freedesktop.org/mesa/drm/-/commit/57df07572ce45a1b60bae6fb89770388d3abd6dd + +diff --git a/xf86drm.c b/xf86drm.c +--- a/xf86drm.c ++++ b/xf86drm.c +@@ -3103,15 +3103,18 @@ static int drmParseSubsystemType(int maj, int min) + int subsystem_type; + + snprintf(path, sizeof(path), "/sys/dev/char/%d:%d/device", maj, min); +- if (!realpath(path, real_path)) +- return -errno; +- snprintf(path, sizeof(path), "%s", real_path); + + subsystem_type = get_subsystem_type(path); ++ /* Try to get the parent (underlying) device type */ + if (subsystem_type == DRM_BUS_VIRTIO) { ++ /* Assume virtio-pci on error */ ++ if (!realpath(path, real_path)) ++ return DRM_BUS_VIRTIO; + strncat(path, "/..", PATH_MAX); + subsystem_type = get_subsystem_type(path); +- } ++ if (subsystem_type < 0) ++ return DRM_BUS_VIRTIO; ++ } + return subsystem_type; + #elif defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) + return DRM_BUS_PCI; +@@ -3920,6 +3923,7 @@ process_device(drmDevicePtr *device, const char *d_name, + + switch (subsystem_type) { + case DRM_BUS_PCI: ++ case DRM_BUS_VIRTIO: + return drmProcessPciDevice(device, node, node_type, maj, min, + fetch_deviceinfo, flags); + case DRM_BUS_USB: diff --git a/gnu/packages/patches/libdrm-symbol-check.patch b/gnu/packages/patches/libdrm-symbol-check.patch deleted file mode 100644 index 0a77763a4f..0000000000 --- a/gnu/packages/patches/libdrm-symbol-check.patch +++ /dev/null @@ -1,215 +0,0 @@ -Augment the list of expected symbols to fix the symbol-check tests on -mips64el-linux, armhf-linux and aarch64-linux. - ---- libdrm-2.4.65/freedreno/freedreno-symbol-check.orig 2015-09-04 11:07:40.000000000 -0400 -+++ libdrm-2.4.65/freedreno/freedreno-symbol-check 2015-10-18 23:57:15.288416229 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first five) are taken from the public headers. -+# The following symbols (past the first 12) are taken from the public headers. - # A list of the latter should be available Makefile.sources/LIBDRM_FREEDRENO_H_FILES - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_freedreno.so} | awk '{print $3}'| while read func; do -@@ -10,6 +10,13 @@ - _end - _fini - _init -+_fbss -+_fdata -+_ftext -+__bss_start__ -+__bss_end__ -+_bss_end__ -+__end__ - fd_bo_cpu_fini - fd_bo_cpu_prep - fd_bo_del ---- libdrm-2.4.65/nouveau/nouveau-symbol-check.orig 2015-05-04 11:47:43.000000000 -0400 -+++ libdrm-2.4.65/nouveau/nouveau-symbol-check 2015-10-18 23:55:26.078327118 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first five) are taken from the public headers. -+# The following symbols (past the first 12) are taken from the public headers. - # A list of the latter should be available Makefile.sources/LIBDRM_NOUVEAU_H_FILES - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_nouveau.so} | awk '{print $3}'| while read func; do -@@ -10,6 +10,13 @@ - _end - _fini - _init -+_fbss -+_fdata -+_ftext -+__bss_start__ -+__bss_end__ -+_bss_end__ -+__end__ - nouveau_bo_map - nouveau_bo_name_get - nouveau_bo_name_ref ---- libdrm-2.4.65/libkms/kms-symbol-check.orig 2015-05-04 11:47:43.000000000 -0400 -+++ libdrm-2.4.65/libkms/kms-symbol-check 2015-10-18 23:46:10.683869471 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first five) are taken from the public headers. -+# The following symbols (past the first 12) are taken from the public headers. - # A list of the latter should be available Makefile.sources/LIBKMS_H_FILES - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libkms.so} | awk '{print $3}'| while read func; do -@@ -10,6 +10,13 @@ - _end - _fini - _init -+_fbss -+_fdata -+_ftext -+__bss_start__ -+__bss_end__ -+_bss_end__ -+__end__ - kms_bo_create - kms_bo_destroy - kms_bo_get_prop ---- libdrm-2.4.65/intel/intel-symbol-check.orig 2015-05-04 11:47:43.000000000 -0400 -+++ libdrm-2.4.65/intel/intel-symbol-check 2015-10-18 23:55:53.309558508 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first five) are taken from the public headers. -+# The following symbols (past the first 12) are taken from the public headers. - # A list of the latter should be available Makefile.sources/LIBDRM_INTEL_H_FILES - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_intel.so} | awk '{print $3}' | while read func; do -@@ -10,6 +10,13 @@ - _end - _fini - _init -+_fbss -+_fdata -+_ftext -+__bss_start__ -+__bss_end__ -+_bss_end__ -+__end__ - drm_intel_bo_alloc - drm_intel_bo_alloc_for_render - drm_intel_bo_alloc_tiled ---- libdrm-2.4.65/amdgpu/amdgpu-symbol-check.orig 2015-08-17 10:08:11.000000000 -0400 -+++ libdrm-2.4.65/amdgpu/amdgpu-symbol-check 2015-10-18 23:56:10.606917723 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first five) are taken from the public headers. -+# The following symbols (past the first 12) are taken from the public headers. - # A list of the latter should be available Makefile.am/libdrm_amdgpuinclude_HEADERS - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_amdgpu.so} | awk '{print $3}' | while read func; do -@@ -10,6 +10,13 @@ - _end - _fini - _init -+_fbss -+_fdata -+_ftext -+__bss_start__ -+__bss_end__ -+_bss_end__ -+__end__ - amdgpu_bo_alloc - amdgpu_bo_cpu_map - amdgpu_bo_cpu_unmap ---- libdrm-2.4.65/exynos/exynos-symbol-check.orig 2015-05-04 11:47:43.000000000 -0400 -+++ libdrm-2.4.65/exynos/exynos-symbol-check 2015-10-18 23:56:32.025486153 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first five) are taken from the public headers. -+# The following symbols (past the first 12) are taken from the public headers. - # A list of the latter should be available Makefile.am/libdrm_exynos*_HEADERS - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_exynos.so} | awk '{print $3}'| while read func; do -@@ -10,6 +10,13 @@ - _end - _fini - _init -+_fbss -+_fdata -+_ftext -+__bss_start__ -+__bss_end__ -+_bss_end__ -+__end__ - exynos_bo_create - exynos_bo_destroy - exynos_bo_from_name ---- libdrm-2.4.65/omap/omap-symbol-check.orig 2015-05-04 11:47:43.000000000 -0400 -+++ libdrm-2.4.65/omap/omap-symbol-check 2015-10-18 23:56:44.834438626 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first five) are taken from the public headers. -+# The following symbols (past the first 12) are taken from the public headers. - # A list of the latter should be available Makefile.am/libdrm_omap*HEADERS - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_omap.so} | awk '{print $3}'| while read func; do -@@ -10,6 +10,13 @@ - _end - _fini - _init -+_fbss -+_fdata -+_ftext -+__bss_start__ -+__bss_end__ -+_bss_end__ -+__end__ - omap_bo_cpu_fini - omap_bo_cpu_prep - omap_bo_del ---- libdrm-2.4.65/tegra/tegra-symbol-check.orig 2015-05-04 11:47:43.000000000 -0400 -+++ libdrm-2.4.65/tegra/tegra-symbol-check 2015-10-18 23:57:00.756759698 -0400 -@@ -1,6 +1,6 @@ - #!/bin/bash - --# The following symbols (past the first nine) are taken from tegra.h. -+# The following symbols (past the first 12) are taken from tegra.h. - - FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_tegra.so} | awk '{print $3}'| while read func; do - ( grep -q "^$func$" || echo $func ) < Date: Sun, 10 May 2020 15:49:20 +0200 Subject: gnu: qtdeclarative: Fix reference on qmlcachegen. * gnu/packages/qt.scm (qtdeclarative)[arguments]: Add phase to fix the reference on qmlcachegen in an installed cmake file. --- gnu/packages/qt.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 73d538360d..0c3a680484 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Kei Kebreau ;;; Copyright © 2020 TomZ +;;; Copyright © 2020 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. ;;; @@ -783,7 +784,18 @@ xmlpatternsvalidator."))) "0l0nhc2si6dl9r4s1bs45z90qqigs8jnrsyjjdy38q4pvix63i53")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg) - ((#:tests? _ #f) #f))) ; TODO: Enable the tests + ((#:tests? _ #f) #f) ;TODO: Enable the tests + ((#:phases phases) + `(modify-phases ,phases + (add-after 'build 'fix-qt5core-install-prefix + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; The Qt5Core install prefix is set to qtbase, but qmlcachegen + ;; is provided by qtdeclarative. + (substitute* + "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake" + (("\\$\\{_qt5Core_install_prefix\\}") out))) + #t)))))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) -- cgit v1.2.3 From 1f49f5c14ae0f16847e29f78ea5419cbe3bdb679 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Sun, 10 May 2020 15:49:21 +0200 Subject: gnu: mtxclient: Update to 0.3.0. * gnu/packages/messaging.scm (mtxclient): Update to 0.3.0. [arguments]: Disable Pushrules test as it requires network. Signed-off-by: Marius Bakke --- gnu/packages/messaging.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 57ff0835d1..754373d355 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1831,7 +1831,7 @@ QMatrixClient project.") (define-public mtxclient (package (name "mtxclient") - (version "0.2.1") + (version "0.3.0") (source (origin (method git-fetch) @@ -1840,7 +1840,7 @@ QMatrixClient project.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0pycznrvj57ff6gbwfn1xj943d2dr4vadl79hii1z16gn0nzxpmj")))) + (base32 "0vf5xmn6yfi5lvskfgrdmnalvclzrapcrml92bj9qaa8vq8mfsf2")))) (arguments `(#:configure-flags (list @@ -1851,7 +1851,7 @@ QMatrixClient project.") (add-before 'configure 'disable-network-tests (lambda _ (substitute* "CMakeLists.txt" - (("add_test\\((BasicConnectivity|ClientAPI|MediaAPI|Encryption)") + (("add_test\\((BasicConnectivity|ClientAPI|MediaAPI|Encryption|Pushrules)") "# add_test")) #t)) (add-before 'configure 'set-home -- cgit v1.2.3 From 76623b6703ce3d5780d742fd7b5285aa0cf7041d Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Sun, 10 May 2020 15:49:22 +0200 Subject: gnu: nheko: Update to 0.7.1. * gnu/packages/messaging.scm (nheko): Update to 0.7.1. [inputs]: Add qtdeclarative, qtgraphicaleffects and qtquickcontrols2. Arrange qtsvg in alphabetical order. Signed-off-by: Marius Bakke --- gnu/packages/messaging.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 754373d355..8042aa0eea 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1881,7 +1881,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (define-public nheko (package (name "nheko") - (version "0.6.4") + (version "0.7.1") (source (origin (method git-fetch) @@ -1890,7 +1890,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "19dkc98l1q4070v6mli4ybqn0ip0za607w39hjf0x8rqdxq45iwm")))) + (base32 "12sxibbrn79sxkf9jrm7jrlj7l5vz15claxrrll7pkv9mv44wady")))) (arguments `(#:tests? #f ;no test target #:configure-flags @@ -1920,8 +1920,11 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") ("mtxclient" ,mtxclient) ("openssl" ,openssl) ("qtbase" ,qtbase) - ("qtsvg" ,qtsvg) + ("qtdeclarative" ,qtdeclarative) + ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia) + ("qtquickcontrols2" ,qtquickcontrols2) + ("qtsvg" ,qtsvg) ("spdlog" ,spdlog) ("tweeny" ,tweeny) ("zlib" ,zlib))) -- cgit v1.2.3 From 682ae6f947ca3efb902f8c7ae25914e34cb74e8e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 May 2020 11:22:45 +0200 Subject: gnu: mutter: Fix build with Mesa 20. * gnu/packages/gnome.scm (mutter)[arguments]: Add #:phases. --- gnu/packages/gnome.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e0e1ed1804..566c31f415 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6084,7 +6084,21 @@ to display dialog boxes from the commandline and shell scripts.") ;; the remaining flags are needed for the bundled cogl (string-append "-Dopengl_libname=" (assoc-ref %build-inputs "mesa") - "/lib/libGL.so")))) + "/lib/libGL.so")) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-build-with-mesa-20 + (lambda _ + ;; Mimic upstream commit a444a4c5f58ea516ad for + ;; compatibility with Mesa 20. Remove for 3.36. + (substitute* '("src/backends/meta-egl-ext.h" + "src/backends/meta-egl.c" + "src/backends/meta-egl.h") + (("#include " all) + (string-append all "\n#include "))) + (substitute* "cogl/cogl/meson.build" + (("#include " all) + (string-append all "\\n#include "))) + #t))))) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database ("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. -- cgit v1.2.3 From cb475eaa71734351acae60e14c4d318d050da64b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 May 2020 11:24:13 +0200 Subject: gnu: mesa-headers: Do not inherit outputs from Mesa. This is a follow-up to commit 43a8d83c08d736b613a385ff0d06941bd373b642. * gnu/packages/gl.scm (mesa-headers)[outputs]: New field. --- gnu/packages/gl.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 788fe7c5c4..e3c3ed850d 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -471,6 +471,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") (propagated-inputs '()) (inputs '()) (native-inputs '()) + (outputs '("out")) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From c37b621cf3f0cd9c06677b4be6f931d927e7fea5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 May 2020 15:42:07 +0200 Subject: gnu: qtwebengine: Fix build failure. * gnu/packages/qt.scm (qtwebengine)[source](snippet): Preserve the included Mesa headers, to avoid an incompatibility with system Mesa. Also adjust some files to use system Vulkan headers. Preserve third_party/emoji-segmenter. [inputs]: Remove obsolete comment (LCMS is already in inputs). --- gnu/packages/qt.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 0c3a680484..d22c84fcf3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1595,6 +1595,7 @@ message."))) "third_party/crc32c" "third_party/dav1d" "third_party/dawn" + "third_party/emoji-segmenter" "third_party/ffmpeg" "third_party/googletest" "third_party/hunspell" @@ -1621,6 +1622,7 @@ message."))) "third_party/libyuv" "third_party/lss" "third_party/markupsafe" + "third_party/mesa_headers" "third_party/metrics_proto" "third_party/modp_b64" "third_party/nasm" @@ -1737,6 +1739,12 @@ message."))) (substitute* "third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h" (("third_party/curl") "curl")) + (substitute* + '("components/viz/common/gpu/vulkan_context_provider.h" + "components/viz/common/resources/resource_format_utils.h" + "gpu/config/gpu_util.cc") + (("third_party/vulkan/include/") + "")) ;; Replace Google Analytics bundle with an empty file and hope ;; no one notices. @@ -1777,8 +1785,6 @@ message."))) ("libgcrypt" ,libgcrypt) ("libjpeg" ,libjpeg-turbo) ("libvpx" ,libvpx) - ;; FIXME: configure does not find system lcms - ;; ("lcms" ,lcms) ("libwebp" ,libwebp) ("libx11" ,libx11) ("libxcb" ,libxcb) -- cgit v1.2.3 From 1bea1b3549537df75fd22a34ab15d1cdb3af72d7 Mon Sep 17 00:00:00 2001 From: TomZ Date: Tue, 26 May 2020 22:53:14 +0200 Subject: gnu: flowee: Update to 2020.04.1. * gnu/packages/finance.scm (flowee): Update to 2020.04.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 3e23fcceea..f182057bb4 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1521,14 +1521,14 @@ like Flowee the Hub, which Fulcrum connects to over RPC.") (define-public flowee (package (name "flowee") - (version "2020.03.3") + (version "2020.04.1") (source (origin (method url-fetch) (uri (string-append "https://gitlab.com/FloweeTheHub/thehub/-/archive/" version "/thehub-" version ".tar.gz")) (sha256 - (base32 "0ksyh7ll3v9p8f5y15vcb2vkrpzb4h0ricag9j90ad4b4rfsnpjw")))) + (base32 "1vwvaxm3b71pfx8l4rrv06wqks6xdf2333w856b36s1bzvj53rhc")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF") -- cgit v1.2.3 From 8880db51d2e052621e4c54f4d594bbc5867d7af2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 00:35:29 +0200 Subject: gnu: fet: Update to 5.44.7. * gnu/packages/education.scm (fet): Update to 5.44.7. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 980cec5443..f8e77f07ad 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -606,14 +606,14 @@ Portuguese, Spanish and Italian.") (define-public fet (package (name "fet") - (version "5.44.4") + (version "5.44.7") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "1bji4910v6adhngdh5ajz5bxam9z3yqnh8d1h1xajy6npm6qq3nx")))) + (base32 "19b22brpb2mpvg14c2a0xmv8ipq5jg7yjmly8y3gfy8gmc3wqg5m")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 10857feaeb69cfbbdbba13dfe2a4d106a400f4d6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 00:41:27 +0200 Subject: gnu: emacs-chronometrist: Update to 0.4.3. * gnu/packages/emacs-xyz.scm (emacs-chronometrist): Update to 0.4.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b99acb7815..cf4bd00217 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1906,7 +1906,7 @@ Lock key.") (define-public emacs-chronometrist (package (name "emacs-chronometrist") - (version "0.4.2") + (version "0.4.3") (source (origin (method git-fetch) @@ -1915,7 +1915,7 @@ Lock key.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ccy7qz1wcmggqlf3hwigbqq4wrx1amds4x9bxz9py6bypglyjc5")))) + (base32 "1ljjqzghcap4admv0hvw6asm148b80mfgjgxjjcw6qc95fkjjjlr")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From f41f8822721571625f3fa315681dc2717d3d4a5c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 01:45:21 +0200 Subject: gnu: bbmap: Use HTTPS home page URI. * gnu/packages/bioinformatics.scm (bbmap)[home-page]: Use HTTPS URI. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a738aa51a8..8def77c6dc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14684,7 +14684,7 @@ is a Cython wrapper for FIt-SNE.") ("java-eclipse-jdt-core" ,java-eclipse-jdt-core) ("java-eclipse-jdt-compiler-apt" ,java-eclipse-jdt-compiler-apt) ("java-openmpi" ,java-openmpi))) - (home-page "http://sourceforge.net/projects/bbmap/") + (home-page "https://sourceforge.net/projects/bbmap/") (synopsis "Aligner and other tools for short sequencing reads") (description "This package provides bioinformatic tools to align, deduplicate, -- cgit v1.2.3 From 2798d5b5843b7ad644b63c808cf848bae9cfb954 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 01:47:31 +0200 Subject: gnu: catcodec: Use HTTPS home page URI. * gnu/packages/game-development.scm (catcodec)[home-page]: Use HTTPS URI. --- gnu/packages/game-development.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 99c0711e1a..185f1bebf3 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -256,15 +256,14 @@ necessary. (uri (string-append "https://binaries.openttd.org/extra/catcodec/" version "/catcodec-" version "-source.tar.xz")) (sha256 - (base32 - "1qg0c2i4p29sxj0q6qp2jynlrzm5pphz2xhcjqlxa69ycrnlxzs7")))) + (base32 "1qg0c2i4p29sxj0q6qp2jynlrzm5pphz2xhcjqlxa69ycrnlxzs7")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests #:make-flags (list (string-append "prefix=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) - (home-page "http://dev.openttdcoop.org/projects/catcodec") + (home-page "https://dev.openttdcoop.org/projects/catcodec") (synopsis "Encode/decode OpenTTD sounds") (description "catcodec encodes and decodes sounds for OpenTTD. These sounds are not much more than some metadata (description and filename) and raw -- cgit v1.2.3 From 98d6edb621ac69b8a5108b4452a2daa078ed0fcc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 01:48:37 +0200 Subject: gnu: blast+: Use HTTPS home page URI. * gnu/packages/bioinformatics.scm (blast+)[home-page]: Use HTTPS URI. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8def77c6dc..cfa0263e46 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1401,7 +1401,7 @@ package provides command line tools using the Bio++ library.") ("python" ,python-wrapper))) (native-inputs `(("cpio" ,cpio))) - (home-page "http://blast.ncbi.nlm.nih.gov") + (home-page "https://blast.ncbi.nlm.nih.gov") (synopsis "Basic local alignment search tool") (description "BLAST is a popular method of performing a DNA or protein sequence -- cgit v1.2.3 From 272d5ada9a3cc951f81e000f51ad7dd506073a5b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 01:49:41 +0200 Subject: gnu: dvtm: Use HTTPS home page URI. * gnu/packages/dvtm.scm (dvtm)[home-page]: Use HTTPS URI. --- gnu/packages/dvtm.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/dvtm.scm b/gnu/packages/dvtm.scm index af16aa8f91..8515c5d06b 100644 --- a/gnu/packages/dvtm.scm +++ b/gnu/packages/dvtm.scm @@ -47,8 +47,7 @@ popularized by X11-window managers like dwm, to the console. As a console window manager it tries to make it easy to work with multiple console based programs.") - (home-page "http://www.brain-dump.org/projects/dvtm/") - + (home-page "https://www.brain-dump.org/projects/dvtm/") ;; "dvtm reuses some code of dwm and is released under the same MIT/X11 ;; license. The terminal emulation part is licensed under the ISC license." ;; source: http://www.brain-dump.org/projects/dvtm/#license -- cgit v1.2.3 From d9bb896f0b809eb1f7c826ad818c1303ea04802a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 01:54:28 +0200 Subject: gnu: emacs-evil-markdown: Small fixes. * gnu/packages/emacs-xyz.scm (emacs-evil-markdown)[propagated-inputs]: Re-order inputs. [home-page]: Fix URL. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cf4bd00217..ed06df54c6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6973,9 +6973,9 @@ in Emacs.") "0mad8sp5y9vyk28595qygspnyh8bfmb1fbxjlw70qwc1kdn822n4")))) (build-system emacs-build-system) (propagated-inputs - `(("emacs-markdown-mode" ,emacs-markdown-mode) - ("emacs-evil" ,emacs-evil))) - (home-page "http://jblevins.org/projects/evil-markdown/") + `(("emacs-evil" ,emacs-evil) + ("emacs-markdown-mode" ,emacs-markdown-mode))) + (home-page "https://github.com/Somelauw/evil-markdown/") (synopsis "Evil keybindings for @code{markdown-mode}") (description "This package provides custom text objects and bindings for -- cgit v1.2.3 From e450373bd67056c0bfcd9e9abfda5d0dcac5660f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 01:56:32 +0200 Subject: gnu: emacs-evil-markdown: Update to 0.0.2-2-685d7fb. * gnu/packages/emacs-xyz.scm (emacs-evil-markdown): Update to 0.0.2-2-685d7fb. --- gnu/packages/emacs-xyz.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ed06df54c6..492a313dae 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6957,20 +6957,20 @@ in Emacs.") (license license:gpl3+))) (define-public emacs-evil-markdown - (let ((commit "46cd81b37991c4325fc24015a610f832b0ff995d") - (revision "1")) + (let ((commit "685d7fbb81bc02fa32779d2a127b99a0c8c7436b") + (revision "2")) (package (name "emacs-evil-markdown") (version (git-version "0.0.2" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Somelauw/evil-markdown.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0mad8sp5y9vyk28595qygspnyh8bfmb1fbxjlw70qwc1kdn822n4")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Somelauw/evil-markdown.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1z1sjn6dcqv8mmkh6nfcwhnql2z6xr9yx3hs77bfxj79pf3c466p")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil) -- cgit v1.2.3 From ec285222e9dd08f8ac780d5ec46be5672000c4b9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 01:59:03 +0200 Subject: gnu: emacs-load-relative: Use HTTPS home page URI. * gnu/packages/emacs-xyz.scm (emacs-load-relative)[home-page]: Use HTTPS URI. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 492a313dae..c287649333 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5913,7 +5913,7 @@ test tags. It supports both interactive and non-interactive use.") (sha256 (base32 "1m37scr82lqqy954fchjxrmdh4lngrl4d1yzxhp3yfjhsydizhrj")))) (build-system emacs-build-system) - (home-page "http://github.com/rocky/emacs-load-relative") + (home-page "https://github.com/rocky/emacs-load-relative") (synopsis "Emacs Lisp relative file loading related functions") (description "Provides functions which facilitate writing multi-file Emacs packages -- cgit v1.2.3 From 646d231d8f2f8cdcc534adfb36250aba93b35491 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 02:00:47 +0200 Subject: gnu: emacs-ryo-modal: Use HTTPS home page URI. * gnu/packages/emacs-xyz.scm (emacs-ryo-modal)[home-page]: Use HTTPS URI. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c287649333..45a10f4689 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7491,7 +7491,7 @@ names, e.g. #0000ff is displayed in white with a blue background.") (sha256 (base32 "1cyvp3bi6yhckbdnq98xvghmhdzghya5y9wd7hxjawibs75rza95")))) (build-system emacs-build-system) - (home-page "http://github.com/Kungsgeten/ryo-modal") + (home-page "https://github.com/Kungsgeten/ryo-modal") (synopsis "Emacs minor mode for defining modal editing environments") (description "RYO modal provides a convenient way of defining modal keybindings in Emacs, and does not come with any predefined bindings.") -- cgit v1.2.3 From 45a21ee45d1781cb6a4dad1d53eeef16cd573436 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 02:02:40 +0200 Subject: gnu: fastcap: Use HTTPS home page URI. * gnu/packages/engineering.scm (fastcap)[home-page]: Use HTTPS URI. --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3653f10aeb..edf701e087 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -535,7 +535,7 @@ featuring various improvements and bug fixes."))) (copy-recursively "doc" doc) (copy-recursively "examples" examples) #t)))))) - (home-page "http://www.rle.mit.edu/cpg/research_codes.htm") + (home-page "https://www.rle.mit.edu/cpg/research_codes.htm") (synopsis "Multipole-accelerated capacitance extraction program") (description "Fastcap is a capacitance extraction program based on a -- cgit v1.2.3 From ebeaf280bc269411b040a3f8d4d883b99db57533 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 02:03:23 +0200 Subject: gnu: fasthenry: Use HTTPS home page URI. * gnu/packages/engineering.scm (fasthenry)[home-page]: Use HTTPS URI. --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index edf701e087..369110a044 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -583,7 +583,7 @@ multipole-accelerated algorithm.") (copy-recursively "doc" doc) (copy-recursively "examples" examples) #t)))))) - (home-page "http://www.rle.mit.edu/cpg/research_codes.htm") + (home-page "https://www.rle.mit.edu/cpg/research_codes.htm") (synopsis "Multipole-accelerated inductance analysis program") (description "Fasthenry is an inductance extraction program based on a -- cgit v1.2.3 From 6fe3a0b6be998b3c1f5ca46f5328fbda76b6d73a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 02:04:39 +0200 Subject: gnu: gcide: Use HTTPS home page URI. * gnu/packages/dictionaries.scm (gcide)[home-page]: Use HTTPS URI. --- gnu/packages/dictionaries.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 4f8c35d040..c13dbc2454 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -119,7 +119,7 @@ acronyms distributed as an info document.") "GCIDE is a free dictionary based on a combination of sources. It can be used via the GNU Dico program or accessed online at http://gcide.gnu.org.ua/") - (home-page "http://gcide.gnu.org.ua/") + (home-page "https://gcide.gnu.org.ua/") (license license:gpl3+))) (define-public diction -- cgit v1.2.3 From a5374cde918cfeae5c16b43b9f2dd2b24bc3564d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 02:06:36 +0200 Subject: gnu: gpm: Use HTTPS URI. * gnu/packages/linux.scm (gpm)[home-page, source]: Use HTTPS URI. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2788f9d319..dad7b6e992 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4504,8 +4504,8 @@ Ridge, Joliet, and zisofs.") (source (origin (method url-fetch) (uri (string-append - "http://www.nico.schottelius.org/software/gpm/archives/gpm-" - version ".tar.bz2")) + "https://www.nico.schottelius.org/software/gpm/archives/" + "gpm-" version ".tar.bz2")) (patches (search-patches "gpm-glibc-2.26.patch")) (sha256 (base32 @@ -4534,7 +4534,7 @@ Ridge, Joliet, and zisofs.") ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool))) - (home-page "http://www.nico.schottelius.org/software/gpm/") + (home-page "https://www.nico.schottelius.org/software/gpm/") (synopsis "Mouse support for the Linux console") (description "The GPM (general-purpose mouse) daemon is a mouse server for -- cgit v1.2.3 From 5507ff8e850bf443965a8aa03385895714ae02d2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 21:59:26 +0200 Subject: gnu: radare2: Remove unused gmp input. * gnu/packages/engineering.scm (radare2)[inputs]: Remove gmp. --- gnu/packages/engineering.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 369110a044..96526cbbf6 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1358,11 +1358,11 @@ bindings for Python, Java, OCaml and more.") "--with-openssl" "--with-rpath") #:make-flags (list "CC=gcc"))) + ;; TODO: Add gmp and libzip and make the build system actually find them. (inputs - `(("openssl" ,openssl) - ("zip" ,zip) - ("gmp" ,gmp) - ("capstone" ,capstone))) + `(("capstone" ,capstone) + ("openssl" ,openssl) + ("zip" ,zip))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://radare.org/") -- cgit v1.2.3 From ecc8cd984e69d33c625df775fb779275c90612a7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 22:01:31 +0200 Subject: gnu: radare2: Add more inputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (radare2)[arguments]: Add ‘--with-sysxxhash’ to #:configure-flags. [inputs]: Add libuv. [propagated-inputs]: Add xxhash. --- gnu/packages/engineering.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 96526cbbf6..2102f8d295 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -61,6 +61,7 @@ #:use-module (gnu packages commencement) #:use-module (gnu packages compression) #:use-module (gnu packages curl) + #:use-module (gnu packages digest) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) @@ -82,6 +83,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages libevent) #:use-module (gnu packages linux) ;FIXME: for pcb #:use-module (gnu packages m4) #:use-module (gnu packages maths) @@ -1354,17 +1356,25 @@ bindings for Python, Java, OCaml and more.") (mkdir-p (string-append (assoc-ref outputs "out") "/lib")) #t))) #:configure-flags - (list "--with-sysmagic" "--with-syszip" "--with-syscapstone" - "--with-openssl" "--with-rpath") + (list "--with-openssl" + "--with-rpath" + "--with-syscapstone" + "--with-sysmagic" + "--with-syszip" + "--with-sysxxhash") #:make-flags (list "CC=gcc"))) ;; TODO: Add gmp and libzip and make the build system actually find them. (inputs `(("capstone" ,capstone) + ("libuv" ,libuv) ("openssl" ,openssl) ("zip" ,zip))) (native-inputs `(("pkg-config" ,pkg-config))) + (propagated-inputs + ;; In the Libs: section of r_hash.pc. + `(("xxhash" ,xxhash))) (home-page "https://radare.org/") (synopsis "Reverse engineering framework") (description -- cgit v1.2.3 From 057c7f1c6707c0585cc84d6e770eb8de84b965b8 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 25 May 2020 23:57:51 +0200 Subject: gnu: ansible: Update to 2.9.9. * gnu/packages/admin.scm (ansible): Update to 2.9.9. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7ec68d1d64..08131a8dd0 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2025,13 +2025,13 @@ of supported upstream metrics systems simultaneously.") (define-public ansible (package (name "ansible") - (version "2.9.6") + (version "2.9.9") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "1jfbp1i3nl4yvqwd5ssy43dz3pq2x03mn875vb8r56gqh43kmksr")))) + (base32 "1l99vwkl48iwr8ffd1ihqia995mz8h8hwk4akm4w0cgiifp88gg8")))) (build-system python-build-system) (native-inputs `(("python-bcrypt" ,python-bcrypt) -- cgit v1.2.3 From 9554fb105802e122177a7a604ddd3b5530a250c0 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 25 May 2020 23:57:53 +0200 Subject: gnu: unbound: Update to 1.10.1. * gnu/packages/dns.scm (unbound): Update to 1.10.1. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index d0c03ff2d5..8b21c79385 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -391,14 +391,14 @@ to result in system-wide compromise.") (define-public unbound (package (name "unbound") - (version "1.10.0") + (version "1.10.1") (source (origin (method url-fetch) (uri (string-append "https://www.unbound.net/downloads/unbound-" version ".tar.gz")) (sha256 - (base32 "0mg9divpysr42sp0m693a70693dp8025v6c9dv1yabr4g1jlhbqm")))) + (base32 "0dnmh9jjh2v274f0hl31bgv40pl77mmfgky8bkqr5kvi3b17fdmp")))) (build-system gnu-build-system) (outputs '("out" "python")) (native-inputs -- cgit v1.2.3 From 71b000bf0353358b14174f06403c804312a4a772 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 25 May 2020 23:57:55 +0200 Subject: gnu: gitolite: Update to 3.6.11. * gnu/packages/version-control.scm (gitolite): Update to 3.6.11. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 09ffd8f271..4f3968286d 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1307,7 +1307,7 @@ also walk each side of a merge and test those changes individually.") (define-public gitolite (package (name "gitolite") - (version "3.6.7") + (version "3.6.11") (source (origin (method git-fetch) @@ -1316,7 +1316,7 @@ also walk each side of a merge and test those changes individually.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0rmyzr66lxh2ildf3h1nh3hh2ndwk21rjdin50r5vhwbdd7jg8vb")))) + (base32 "1rkj7gknwjlc5ij9w39zf5mr647bm45la57yjczydmvrb8c56yrh")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests -- cgit v1.2.3 From 15475f0ceca17b0ed68a4b3e4a89d1f483eaca94 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 25 May 2020 23:57:56 +0200 Subject: gnu: nagios: Update to 4.4.6. * gnu/packages/monitoring.scm (nagios): Update to 4.4.6. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/monitoring.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index d88bbc3aa3..f6a1153548 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -62,7 +62,7 @@ (define-public nagios (package (name "nagios") - (version "4.3.4") + (version "4.4.6") ;; XXX: Nagios 4.2.x and later bundle a copy of AngularJS. (source (origin (method url-fetch) @@ -71,7 +71,7 @@ version "/nagios-" version ".tar.gz")) (sha256 (base32 - "1wa4m952sb23dqi5w759adimsp21bkhp598rpq9dnhz3v497h2y9")) + "1x5hb97zbvkm73q53ydp1gwj8nnznm72q9c4rm6ny7phr995l3db")) (modules '((guix build utils))) (snippet ;; Ensure reproducibility. -- cgit v1.2.3 From 3e7a48677e612775c07d80b17ca9a585c8a8cf8e Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 25 May 2020 23:57:58 +0200 Subject: gnu: xerces-c: Update to 3.2.3. * gnu/packages/xml.scm (xerces-c): Update to 3.2.3. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index d9efd5264b..90181a1773 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1286,14 +1286,14 @@ spreadsheet.") (define-public xerces-c (package (name "xerces-c") - (version "3.1.4") + (version "3.2.3") (source (origin (method url-fetch) (uri (string-append "mirror://apache/xerces/c/3/sources/" "xerces-c-" version ".tar.xz")) (sha256 (base32 - "0hb29c0smqlpxj0zdm09s983z5jx37szlliccnvgh0qq91wwqwwr")))) + "0jf1khvlssg31vkxbc25dxjxcxm56xb8nywj1sypj6hxzjlrkz0j")))) (build-system gnu-build-system) (arguments (let ((system (or (%current-target-system) -- cgit v1.2.3 From 695fb93e3b25d4b8f78da773e20135c4b2508b68 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 25 May 2020 23:57:59 +0200 Subject: gnu: java-xerces: Update to 2.12.1. * gnu/packages/java.scm (java-xerces): Update to 2.12.1. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a4659240fc..b12c3ca95c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10523,14 +10523,14 @@ classes prior to Java SE 8.") (define-public java-xerces (package (name "java-xerces") - (version "2.11.0") + (version "2.12.1") (source (origin (method url-fetch) (uri (string-append "mirror://apache/xerces/j/source/" "Xerces-J-src." version ".tar.gz")) (sha256 - (base32 "1006igwy2lqrmjvdk64v8dg6qbk9c29pm8xxx7r87n0vnpvmx6pm")) + (base32 "0494kq36gw3nah19ifb720vwxbpg4ww0k6m3zq6wyanw6a083p6s")) (patches (search-patches "java-xerces-xjavac_taskdef.patch" "java-xerces-build_dont_unzip.patch" -- cgit v1.2.3 From 3c0d165ad3627aa8c7696e4ec064da0bb947f23f Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 27 May 2020 01:04:42 +0100 Subject: gnu: Add lsp-plugins. * gnu/packages/music.scm (lsp-plugins): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/music.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2c6be8eba8..dec986e5e5 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4863,6 +4863,53 @@ effects. It contains a bitcrusher, delay, distortion, equalizer, compressor, and reverb.") (license license:gpl2+))) +(define-public lsp-plugins + (package + (name "lsp-plugins") + (version "1.1.21") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sadko4u/lsp-plugins.git") + (commit (string-append "lsp-plugins-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zw0iip6ki9k65kh8dp53x7l4va4mi5rj793n2yn4p9y84qzwrz9")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list + (string-append "CC=" + (if ,(%current-target-system) + (string-append (assoc-ref %build-inputs "cross-gcc") + "/bin/" ,(%current-target-system) "-gcc") + "gcc")) + "BUILD_MODULES=\"lv2 ladspa jack\"" "VST_UI=0" + (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "ETC_PATH=" (assoc-ref %outputs "out") "/etc")) + #:phases + (modify-phases %standard-phases + (delete 'configure)) ; no configure + #:test-target "test")) + (inputs + `(("cairo", cairo) + ("hicolor-icon-theme", hicolor-icon-theme) + ("jack", jack-1) + ("ladspa", ladspa) + ("libsndfile", libsndfile) + ("lv2", lv2) + ("mesa", mesa))) + (native-inputs + `(("pkg-config", pkg-config))) + (synopsis "Audio plugin collection") + (description "LSP (Linux Studio Plugins) is a collection of audio +plugins available as LADSPA/LV2 plugins and as standalone JACK +applications.") + (home-page "https://lsp-plug.in/") + (license license:lgpl3))) + (define-public sherlock-lv2 (package (name "sherlock-lv2") -- cgit v1.2.3 From 8c1d7c8511ceca1fe650f3dd94b63a4945a1f9b7 Mon Sep 17 00:00:00 2001 From: Josh Marshall Date: Tue, 26 May 2020 23:12:26 -0400 Subject: gnu: aegis: Fix build failure. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (aegis)[arguments]: Add ‘CXXFLAGS=-std=c++03’ to #:configure-flags. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/version-control.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 4f3968286d..27c1f3beb9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1885,7 +1885,10 @@ accessed and migrated on modern systems.") ("ed" ,ed))) (arguments `(#:configure-flags (list "--with-no-aegis-configured" - "--sharedstatedir=/var/com/aegis") + "--sharedstatedir=/var/com/aegis" + ;; Uses the old 'throw()' specifier with 'new' + ;; which changed in C++11. + "CXXFLAGS=-std=c++03") #:parallel-build? #f ; There are some nasty racy rules in the Makefile. #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 812dad08764af5ae4d80394732dcc1481742db3a Mon Sep 17 00:00:00 2001 From: Josh Marshall Date: Tue, 26 May 2020 23:12:26 -0400 Subject: gnu: aegis: Update home page. * gnu/packages/version-control.scm (aegis)[home-page]: Update and use HTTPS. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 27c1f3beb9..df00c4a5eb 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1931,7 +1931,7 @@ accessed and migrated on modern systems.") ;; The author decided to call the check rule "sure". (invoke "make" "sure"))))))) - (home-page "http://aegis.sourceforge.net") + (home-page "https://sourceforge.net/projects/aegis/") (synopsis "Project change supervisor") (description "Aegis is a project change supervisor, and performs some of the Software Configuration Management needed in a CASE environment. Aegis -- cgit v1.2.3 From 4b01930f5497b2b8ab85dbdfd171868712f20857 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 17:05:32 +0200 Subject: gnu: nauty: Update to 2.7r1. * gnu/packages/maths.scm (nauty): Update to 2.7r1. [arguments]: Prevent using "-march-native". Install new executable. --- gnu/packages/maths.scm | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 3424aaa15e..76e9eacc1a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5349,20 +5349,20 @@ management via the GIMPS project's Primenet server.") (define-public nauty (package (name "nauty") - (version "2.6r12") - (source (origin - (method url-fetch) - (uri (string-append - "https://pallini.di.uniroma1.it/" - "nauty" (string-join (string-split version #\.) "") - ".tar.gz")) - (sha256 - (base32 - "1p4mxf8q5wm47nxyskxbqwa5p1vvkycv1zgswvnk9nsn6vff0al6")))) + (version "2.7r1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pallini.di.uniroma1.it/" + "nauty" (string-join (string-split version #\.) "") ".tar.gz")) + (sha256 + (base32 "0xsfqfcknbd6g6wzpa5l7crmmk3bf3zjh37rhylq6b20dqcmvjkn")))) (build-system gnu-build-system) (outputs '("out" "lib")) (arguments `(#:test-target "checks" + #:configure-flags '("--enable-generic") ;prevent -march-native #:phases (modify-phases %standard-phases ;; Default make target does not build all available @@ -5382,15 +5382,16 @@ management via the GIMPS project's Primenet server.") (include (string-append lib-output "/include/nauty")) (lib (string-append lib-output "/lib/nauty"))) (for-each (lambda (f) (install-file f bin)) - '("dreadnaut" "NRswitchg" "addedgeg" "amtog" "biplabg" - "blisstog" "bliss2dre" "catg" "checks6" "complg" - "converseg" "copyg" "countg" "cubhamg" "deledgeg" - "delptg" "directg" "dretodot" "dretog" "genbg" + '("addedgeg" "amtog" "assembleg" "biplabg" "blisstog" + "bliss2dre" "catg" "checks6" "complg" "converseg" + "copyg" "countg" "cubhamg" "deledgeg" "delptg" + "directg" "dreadnaut" "dretodot" "dretog" "genbg" "genbgL" "geng" "genquarticg" "genrang" "genspecialg" "gentourng" "gentreeg" "hamheuristic" "labelg" "linegraphg" "listg" "multig" "newedgeg" "pickg" "planarg" "ranlabg" "shortg" "showg" "subdivideg" - "sumlines" "twohamg" "vcolg" "watercluster2")) + "sumlines" "twohamg" "underlyingg" "vcolg" + "watercluster2" "NRswitchg")) (for-each (lambda (f) (install-file f include)) (find-files "." "\\.h$")) (for-each (lambda (f) (install-file f lib)) -- cgit v1.2.3 From c889fbbf1f48ab09e9c2ca4ce6d4ceabcdbe8623 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 15:07:50 +0200 Subject: gnu: yoshimi: Update to 1.7.0.1-0.bfcadc6 to fix build. * gnu/packages/music.scm (yoshimi): Update to 1.7.0.1-0.bfcadc6. [source]: Use GIT-FETCH for now. --- gnu/packages/music.scm | 131 +++++++++++++++++++++++++------------------------ 1 file changed, 68 insertions(+), 63 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index dec986e5e5..89edcae43e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2237,61 +2237,66 @@ capabilities, custom envelopes, effects, etc.") (license license:gpl2))) (define-public yoshimi - (package - (name "yoshimi") - (version "1.7.0.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/yoshimi/" - (version-major+minor version) - "/yoshimi-" version ".tar.bz2")) - (sha256 - (base32 - "1pkqrrr51vlxh96vy0c0rf5ijjvymys4brsw9rv1bdp1bb8izw6c")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; there are no tests - #:configure-flags - (list (string-append "-DCMAKE_INSTALL_DATAROOTDIR=" - (assoc-ref %outputs "out") "/share")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'enter-dir - (lambda _ (chdir "src") #t)) - ;; Move SSE compiler optimization flags from generic target to - ;; athlon64 and core2 targets, because otherwise the build would fail - ;; on non-Intel machines. - (add-after 'unpack 'remove-sse-flags-from-generic-target - (lambda _ - (substitute* "src/CMakeLists.txt" - (("-msse -msse2 -mfpmath=sse") "") - (("-march=(athlon64|core2)" flag) - (string-append flag " -msse -msse2 -mfpmath=sse"))) - #t))))) - (inputs - `(("boost" ,boost) - ("fftwf" ,fftwf) - ("alsa-lib" ,alsa-lib) - ("jack" ,jack-1) - ("fontconfig" ,fontconfig) - ("minixml" ,minixml) - ("mesa" ,mesa) - ("fltk" ,fltk) - ("lv2" ,lv2) - ("readline" ,readline) - ("ncurses" ,ncurses) - ("cairo" ,cairo) - ("zlib" ,zlib))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "http://yoshimi.sourceforge.net/") - (synopsis "Multi-paradigm software synthesizer") - (description - "Yoshimi is a fork of ZynAddSubFX, a feature-heavy real-time software + ;; Release 1.7.1 doesn't build with our version of LV2. Applying only + ;; 86996cbb235f0fe138ae814a6758c2c8ba1c2a38 is not enough. + (let ((commit "bfcadc6537dbcb301cd93346f21d36bcbffa36c7") + (revision "0")) + (package + (name "yoshimi") + (version (git-version "1.7.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.code.sf.net/p/yoshimi/code") + (commit commit))) + (sha256 + (base32 "0vhdxj7ky4iyq11r5wj9jwavjih4xvcn2djbrlmwpkdhrzpy6myl")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:configure-flags + (list (string-append "-DCMAKE_INSTALL_DATAROOTDIR=" + (assoc-ref %outputs "out") "/share")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'enter-dir + (lambda _ (chdir "src") #t)) + ;; Move SSE compiler optimization flags from generic target to + ;; athlon64 and core2 targets, because otherwise the build would fail + ;; on non-Intel machines. + (add-after 'unpack 'remove-sse-flags-from-generic-target + (lambda _ + (substitute* "src/CMakeLists.txt" + (("-msse -msse2 -mfpmath=sse") "") + (("-march=(athlon64|core2)" flag) + (string-append flag " -msse -msse2 -mfpmath=sse"))) + #t))))) + (inputs + `(("boost" ,boost) + ("fftwf" ,fftwf) + ("alsa-lib" ,alsa-lib) + ("jack" ,jack-1) + ("fontconfig" ,fontconfig) + ("minixml" ,minixml) + ("mesa" ,mesa) + ("fltk" ,fltk) + ("lv2" ,lv2) + ("readline" ,readline) + ("ncurses" ,ncurses) + ("cairo" ,cairo) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://yoshimi.sourceforge.net/") + (synopsis "Multi-paradigm software synthesizer") + (description + "Yoshimi is a fork of ZynAddSubFX, a feature-heavy real-time software synthesizer. It offers three synthesizer engines, multitimbral and polyphonic synths, microtonal capabilities, custom envelopes, effects, etc. Yoshimi improves on support for JACK features, such as JACK MIDI.") - (license license:gpl2))) + (license license:gpl2)))) (define-public libgig (package @@ -2961,7 +2966,7 @@ websites such as Libre.fm.") (home-page "https://github.com/yask123/Instant-Music-Downloader") (synopsis "Command-line program to download a song from YouTube") (description "InstantMusic downloads a song from YouTube in MP3 format. -Songs can be searched by artist, name or even by a part of the song text.") + Songs can be searched by artist, name or even by a part of the song text.") (license license:expat)))) (define-public beets @@ -3010,9 +3015,9 @@ Songs can be searched by artist, name or even by a part of the song text.") (home-page "https://beets.io") (synopsis "Music organizer") (description "The purpose of beets is to get your music collection right -once and for all. It catalogs your collection, automatically improving its -metadata as it goes using the MusicBrainz database. Then it provides a variety -of tools for manipulating and accessing your music.") + once and for all. It catalogs your collection, automatically improving its + metadata as it goes using the MusicBrainz database. Then it provides a variety + of tools for manipulating and accessing your music.") (license license:expat))) (define-public beets-bandcamp @@ -3038,8 +3043,8 @@ of tools for manipulating and accessing your music.") (synopsis "Bandcamp plugin for beets") (description "This plugin for beets automatically obtains tag data from @uref{Bandcamp, -https://bandcamp.com/}. It's also capable of getting song lyrics and album art -using the beets FetchArt plugin.") + https://bandcamp.com/}. It's also capable of getting song lyrics and album art + using the beets FetchArt plugin.") (license license:gpl2))) (define-public milkytracker @@ -3080,9 +3085,9 @@ using the beets FetchArt plugin.") `(("pkg-config" ,pkg-config))) (synopsis "Music tracker for working with .MOD/.XM module files") (description "MilkyTracker is a music application for creating .MOD and .XM -module files. It attempts to recreate the module replay and user experience of -the popular DOS program Fasttracker II, with special playback modes available -for improved Amiga ProTracker 2/3 compatibility.") + module files. It attempts to recreate the module replay and user experience of + the popular DOS program Fasttracker II, with special playback modes available + for improved Amiga ProTracker 2/3 compatibility.") (home-page "https://milkytracker.titandemo.org/") ;; 'src/milkyplay' is under Modified BSD, the rest is under GPL3 or later. (license (list license:bsd-3 license:gpl3+)))) @@ -3106,8 +3111,8 @@ for improved Amiga ProTracker 2/3 compatibility.") `(begin (substitute* "schism/version.c" (("Schism Tracker built %s %s.*$") - (string-append "Schism Tracker version " ,version "\");"))) - #t)))) + (string-append "Schism Tracker version " ,version "\") ;"))) + #t)))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From ea3e94e5fe0dbba3928c7a6380392b1495bfbcac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 18:41:41 +0200 Subject: gnu: nnn: Update to 3.2. * gnu/packages/admin.scm (nnn): Update to 3.2. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 08131a8dd0..b0a43d9644 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3116,14 +3116,14 @@ everyone's screenshots nowadays.") (define-public nnn (package (name "nnn") - (version "2.8.1") + (version "3.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/jarun/nnn/releases/download/v" version "/nnn-v" version ".tar.gz")) (sha256 - (base32 "1g47bndxld875d0xb3pgmlw223mz47p1xcvwym861y6l4zkgiyp0")))) + (base32 "1zflz7yj5wzdnl0728g8qrld2z6dqn7sblbmkjvyqlv1fwjd1fsf")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) -- cgit v1.2.3 From 3217140398a3f791c3c3122ec93fced47660e419 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 18:51:16 +0200 Subject: gnu: nginx: Update to 1.19.0. * gnu/packages/web.scm (nginx): Update to 1.19.0. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 66774c4a2d..392264391e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -229,14 +229,14 @@ Interface} specification.") ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) ;; Consider updating the nginx-documentation package together with this one. - (version "1.17.9") + (version "1.19.0") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "12dnrdxwnlid0wr797vdxj9z1fmxnk7ib55bznvl2g3mbi05vmkx")))) + "1j1n3rlvan6l9j3vw8axbbdm96w7s0x6ygmgqvbplzfd3wbid9j4")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre) @@ -278,7 +278,6 @@ Interface} specification.") (string-append "--crossbuild=" system ":" release ":" machine))))) (setenv "CC" "gcc") - (format #t "environment variable `CC' set to `gcc'~%") (format #t "configure flags: ~s~%" flags) (apply invoke "./configure" flags) #t))) -- cgit v1.2.3 From ffd2cfc8627c9e37451f0bb7a4ff0edd664e094b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 18:51:41 +0200 Subject: gnu: nginx-documentation: Update to 1.19.0-2549-c13a55aae487. * gnu/packages/web.scm (nginx-documentation): Update to 1.19.0-2549-c13a55aae487. --- gnu/packages/web.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 392264391e..169f9499fa 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -359,13 +359,13 @@ documentation.") (license license:bsd-2)))) (define-public nginx-documentation - ;; This documentation should be relevant for nginx@1.15.9. - (let ((revision 2345) - (changeset "7ef11708457e")) + ;; This documentation should be relevant for the current nginx package. + (let ((version "1.19.0") + (revision 2549) + (changeset "c13a55aae487")) (package (name "nginx-documentation") - (version - (simple-format #f "2019-03-01-~A-~A" revision changeset)) + (version (simple-format #f "~A-~A-~A" version revision changeset)) (source (origin (method hg-fetch) (uri (hg-reference @@ -374,7 +374,7 @@ documentation.") (file-name (string-append name "-" version)) (sha256 (base32 - "15975jvh53mnsgi4hhgrwdwy3by23v4kxnhy2vnkziq8v7wkmy4y")))) + "0vwwvk6wf8f6c6n6yffmya9a287s6dbx1p739hdl3hwxfyh2ygc5")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no test suite -- cgit v1.2.3 From 18e86ea9825a0c336f34f167ed3529e463c773b1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 18:51:57 +0200 Subject: gnu: wimlib: Update to 1.13.2. * gnu/packages/backup.scm (wimlib): Update to 1.13.2. --- gnu/packages/backup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index e79fe4a85e..49db612eb9 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -737,14 +737,14 @@ changes are stored.") (define-public wimlib (package (name "wimlib") - (version "1.13.1") + (version "1.13.2") (source (origin (method url-fetch) (uri (string-append "https://wimlib.net/downloads/" "wimlib-" version ".tar.gz")) (sha256 (base32 - "0pxgrpr3dr81rcf2jh71aiiq3v4anc5sj1nld18f2vhvbijbrx27")))) + "0id9ym3hzij4kpdrk0sz3ijxp5r0z1md5jch83pml9hdy1zbx5bj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 20771f4043990632b73187b10d1851a1244df4e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 19:09:46 +0200 Subject: gnu: fossil: Update to 2.11. * gnu/packages/version-control.scm (fossil): Update to 2.11. --- gnu/packages/version-control.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index df00c4a5eb..2e3607f8f3 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2171,7 +2171,7 @@ by rclone usable with git-annex.") (define-public fossil (package (name "fossil") - (version "2.10") + (version "2.11") (source (origin (method url-fetch) @@ -2179,8 +2179,7 @@ by rclone usable with git-annex.") "https://www.fossil-scm.org/index.html/uv/" "fossil-src-" version ".tar.gz")) (sha256 - (base32 - "041bs4fgk52fw58p7s084pxk9d9vs5v2f2pjbznqawz75inpg8yq")) + (base32 "0c9nzx42wxfmym9vf1pnbdb1c7gp7a7zqky60izxsph7w2xh8nix")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 7b419b026e59141bdb0caae876f0f50928de1052 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 19:10:45 +0200 Subject: gnu: knot: Update to 2.9.5. * gnu/packages/dns.scm (knot): Update to 2.9.5. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 8b21c79385..7ff0501ab2 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -595,14 +595,14 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "2.9.4") + (version "2.9.5") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-dns/" "knot-" version ".tar.xz")) (sha256 - (base32 "00d5lkan1yfxphw8q1vrmfpmg8kykdaky8082m1s1ps03cxckwsp")) + (base32 "0xmzmhd2m9rb24clrrd9k058harsq67nyjplpbyxvy1g46xah28i")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From c08f235b12900e8079677fe90d075f03867e0be2 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 27 May 2020 19:09:20 +0200 Subject: gnu: Add guile-rdf. * gnu/packages/guile-xyz.scm (guile-rdf): New variable. --- gnu/packages/guile-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 8225604a0f..c7349af790 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2020 Evan Straw ;;; Copyright © 2020 Jack Hill +;;; Copyright © 2020 Julien Lepiler ;;; ;;; This file is part of GNU Guix. ;;; @@ -3608,3 +3609,40 @@ WebSocket protocol as defined by RFC 6455.") (define-public guile3.0-websocket (deprecated-package "guile3.0-websocket" guile-websocket)) + +(define-public guile-rdf + (package + (name "guile-rdf") + (version "1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://framagit.org/tyreunom/guile-rdf") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dwn3app1fscbpmpgvjs5jy1y0gwy3j5gdx8br79af6a88zjlnqf")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f)); tests require network + (inputs + `(("guile" ,guile-3.0))) + (native-inputs + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) + (home-page "https://framagit.org/tyreunom/guile-rdf") + (synopsis "Guile implementation of the RDF abstract and concrete syntaxes") + (description "Guile RDF is an implementation of the RDF (Resource Description +Framework) format defined by the W3C for GNU Guile. RDF structures include +triples (facts with a subject, a predicate and an object), graphs which are +sets of triples, and datasets, which are collections of graphs. + +RDF specifications include the specification of concrete syntaxes and of +operations on graphs. This library implements some basic functionalities, +such as parsing and producing turtle and nquads syntax, as well as +manipulating graphs and datasets.") + (license license:gpl3+))) -- cgit v1.2.3 From 9ea9e97b9c6d886151f4fd4394c315fda8efa9cb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 27 Mar 2020 21:21:37 -0400 Subject: gnu: Add emacs-libgit. * gnu/packages/emacs-xyz.scm (emacs-libgit): New variable. * gnu/packages/patches/emacs-libgit-use-system-libgit2.patch: New file. * gnu/local.mk (dist_patch_DATA): Register patch. --- gnu/local.mk | 3 +- gnu/packages/emacs-xyz.scm | 78 ++++++++++++++++++- .../patches/emacs-libgit-use-system-libgit2.patch | 88 ++++++++++++++++++++++ 3 files changed, 167 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/emacs-libgit-use-system-libgit2.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3d5653b0b1..6be47b9a9a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -19,7 +19,7 @@ # Copyright © 2018 Amirouche Boubekki # Copyright © 2018, 2019, 2020 Oleg Pykhalov # Copyright © 2018 Stefan Stefanović -# Copyright © 2018 Maxim Cournoyer +# Copyright © 2018, 2020 Maxim Cournoyer # Copyright © 2019 Guillaume Le Vaillant # Copyright © 2019, 2020 John Soo # Copyright © 2019 Jonathan Brielmaier @@ -886,6 +886,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ + %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ %D%/packages/patches/emacs-magit-log-format-author-margin.patch \ %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 45a10f4689..e6cbd44453 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2017 Peter Mikkelsen ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Mike Gerwitz -;;; Copyright © 2017, 2018, 2019 Maxim Cournoyer +;;; Copyright © 2017, 2018, 2019, 2020 Maxim Cournoyer ;;; Copyright © 2018 Sohom Bhattacharjee ;;; Copyright © 2018, 2019 Mathieu Lirzin ;;; Copyright © 2018, 2019, 2020 Pierre Neidhardt @@ -318,6 +318,82 @@ For remote processes a substitute is provided, which communicates with Emacs on stdout instead of using a socket as the Emacsclient does.") (license license:gpl3+))) +(define-public emacs-libgit + (let ((commit "0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a") + (revision "1")) + (package + (name "emacs-libgit") + (version (git-version "20200515" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/libegit2.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pnjr3bg6y6354dfjjxfj0g51swzgl1fncpprah75x4k94rd369f")) + (patches (search-patches + ;; Submitted for inclusion upstream (see: + ;; https://github.com/magit/libegit2/pull/96). + "emacs-libgit-use-system-libgit2.patch")))) + ;; Use the cmake-build-system as it provides support for cross builds. + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DUSE_SYSTEM_LIBGIT2=x") + ;; Add the emacs-build-system byte compilation and install phases. + #:imported-modules (,@%cmake-build-system-modules + (guix build emacs-build-system) + (guix build emacs-utils)) + #:modules ((guix build cmake-build-system) + ((guix build emacs-build-system) #:prefix emacs:) + (guix build emacs-utils) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-libgit--module-file + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (make-file-writable "libgit.el") + (emacs-substitute-variables "libgit.el" + ("libgit--module-file" + (string-append out "/share/emacs/site-lisp/libegit2.so"))) + #t))) + (add-before 'install 'prepare-for-install + (lambda _ + (let ((s (string-append "../" ,name "-" ,version "-checkout"))) + (copy-file "libegit2.so" (string-append s "/libegit2.so")) + (chdir s) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((install (assoc-ref emacs:%standard-phases 'install))) + (install #:outputs outputs + #:include (cons "\\.so$" + emacs:%default-include))))) + (add-after 'install 'make-autoloads + (assoc-ref emacs:%standard-phases 'make-autoloads)) + (add-after 'make-autoloads 'enable-autoloads-compilation + (assoc-ref emacs:%standard-phases 'enable-autoloads-compilation)) + (add-after 'enable-autoloads-compilation 'patch-el-files + (assoc-ref emacs:%standard-phases 'patch-el-files)) + (add-after 'patch-el-files 'emacs-build + (assoc-ref emacs:%standard-phases 'build)) + (add-after 'emacs-build 'validate-compiled-autoloads + (assoc-ref emacs:%standard-phases 'validate-compiled-autoloads))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("emacs" ,emacs-no-x) + ("git" ,git-minimal))) + (inputs + `(("libgit2" ,libgit2))) + (home-page "https://github.com/magit/libegit2") + (synopsis "Emacs bindings for libgit2") + (description "This is an experimental module written in C providing +libgit2 bindings for Emacs, intended to boost the performance of Magit.") + ;; The LICENSE file says GPL v2+, but libgit.el says GPL v3+. + (license license:gpl3+)))) + (define-public emacs-magit ;; `magit-setup-buffer' macro introduced in c761d28d and required in ;; `emacs-forge'. diff --git a/gnu/packages/patches/emacs-libgit-use-system-libgit2.patch b/gnu/packages/patches/emacs-libgit-use-system-libgit2.patch new file mode 100644 index 0000000000..4a5546b06b --- /dev/null +++ b/gnu/packages/patches/emacs-libgit-use-system-libgit2.patch @@ -0,0 +1,88 @@ +From de3c48d72ec7064e7f0522877fe759c729df0c50 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Wed, 25 Mar 2020 11:32:18 -0400 +Subject: [PATCH] Allow using a system provided libgit2 library + +Setting the USE_SYSTEM_LIBGIT2 Make or CMake variable (through the +BUILD_OPTIONS variable) to any value enables using the system library. +The default behavior of using a bundled copy of libgit2 is unchanged. +--- + CMakeLists.txt | 9 +++++++-- + Makefile | 11 +++++++++++ + src/CMakeLists.txt | 9 +++++++-- + 3 files changed, 25 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a393d7c..75d6ca6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,9 +7,14 @@ set(BUILD_SHARED_LIBS OFF CACHE BOOL "shared" FORCE) + set(BUILD_CLAR OFF CACHE BOOL "clar" FORCE) + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DEGIT_DEBUG") + +-add_subdirectory(libgit2) ++if(USE_SYSTEM_LIBGIT2) ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(git2 REQUIRED IMPORTED_TARGET libgit2) ++else() ++ add_subdirectory(libgit2) ++ find_library(git2 libgit2.a) ++endif() + +-find_library(git2 libgit2.a) + add_subdirectory(src) + + enable_testing() +diff --git a/Makefile b/Makefile +index 8199532..6a6a4e1 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,6 +13,13 @@ ifeq ($(UNAME),MSYS) + BUILD_OPTIONS+= -G "MSYS Makefiles" + endif + ++# If the variable USE_SYSTEM_LIBGIT2 is set to *any* value, use the ++# system provided libgit2 library. ++USE_SYSTEM_LIBGIT2? := \ ++ $(if $(or $(USE_SYSTEM_LIBGIT2),\ ++ $(findstring USE_SYSTEM_LIBGIT2,$(BUILD_OPTIONS))),\ ++ true) ++ + ifeq "$(TRAVIS)" "true" + ## Makefile for Travis ################################################### + # +@@ -87,7 +94,11 @@ submodule-update: + @git submodule update + + libgit2: ++ifeq ($(USE_SYSTEM_LIBGIT2?),) + @git submodule update --init ++else ++ @echo "Using the system provided libgit2 library" ++endif + + CLEAN = $(ELCS) $(PKG)-autoloads.el build + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index cfb5777..0dbad8a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -13,8 +13,13 @@ if(WIN32) + set_target_properties(egit2 PROPERTIES PREFIX lib) + endif(WIN32) + +-target_link_libraries(egit2 git2) +-target_include_directories(egit2 SYSTEM PRIVATE "${libgit2_SOURCE_DIR}/include") ++if(USE_SYSTEM_LIBGIT2) ++ target_link_libraries(egit2 PRIVATE PkgConfig::git2) ++else() ++ target_link_libraries(egit2 git2) ++ target_include_directories( ++ egit2 SYSTEM PRIVATE "${libgit2_SOURCE_DIR}/include") ++endif() + + if(CMAKE_COMPILER_IS_GNUCC) + target_compile_options(egit2 PRIVATE -Wall -Wextra) +-- +2.26.2 + -- cgit v1.2.3 From a10349d2bb09e3a3e0c84f290a7e57989c695467 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 27 Mar 2020 21:20:03 -0400 Subject: gnu: emacs-magit: Update to commit d05545e. * gnu/packages/emacs-xyz.scm (emacs-magit): Update to commit 68b5a13fa1b6b122d4a2547b8c415aadff83d8ca. [origin]: Remove obsoleted patches and snippets. [build-system]: Switch to the emacs-build-system. [arguments]: Remove the #:modules and #:imported-modules arguments. Enable tests. Remove the #:make-flags and #:test-target argument. Specify the \#:test-command argument. [phases]{patch}: Remove phase. {build-info-manual, set-magit-version, configure-git} {disable-tramp-test}: New phases. {configure}: Do not delete phase. {patch-exec-paths}: Adapt file names. * gnu/packages/patches/emacs-magit-log-format-author-margin.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Unregister it. --- gnu/local.mk | 1 - gnu/packages/emacs-xyz.scm | 144 +++++++++------------ .../emacs-magit-log-format-author-margin.patch | 72 ----------- 3 files changed, 63 insertions(+), 154 deletions(-) delete mode 100644 gnu/packages/patches/emacs-magit-log-format-author-margin.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6be47b9a9a..80cefe5b63 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -887,7 +887,6 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ - %D%/packages/patches/emacs-magit-log-format-author-margin.patch \ %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/emacs-telega-test-env.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e6cbd44453..cb699c0197 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -395,12 +395,11 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.") (license license:gpl3+)))) (define-public emacs-magit - ;; `magit-setup-buffer' macro introduced in c761d28d and required in - ;; `emacs-forge'. - (let ((commit "c761d28d49e5238037512b898db0ec9b40d85770")) + ;; There hasn't been an official release since 2018-11-16. + (let ((commit "d05545ec2fd7edf915eaf1b9c15c785bb08975cc")) (package (name "emacs-magit") - (version (git-version "2.90.1" "3" commit)) + (version (git-version "2.90.1" "4" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -409,93 +408,76 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.") (file-name (git-file-name name version)) (sha256 (base32 - "16qx0404l05q1m6w7y5j8ck1z5nfmpinm00w0p2yh1hn5zzwy6dd")) - ;; FIXME: emacs-forge uses a function defined in this patch, - ;; which is newer than the current commit. - (patches - (search-patches - "emacs-magit-log-format-author-margin.patch")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Fix syntax error - (substitute* "lisp/magit-extras.el" - (("rev\\)\\)\\)\\)\\)\\)") "rev)))))")) - #t)))) - (build-system gnu-build-system) - (native-inputs `(("texinfo" ,texinfo) - ("emacs" ,emacs-minimal))) - (inputs - `(("git" ,git) - ("perl" ,perl))) - (propagated-inputs - `(("dash" ,emacs-dash) - ("with-editor" ,emacs-with-editor) - ("transient" ,emacs-transient))) + "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg")))) + (build-system emacs-build-system) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) - #:test-target "test" - #:tests? #f ; tests are not included in the release - #:make-flags - (list (string-append "PREFIX=" %output) - ;; Don't put .el files in a sub-directory. - (string-append "lispdir=" %output "/share/emacs/site-lisp")) + `(#:emacs ,emacs-no-x ;module support is required + #:tests? #t + #:test-command '("make" "test") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch + (add-after 'unpack 'build-info-manual (lambda _ - (chmod "lisp/magit-extras.el" #o644) - (emacs-batch-edit-file "lisp/magit-extras.el" - `(progn (progn - (goto-char (point-min)) - (re-search-forward "(defun magit-copy-buffer-revision ()") - (forward-sexp 2) - (kill-sexp) - (insert ,(format #f "~S" - '(if (use-region-p) - (copy-region-as-kill nil nil 'region) - (when-let ((rev (cl-case major-mode - ((magit-cherry-mode - magit-log-select-mode - magit-reflog-mode - magit-refs-mode - magit-revision-mode - magit-stash-mode - magit-stashes-mode) - (car magit-refresh-args)) - ((magit-diff-mode magit-log-mode) - (let ((r (caar magit-refresh-args))) - (if (string-match "\\.\\.\\.?\\(.+\\)" r) - (match-string 1 r) - r))) - (magit-status-mode "HEAD")))) - (when (magit-commit-p rev) - (setq rev (magit-rev-parse rev)) - (push (list rev default-directory) magit-revision-stack) - (kill-new (message "%s" rev)))))))) - (basic-save-buffer))) + (invoke "make" "info") + ;; Copy info files to the lisp directory, which acts as + ;; the root of the project for the emacs-build-system. + (for-each (lambda (f) + (install-file f "lisp")) + (find-files "Documentation" "\\.info$")) + (chdir "lisp") #t)) - (delete 'configure) - (add-before - 'build 'patch-exec-paths + (add-after 'build-info-manual 'set-magit-version + (lambda _ + (make-file-writable "magit.el") + (emacs-substitute-variables "magit.el" + ("magit-version" ,version)) + #t)) + (add-after 'set-magit-version 'patch-exec-paths (lambda* (#:key inputs #:allow-other-keys) (let ((perl (assoc-ref inputs "perl"))) - (make-file-writable "lisp/magit-sequence.el") - (emacs-substitute-variables "lisp/magit-sequence.el" + (make-file-writable "magit-sequence.el") + (emacs-substitute-variables "magit-sequence.el" ("magit-perl-executable" (string-append perl "/bin/perl"))) - #t)))))) + #t))) + (add-before 'check 'configure-git + (lambda _ + ;; Otherwise some tests fail with error "unable to auto-detect + ;; email address". + (setenv "HOME" (getcwd)) + (invoke "git" "config" "--global" "user.name" "toto") + (invoke "git" "config" "--global" "user.email" + "toto@toto.com"))) + (add-after 'configure-git 'disable-tramp-test + (lambda _ + ;; There is an issue causing TRAMP to fail in the build + ;; environment. Setting the tramp-remote-shell parameter of + ;; the sudo-method to the file name of the shell didn't help. + (chdir "..") + (substitute* "t/magit-tests.el" + (("^\\(ert-deftest magit-toplevel:tramp.*" all) + (string-append all " (skip-unless nil)"))) + #t)) + (add-before 'install 'enter-lisp-directory + (lambda _ + (chdir "lisp") + #t))))) + (native-inputs + `(("texinfo" ,texinfo))) + (inputs + `(("git" ,git) + ("perl" ,perl))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-libgit" ,emacs-libgit) + ("emacs-transient" ,emacs-transient) + ("emacs-with-editor" ,emacs-with-editor))) (home-page "https://magit.vc/") (synopsis "Emacs interface for the Git version control system") - (description - "With Magit, you can inspect and modify your Git repositories with Emacs. -You can review and commit the changes you have made to the tracked files, for -example, and you can browse the history of past changes. There is support for -cherry picking, reverting, merging, rebasing, and other common Git -operations.") + (description "With Magit, you can inspect and modify your Git +repositories with Emacs. You can review and commit the changes you have made +to the tracked files, for example, and you can browse the history of past +changes. There is support for cherry picking, reverting, merging, rebasing, +and other common Git operations.") (license license:gpl3+)))) (define-public emacs-magit-svn diff --git a/gnu/packages/patches/emacs-magit-log-format-author-margin.patch b/gnu/packages/patches/emacs-magit-log-format-author-margin.patch deleted file mode 100644 index fc52157a32..0000000000 --- a/gnu/packages/patches/emacs-magit-log-format-author-margin.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 94914ca4690c0cff12d600a0c8ba6bfb3fb38dc5 Mon Sep 17 00:00:00 2001 -From: Jonas Bernoulli -Date: Tue, 25 Jun 2019 21:44:32 +0200 -Subject: [PATCH] magit-log-format-author-margin: New function - -Split it from `magit-log-format-margin'. ---- - lisp/magit-log.el | 48 +++++++++++++++++++++++++---------------------- - 1 file changed, 26 insertions(+), 22 deletions(-) - -diff --git a/lisp/magit-log.el b/lisp/magit-log.el -index c8e6ef63..c0a79b19 100644 ---- a/lisp/magit-log.el -+++ b/lisp/magit-log.el -@@ -1374,28 +1374,32 @@ The shortstat style is experimental and rather slow." - (when-let ((option (magit-margin-option))) - (if magit-log-margin-show-shortstat - (magit-log-format-shortstat-margin rev) -- (pcase-let ((`(,_ ,style ,width ,details ,details-width) -- (or magit-buffer-margin -- (symbol-value option)))) -- (magit-make-margin-overlay -- (concat (and details -- (concat (propertize (truncate-string-to-width -- (or author "") -- details-width -- nil ?\s (make-string 1 magit-ellipsis)) -- 'face 'magit-log-author) -- " ")) -- (propertize -- (if (stringp style) -- (format-time-string -- style -- (seconds-to-time (string-to-number date))) -- (pcase-let* ((abbr (eq style 'age-abbreviated)) -- (`(,cnt ,unit) (magit--age date abbr))) -- (format (format (if abbr "%%2i%%-%ic" "%%2i %%-%is") -- (- width (if details (1+ details-width) 0))) -- cnt unit))) -- 'face 'magit-log-date))))))) -+ (magit-log-format-author-margin author date)))) -+ -+(defun magit-log-format-author-margin (author date &optional previous-line) -+ (pcase-let ((`(,_ ,style ,width ,details ,details-width) -+ (or magit-buffer-margin -+ (symbol-value option)))) -+ (magit-make-margin-overlay -+ (concat (and details -+ (concat (propertize (truncate-string-to-width -+ (or author "") -+ details-width -+ nil ?\s (make-string 1 magit-ellipsis)) -+ 'face 'magit-log-author) -+ " ")) -+ (propertize -+ (if (stringp style) -+ (format-time-string -+ style -+ (seconds-to-time (string-to-number date))) -+ (pcase-let* ((abbr (eq style 'age-abbreviated)) -+ (`(,cnt ,unit) (magit--age date abbr))) -+ (format (format (if abbr "%%2i%%-%ic" "%%2i %%-%is") -+ (- width (if details (1+ details-width) 0))) -+ cnt unit))) -+ 'face 'magit-log-date)) -+ previous-line))) - - (defun magit-log-format-shortstat-margin (rev) - (magit-make-margin-overlay --- -2.23.0 - -- cgit v1.2.3 From 3a2c69d9e9ac5d5e4fb571af1e393aeb3d70bf03 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 May 2020 11:09:16 -0400 Subject: gnu: emacs-evil-magit: Update to commit 253c644. This resolves tests failures that appeared with the update to emacs-magit. * gnu/packages/emacs-xyz.scm (emacs-evil-magit): Update to commit 253c644. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cb699c0197..3d21c6e3cb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16153,8 +16153,8 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.") (license license:gpl3+))) (define-public emacs-evil-magit - (let ((commit "4b66a1db8285457147a5436f209391016a819ea1") - (revision "3")) + (let ((commit "253c644807013fe92429acdef418748794b8f254") + (revision "4")) (package (name "emacs-evil-magit") (version (git-version "0.4.2" revision commit)) @@ -16167,7 +16167,7 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.") (file-name (git-file-name name version)) (sha256 (base32 - "0kkmbswfh34k3amfl3v140vsnz1gq4n4mg9g4khjd9yjph3zms4h")))) + "08mh7phxsdb9w4dfs0pmr4l4fdzzr2rm88z2s8karfi5j5ik2ag5")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil) -- cgit v1.2.3 From 25043eb42baf5dbd45789123aeff1f11ea926fc8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 24 Mar 2020 21:43:55 -0400 Subject: gnu: emacs-transient: Update to commit a6e4cced. This is necessary to build a recent version of emacs-forge. * gnu/packages/emacs-xyz.scm (emacs-transient): Update to commit a6e4cced. [build-system]: Switch to the emacs-build-system. [arguments]: Remove the #:modules, #:imported-modules and #:make-flags arguments. [phases]{configure}: Do not delete. {install}: Do not replace. {build-info-manual}: New phase. {enter-lisp-directory}: New phase. [native-inputs]: Remove emacs-minimal, which is implicitly provided by the emacs-build-system. --- gnu/packages/emacs-xyz.scm | 56 ++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3d21c6e3cb..3b80218c45 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19293,11 +19293,11 @@ as Emacs Lisp.") (license license:gpl3+)))) (define-public emacs-transient - ;; 0.1.0 depends on lv.el but not later versions. - (let ((commit "7e45a57ec81185631fe763733f64c99021df2a06")) + (let ((revision "1") + (commit "a6e4cced303b3febd59412b24a97eaf1e855e6d7")) (package (name "emacs-transient") - (version (git-version "0.1.0" "1" commit)) + (version (git-version "0.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -19306,41 +19306,33 @@ as Emacs Lisp.") (file-name (git-file-name name version)) (sha256 (base32 - "0r6d4c1lga3bk0s7q7y4v4hbpxnd9h40cjxybqvax2z902931fz1")))) - (build-system gnu-build-system) - (native-inputs `(("texinfo" ,texinfo) - ("emacs" ,emacs-minimal))) - (propagated-inputs - `(("dash" ,emacs-dash))) + "01xsw9sxr50valc2q590ngy3ra2ll01p39l9cbzvqqz6mxyymxmd")))) + (build-system emacs-build-system) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-26) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) - #:tests? #f ; tests are not included in the release - #:make-flags (list "lisp" "info") + `(#:tests? #f ;no test suite #:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lisp (string-append out "/share/emacs/site-lisp")) - (info (string-append out "/share/info"))) - (for-each (cut install-file <> lisp) - (find-files "." "\\.elc*$")) - (install-file "docs/transient.info" (string-append info))) + (add-after 'unpack 'build-info-manual + (lambda _ + (invoke "make" "info") + ;; Move the info file to lisp so that it gets installed by the + ;; emacs-build-system. + (rename-file "docs/transient.info" "lisp/transient.info"))) + (add-after 'build-info-manual 'enter-lisp-directory + (lambda _ + (chdir "lisp") #t))))) + (native-inputs + `(("texinfo" ,texinfo))) + (propagated-inputs + `(("dash" ,emacs-dash))) (home-page "https://magit.vc/manual/transient") (synopsis "Transient commands in Emacs") - (description - "Taking inspiration from prefix keys and prefix arguments in Emacs, -Transient implements a similar abstraction involving a prefix command, infix -arguments and suffix commands. We could call this abstraction a \"transient -command\", but because it always involves at least two commands (a prefix and -a suffix) we prefer to call it just a \"transient\".") + (description "Taking inspiration from prefix keys and prefix arguments +in Emacs, Transient implements a similar abstraction involving a prefix +command, infix arguments and suffix commands. We could call this abstraction +a \"transient command\", but because it always involves at least two +commands (a prefix and a suffix) we prefer to call it just a \"transient\".") (license license:gpl3+)))) (define-public emacs-forge -- cgit v1.2.3 From ffd2696bd8c898cb69b8b443db5584d84986d419 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 May 2020 11:55:17 -0400 Subject: gnu: emacs-forge: Update to commit 09bf8ad. * gnu/packages/emacs-xyz.scm (emacs-forge): Update to 09bf8ad. [native-inputs]: Remove emacs-minimal, which is implicitly provided by the emacs-build-system. --- gnu/packages/emacs-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3b80218c45..e845ca9097 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19336,10 +19336,10 @@ commands (a prefix and a suffix) we prefer to call it just a \"transient\".") (license license:gpl3+)))) (define-public emacs-forge - (let ((commit "63cbf81f166fc71861d8e3d246df8e5ccedcb9bb")) + (let ((commit "09bf8adc9c9afb492632e612f51f39e1cc15fca0")) (package (name "emacs-forge") - (version (git-version "0.1.0" "3" commit)) + (version (git-version "0.1.0" "4" commit)) (source (origin (method git-fetch) @@ -19349,11 +19349,10 @@ commands (a prefix and a suffix) we prefer to call it just a \"transient\".") (file-name (git-file-name name version)) (sha256 (base32 - "1yf2xjx3459py6rji740jm8bmh2pv66ghnbjxsvjd4jf9kcdav83")))) + "148h1rvmfmxyrfy2q5l0vzblr7lpsyw1si30hfwhzsj8fvj21qcr")))) (build-system emacs-build-system) (native-inputs - `(("texinfo" ,texinfo) - ("emacs" ,emacs-minimal))) + `(("texinfo" ,texinfo))) (propagated-inputs `(("emacs-closql" ,emacs-closql) ("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From db38840198a62e84e0754975dfece75132fd6672 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 27 May 2020 13:53:11 -0400 Subject: Revert some Go package updates. This reverts commit 5f833e0495f00a72f8d34a63e8afbc531afdd22d through 681ac9a66c26d2c739e41f03228f8c63fc0df482. It's not idiomatic to update Go packages independently of their users. This reversion was approved by Efraim on #guix: http://logs.guix.gnu.org/guix/2020-05-26.log * gnu/packages/golang.scm, gnu/packages/syncthing.scm, gnu/packages/tls.scm: Revert. --- gnu/packages/golang.scm | 100 ++++++++++++------------ gnu/packages/syncthing.scm | 184 +++++++++++++++++++++++---------------------- gnu/packages/tls.scm | 42 ++++++----- 3 files changed, 166 insertions(+), 160 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e11c52b0e4..8dd276562a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -978,26 +978,28 @@ optimized for performance yet simple to use.") (license license:expat)))) (define-public go-github-com-blang-semver - (package - (name "go-github-com-blang-semver") - (version "4.0.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/blang/semver.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "14h9ys4n4kx9cbj42lkdf4i5k3nkll6sd62jcvl7cs565v6fiknz")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/blang/semver")) - (home-page "https://github.com/blang/semver") - (synopsis "Semantic versioning library written in Go") - (description "Semver is a library for Semantic versioning written in Go.") - (license license:expat))) + (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9") + (revision "0")) + (package + (name "go-github-com-blang-semver") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/blang/semver.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/blang/semver")) + (home-page "https://github.com/blang/semver") + (synopsis "Semantic versioning library written in Go") + (description "Semver is a library for Semantic versioning written in Go.") + (license license:expat)))) (define-public go-github-com-emicklei-go-restful (let ((commit "89ef8af493ab468a45a42bb0d89a06fccdd2fb22") @@ -2341,31 +2343,29 @@ statistics for wrapped connections.") (license license:expat)))) (define-public go-github-com-mitchellh-go-homedir - (package - (name "go-github-com-mitchellh-go-homedir") - (version "1.1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mitchellh/go-homedir.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/mitchellh/go-homedir" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-home-directory - (lambda _ - (setenv "HOME" "/") - #t))))) - (home-page "https://github.com/mitchellh/go-homedir") - (synopsis "Go library for detecting and expanding the user's home directory without cgo") - (description "This is a Go library for detecting the user's home + (let ((commit "ae18d6b8b3205b561c79e8e5f69bff09736185f4") + (revision "0")) + (package + (name "go-github-com-mitchellh-go-homedir") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mitchellh/go-homedir.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq")))) + (build-system go-build-system) + (arguments + (quote (#:import-path "github.com/mitchellh/go-homedir" + ;; TODO: Tests fail because it tries to access home. + #:tests? #f))) + (home-page "https://github.com/mitchellh/go-homedir") + (synopsis "Go library for detecting and expanding the user's home directory without cgo") + (description "This is a Go library for detecting the user's home directory without the use of @command{cgo}, so the library can be used in cross-compilation environments. @@ -2379,7 +2379,7 @@ package cannot cross compile. But 99% of the time the use for @command{os/user} is just to retrieve the home directory, which we can do for the current user without cgo. This library does that, enabling cross-compilation.") - (license license:expat))) + (license license:expat)))) (define-public go-github-com-multiformats-go-multiaddr (let ((commit "fe1c46f8be5af4aff4db286e08839295bd922efb") @@ -2824,7 +2824,7 @@ format in Go.") (define-public go-github-com-kr-text (package (name "go-github-com-kr-text") - (version "0.2.0") + (version "0.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -2833,7 +2833,7 @@ format in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "0hf58ypz6rxsw6nx3i856whir9lvy4sdx946wbw1nfaf2rdmr9vx")))) + "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1")))) (build-system go-build-system) (arguments '(#:import-path "github.com/kr/text")) @@ -3191,7 +3191,7 @@ error handling primitives in Go.") (define-public go-github-com-maruel-panicparse (package (name "go-github-com-maruel-panicparse") - (version "1.4.1") + (version "1.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -3200,7 +3200,7 @@ error handling primitives in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "0sff44kqmpwzpa6h84fssdsv9glfm8bjjcnspsr64qzmqxpbc7m4")))) + "13qkn7f64yln8jdmma37h6ra4c7anxkp3vfgvfyb6lb07dpr1ibq")))) (build-system go-build-system) (arguments '(#:import-path "github.com/maruel/panicparse")) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index bb264df717..99bdd7704b 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -232,7 +232,7 @@ configuration that is stored in a Go struct.") (revision "0")) (package (name "go-github-com-bkaradzic-go-lz4") - (version (git-version "1.0.0" revision commit)) + (version (git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -416,7 +416,7 @@ address of the default LAN gateway.") (define-public go-github-com-lib-pq (package (name "go-github-com-lib-pq") - (version "1.5.2") + (version "1.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -425,7 +425,7 @@ address of the default LAN gateway.") (file-name (git-file-name name version)) (sha256 (base32 - "1wjw5pfjgc63n9934mgvg8hr1v9381mcdz62jkn9xqxqcv6b95lw")))) + "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz")))) (build-system go-build-system) (arguments `(#:import-path "github.com/lib/pq" @@ -468,7 +468,7 @@ GeoLite2 and GeoIP2 databases in Go.") (define-public go-github-com-oschwald-maxminddb-golang (package (name "go-github-com-oschwald-maxminddb-golang") - (version "1.6.0") + (version "1.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -477,7 +477,7 @@ GeoLite2 and GeoIP2 databases in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "1xdqaazxddnajh0qic1c70skad44kxxr7m46fypbnawn61v3f7gc")))) + "100wd5qv00pkcm6cb8c4x5gavc9jnn7drh6xrqh85hzci4rils66")))) (build-system go-build-system) (propagated-inputs `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) @@ -492,25 +492,27 @@ higher-level API for doing so.") (license isc))) (define-public go-github-com-stathat-go - (package - (name "go-github-com-stathat-go") - (version "1.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stathat/go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1zzlsl24dyr202qkr2pay22m6d0gb7ssms77wgdx0r0clgm7dihw")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/stathat/go")) - (synopsis "Post statistics to StatHat") - (description "This is a Go package for posting to a StatHat account.") - (home-page "https://github.com/stathat/go") - (license expat))) + (let ((commit "74669b9f388d9d788c97399a0824adbfee78400e") + (revision "0")) + (package + (name "go-github-com-stathat-go") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stathat/go") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zzlsl24dyr202qkr2pay22m6d0gb7ssms77wgdx0r0clgm7dihw")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/stathat/go")) + (synopsis "Post statistics to StatHat") + (description "This is a Go package for posting to a StatHat account.") + (home-page "https://github.com/stathat/go") + (license expat)))) (define-public go-github-com-rcrowley-go-metrics (let ((commit "cac0b30c2563378d434b5af411844adff8e32960") @@ -747,28 +749,30 @@ notification library in Go.") (license expat)))) (define-public go-github-com-beorn7-perks-quantile - (package - (name "go-github-com-beorn7-perks-quantile") - (version "1.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/beorn7/perks.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/beorn7/perks/quantile" - #:unpack-path "github.com/beorn7/perks")) - (synopsis "Compute approximate quantiles over an unbounded data stream") - (description "Perks contains the Go package @code{quantile} that computes + (let ((commit "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9") + (revision "0")) + (package + (name "go-github-com-beorn7-perks-quantile") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/beorn7/perks.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/beorn7/perks/quantile" + #:unpack-path "github.com/beorn7/perks")) + (synopsis "Compute approximate quantiles over an unbounded data stream") + (description "Perks contains the Go package @code{quantile} that computes approximate quantiles over an unbounded data stream within low memory and CPU bounds.") - (home-page "https://github.com/beorn7/perks") - (license expat))) + (home-page "https://github.com/beorn7/perks") + (license expat)))) (define-public go-github-com-prometheus-client-model (let ((commit "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016") @@ -876,31 +880,29 @@ Prometheus metrics.") (license asl2.0))) (define-public go-github-com-prometheus-procfs - (package - (name "go-github-com-prometheus-procfs") - (version "0.0.11") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/prometheus/procfs.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1msc8bfywsmrgr2ryqjdqwkxiz1ll08r3qgvaka2507z1wpcpj2c")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/prometheus/procfs" - ;; The tests require Go modules, which are not yet supported in Guix's - ;; Go build system. - #:tests? #f)) - (propagated-inputs - `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) - (synopsis "Go library for reading @file{/proc}") - (description "The @code{procfs} Go package provides functions to retrieve + (package + (name "go-github-com-prometheus-procfs") + (version "0.0.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prometheus/procfs.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1z5jq5rjala0a0di4nwk1rai0z9f73qwqj6mgcbpjbg2qknlb544")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/prometheus/procfs" + ;; The tests require Go modules, which are not yet supported in Guix's + ;; Go build system. + #:tests? #f)) + (synopsis "Go library for reading @file{/proc}") + (description "The @code{procfs} Go package provides functions to retrieve system, kernel, and process metrics from the @file{/proc} pseudo file system.") - (home-page "https://github.com/prometheus/procfs") - (license asl2.0))) + (home-page "https://github.com/prometheus/procfs") + (license asl2.0))) (define-public go-github-com-prometheus-client-golang (package @@ -943,7 +945,7 @@ server tools for Prometheus metrics.") (define-public go-github-com-go-asn1-ber-asn1-ber (package (name "go-github-com-go-asn1-ber-asn1-ber") - (version "1.4.1") + (version "1.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -952,7 +954,7 @@ server tools for Prometheus metrics.") (file-name (git-file-name name version)) (sha256 (base32 - "0d7yl1f7ak0djkflw8wx1wlhym2whg7bh57m419arfym9ncwrhg1")))) + "0dxfmgk84fn0p6pz3i0cspynh6rly5pfk9wghm1q07mx99npln02")))) (build-system go-build-system) (arguments '(#:import-path "github.com/go-asn1-ber/asn1-ber")) @@ -1035,27 +1037,29 @@ virtual connections from a single physical connection.") (license expat))) (define-public go-github-com-ccding-go-stun - (package - (name "go-github-com-ccding-go-stun") - (version "0.1.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ccding/go-stun.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "133r2s4h9vv5lmjd680my2c5973gfi0gg5cxcwzjwdjad83a2dm0")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/ccding/go-stun")) - (synopsis "STUN client implementation") - (description "Go-stun is a go implementation of the STUN client (RFC 3489 + (let ((commit "be486d185f3dfcb2dbf8429332da50a0da7f95a6") + (revision "2")) + (package + (name "go-github-com-ccding-go-stun") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ccding/go-stun.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gr0rw1c1y7wh6913lyn5k4ig023by27i36bly6am8dwgrgp34ww")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/ccding/go-stun")) + (synopsis "STUN client implementation") + (description "Go-stun is a go implementation of the STUN client (RFC 3489 and RFC 5389).") - (home-page "https://github.com/ccding/go-stun") - (license asl2.0))) + (home-page "https://github.com/ccding/go-stun") + (license asl2.0)))) (define-public go-github-com-cespare-xxhash (package diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f6746ebe21..ec81b7bf07 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Leo Famulari -;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2019 Efraim Flashner ;;; Copyright © 2016, 2017, 2018 Nikita ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Ricardo Wurmus @@ -1021,23 +1021,25 @@ relatively simple Bash script.") (license license:expat))) (define-public go-github-com-certifi-gocertifi - (package - (name "go-github-com-certifi-gocertifi") - (version "2020.02.11") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/certifi/gocertifi") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "018bsy1vclsdk2kns9f37giabibg3kggk3vpj0yr3dv0k72gzybk")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/certifi/gocertifi")) - (synopsis "X.509 TLS root certificate bundle for Go") - (description "This package is a Go language X.509 TLS root certificate bundle, + (let ((commit "a5e0173ced670013bfb649c7e806bc9529c986ec") + (revision "1")) + (package + (name "go-github-com-certifi-gocertifi") + (version (git-version "2018.01.18" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/certifi/gocertifi") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1n9drccl3q1rr8wg3nf60slkf1lgsmz5ahifrglbdrc6har3rryj")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/certifi/gocertifi")) + (synopsis "X.509 TLS root certificate bundle for Go") + (description "This package is a Go language X.509 TLS root certificate bundle, derived from Mozilla's collection.") - (home-page "https://certifi.io") - (license license:mpl2.0))) + (home-page "https://certifi.io") + (license license:mpl2.0)))) -- cgit v1.2.3 From fadd962f4b7aa5a5a26a3efa705a359e29f60fc5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 14:50:01 +0200 Subject: gnu: hdf4: Provide an absolute reference to libjpeg. * gnu/packages/maths.scm (hdf4)[arguments]: Add phase 'provide-absolute-libjpeg-reference'. --- gnu/packages/maths.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 76e9eacc1a..8e35188d80 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -920,7 +920,17 @@ computations.") (("(/gnu/store/)([a-Z0-9]*)" all prefix hash) (string-append prefix (string-take hash 10) "..."))) #t)) - ))) + (add-after 'install 'provide-absolute-libjpeg-reference + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (libjpeg (assoc-ref inputs "libjpeg"))) + ;; libjpeg-turbo does not provide a .la file, so libtool is + ;; unable to add an absolute reference for -ljpeg in the .la + ;; files. Fix it manually to avoid having to propagate it. + (substitute* (find-files (string-append out "/lib") "\\.la$") + (("-ljpeg") + (string-append "-L" libjpeg "/lib -ljpeg"))) + #t)))))) (home-page "https://www.hdfgroup.org/products/hdf4/") (synopsis "Library and multi-object file format for storing and managing data") -- cgit v1.2.3 From af59d4b43d711c1033b16b0a94d7eaef3de770eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 15:07:11 +0200 Subject: gnu: Add ruby-ptools. * gnu/packages/ruby.scm (ruby-ptools): New public variable. --- gnu/packages/ruby.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 94b16957e0..cb9495a266 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1799,6 +1799,41 @@ and inspect the environment.") (home-page "https://github.com/e2/nenv") (license license:expat))) +(define-public ruby-ptools + (package + (name "ruby-ptools") + (version "1.3.5") + (source (origin + (method url-fetch) + (uri (rubygems-uri "ptools" version)) + (sha256 + (base32 + "1jb1h1nsk9zwykpniw8filbsk26kjsdlpk5wz6w0zyamcd41h87j")))) + (build-system ruby-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/ls + (lambda _ + (substitute* "test/test_binary.rb" + (("/bin/ls") + (which "ls"))) + #t)) + (add-before 'install 'create-gem + (lambda _ + ;; Do not attempt to sign the gem. + (substitute* "Rakefile" + (("spec\\.signing_key = .*") + "")) + (invoke "rake" "gem:create")))))) + (synopsis "Extra methods for Ruby's @code{File} class") + (description + "The @dfn{ptools} (power tools) library extends Ruby's core @code{File} +class with many additional methods modelled after common POSIX tools, such as +@code{File.which} for finding executables, @code{File.tail} to print the last +lines of a file, @code{File.wc} to count words, and so on.") + (home-page "https://github.com/djberg96/ptools") + (license license:artistic2.0))) + (define-public ruby-permutation (package (name "ruby-permutation") -- cgit v1.2.3 From fae1c86605046b3fbc93384170438382248faab3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 15:07:31 +0200 Subject: gnu: Add ruby-mkmf-lite. * gnu/packages/ruby.scm (ruby-mkmf-lite): New public variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index cb9495a266..2ab6dc2394 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2839,6 +2839,28 @@ objects.") (home-page "https://github.com/floehopper/metaclass") (license license:expat))) +(define-public ruby-mkmf-lite + (package + (name "ruby-mkmf-lite") + (version "0.3.2") + (source (origin + (method url-fetch) + (uri (rubygems-uri "mkmf-lite" version)) + (sha256 + (base32 + "0br9k6zijj1zc25n8p7f2j1mwl58nfgdknf3q13h9k156jvrir06")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-ptools" ,ruby-ptools))) + (synopsis "Lightweight alternative to @code{mkmf}") + (description + "@code{mkmf-lite} is a light version of Ruby's @code{mkmf.rb} designed +for use as a library. It does not create packages, builds, or log files of +any kind. Instead, it provides mixin methods that you can use in FFI or tests +to check for the presence of header files, constants, and so on.") + (home-page "https://github.com/djberg96/mkmf-lite") + (license license:asl2.0))) + (define-public ruby-mspec (package (name "ruby-mspec") -- cgit v1.2.3 From 9c566d1b23f574298d1ff0fc1d2a904a441ec7b3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 15:07:52 +0200 Subject: gnu: Add ruby-sys-filesystem. * gnu/packages/ruby.scm (ruby-sys-filesystem): New public variable. --- gnu/packages/ruby.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 2ab6dc2394..e32f93bec0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -9320,6 +9320,35 @@ the Thin library.") (home-page "https://github.com/sj26/skinny") (license license:expat))) +(define-public ruby-sys-filesystem + (package + (name "ruby-sys-filesystem") + (version "1.3.4") + (source (origin + (method url-fetch) + (uri (rubygems-uri "sys-filesystem" version)) + (sha256 + (base32 + "0mizqnsiagagmracadr16s5na2ks2j3ih1w0f3gp4ssrda6szl01")))) + (build-system ruby-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'check 'set-HOME + (lambda _ + ;; Some tests attempt to stat $HOME. Let them. + (setenv "HOME" "/tmp") + #t))))) + (propagated-inputs + `(("ruby-ffi" ,ruby-ffi))) + (native-inputs + `(("ruby-mkmf-lite" ,ruby-mkmf-lite))) + (synopsis "Gather file system information") + (description + "The @code{sys-filesystem} library provides a cross-platform interface +for gathering file system information, such as disk space and mount points.") + (home-page "https://github.com/djberg96/sys-filesystem") + (license license:asl2.0))) + (define-public mailcatcher (package (name "mailcatcher") -- cgit v1.2.3 From bb719d6ae37569abf43a80684451081b16864221 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 16:15:48 +0200 Subject: gnu: ruby-thor: Update to 1.0.1. * gnu/packages/ruby.scm (ruby-thor): Update to 1.0.1. [source]: Switch to GIT-FETCH. [arguments]: Remove #:tests?. Add #:phases. [native-inputs]: Remove BUNDLER. Add RUBY-RSPEC and RUBY-SIMPLECOV. --- gnu/packages/ruby.scm | 64 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e32f93bec0..c80bab47cc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1680,18 +1680,70 @@ Ruby.") (define-public ruby-thor (package (name "ruby-thor") - (version "0.19.4") + (version "1.0.1") (source (origin - (method url-fetch) - (uri (rubygems-uri "thor" version)) + ;; Pull from git because the gem has no tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/erikhuda/thor") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns")))) + "1anrx5vynk57hn5c8ig5pgkmcsbj9q5mvckd5rviw1jid7n89k57")))) (build-system ruby-build-system) (arguments - '(#:tests? #f)) ; no test suite + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-readline-tests + (lambda _ + ;; Ensure Readline is initialized before running the + ;; test to avoid a type clash with the mock ::Readline. + ;; See . + (substitute* "spec/line_editor/readline_spec.rb" + (("unless defined\\? ::Readline" all) + (string-append "Thor::LineEditor::Readline.available?\n" + all))) + #t)) + (add-after 'unpack 'remove-coveralls-dependency + (lambda _ + ;; Do not hook the test suite into the online + ;; coveralls service. + (substitute* "Gemfile" + ((".*coveralls.*") "")) + (substitute* "spec/helper.rb" + (("require \"coveralls\"") "") + (("Coveralls::SimpleCov::Formatter") "") + ;; Also drop the WebMock dependency which is only + ;; present to allow a coveralls.io connection, and + ;; would otherwise introduce a circular dependency. + (("require \"webmock/rspec\"") "") + (("WebMock\\.disable_net_connect.*") "")) + #t)) + (add-after 'unpack 'disable-network-tests + (lambda _ + ;; These tests attempt to look up example.com. + (substitute* "spec/actions/file_manipulation_spec.rb" + (("it \"accepts (https?) remote sources" _ proto) + (string-append "xit \"accepts " proto " remote sources"))) + #t)) + (add-after 'unpack 'disable-quality-tests + (lambda _ + ;; These tests attempt to check the git repository for + ;; tabs vs spaces, double vs single quotes, etc, and + ;; depend on the git checkout. + (delete-file "spec/quality_spec.rb") + #t)) + (add-before 'check 'make-files-writable + (lambda _ + ;; The tests needs rw access to the test suite. + (for-each make-file-writable (find-files "spec")) + #t)) + (replace 'check + (lambda _ + (invoke "rspec" "spec")))))) (native-inputs - `(("bundler" ,bundler))) + `(("ruby-rspec" ,ruby-rspec) + ("ruby-simplecov" ,ruby-simplecov))) (synopsis "Ruby toolkit for building command-line interfaces") (description "Thor is a toolkit for building powerful command-line interfaces.") -- cgit v1.2.3 From 2d2d5b29fb461850858638e023cee3a3a04beb77 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 17:04:36 +0200 Subject: gnu: Add facter. * gnu/packages/admin.scm (facter): New public variable. --- gnu/packages/admin.scm | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b0a43d9644..36f063ca96 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -58,6 +58,7 @@ #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix build-system ruby) #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) @@ -121,6 +122,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages sphinx) #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) @@ -429,6 +431,71 @@ services.") graphs and can export its output to different formats.") (license license:bsd-3))) +(define-public facter + (package + (name "facter") + (version "4.0.24") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/puppetlabs/facter-ng") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1n8yd2p7m0jf0wld6q43f2gqxyz8fiamz3p79wbl53q5qih0vba2")))) + (build-system ruby-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'delete-facter-ng-gemspec + (lambda _ + ;; XXX: ruby-build-system incorrectly finds + ;; facter-ng.gemspec from this directory and tries to + ;; build that instead of the proper facter.gemspec. + ;; Just delete it as a workaround, as it appears to + ;; only exist for backwards-compatibility after the + ;; facter-ng->facter rename. + (delete-file "agent/facter-ng.gemspec") + #t)) + (add-after 'unpack 'embed-iproute-reference + (lambda* (#:key inputs #:allow-other-keys) + (let ((iproute (assoc-ref inputs "iproute"))) + ;; Provide an absolute reference to the 'ip' executable + ;; to avoid propagating it. + (substitute* "lib/resolvers/networking_linux_resolver.rb" + (("execute\\('ip") + (string-append "execute('" iproute "/sbin/ip"))) + #t))) + (delete 'check) + (add-after 'wrap 'check + (lambda* (#:key tests? outputs #:allow-other-keys) + ;; XXX: The test suite wants to run Bundler and + ;; complains that the gemspec is invalid. For now + ;; just make sure that we can run the wrapped + ;; executable directly. + (if tests? + (invoke (string-append (assoc-ref outputs "out") + "/bin/facter") + ;; Many facts depend on /sys, /etc/os-release, + ;; etc, so we only run a small sample. + "facterversion" "architecture" + "kernel" "kernelversion") + (format #t "tests disabled~%")) + #t))))) + (inputs + `(("iproute" ,iproute) + ("ruby-hocon" ,ruby-hocon) + ("ruby-sys-filesystem" ,ruby-sys-filesystem) + ("ruby-thor" ,ruby-thor))) + (synopsis "Collect and display system facts") + (description + "Facter is a tool that gathers basic facts about nodes (systems) such +as hardware details, network settings, OS type and version, and more. These +facts can be collected on the command line with the @command{facter} command +or via the @code{facter} Ruby library.") + (home-page "https://github.com/puppetlabs/facter-ng") + (license license:expat))) + (define-public htop (package (name "htop") -- cgit v1.2.3 From 1b8c7d12e94d5b630d48471f1490f5691e17900b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 20:13:22 +0200 Subject: gnu: code.scm: Sort module imports. * gnu/packages/code.scm (define-module): Sort imports. --- gnu/packages/code.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index ee47582ec8..d6aacadfe7 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -48,16 +48,16 @@ #:use-module (gnu packages emacs) #:use-module (gnu packages gcc) #:use-module (gnu packages graphviz) + #:use-module (gnu packages llvm) + #:use-module (gnu packages lua) + #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages perl-compression) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages sqlite) - #:use-module (gnu packages texinfo) - #:use-module (gnu packages ncurses) - #:use-module (gnu packages llvm) - #:use-module (gnu packages lua)) + #:use-module (gnu packages texinfo)) ;;; Tools to deal with source code: metrics, cross-references, etc. -- cgit v1.2.3 From d1c6b0979f763980729bb11a98d2e003a37e403d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 21:22:13 +0200 Subject: gnu: Add packcc. * gnu/packages/c.scm (packcc): New public variable. --- gnu/packages/c.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 5718ec66ac..5c0209f42d 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2019 Andreas Enge ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -254,6 +255,57 @@ string formatting and autoresizing, option and config file parsing, type checking casts and more.") (license license:lgpl2.1+))) +(define-public packcc + (package + (name "packcc") + ;; We need a few fixes on top of the latest release to prevent test + ;; failures in Universal Ctags. + (version "1.2.5-19-g58d1b9d") + (home-page "https://github.com/enechaev/packcc") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0biyv835jlk43fvmmd3p8jafs7k2iw9qlaj37hvsl604ai6rd5aj")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ;no tests + #:make-flags '("-DUSE_SYSTEM_STRNLEN=1") + #:phases (modify-phases %standard-phases + ;; The project consists of a single source file and has + ;; no actual build system, so we need to do it manually. + (delete 'configure) + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "gcc" "-o" "packcc" "packcc.c" + make-flags))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "packcc" (string-append out "/bin")) + (install-file "README.md" + (string-append out "/share/doc/packcc")) + #t)))))) + (synopsis "Packrat parser generator for C") + (description + "PackCC is a packrat parser generator for the C programming language. +Its main features are: +@itemize +@item Generates a parser in C from a grammar described in a PEG. +@item Gives your parser great efficiency by packrat parsing. +@item Supports direct and indirect left-recursive grammar rules. +@end itemize +The grammar of your parser can be described in a @acronym{PEG, Parsing +Expression Grammar}. The PEG is a top-down parsing language, and is similar +to the regular-expression grammar. The PEG does not require tokenization to +be a separate step, and tokenization rules can be written in the same way as +any other grammar rules.") + (license license:expat))) + (define-public sparse (package (name "sparse") -- cgit v1.2.3 From 58056d5bf27e802a689eb1a1800304494a88a1f9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 21:22:55 +0200 Subject: gnu: Add Universal Ctags. * gnu/packages/code.scm (universal-ctags): New public variable. --- gnu/packages/code.scm | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index d6aacadfe7..2285b519a0 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,12 +44,14 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages c) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages emacs) #:use-module (gnu packages gcc) #:use-module (gnu packages graphviz) #:use-module (gnu packages llvm) + #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) @@ -57,7 +60,9 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages sqlite) - #:use-module (gnu packages texinfo)) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages web) + #:use-module (gnu packages xml)) ;;; Tools to deal with source code: metrics, cross-references, etc. @@ -321,6 +326,83 @@ features that are not supported by the standard @code{stdio} implementation.") (license (license:non-copyleft "http://sourceforge.net/p/ctrio/git/ci/master/tree/README")))) +(define-public universal-ctags + ;; The project is unable to decide whether to use 1.0 or 6.0 as the + ;; first public release version (it started as a fork of another ctags + ;; project that was on version 5.8), and five years later have been + ;; unable to tag a release. Thus, we just take the master branch. + (let ((commit "0c78c0c4a68030df0d025c90bad291108b5e7107") + (revision "0")) + (package + (name "universal-ctags") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/universal-ctags/ctags") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lnxc3kwi6srw0015m16vyjfdc7pdr9d1qzxjsbfv3c69ag87jhc")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove the bundled PackCC and associated build rules. + (substitute* "Makefile.am" + (("\\$\\(packcc_verbose\\)\\$\\(PACKCC\\)") + "packcc") + (("\\$\\(PEG_SRCS\\) \\$\\(PEG_HEADS\\): packcc\\$\\(EXEEXT\\)") + "$(PEG_SRCS) $(PEG_HEADS):") + (("noinst_PROGRAMS \\+= packcc") + "")) + (delete-file-recursively "misc/packcc") + #t)))) + (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'make-files-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) + (add-before 'bootstrap 'patch-optlib2c + (lambda _ + ;; The autogen.sh script calls out to optlib2c to + ;; generate translations, so we can not wait for the + ;; patch-source-shebangs phase. + (patch-shebang "misc/optlib2c") + #t)) + (add-before 'check 'patch-tests + (lambda _ + (substitute* "misc/units" + (("SHELL=/bin/sh") + (string-append "SHELL=" (which "sh")))) + (substitute* "Tmain/utils.sh" + (("/bin/echo") (which "echo"))) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("packcc" ,packcc) + ("perl" ,perl) + ("pkg-config" ,pkg-config))) + (inputs + `(("jansson" ,jansson) + ("libseccomp" ,libseccomp) + ("libxml2" ,libxml2) + ("libyaml" ,libyaml))) + (home-page "https://ctags.io/") + (synopsis "Generate tag files for source code") + (description + "Universal Ctags generates an index (or tag) file of language objects +found in source files for many popular programming languages. This index +makes it easy for text editors and other tools to locate the indexed items. +Universal Ctags improves on traditional ctags because of its multilanguage +support, its ability for the user to define new languages searched by regular +expressions, and its ability to generate emacs-style TAGS files.") + (license license:gpl2+)))) + (define-public withershins (package (name "withershins") -- cgit v1.2.3 From ef64f9ca8f73809119a0ffaed79a756ec1924b65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 21:24:02 +0200 Subject: gnu: jucipp: Update to 1.6.0. * gnu/packages/text-editors.scm (jucipp): Update to 1.6.0. [arguments]: Remove obsolete phase. [inputs]: Add UNIVERSAL-CTAGS. --- gnu/packages/text-editors.scm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index f415fd7f65..d6c0aa7acb 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages assembly) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) + #:use-module (gnu packages code) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) #:use-module (gnu packages gcc) @@ -196,7 +197,7 @@ bindings and many of the powerful features of GNU Emacs.") (define-public jucipp (package (name "jucipp") - (version "1.5.1") + (version "1.6.0") (home-page "https://gitlab.com/cppit/jucipp") (source (origin (method git-fetch) @@ -208,7 +209,7 @@ bindings and many of the powerful features of GNU Emacs.") (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "0v7fmsya2zn1xx59bkv4cbyinmcnv52hm4j40nbfwalcks631xrr")))) + (base32 "177myy6qvjlb6j3f3i3xmfml5r3p9in8xzpvm0n59dn56s81gpnr")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_TESTING=ON" @@ -225,19 +226,6 @@ bindings and many of the powerful features of GNU Emacs.") (chdir "build") #t)) - ;; This phase is necessary to fix a test failure, see - ;; . - (add-after 'unpack 'add-reference-to-clang-internal-header - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/compile_commands.cc" - ((".*-I/usr/lib/clang.*" all) - (string-append "arguments.emplace_back(\"-I" - (assoc-ref inputs "libclang") - "/lib/clang/" - ,@(list (package-version clang)) - "/include\");\n" - all))) - #t)) (add-after 'unpack 'patch-tiny-process-library (lambda _ (with-directory-excursion "lib/tiny-process-library" @@ -269,6 +257,7 @@ bindings and many of the powerful features of GNU Emacs.") (inputs `(("aspell" ,aspell) ("boost" ,boost) + ("ctags" ,universal-ctags) ("gtkmm" ,gtkmm) ("gtksourceviewmm" ,gtksourceviewmm) ("libclang" ,clang) -- cgit v1.2.3 From f18d5d75979f5374962c03a8f3c266054a489e11 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 27 May 2020 16:52:53 +0200 Subject: doc: Use existing URLs and file names in installation instructions. Some users are confused that these URLs and file names don't work, so change them to the most popular architecture, while still mentioning alternatives. * doc/guix.texi (USB Stick and DVD Installation, Binary Installation): Use x86_64-linux URLs by default. --- doc/guix.texi | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 4dbbf96db9..9c56f657d6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -36,7 +36,7 @@ Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 Nikita Gillmann@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Jan Nieuwenhuizen@* -Copyright @copyright{} 2016 Julien Lepiller@* +Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018, 2019 Clément Lassieur@* @@ -567,17 +567,18 @@ Installing goes along these lines: @item @cindex downloading Guix binary Download the binary tarball from -@indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz}, -where @var{system} is @code{x86_64-linux} for an @code{x86_64} machine -already running the kernel Linux, and so on. +@indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.x86_64-linux.tar.xz}, +where @code{x86_64-linux} can be replaced with @code{i686-linux} for an +@code{i686} (32-bits) machine already running the kernel Linux, and so on +(@pxref{GNU Distribution}). @c The following is somewhat duplicated in ``System Installation''. Make sure to download the associated @file{.sig} file and to verify the authenticity of the tarball against it, along these lines: @example -$ wget @value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz.sig -$ gpg --verify guix-binary-@value{VERSION}.@var{system}.tar.xz.sig +$ wget @value{BASE-URL}/guix-binary-@value{VERSION}.x86_64-linux.tar.xz.sig +$ gpg --verify guix-binary-@value{VERSION}.x86_64-linux.tar.xz.sig @end example If that command fails because you do not have the required public key, @@ -603,7 +604,7 @@ you may have to run @code{su -} or @code{sudo -i}. As @code{root}, run: @example # cd /tmp # tar --warning=no-timestamp -xf \ - /path/to/guix-binary-@value{VERSION}.@var{system}.tar.xz + /path/to/guix-binary-@value{VERSION}.x86_64-linux.tar.xz # mv var/guix /var/ && mv gnu / @end example @@ -1917,8 +1918,8 @@ about their support in GNU/Linux. An ISO-9660 installation image that can be written to a USB stick or burnt to a DVD can be downloaded from -@indicateurl{@value{BASE-URL}/guix-system-install-@value{VERSION}.@var{system}.iso.xz}, -where @var{system} is one of: +@indicateurl{@value{BASE-URL}/guix-system-install-@value{VERSION}.x86_64-linux.iso.xz}, +where you can replace @code{x86_64-linux} with one of: @table @code @item x86_64-linux @@ -1933,8 +1934,8 @@ Make sure to download the associated @file{.sig} file and to verify the authenticity of the image against it, along these lines: @example -$ wget @value{BASE-URL}/guix-system-install-@value{VERSION}.@var{system}.iso.xz.sig -$ gpg --verify guix-system-install-@value{VERSION}.@var{system}.iso.xz.sig +$ wget @value{BASE-URL}/guix-system-install-@value{VERSION}.x86_64-linux.iso.xz.sig +$ gpg --verify guix-system-install-@value{VERSION}.x86_64-linux.iso.xz.sig @end example If that command fails because you do not have the required public key, @@ -1965,7 +1966,7 @@ To copy the image to a USB stick, follow these steps: Decompress the image using the @command{xz} command: @example -xz -d guix-system-install-@value{VERSION}.@var{system}.iso.xz +xz -d guix-system-install-@value{VERSION}.x86_64-linux.iso.xz @end example @item @@ -1974,7 +1975,7 @@ its device name. Assuming that the USB stick is known as @file{/dev/sdX}, copy the image with: @example -dd if=guix-system-install-@value{VERSION}.@var{system}.iso of=/dev/sdX +dd if=guix-system-install-@value{VERSION}.x86_64-linux.iso of=/dev/sdX sync @end example @@ -1990,7 +1991,7 @@ To copy the image to a DVD, follow these steps: Decompress the image using the @command{xz} command: @example -xz -d guix-system-install-@value{VERSION}.@var{system}.iso.xz +xz -d guix-system-install-@value{VERSION}.x86_64-linux.iso.xz @end example @item @@ -1999,7 +2000,7 @@ its device name. Assuming that the DVD drive is known as @file{/dev/srX}, copy the image with: @example -growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.@var{system}.iso +growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.x86_64-linux.iso @end example Access to @file{/dev/srX} usually requires root privileges. -- cgit v1.2.3 From d47ae07d1958878d32212080066a601244666ff6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 May 2020 17:22:56 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.225. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.225. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index dad7b6e992..8234fd146c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,10 +409,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.224") +(define-public linux-libre-4.4-version "4.4.225") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1lb8ypn558vk73bj4a20wq40cig9vmzjn2xzzdws78gfair6hxpg"))) + (hash (base32 "0pn66hf9yrjg15skq1inscr5m0slvgsd2qm8rg5id70llrb4jis9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 26f548f400aec03c43ac1e7c337750d0da029c38 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 May 2020 17:23:50 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.225. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.225. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8234fd146c..112498d495 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -401,10 +401,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.224") +(define-public linux-libre-4.9-version "4.9.225") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0jf92cx0b3wq9fxa3169wk4wqvy58hglfk6lsynszy8kjplhfvfz"))) + (hash (base32 "1s63aymgsc4lsysy9d972ps9cyrf6bncyy5wcpv5a3wbaj678iz5"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From e3d20816bd9b5897de9c15ac952bec287f8347b2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 May 2020 17:24:17 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.182. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.182. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 112498d495..1ae686b5dc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -393,10 +393,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.181") +(define-public linux-libre-4.14-version "4.14.182") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0kaasqhmg9in7pf4ldk9z4z1cjgv1c9xdr1ca0pznngygibym6xb"))) + (hash (base32 "142v7qnfska86jqzilwq00kxdrq08iaaaw7f47xp9bnhb8fiy7b7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 08ae4a528d2950a007a0b66324482e8143435e63 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 May 2020 17:24:54 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.125. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.125. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1ae686b5dc..4a463b4af9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -385,10 +385,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.124") +(define-public linux-libre-4.19-version "4.19.125") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "005dznldnj1m03cbkc5pd2q2cv9jj1j6a0x2vh4p79ypg4c01nfm"))) + (hash (base32 "0zmxs6q2rgssvsh76xq9xgcax7bps19x2448d1q1fj9pzc7g8hwq"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 3294ac691c786a8964c0c8b738ac2d82df116297 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 May 2020 17:25:39 -0400 Subject: gnu: linux-libre@5.6: Update to 5.6.15. * gnu/packages/linux.scm (linux-libre-5.6-version): Update to 5.6.15. (linux-libre-5.6-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4a463b4af9..ef0fbd9bf9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,10 +369,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) -(define-public linux-libre-5.6-version "5.6.14") +(define-public linux-libre-5.6-version "5.6.15") (define-public linux-libre-5.6-pristine-source (let ((version linux-libre-5.6-version) - (hash (base32 "18vyxi64i93v4qyky5q62kkasm1da7wmz91xfkx3j7ki84skyxik"))) + (hash (base32 "0kh34f9vdfsi9g83fa1i1926djyzfi466w02c4y4d46ljf9pkav5"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.6))) -- cgit v1.2.3 From 3ddd4b28a8c3ae8b4db7923bdeca1c44afb66b7b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 May 2020 17:26:23 -0400 Subject: gnu: linux-libre: Update to 5.4.43. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.43. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ef0fbd9bf9..b159ff7b22 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -377,10 +377,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.6))) -(define-public linux-libre-5.4-version "5.4.42") +(define-public linux-libre-5.4-version "5.4.43") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0cdwazpzfrrb2y5fp87v9yihy7v8mlbqjzxpzmv7p83609y1nhsf"))) + (hash (base32 "0i07g72138xdf1l8x593jndq0waf3fx7plz3m6n5f9fl885bjrr6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 9549f0283a78fe36f2d4ff2a04ef8ad6b0c02604 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 27 May 2020 17:35:20 -0500 Subject: gnu: libnslog: Use latest version of check for tests. Test failures with latest check were fixed in most recent release. See bug report: https://bugs.netsurf-browser.org/mantis/view.php?id=2736 * gnu/packages/web.scm (libnslog)[native-inputs]: Use latest check. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 169f9499fa..64671842a7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5157,7 +5157,7 @@ C. It is developed as part of the NetSurf project.") (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) ("pkg-config" ,pkg-config) - ("check" ,check-0.12) ; For tests + ("check" ,check) ; For tests ("bison" ,bison) ("flex" ,flex))) (arguments netsurf-buildsystem-arguments) -- cgit v1.2.3 From c041c360b7145997b723c66065b1a0a22265efe7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 27 May 2020 12:12:46 +0200 Subject: system: hurd: Remove custom gexp compiler. This is superseded by , which was added in ef674a24c527eaf54801707d34dbf5d12ec139cb. * gnu/system/hurd.scm (compile-manifest): Remove. (cross-hurd-image)[system-profile]: Define using 'profile'. --- gnu/system/hurd.scm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 58bfdf88f6..3ccf47aa21 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -41,16 +41,6 @@ ;;; ;;; Code: -;; XXX: Surely this belongs in (guix profiles), but perhaps we need high-level -;; objects so one can specify hooks, etc.? -(define-gexp-compiler (compile-manifest (manifest - (@@ (guix profiles) )) - system target) - "Lower MANIFEST as a profile." - (profile-derivation manifest - #:system system - #:target target)) - (define %base-packages/hurd (list hurd bash coreutils file findutils grep sed guile-3.0 guile-colorized guile-readline @@ -71,8 +61,10 @@ (manifest-entry-dependencies entry))))) (define system-profile - (map-manifest-entries cross-built-entry - (packages->manifest %base-packages/hurd))) + (profile + (content + (map-manifest-entries cross-built-entry + (packages->manifest %base-packages/hurd))))) (define grub.cfg (let ((hurd (cross-built hurd)) -- cgit v1.2.3 From c1dc50ab202fafedde3a6b70ce6339496ad53a51 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 27 May 2020 14:28:00 +0200 Subject: maint: Check whether Guile-Gcrypt is recent enough. Suggested by Danny Milosavljevic in . * m4/guix.m4 (GUIX_CHECK_GUILE_GCRYPT): New macro. * configure.ac: Use it. --- configure.ac | 6 +++--- m4/guix.m4 | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 0a20b476eb..cbf92dad30 100644 --- a/configure.ac +++ b/configure.ac @@ -136,9 +136,9 @@ if test "x$guix_cv_have_recent_guile_sqlite3" != "xyes"; then AC_MSG_ERROR([A recent Guile-SQLite3 could not be found; please install it.]) fi -GUILE_MODULE_AVAILABLE([have_guile_gcrypt], [(gcrypt hash)]) -if test "x$have_guile_gcrypt" != "xyes"; then - AC_MSG_ERROR([Guile-Gcrypt could not be found; please install it.]) +GUIX_CHECK_GUILE_GCRYPT +if test "x$guix_cv_have_recent_guile_gcrypt" != "xyes"; then + AC_MSG_ERROR([A recent Guile-Gcrypt could not be found; please install it.]) fi dnl Guile-newt is used by the graphical installer. diff --git a/m4/guix.m4 b/m4/guix.m4 index 961ce838ac..9eb3863482 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -1,5 +1,5 @@ dnl GNU Guix --- Functional package management for GNU -dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès +dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020 Ludovic Courtès dnl Copyright © 2014 Mark H Weaver dnl Copyright © 2017 Efraim Flashner dnl @@ -194,6 +194,24 @@ AC_DEFUN([GUIX_CHECK_GUILE_JSON], [ fi]) ]) +dnl GUIX_CHECK_GUILE_GCRYPT +dnl +dnl Check whether a recent-enough Guile-Gcrypt is available. +AC_DEFUN([GUIX_CHECK_GUILE_GCRYPT], [ + dnl Check whether we're using Guile-Gcrypt 0.2.x or later. 0.2.0 + dnl introduced the 'hash-algorithm' macro and related code. + AC_CACHE_CHECK([whether Guile-Gcrypt is available and recent enough], + [guix_cv_have_recent_guile_gcrypt], + [GUILE_CHECK([retval], + [(use-modules (gcrypt hash)) + (equal? (hash-algorithm sha256) + (lookup-hash-algorithm 'sha256))]) + if test "$retval" = 0; then + guix_cv_have_recent_guile_gcrypt="yes" + else + guix_cv_have_recent_guile_gcrypt="no" + fi]) +]) dnl GUIX_TEST_ROOT_DIRECTORY AC_DEFUN([GUIX_TEST_ROOT_DIRECTORY], [ -- cgit v1.2.3 From 060e44b14fbf424f1c72fe0cb4978b9827b9e833 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 28 May 2020 01:02:35 +0200 Subject: gnu: gdb: Add version 9.2. * gnu/packages/gdb.scm (gdb-9.2): New variable. --- gnu/packages/gdb.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 3fa8e53884..6b7e7c1ae9 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -130,3 +130,15 @@ written in C, C++, Ada, Objective-C, Pascal and more.") ;; This is the fixed version that packages depend on. Update it rarely ;; enough to avoid massive rebuilds. gdb-9.1) + +(define-public gdb-9.2 + (package + (inherit gdb) + (version "9.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gdb/gdb-" + version ".tar.xz")) + (sha256 + (base32 + "0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n")))))) -- cgit v1.2.3 From bdfd5d6f51b5e9b916780ca896a3a7f76bc742ca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 28 May 2020 02:09:14 +0200 Subject: gnu: gnome-boxes: Update to 3.36.4. * gnu/packages/gnome.scm (gnome-boxes): Update to 3.36.4. --- gnu/packages/gnome.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 94a649779e..23684aabba 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9911,7 +9911,7 @@ integrate seamlessly with the GNOME desktop.") (define-public gnome-boxes (package (name "gnome-boxes") - (version "3.35.91") + (version "3.36.4") (source (origin (method url-fetch) @@ -9919,8 +9919,7 @@ integrate seamlessly with the GNOME desktop.") (version-major+minor version) "/" "gnome-boxes-" version ".tar.xz")) (sha256 - (base32 - "0l96spz6pc8q4l5p9a58cc0kgvdr7pbc89hy6ixn72k5pl3s7fxj")))) + (base32 "16l0mq2ydmywcdya1795mcy8syg4zkmz9ws3pzjcqv5y4m7cjj03")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 897897bda3ef2f7366560c45b92a6f39abca148f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 28 May 2020 02:10:31 +0200 Subject: gnu: gnome: Add gnome-boxes. * gnu/packages/gnome.scm (gnome)[propagated-inputs]: Add gnome-boxes. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 23684aabba..0d63579d4a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7895,7 +7895,7 @@ world.") ("evince" ,evince) ("file-roller" ,file-roller) ("gedit" ,gedit) - ; TODO: ("gnome-boxes" ,gnome-boxes) + ("gnome-boxes" ,gnome-boxes) ("gnome-calculator" ,gnome-calculator) ("gnome-calendar" ,gnome-calendar) ("gnome-characters" ,gnome-characters) -- cgit v1.2.3 From 6cff0af0d198fa51ef487fa61dc5f215d2cb1ccc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 7 May 2020 15:37:34 +0200 Subject: gnu: mu: Update to 1.4.7. * gnu/packages/mail.scm (mu): Update to 1.4.7. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index fa0b22cd9c..b44afd360e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -711,15 +711,15 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.4.6") + (version "1.4.7") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/" - "download/" version "/" + "download/1,4.7/" ; sic "mu-" version ".tar.xz")) (sha256 (base32 - "15spbplf9p8cdxqfwnv3x67451sfpna9q5n2kgqqwh2y78i7zlhc")))) + "19qmz9fgnjpj0cxb8y9nb2dfk7pc0a9kwfiysa0f13ps3d5k4mhm")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From b6389525a48c7450fad89877327a8354ebef7503 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 28 May 2020 02:24:14 +0200 Subject: gnu: eid-mw: Update to 4.4.27. * gnu/packages/security-token.scm (eid-mw): Update to 4.4.27. --- gnu/packages/security-token.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 2ab8a85702..e1df075bf3 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -103,7 +103,7 @@ readers and is needed to communicate with such devices through the (define-public eid-mw (package (name "eid-mw") - (version "4.4.23") + (version "4.4.27") (source (origin (method git-fetch) @@ -112,7 +112,7 @@ readers and is needed to communicate with such devices through the (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0kf147zxsp5ilghr46hjxa2nsikhv8198n04q81qzn9zln69av04")))) + (base32 "17lw8iwp7h5cs3db80sysr84ffi333cf2vrhncs9l6hy6glfl2v1")))) (build-system glib-or-gtk-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -139,7 +139,7 @@ readers and is needed to communicate with such devices through the ;; Patch it to just return the real version number directly. (substitute* "scripts/build-aux/genver.sh" (("/bin/sh") (which "sh")) - (("^(GITDESC=).*" match) (string-append match ,version "\n"))) + (("^(GITDESC=).*" _ match) (string-append match ,version "\n"))) (invoke "sh" "./bootstrap.sh")))))) (synopsis "Belgian eID Middleware") (description "The Belgian eID Middleware is required to authenticate with -- cgit v1.2.3 From 637924ad7ea2a45ae7287b68fd8ec8ce97652717 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 28 May 2020 02:40:23 +0200 Subject: gnu: cvs-fast-export: Update to 1.55. * gnu/packages/version-control.scm (cvs-fast-export): Update to 1.55. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 2e3607f8f3..f26d0ca2b4 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1718,14 +1718,14 @@ RCS, PRCS, and Aegis packages.") (define-public cvs-fast-export (package (name "cvs-fast-export") - (version "1.51") + (version "1.55") (source (origin (method url-fetch) (uri (string-append "http://www.catb.org/~esr/cvs-fast-export/" "cvs-fast-export-" version ".tar.gz")) (sha256 (base32 - "0nn5cf8syb5nbjvkn8w561pk25clv187h4hs9pnc700g9w56chzf")))) + "06y2myhhv2ap08bq7d7shq0b7lq6wgznwrpz6622xq66cxkf2n5g")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From c5982689924cd1d5bf472ee4c2b1003318c31a58 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 28 May 2020 02:52:51 +0200 Subject: gnu: r-rversions: Update to 2.0.2. * gnu/packages/statistics.scm (r-rversions): Update to 2.0.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 224c19cea3..fd898a32c5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2052,13 +2052,13 @@ jackknifed confidence intervals are available for most estimates.") (define-public r-rversions (package (name "r-rversions") - (version "2.0.1") + (version "2.0.2") (source (origin (method url-fetch) (uri (cran-uri "rversions" version)) (sha256 (base32 - "1ic6sxnyya24d5xsxjg3fba73fhya9fhs0kaf66yha6nwxj1zv2i")))) + "0ghpla5r3d6zh5dn6d6ii5p0a952lcdv004m88fk8r9k76vz88rm")))) (build-system r-build-system) (propagated-inputs `(("r-curl" ,r-curl) -- cgit v1.2.3 From 023eea68f53a6d2979f558fc7590f43aee3aff43 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 27 May 2020 22:21:35 -0400 Subject: gnu: apfs-fuse: Update to 0.0.0-1.7b89418. * gnu/packages/file-systems.scm (apfs-fuse): Update to 0.0.0-1.7b89418. [arguments]: Install the README. Select FUSE 2 in #:configure-flags. --- gnu/packages/file-systems.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index df6febb92e..03ad144fc2 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -491,8 +491,9 @@ network. LIBNFS offers three different APIs, for different use : )))) (define-public apfs-fuse - (let ((commit "c7036a3030d128bcecefc1eabc47c039ccfdcec9") - (revision "0")) + ;; Later versions require FUSE 3. + (let ((commit "7b89418e8dc27103d3c4f8fa348086ffcd634c17") + (revision "1")) (package (name "apfs-fuse") (version (git-version "0.0.0" revision commit)) @@ -504,11 +505,13 @@ network. LIBNFS offers three different APIs, for different use : (commit commit))) (sha256 (base32 - "1akd4cx1f9cyq6sfk9ybv4chhjwjlnqi8ic4z5ajnd5x0g76nz3r")) + "0x2siy3cmnm9wsdfazg3xc8r3kbg73gijmnn1vjw33pp71ckylxr")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test suite + #:configure-flags + '("-DUSE_FUSE3=OFF") ; FUSE 3 is not packaged yet. #:phases (modify-phases %standard-phases ;; No 'install' target in CMakeLists.txt @@ -523,6 +526,7 @@ network. LIBNFS offers three different APIs, for different use : (install-file "apfs-dump-quick" bin) (install-file "apfs-fuse" bin) (install-file "libapfs.a" lib) + (install-file "../source/README.md" doc) #t)))))) (inputs `(("bzip2" ,bzip2) -- cgit v1.2.3 From 03e6404936ef0974fdbc877d537b97b28e54124d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 12:29:55 +0300 Subject: doc: Remove explicit support for mips64el-linux. It's been a good run, but no one is maintaining the architecture. So long, and thanks for all the fish. * doc/guix.texi (GNU Distribution): Change text for mips64el-linux to denote it is deprecated. (Daemon Offload Setup): Change occurrences of mips64el-linux to aarch64-linux and adjust local code snippets. (Guix Environment)[cross-compilation]: Change mips64el-linux-gnu to aarch64-linux-gnu. (GNU Build System)(package-cross-derivation]: Same. (G-Expressions)[cross compilation]: Same. (Additional Build Options)[cross-compilation, build logs]: Same. (qemu-binfmt-service-type): Remove mips64el. * doc/contributing.texi (Submitting Patches): Same. * m4/guix.m4: (GUIX_ASSERT_SUPPORTED_SYSTEM): Remove mips64el-linux. --- doc/contributing.texi | 3 +-- doc/guix.texi | 25 +++++++++++++------------ m4/guix.m4 | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index 25b50e8e72..88128e5498 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -938,7 +938,7 @@ your @code{operating-system} configuration: @lisp (service qemu-binfmt-service-type (qemu-binfmt-configuration - (platforms (lookup-qemu-platforms "arm" "aarch64" "mips64el")) + (platforms (lookup-qemu-platforms "arm" "aarch64")) (guix-support? #t))) @end lisp @@ -951,7 +951,6 @@ commands, respectively: @example guix build --system=armhf-linux --rounds=2 hello guix build --system=aarch64-linux --rounds=2 hello -guix build --system=mips64el-linux --rounds=2 hello @end example @item diff --git a/doc/guix.texi b/doc/guix.texi index 9c56f657d6..5b9942d420 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -464,11 +464,12 @@ and Linux-Libre kernel. @item aarch64-linux little-endian 64-bit ARMv8-A processors, Linux-Libre kernel. -@item mips64el-linux +@item mips64el-linux (deprecated) little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel. This configuration is no longer fully -supported; in particular, the project's build farms no longer provide -substitutes for this architecture. +supported; in particular, there is no ongoing work to ensure that this +architecture still works. Should someone decide they wish to revive this +architecture then the code is still available. @end table @@ -1060,8 +1061,8 @@ The @file{/etc/guix/machines.scm} file typically looks like this: (speed 2.)) ;incredibly fast! (build-machine - (name "meeps.example.org") - (system "mips64el-linux") + (name "armeight.example.org") + (system "aarch64-linux") (host-key "ssh-rsa AAAAB3Nza@dots{}") (user "alice") (private-key @@ -1071,7 +1072,7 @@ The @file{/etc/guix/machines.scm} file typically looks like this: @noindent In the example above we specify a list of two build machines, one for -the @code{x86_64} architecture and one for the @code{mips64el} +the @code{x86_64} architecture and one for the @code{aarch64} architecture. In fact, this file is---not surprisingly!---a Scheme file that is @@ -5330,7 +5331,7 @@ the system type of the build host. @item --target=@var{triplet} @cindex cross-compilation Cross-build for @var{triplet}, which must be a valid GNU triplet, such -as @code{"mips64el-linux-gnu"} (@pxref{Specifying target triplets, GNU +as @code{"aarch64-linux-gnu"} (@pxref{Specifying target triplets, GNU configuration triplets,, autoconf, Autoconf}). @item --compression=@var{tool} @@ -5719,7 +5720,7 @@ Return the @code{} object of @var{package} cross-built from @var{system} to @var{target}. @var{target} must be a valid GNU triplet denoting the target hardware -and operating system, such as @code{"mips64el-linux-gnu"} +and operating system, such as @code{"aarch64-linux-gnu"} (@pxref{Specifying Target Triplets,,, autoconf, Autoconf}). @end deffn @@ -7720,7 +7721,7 @@ native package build: "-s" (string-append #$emacs "/bin/emacs") (string-append #$output "/bin/vi"))) - #:target "mips64el-linux-gnu") + #:target "aarch64-linux-gnu") @end lisp @noindent @@ -8840,7 +8841,7 @@ also be offloaded to a remote machine of the right architecture. @item --target=@var{triplet} @cindex cross-compilation Cross-build for @var{triplet}, which must be a valid GNU triplet, such -as @code{"mips64el-linux-gnu"} (@pxref{Specifying Target Triplets, GNU +as @code{"aarch64-linux-gnu"} (@pxref{Specifying Target Triplets, GNU configuration triplets,, autoconf, Autoconf}). @anchor{build-check} @@ -8910,7 +8911,7 @@ So for instance, imagine you want to see the build log of GDB on MIPS, but you are actually on an @code{x86_64} machine: @example -$ guix build --log-file gdb -s mips64el-linux +$ guix build --log-file gdb -s aarch64-linux https://@value{SUBSTITUTE-SERVER}/log/@dots{}-gdb-7.10 @end example @@ -24477,7 +24478,7 @@ emulated: @lisp (service qemu-binfmt-service-type (qemu-binfmt-configuration - (platforms (lookup-qemu-platforms "arm" "aarch64" "mips64el")))) + (platforms (lookup-qemu-platforms "arm" "aarch64")))) @end lisp In this example, we enable transparent emulation for the ARM and aarch64 diff --git a/m4/guix.m4 b/m4/guix.m4 index 9eb3863482..7c27ae74df 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -88,7 +88,7 @@ courageous and port the GNU System distribution to it (see # Currently only Linux-based systems are supported, and only on some # platforms. case "$guix_system" in - x86_64-linux|i686-linux|armhf-linux|aarch64-linux|mips64el-linux) + x86_64-linux|i686-linux|armhf-linux|aarch64-linux) ;; *) if test "x$guix_courageous" = "xyes"; then -- cgit v1.2.3 From 66e4db8cf828ba58bfd0bd5b41f38b93b5b71b3a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 28 May 2020 02:59:27 +0200 Subject: gnu: python-flask-sqlalchemy: Update to 2.4.2. * gnu/packages/python-web.scm (python-flask-sqlalchemy): Update to 2.4.2. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 00caf7f229..ff5b5b4ede 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2371,13 +2371,13 @@ applications.") (define-public python-flask-sqlalchemy (package (name "python-flask-sqlalchemy") - (version "2.4.0") + (version "2.4.2") (source (origin (method url-fetch) (uri (pypi-uri "Flask-SQLAlchemy" version)) (sha256 (base32 - "0nnllf0ddbh9jlhngnyjj98lbxgxr1csaplllx0caw98syq0k5hc")))) + "1ryb2y5gvpcglrmhk25hwzpi8a5q69m33gfqwxdcl67gjwdggnbc")))) (build-system python-build-system) (propagated-inputs `(("python-flask" ,python-flask) -- cgit v1.2.3 From ccd9107ed9e8b918c6fb521cc69ac459fe4257ac Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Wed, 27 May 2020 23:13:48 +0200 Subject: update-guix-package: Use 'origin-hash'. * gnu/packages/package-management.scm (main): Use 'origin-hash' instead of 'origin-sha256'. Signed-off-by: Tobias Geerinckx-Rice --- build-aux/update-guix-package.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-aux/update-guix-package.scm b/build-aux/update-guix-package.scm index 83f6eca6bb..f695e91cfd 100644 --- a/build-aux/update-guix-package.scm +++ b/build-aux/update-guix-package.scm @@ -112,7 +112,8 @@ COMMIT." #:select? version-controlled?)) (hash (query-path-hash store source)) (location (package-definition-location)) - (old-hash (origin-sha256 (package-source guix)))) + (old-hash (content-hash-value + (origin-hash (package-source guix))))) (edit-expression location (update-definition commit hash #:old-hash old-hash -- cgit v1.2.3 From 77a87ad4aceed9d89d615540e0fd147e3a8b2f64 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 28 May 2020 11:46:59 +0200 Subject: gnu: clang: Build 'clang-tools-extra'. * gnu/packages/llvm.scm (clang-from-llvm): Add #:tools-extra. Add 'output' field. In 'inputs', add TOOLS-EXTRA when it's given. In 'arguments', add 'add-tools-extra' and 'move-extra-tools' phases when TOOLS-EXTRA is given. --- gnu/packages/llvm.scm | 87 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 3 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 47b490aac8..11e4cfbe4c 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -201,7 +201,11 @@ compiler. In LLVM this library is called \"compiler-rt\".") (supported-systems (delete "mips64el-linux" %supported-systems)))) (define* (clang-from-llvm llvm clang-runtime hash - #:key (patches '())) + #:key (patches '()) tools-extra) + "Produce Clang with dependencies on LLVM and CLANG-RUNTIME, and applying the +given PATCHES. When TOOLS-EXTRA is given, it must point to the +'clang-tools-extra' tarball, which contains code for 'clang-tidy', 'pp-trace', +'modularize', and other tools." (package (name "clang") (version (package-version llvm)) @@ -218,11 +222,15 @@ compiler. In LLVM this library is called \"compiler-rt\".") ;; doesn't seem to be any way to do this with clang's autotools-based ;; build system. (build-system cmake-build-system) + (outputs (if tools-extra '("out" "extra") '("out"))) (native-inputs (package-native-inputs llvm)) (inputs `(("libxml2" ,libxml2) ("gcc-lib" ,gcc "lib") - ,@(package-inputs llvm))) + ,@(package-inputs llvm) + ,@(if tools-extra + `(("clang-tools-extra" ,tools-extra)) + '()))) (propagated-inputs `(("llvm" ,llvm) ("clang-runtime" ,clang-runtime))) @@ -243,6 +251,71 @@ compiler. In LLVM this library is called \"compiler-rt\".") #:build-type "Release" #:phases (modify-phases %standard-phases + ,@(if tools-extra + `((add-after 'unpack 'add-tools-extra + (lambda* (#:key inputs #:allow-other-keys) + ;; Unpack the 'clang-tools-extra' tarball under + ;; tools/. + (let ((extra (assoc-ref inputs + "clang-tools-extra"))) + (invoke "tar" "xf" extra) + (rename-file ,(string-append + "clang-tools-extra-" + (package-version llvm) + ".src") + "tools/extra") + #t))) + (add-after 'install 'move-extra-tools + (lambda* (#:key outputs #:allow-other-keys) + ;; Move the extra tools to the "extra" output. + ;; These programs alone weigh in at 296 MiB, + ;; because they statically-link a whole bunch of + ;; Clang libraries. + (let* ((out (assoc-ref outputs "out")) + (extra (assoc-ref outputs "extra")) + (bin (string-append out "/bin")) + (bin* (string-append extra "/bin")) + (lib (string-append out "/lib"))) + (define (move program) + (rename-file (string-append bin "/" program) + (string-append bin* "/" + program))) + + (mkdir-p bin*) + (for-each move + '("clang-apply-replacements" + "clang-change-namespace" + "clangd" + "clang-doc" + "clang-include-fixer" + "clang-move" + "clang-query" + "clang-reorder-fields" + "clang-tidy" + "find-all-symbols" + "modularize" + "pp-trace")) + + ;; Remove MiBs of .a files coming from + ;; 'clang-tools-extra'. + (for-each (lambda (component) + (delete-file + (string-append lib "/libclang" + component ".a"))) + '("ApplyReplacements" + "ChangeNamespace" + "Daemon" + "DaemonTweaks" + "Doc" + "IncludeFixer" + "IncludeFixerPlugin" + "Move")) + (for-each delete-file + (find-files + lib + "^(libfindAllSymbols|libclangTidy)")) + #t)))) + '()) (add-after 'unpack 'add-missing-triplets (lambda _ ;; Clang iterates through known triplets to search for @@ -414,7 +487,15 @@ output), and Binutils.") (define-public clang-10 (clang-from-llvm llvm-10 clang-runtime-10 "08fbxa2a0kr3ni35ckppj0kyvlcyaywrhpqwcdrdy0z900mhcnw8" - #:patches '("clang-10.0-libc-search-path.patch"))) + #:patches '("clang-10.0-libc-search-path.patch") + #:tools-extra + (origin + (method url-fetch) + (uri (llvm-download-uri "clang-tools-extra" + (package-version llvm-10))) + (sha256 + (base32 + "074ija5s2jsdn0k035r2dzmryjmqxdnyg4xwvaqych2bazv8rpxc"))))) (define-public clang-toolchain-10 (make-clang-toolchain clang-10)) -- cgit v1.2.3 From 8ccac2c974223886e98417f7f49804d18388eaa9 Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Thu, 28 May 2020 13:41:37 +0100 Subject: gnu: python-netcdf4: Update to 1.5.3 * gnu/packages/python-xyz.scm (python-netcdf4): Update to 1.5.3. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b359ffc955..b96a44e5fc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -78,6 +78,7 @@ ;;; Copyright © 2020 Alex ter Weele ;;; Copyright © 2020 Matthew Kraai ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2020 Josh Holland ;;; ;;; This file is part of GNU Guix. ;;; @@ -848,14 +849,14 @@ of the netcdf4 package before.") (define-public python-netcdf4 (package (name "python-netcdf4") - (version "1.4.2") + (version "1.5.3") (source (origin (method url-fetch) (uri (pypi-uri "netCDF4" version)) (sha256 (base32 - "0c0sklgrmv15ygliin8qq0hp7vanmbi74m6zpi0r1ksr0hssyd5r")))) + "1gn35mb2yc263pci720aik8ymz41lrvxlrn3z83vyjwghiashg1a")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 0d796201db2188e0a3abb6522f65458720b46fa6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 28 May 2020 10:40:34 -0400 Subject: gnu: Transmission: Fix CVE-2018-10756. * gnu/packages/patches/transmission-CVE-2018-10756.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/bittorrent.scm (transmission)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/bittorrent.scm | 1 + .../patches/transmission-CVE-2018-10756.patch | 71 ++++++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 gnu/packages/patches/transmission-CVE-2018-10756.patch diff --git a/gnu/local.mk b/gnu/local.mk index 80cefe5b63..de51c21014 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1531,6 +1531,7 @@ dist_patch_DATA = \ %D%/packages/patches/tipp10-fix-compiling.patch \ %D%/packages/patches/tipp10-remove-license-code.patch \ %D%/packages/patches/tk-find-library.patch \ + %D%/packages/patches/transmission-CVE-2018-10756.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \ %D%/packages/patches/tomb-fix-errors-on-open.patch \ diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 947537b231..8b041cb3f5 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -73,6 +73,7 @@ (uri (string-append "https://github.com/transmission/transmission-releases/raw/" "master/transmission-" version ".tar.xz")) + (patches (search-patches "transmission-CVE-2018-10756.patch")) (sha256 (base32 "0zbbj7rlm6m7vb64x68a64cwmijhsrwx9l63hbwqs7zr9742qi1m")))) diff --git a/gnu/packages/patches/transmission-CVE-2018-10756.patch b/gnu/packages/patches/transmission-CVE-2018-10756.patch new file mode 100644 index 0000000000..f9bdcf60aa --- /dev/null +++ b/gnu/packages/patches/transmission-CVE-2018-10756.patch @@ -0,0 +1,71 @@ +Fix CVE-2018-10756: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10756 + +Patch copied from Fedora: + +https://src.fedoraproject.org/rpms/transmission/blob/master/f/2123adf8e5e1c2b48791f9d22fc8c747e974180e.patch + +--- a/libtransmission/variant.c 2018-05-01 12:21:08.000000000 -0500 ++++ b/libtransmission/variant.c 2020-05-18 10:21:27.554214128 -0500 +@@ -820,7 +820,7 @@ + struct SaveNode + { + const tr_variant * v; +- tr_variant sorted; ++ tr_variant* sorted; + size_t childIndex; + bool isVisited; + }; +@@ -849,26 +849,33 @@ + + qsort (tmp, n, sizeof (struct KeyIndex), compareKeyIndex); + +- tr_variantInitDict (&node->sorted, n); ++ node->sorted = tr_new(tr_variant, 1); ++ tr_variantInitDict (node->sorted, n); + for (i=0; isorted.val.l.vals[i] = *tmp[i].val; ++ node->sorted->val.l.vals[i] = *tmp[i].val; + node->sorted.val.l.count = n; + + tr_free (tmp); + +- node->v = &node->sorted; ++ v = node->sorted; + } + else + { +- node->v = v; ++ node->sorted = NULL; + } ++ ++ node->v = v; + } + + static void + nodeDestruct (struct SaveNode * node) + { +- if (node->v == &node->sorted) +- tr_free (node->sorted.val.l.vals); ++ //TR_ASSERT(node != NULL); ++ if (node->sorted != NULL) ++ { ++ tr_free(node->sorted->val.l.vals); ++ tr_free(node->sorted); ++ } + } + + /** +--- a/libtransmission/variant.c 2020-05-18 10:21:49.000000000 -0500 ++++ b/libtransmission/variant.c 2020-05-18 10:24:34.673648865 -0500 +@@ -853,7 +853,7 @@ + tr_variantInitDict (node->sorted, n); + for (i=0; isorted->val.l.vals[i] = *tmp[i].val; +- node->sorted.val.l.count = n; ++ node->sorted->val.l.count = n; + + tr_free (tmp); + + -- cgit v1.2.3 From d1fa24afefa2efa4f11f17cacaaab700a290647c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 28 May 2020 17:21:52 +0200 Subject: gnu: Add guile-jsonld. * gnu/packages/guile-xyz.scm (guile-jsonld): New variable. --- gnu/packages/guile-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index c7349af790..6a8bf54bf8 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3646,3 +3646,40 @@ operations on graphs. This library implements some basic functionalities, such as parsing and producing turtle and nquads syntax, as well as manipulating graphs and datasets.") (license license:gpl3+))) + +(define-public guile-jsonld + (package + (name "guile-jsonld") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://framagit.org/tyreunom/guile-jsonld") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zfn3nwlz6xzip1j8xbj768dc299r037cfc81bk6kwl9xhzkjbrg")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f)); require network + (propagated-inputs + `(("guile-gnutls" ,gnutls) + ("guile-json" ,guile-json-3) + ("guile-rdf" ,guile-rdf))) + (inputs + `(("guile" ,guile-3.0))) + (native-inputs + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) + (home-page "https://framagit.org/tyreunom/guile-jsonld") + (synopsis "Guile implementation of the JsonLD API specification") + (description "Guile JsonLD is an implementation of the JsonLD (Json for +Linked Data) API defined by the W3C for GNU Guile. It allows you to express links +between data, in a way that is very similar to WikiData or RDF for instance. +An object can have relations (in the form of an IRI) that relates it to one or +more objects or strings, represented by a Json object or an IRI.") + (license license:gpl3+))) -- cgit v1.2.3 From 29ac40e9befb3fb9425e2d457fc52f0898ab24a7 Mon Sep 17 00:00:00 2001 From: Yuval Kogman Date: Thu, 28 May 2020 20:27:30 -0400 Subject: gnu: Add python-bashlex. * gnu/packages/python-xyz.scm (python-bashlex): New variable. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b96a44e5fc..4cbf20ebcd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -79,6 +79,7 @@ ;;; Copyright © 2020 Matthew Kraai ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Josh Holland +;;; Copyright © 2020 Yuval Kogman ;;; ;;; This file is part of GNU Guix. ;;; @@ -20021,3 +20022,39 @@ allows you, from Python code, to “fix” invalid (X)HTML markup.") (description "This packages selects the fastest JSON functions available at import time.") (license license:expat))) + +(define-public python-bashlex + (package + (name "python-bashlex") + (version "0.14") + (source + (origin + (method url-fetch) + (uri (pypi-uri "bashlex" version)) + (sha256 + (base32 + "1z9g96fgsfpdwawp4sb5x6hbdhmda7kgmcrqlf9xx4bs1f8f14js")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'pregenerate-yacc-tables + (lambda _ + ;; parser.py caches tables, which attempts to write to site lib + ;; see https://github.com/idank/bashlex/issues/51 + (invoke "python" "-c" "import bashlex")))))) + (home-page + "https://github.com/idank/bashlex") + (synopsis "Python parser for bash") + (description "@code{bashlex} is a Python port of the parser used +internally by GNU bash. + +For the most part it's transliterated from C, the major differences are: + +@itemize +@item it does not execute anything +@item it is reentrant +@item it generates a complete AST +@end itemize +") + (license license:gpl3+))) -- cgit v1.2.3 From 6560c4976f775db5b494356df2beaa0fcec6f9c0 Mon Sep 17 00:00:00 2001 From: Yuval Kogman Date: Thu, 28 May 2020 20:28:49 -0400 Subject: gnu: Add compiledb. * gnu/packages/build-tools.scm (compiledb): New variable. Signed-off-by: Leo Famulari --- gnu/packages/build-tools.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index a8ffa56bc6..9ff32b22f9 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2019 Jonathan Brielmaier ;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Yuval Kogman ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,12 +34,14 @@ #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (gnu packages) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages lua) #:use-module (gnu packages package-management) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages ninja) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) @@ -310,3 +313,38 @@ Service. It allows you to checkout, commit, perform reviews etc. The vast majority of the OBS functionality is available via commands and the rest can be reached via direct API calls.") (license license:gpl2+))) + +(define-public compiledb + (package + (name "compiledb") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "compiledb" version)) + (sha256 + (base32 "0vlngsdxfakyl8b7rnvn8h3l216lhbrrydr04yhy6kd03zflgfq6")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'no-compat-shim-dependency + ;; shutilwhich is only needed for python 3.3 and earlier + (lambda _ + (substitute* "setup.py" (("^ *'shutilwhich'\n") "")) + (substitute* "compiledb/compiler.py" (("shutilwhich") "shutil"))))))) + (propagated-inputs + `(("python-bashlex" ,python-bashlex) + ("python-click" ,python-click))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page + "https://github.com/nickdiego/compiledb") + (synopsis + "Generate Clang JSON Compilation Database files for make-based build systems") + (description + "@code{compiledb} provides a @code{make} python wrapper script which, +besides executing the make build command, updates the JSON compilation +database file corresponding to that build, resulting in a command-line +interface similar to Bear.") + (license license:gpl3))) -- cgit v1.2.3 From d870fcfb099cf5b0ad25220e1fa36162cc3284a5 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Thu, 28 May 2020 21:39:33 -0400 Subject: gnu: Add shiru-lv2. * gnu/packages/music.scm (shiru-lv2): New variable. Signed-off-by: Leo Famulari --- gnu/packages/music.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 89edcae43e..e4414dafd6 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5589,3 +5589,66 @@ It is provided as an LV2 plugin and as a standalone Jack application.") It is provided as an LV2 plugin and as a standalone Jack application.") (home-page "https://github.com/pdesaulniers/wolf-spectrum") (license license:gpl3))) + +(define-public shiru-lv2 + (let ((commit "08853f99140012234649e67e5647906fda74f6cc") + (revision "1")) + (package + (name "shiru-lv2") + (version (git-version "0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/linuxmao-org/shiru-plugins.git") + (commit commit) + ;; Bundles a specific commit of the DISTRHO plugin framework. + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00rf6im3rhg98h60sgl1r2s37za5vr5h14pybwi07h8zbc8mi6fm")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no check target + #:make-flags (list "CC=gcc") + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure target + (replace 'install ;no install target + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lv2 (string-append out "/lib/lv2"))) + ;; Install LV2. + (for-each + (lambda (file) + (copy-recursively file + (string-append lv2 "/" (basename file)))) + (find-files "bin" "\\.lv2$" #:directories? #t)) + ;; Install executables. + (for-each + (lambda (file) + (install-file file bin)) + (find-files "bin" + (lambda (name stat) + (and + (equal? (dirname name) "bin") + (not (string-suffix? ".so" name)) + (not (string-suffix? ".lv2" name)))))) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("cairo", cairo) + ("glu", glu) + ("jack", jack-1) + ("lv2", lv2) + ("mesa", mesa) + ("pango", pango))) + (synopsis "Audio plugin collection") + (description "Shiru plugins is a collection of audio plugins created + by Shiru, ported to LV2 by the Linux MAO project using the DISTRHO plugin + framework.") + (home-page "http://shiru.untergrund.net/software.shtml") + (license license:wtfpl2)))) -- cgit v1.2.3 From d7aef3ab59837b9ed8abbe199debf8ed687f6782 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Apr 2020 23:58:37 +0200 Subject: gnu: Add exfatprogs. * gnu/packages/file-systems.scm (exfatprogs): New public variable. Signed-off-by: Leo Famulari --- gnu/packages/file-systems.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 03ad144fc2..1f58917d0c 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -187,6 +187,38 @@ caching system, and lets you assign different roles to each device based on its performance and other characteristics.") (license license:gpl2+)))) +(define-public exfatprogs + (package + (name "exfatprogs") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/exfatprogs/exfatprogs") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1s47qvhr702z5c19wfqz8cwl9ammmincs7a8vjc6p974wnnjg77y")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--disable-static"))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/exfatprogs/exfatprogs") + (synopsis "Tools to create, check, and repair exFAT file systems") + (description + "These are command-line user space tools for the @acronym{exFAT, +Extensible File Allocation Table} file systems. Included are +@command{mkfs.exfat} to create (format) new exFAT file systems, and +@command{fsck.exfat} to check their consistency and repair them.") + (license license:gpl2+))) + (define-public httpfs2 (package (name "httpfs2") -- cgit v1.2.3 From fa2811465b9ae5de278cfc3615c478a30eae49db Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Thu, 28 May 2020 23:12:08 -0400 Subject: gnu: Add r-brms. * gnu/packages/cran.scm (r-brms): New variable. Signed-off-by: Leo Famulari --- gnu/packages/cran.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fff71790b6..fb450eb25d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21726,3 +21726,55 @@ of R without the need of linking to R code. Rserve supports remote connection, user authentication and file transfer. A simple R client is included in this package as well.") (license license:gpl2))) + +(define-public r-brms + (package + (name "r-brms") + (version "2.12.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "brms" version)) + (sha256 + (base32 + "1699lwkklfhjz7fddawlig552g2zvrc34mqwrzqjgl35r9fm08gs")))) + (properties `((upstream-name . "brms"))) + (build-system r-build-system) + (propagated-inputs + `(("r-abind" ,r-abind) + ("r-backports" ,r-backports) + ("r-bayesplot" ,r-bayesplot) + ("r-bridgesampling" ,r-bridgesampling) + ("r-coda" ,r-coda) + ("r-future" ,r-future) + ("r-ggplot2" ,r-ggplot2) + ("r-glue" ,r-glue) + ("r-loo" ,r-loo) + ("r-matrix" ,r-matrix) + ("r-matrixstats" ,r-matrixstats) + ("r-mgcv" ,r-mgcv) + ("r-nleqslv" ,r-nleqslv) + ("r-nlme" ,r-nlme) + ("r-rcpp" ,r-rcpp) + ("r-rstan" ,r-rstan) + ("r-rstantools" ,r-rstantools) + ("r-shinystan" ,r-shinystan))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page + "https://github.com/paul-buerkner/brms") + (synopsis + "Bayesian Regression Models using 'Stan'") + (description + "Fit Bayesian generalized (non-)linear multivariate multilevel models +using 'Stan' for full Bayesian inference. A wide range of distributions and +link functions are supported, allowing users to fit -- among others -- linear, +robust linear, count data, survival, response times, ordinal, zero-inflated, +hurdle, and even self-defined mixture models all in a multilevel context. +Further modeling options include non-linear and smooth terms, auto-correlation +structures, censored data, meta-analytic standard errors, and quite a few +more. In addition, all parameters of the response distribution can be +predicted in order to perform distributional regression. Prior specifications +are flexible and explicitly encourage users to apply prior distributions that +actually reflect their beliefs. Model fit can easily be assessed and compared +with posterior predictive checks and leave-one-out cross-validation.") + (license license:gpl2))) -- cgit v1.2.3 From 3bafa88b40483040e5f8034561590cadd43514c8 Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Thu, 28 May 2020 23:13:31 -0400 Subject: gnu: Add r-mstate. * gnu/packages/cran.scm (r-mstate): New variable. Signed-off-by: Leo Famulari --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fb450eb25d..b27dd40871 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21778,3 +21778,29 @@ are flexible and explicitly encourage users to apply prior distributions that actually reflect their beliefs. Model fit can easily be assessed and compared with posterior predictive checks and leave-one-out cross-validation.") (license license:gpl2))) + +(define-public r-mstate + (package + (name "r-mstate") + (version "0.2.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "mstate" version)) + (sha256 + (base32 + "0qnhivbibzss8yfsg44cvbf73n4jj4i28rbdysl88g14ig5sabgv")))) + (properties `((upstream-name . "mstate"))) + (build-system r-build-system) + (propagated-inputs + `(("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-survival" ,r-survival))) + (home-page + "https://www.lumc.nl/org/bds/research/medische-statistiek/survival-analysis/") + (synopsis + "Data Preparation, Estimation and Prediction in Multi-State Models") + (description + "Contains functions for data preparation, descriptives, hazard estimation +and prediction with Aalen-Johansen or simulation in competing risks and +multi-state models.") + (license license:gpl2+))) -- cgit v1.2.3 From b51f74ae0d45836e81dfacd12443b3059c814040 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 04:41:10 +0200 Subject: gnu: python-flask-sqlalchemy: Update to 2.4.3. * gnu/packages/python-web.scm (python-flask-sqlalchemy): Update to 2.4.3. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ff5b5b4ede..cd8ce8a83f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2371,13 +2371,13 @@ applications.") (define-public python-flask-sqlalchemy (package (name "python-flask-sqlalchemy") - (version "2.4.2") + (version "2.4.3") (source (origin (method url-fetch) (uri (pypi-uri "Flask-SQLAlchemy" version)) (sha256 (base32 - "1ryb2y5gvpcglrmhk25hwzpi8a5q69m33gfqwxdcl67gjwdggnbc")))) + "19apnn2m9bl1d1h2nc52pnmiyx993mwzmfjrv04l3wn5hyznyr8b")))) (build-system python-build-system) (propagated-inputs `(("python-flask" ,python-flask) -- cgit v1.2.3 From 9dbef2ce69dc5df906761ca90d8990b40f5eca42 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 05:35:48 +0200 Subject: gnu: rust-version-check: Update to 0.9.2. * gnu/packages/crates-io.scm (rust-version-check-0.9): Update to 0.9.2. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9237a282b7..2c4c6d4bb6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2019, 2020 Efraim Flashner ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Giacomo Leidi -;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 John Soo ;;; Copyright © 2019, 2020 Hartmut Goebel ;;; Copyright © 2020 Jakub Kądziołka @@ -25681,15 +25681,14 @@ designed for reexporting.") (define-public rust-version-check-0.9 (package (name "rust-version-check") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) (uri (crate-uri "version_check" version)) (file-name (string-append name "-" version ".crate")) (sha256 - (base32 - "1kikqlnggii1rvnxrbls55sc46lxvinz5k3giscgncjj4p87b1q7")))) + (base32 "1vbaqdf802qinsq8q20w8w0qn2pv0rkq5p73ijcblrwxcvjp5adm")))) (build-system cargo-build-system) (home-page "https://github.com/SergioBenitez/version_check") (synopsis "Check that the installed rustc meets some version requirements") -- cgit v1.2.3 From b21d1735e855e7098cb8dc695054d0d64c2dba92 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 05:48:44 +0200 Subject: gnu: font-comic-neue: Update to 2.5. * gnu/packages/fonts.scm (font-comic-neue): Update to 2.5. --- gnu/packages/fonts.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index b77aaca059..14cf5b2dea 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1121,16 +1121,14 @@ later hand-tweaked with the gbdfed(1) editor: (define-public font-comic-neue (package (name "font-comic-neue") - ;; The ‘v2.3’ and ‘v2.4’ releases at https://github.com/crozynski/comicneue - ;; are equivalent. The home page hosts 2.3, not 2.4, so we use that here. - (version "2.3") + (version "2.5") (source (origin (method url-fetch/zipbomb) (uri (string-append "http://www.comicneue.com/comic-neue-" version ".zip")) (sha256 (base32 - "1695hkpd8kqnr2a88p8xs496slgzxjjkzpa9aa33ml3pnh7519zk")))) + "1ng0m0zs7qr91qy5ff0l01l27npr76961c6zfkxnhxf68zpwz5k4")))) (build-system font-build-system) (arguments `(#:phases -- cgit v1.2.3 From f6c454940a52c775693704e3e9768434a46273f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 06:19:25 +0200 Subject: gnu: babl: Update to 0.1.76. * gnu/packages/gimp.scm (babl): Update to 0.1.76. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 2a0ca3ac25..b5bb29e010 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -51,7 +51,7 @@ (define-public babl (package (name "babl") - (version "0.1.74") + (version "0.1.76") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/babl/" @@ -65,7 +65,7 @@ "/babl-" version ".tar.xz"))) (sha256 (base32 - "03nfcvy3453xkfvsfcnsfcjf2vg2pin09qnr9jlssdysa1lhnwcs")))) + "183kj2yq08vvldp8307vq61y2ravcqkyarrhak9w2l30gygp9100")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From ed67c4998cb9217dac0bf49df47d6f9c4c72e736 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 06:19:38 +0200 Subject: gnu: fluidsynth: Update to 2.1.3. * gnu/packages/audio.scm (fluidsynth): Update to 2.1.3. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 893c56514c..358eddb22e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1242,7 +1242,7 @@ follower.") (define-public fluidsynth (package (name "fluidsynth") - (version "2.1.2") + (version "2.1.3") (source (origin (method git-fetch) (uri (git-reference @@ -1251,7 +1251,7 @@ follower.") (file-name (git-file-name name version)) (sha256 (base32 - "0pf8hjn15isf772nz8qcqja700aay8nhdwmr24djkj42c7chf96j")))) + "0dv6jprz2bzasvk91x2rv2pqyyvxkc72s4r6vsqw723a3kqa5bhc")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target -- cgit v1.2.3 From bd6eed4c36fb0e6fd12144b414db576da98e8641 Mon Sep 17 00:00:00 2001 From: Ryan Prior via Guix-patches via Date: Thu, 28 May 2020 23:38:50 +0000 Subject: gnu: oil: Update to 0.8.pre5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/shells.scm (oil): Update to 0.8.pre5. [arguments]: Perform ‘patch-compiler-invocation’ phase as part of 'configure. Remove ‘make-destination’ phase. Run a basic smoke test. [synopsis, description]: Update. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/shells.scm | 54 ++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index fa3eccabd4..a82f1c8b26 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 Ryan Prior ;;; ;;; This file is part of GNU Guix. ;;; @@ -793,47 +794,44 @@ Shell (pdksh).") (define-public oil (package (name "oil") - (version "0.7.0") - (source (origin - (method url-fetch) - (uri (string-append "https://www.oilshell.org/download/oil-" - version ".tar.xz")) - (sha256 - (base32 - "12c9s462879adb6mwd3fqafk0dnqsm16s18rhym6cmzfzy8v8zm3")))) + ;; https://www.oilshell.org/blog/2020/04/release-0.8.pre4.html#comment-on-version-numbering + (version "0.8.pre5") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.oilshell.org/download/oil-" + version ".tar.gz")) + (sha256 + (base32 "02llxx10izxpv1y32qn8k6r0y7al01rzxjirc8h6x8nd9kiaqknl")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; the tests are not distributed in the tarballs - #:strip-binaries? #f ; the binaries cannot be stripped + `(#:strip-binaries? #f ; strip breaks the binary #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-compiler-invocation - (lambda _ - (substitute* "configure" - ((" cc ") " gcc ")) - #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (setenv "CC" "gcc") - ;; The configure script doesn't recognize CONFIG_SHELL. - (setenv "CONFIG_SHELL" (which "sh")) + (substitute* "configure" + ((" cc ") " $CC ")) (invoke "./configure" (string-append "--prefix=" out) "--with-readline")))) - (add-before 'install 'make-destination + (replace 'check + ;; The tests are not distributed in the tarballs but upstream + ;; recommends running this smoke test. + ;; https://github.com/oilshell/oil/blob/release/0.8.pre5/INSTALL.txt#L38-L48 (lambda _ - ;; The build scripts don't create the destination directory. - (mkdir-p (string-append (assoc-ref %outputs "out") "/bin"))))))) + (let* ((oil "_bin/oil.ovm")) + (invoke/quiet oil "osh" "-c" "echo hi") + (invoke/quiet oil "osh" "-n" "configure"))))))) (inputs `(("readline" ,readline))) - (synopsis "Bash-compatible Unix shell") - (description "Oil is a Unix / POSIX shell, compatible with Bash. It -implements the Oil language, which is a new shell language to which Bash can be -automatically translated. The Oil language is a superset of Bash. It also -implements the OSH language, a statically-parseable language based on Bash as it -is commonly written.") - (home-page "https://www.oilshell.org/") - (license (list psfl ; The Oil sources include a patched Python 2 source tree + (home-page "https://www.oilshell.org") + (synopsis "Programming language and Bash-compatible Unix shell") + (description "Oil is a programming language with automatic translation for +Bash. It includes osh, a Unix/POSIX shell that runs unmodified Bash +scripts.") + (license (list psfl ; tarball includes python2.7 asl2.0)))) (define-public oil-shell -- cgit v1.2.3 From 38ebe227b706c21d8f45df1b6e8aaf02b4f2f80e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 07:58:58 +0200 Subject: gnu: usbguard: Update to 0.7.8. * gnu/packages/hardware.scm (usbguard): Update to 0.7.8. --- gnu/packages/hardware.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 7ca565e17f..7ebe8f48eb 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -387,7 +387,7 @@ applications.") (define-public usbguard (package (name "usbguard") - (version "0.7.6") + (version "0.7.8") (source (origin (method url-fetch) (uri (string-append @@ -395,7 +395,7 @@ applications.") version "/usbguard-" version ".tar.gz")) (file-name (git-file-name name version)) (sha256 - (base32 "0gzhs8s4aka86mkcjib36z54si939ki4bmk46p6v8kln1fixad3j")))) + (base32 "1il5immqfxh2cj8wn1bfk7l42inflzgjf07yqprpz7r3lalbxc25")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 73014984bbc4067b9ed9e8c72e89921004217693 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 08:01:15 +0200 Subject: gnu: piper: Update to 0.5. * gnu/packages/gnome.scm (piper): Update to 0.5. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0d63579d4a..360a4c03a3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10153,7 +10153,7 @@ your operating-system definition: (define-public piper (package (name "piper") - (version "0.4") + (version "0.5") (source (origin (method git-fetch) @@ -10161,7 +10161,7 @@ your operating-system definition: (url "https://github.com/libratbag/piper.git") (commit version))) (sha256 - (base32 "17h06j8lxpbfygq8fzycl7lml4vv7r05bsyhh3gga2hp0zms4mvg")))) + (base32 "00vrcsbsv2477l1ncpyzc61lhxgac84dsgr3sjs8qxw3nh1gaasv")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 81af0de99986ab28628822cbec59632edbf65570 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 08:02:21 +0200 Subject: gnu: piper: Include package name in source file name. * gnu/packages/gnome.scm (piper)[source]: Set FILE-NAME. --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 360a4c03a3..9f7b3eeecb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10161,7 +10161,8 @@ your operating-system definition: (url "https://github.com/libratbag/piper.git") (commit version))) (sha256 - (base32 "00vrcsbsv2477l1ncpyzc61lhxgac84dsgr3sjs8qxw3nh1gaasv")))) + (base32 "00vrcsbsv2477l1ncpyzc61lhxgac84dsgr3sjs8qxw3nh1gaasv")) + (file-name (git-file-name name version)))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From bb9f9e1d1b32c1de2c7c0431bd931d106da3c7a2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 08:02:45 +0200 Subject: gnu: clp: Update to 1.17.6. * gnu/packages/maths.scm (clp): Update to 1.17.6. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8e35188d80..e1c8f8b559 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1612,14 +1612,14 @@ interfaces.") (define-public clp (package (name "clp") - (version "1.17.1") + (version "1.17.6") (source (origin (method url-fetch) (uri (string-append "https://www.coin-or.org/download/source/" "Clp/Clp-" version ".tgz")) (sha256 (base32 - "1wdg820g3iikf9344ijwsc8sy6c0m6im42bzzizm6rlmkvnmxhk9")) + "0ap1f0lxppa6pnbc4bg7ih7a96avwaki482nig8w5fr3vg9wvkzr")) (modules '((guix build utils))) (snippet ;; Make sure we don't use the bundled software. -- cgit v1.2.3 From 3059e12047a5074eb47da6ec69b08232fa737d9b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 08:07:58 +0200 Subject: gnu: fldigi: Update to 4.1.13. * gnu/packages/radio.scm (fldigi): Update to 4.1.13. --- gnu/packages/radio.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index f5dbbf7838..5d58602ab0 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Danny Milosavljevic ;;; Copyright © 2020 Charlie Ritter +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -573,14 +574,14 @@ using GNU Radio and the Qt GUI toolkit.") (define-public fldigi (package (name "fldigi") - (version "4.1.12") + (version "4.1.13") (source (origin (method url-fetch) (uri (string-append "http://www.w1hkj.com/files/fldigi/fldigi-" version ".tar.gz")) (sha256 - (base32 "1yjjv2ss84xfiaidypp476mhrbpnw4zf7mb5cdqwhdh604x0svr1")))) + (base32 "0mlq4z5k3h466plij8hg9xn5xbjxk557g4pw13cplpf32fhng224")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From c3beb7ced7ec632e7190c3e4e344e2f4164a75a8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 08:20:34 +0200 Subject: gnu: ruby-fast-gettext: Update to 2.0.3. * gnu/packages/ruby.scm (ruby-fast-gettext): Update to 2.0.3. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c80bab47cc..5ffb4374b0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2495,7 +2495,7 @@ interface for Ruby programs.") (define-public ruby-fast-gettext (package (name "ruby-fast-gettext") - (version "2.0.2") + (version "2.0.3") (home-page "https://github.com/grosser/fast_gettext") (source (origin (method git-fetch) @@ -2504,7 +2504,7 @@ interface for Ruby programs.") (file-name (git-file-name name version)) (sha256 (base32 - "1rd48fp89k1sclgn2v26br2glwl3iv7z72mizzzmkdmqalqfn1sa")))) + "1dg14apq5sfjshhcq0idphhs7aq9ikzswhqmn689p1h76mxqr1v6")))) (build-system ruby-build-system) (arguments '(#:test-target "spec" -- cgit v1.2.3 From fd13ec5fecacdb65d0a76073c65e4f6f367a2b31 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 08:23:29 +0200 Subject: gnu: ruby-hocon: Update to 1.3.1. * gnu/packages/ruby.scm (ruby-hocon): Update to 1.3.1. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5ffb4374b0..82911a6866 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3853,7 +3853,7 @@ and manipulate Git repositories by wrapping system calls to the git binary.") (define-public ruby-hocon (package (name "ruby-hocon") - (version "1.3.0") + (version "1.3.1") (home-page "https://github.com/puppetlabs/ruby-hocon") (source (origin (method git-fetch) @@ -3861,7 +3861,7 @@ and manipulate Git repositories by wrapping system calls to the git binary.") (file-name (git-file-name name version)) (sha256 (base32 - "1wz4cswjg3gs1y1bar7j4j88wjimfa9zhvy51jyi177i5dzax416")))) + "172hh2zr0n9nnszv0qvlgwszgkrq84yahrg053m68asy79zpmbqr")))) (build-system ruby-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 7c5c21fd467cb4554a39569087a118621fc42ec3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 08:31:36 +0200 Subject: gnu: openssh: Update to 8.3p1. * gnu/packages/ssh.scm (openssh): Update to 8.3p1. --- gnu/packages/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index ec5c4d5a18..73841db6b5 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -133,7 +133,7 @@ a server that supports the SSH-2 protocol.") (define-public openssh (package (name "openssh") - (version "8.2p1") + (version "8.3p1") (source (origin (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" @@ -141,7 +141,7 @@ a server that supports the SSH-2 protocol.") (patches (search-patches "openssh-hurd.patch")) (sha256 (base32 - "0wg6ckzvvklbzznijxkk28fb8dnwyjd0w30ra0afwv6gwr8m34j3")))) + "1cl74ghi9y21dc3f4xa0qamb7dhwacbynh1ks9syprrg8zhgpgpj")))) (build-system gnu-build-system) (native-inputs `(("groff" ,groff) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 7feefb3b82186be382725ac2d6b7e9f8953e4a83 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:09:14 +0200 Subject: bootloader: Add 'disk-image-installer'. * gnu/bootloader.scm ()[disk-image-installer]: New field, (bootloader-disk-image-installer): export it. * gnu/bootloader/grub.scm (install-grub-disk-image): New procedure ... (grub-bootloader): ... used as "disk-image-installer" here. (grub-efi-bootloader): set "disk-image-installer" to #f. * gnu/system/image.scm (root-partition?, find-root-partition): Move to "Helpers" section. (root-partition-index): New procedure. (system-disk-image): Honor disk-image-installer, and use it to install the bootloader directly on the disk-image, if supported. --- gnu/bootloader.scm | 5 ++++- gnu/bootloader/grub.scm | 45 ++++++++++++++++++++++++++++++++++++++++++++- gnu/system/image.scm | 32 ++++++++++++++++++++++---------- 3 files changed, 70 insertions(+), 12 deletions(-) diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm index 01bdd4acaa..668caa7fc3 100644 --- a/gnu/bootloader.scm +++ b/gnu/bootloader.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 David Craven -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2020 Mathieu Othacehe ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2019 Ludovic Courtès ;;; @@ -42,6 +42,7 @@ bootloader-name bootloader-package bootloader-installer + bootloader-disk-image-installer bootloader-configuration-file bootloader-configuration-file-generator @@ -125,6 +126,8 @@ record." (name bootloader-name) (package bootloader-package) (installer bootloader-installer) + (disk-image-installer bootloader-disk-image-installer + (default #f)) (configuration-file bootloader-configuration-file) (configuration-file-generator bootloader-configuration-file-generator)) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index bb40c551a7..57deaba912 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Leo Famulari -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2020 Mathieu Othacehe ;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Maxim Cournoyer ;;; @@ -436,6 +436,47 @@ fi~%")))) "--boot-directory" install-dir device)))) +(define install-grub-disk-image + #~(lambda (bootloader root-index image) + ;; Install GRUB on the given IMAGE. The root partition index is + ;; ROOT-INDEX. + (let ((grub-mkimage + (string-append bootloader "/bin/grub-mkimage")) + (modules '("biosdisk" "part_msdos" "fat" "ext2")) + (grub-bios-setup + (string-append bootloader "/sbin/grub-bios-setup")) + (root-device (format #f "hd0,msdos~a" root-index)) + (boot-img (string-append bootloader "/lib/grub/i386-pc/boot.img")) + (device-map "device.map")) + + ;; Create a minimal, standalone GRUB image that will be written + ;; directly in the MBR-GAP (space between the end of the MBR and the + ;; first partition). + (apply invoke grub-mkimage + "-O" "i386-pc" + "-o" "core.img" + "-p" (format #f "(~a)/boot/grub" root-device) + modules) + + ;; Create a device mapping file. + (call-with-output-file device-map + (lambda (port) + (format port "(hd0) ~a~%" image))) + + ;; Copy the default boot.img, that will be written on the MBR sector + ;; by GRUB-BIOS-SETUP. + (copy-file boot-img "boot.img") + + ;; Install both the "boot.img" and the "core.img" files on the given + ;; IMAGE. On boot, the MBR sector will execute the minimal GRUB + ;; written in the MBR-GAP. GRUB configuration and missing modules will + ;; be read from ROOT-DEVICE. + (invoke grub-bios-setup + "-m" device-map + "-r" root-device + "-d" "." + image)))) + (define install-grub-efi #~(lambda (bootloader efi-dir mount-point) ;; Install GRUB onto the EFI partition mounted at EFI-DIR, for the @@ -465,6 +506,7 @@ fi~%")))) (name 'grub) (package grub) (installer install-grub) + (disk-image-installer install-grub-disk-image) (configuration-file "/boot/grub/grub.cfg") (configuration-file-generator grub-configuration-file))) @@ -480,6 +522,7 @@ fi~%")))) (bootloader (inherit grub-bootloader) (installer install-grub-efi) + (disk-image-installer #f) (name 'grub-efi) (package grub-efi))) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index a1214dd20a..92b3f4424e 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -147,6 +147,18 @@ (guix build utils)) gexp* ...)))) +(define (root-partition? partition) + "Return true if PARTITION is the root partition, false otherwise." + (member 'boot (partition-flags partition))) + +(define (find-root-partition image) + "Return the root partition of the given IMAGE." + (srfi-1:find root-partition? (image-partitions image))) + +(define (root-partition-index image) + "Return the index of the root partition of the given IMAGE." + (1+ (srfi-1:list-index root-partition? (image-partitions image)))) + ;; ;; Disk image. @@ -276,9 +288,17 @@ image ~a { (let* ((substitutable? (image-substitutable? image)) (builder (with-imported-modules* - (let ((inputs '#+(list genimage coreutils findutils))) + (let ((inputs '#+(list genimage coreutils findutils)) + (bootloader-installer + #+(bootloader-disk-image-installer bootloader))) (set-path-environment-variable "PATH" '("bin" "sbin") inputs) - (genimage #$(image->genimage-cfg image) #$output)))) + (genimage #$(image->genimage-cfg image) #$output) + ;; Install the bootloader directly on the disk-image. + (when bootloader-installer + (bootloader-installer + #+(bootloader-package bootloader) + #$(root-partition-index image) + (string-append #$output "/" #$genimage-name)))))) (image-dir (computed-file "image-dir" builder))) (computed-file name #~(symlink @@ -371,14 +391,6 @@ used in the image. " ;; Image creation. ;; -(define (root-partition? partition) - "Return true if PARTITION is the root partition, false otherwise." - (member 'boot (partition-flags partition))) - -(define (find-root-partition image) - "Return the root partition of the given IMAGE." - (srfi-1:find root-partition? (image-partitions image))) - (define (image->root-file-system image) "Return the IMAGE root partition file-system type." (let ((format (image-format image))) -- cgit v1.2.3 From 7e6a42f215726b6ea5b1a2a8b8bc80481f7ebcd9 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:09:38 +0200 Subject: bootloader: grub: Do not run grub-install when creating a disk-image. * gnu/bootloader/grub.scm (install-grub): When creating a disk-image, grub-install will fail because it lacks root permissions. In that case, do not run grub-install and only copy Grub modules to the /boot directory. --- gnu/bootloader/grub.scm | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 57deaba912..23c7a82084 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -423,18 +423,24 @@ fi~%")))) (define install-grub #~(lambda (bootloader device mount-point) - ;; Install GRUB on DEVICE which is mounted at MOUNT-POINT. (let ((grub (string-append bootloader "/sbin/grub-install")) (install-dir (string-append mount-point "/boot"))) - ;; Tell 'grub-install' that there might be a LUKS-encrypted /boot or - ;; root partition. - (setenv "GRUB_ENABLE_CRYPTODISK" "y") - - ;; Hide potentially confusing messages from the user, such as - ;; "Installing for i386-pc platform." - (invoke/quiet grub "--no-floppy" "--target=i386-pc" - "--boot-directory" install-dir - device)))) + ;; Install GRUB on DEVICE which is mounted at MOUNT-POINT. If DEVICE + ;; is #f, then we populate the disk-image rooted at MOUNT-POINT. + (if device + (begin + ;; Tell 'grub-install' that there might be a LUKS-encrypted + ;; /boot or root partition. + (setenv "GRUB_ENABLE_CRYPTODISK" "y") + + ;; Hide potentially confusing messages from the user, such as + ;; "Installing for i386-pc platform." + (invoke/quiet grub "--no-floppy" "--target=i386-pc" + "--boot-directory" install-dir + device)) + ;; When creating a disk-image, only install GRUB modules. + (copy-recursively (string-append bootloader "/lib/") + install-dir))))) (define install-grub-disk-image #~(lambda (bootloader root-index image) -- cgit v1.2.3 From 7202895e5afa9922ba06eaba295645b08d6fd254 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:09:46 +0200 Subject: bootloader: grub: Use inheritance to define grub-minimal-bootloader. * gnu/bootloader/grub.scm (grub-minimal-bootloader): Inherit from grub-bootloader to avoid field redefinition. --- gnu/bootloader/grub.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 23c7a82084..40918ea307 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -516,13 +516,10 @@ fi~%")))) (configuration-file "/boot/grub/grub.cfg") (configuration-file-generator grub-configuration-file))) -(define grub-minimal-bootloader +(define* grub-minimal-bootloader (bootloader - (name 'grub) - (package grub-minimal) - (installer install-grub) - (configuration-file "/boot/grub/grub.cfg") - (configuration-file-generator grub-configuration-file))) + (inherit grub-bootloader) + (package grub-minimal))) (define* grub-efi-bootloader (bootloader -- cgit v1.2.3 From 9c1adb240016261d6263e8d7d0308040542f3c60 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:09:53 +0200 Subject: image: Add bootloader installation support. * gnu/build/image.scm (initialize-root-partition): Add bootloader-package and bootloader-installer arguments. Run the bootloader-installer if defined. * gnu/system/image.scm (system-disk-image): Adapt the partition initializer call accordingly. --- gnu/build/image.scm | 5 +++++ gnu/system/image.scm | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index b37ea9332a..49faeab466 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -155,6 +155,8 @@ deduplicates files common to CLOSURE and the rest of PREFIX." #:key bootcfg bootcfg-location + bootloader-package + bootloader-installer (deduplicate? #t) references-graphs (register-closures? #t) @@ -178,6 +180,9 @@ of the directory of the 'system' derivation." #:deduplicate? deduplicate?)) references-graphs)) + (when bootloader-installer + (display "installing bootloader...\n") + (bootloader-installer bootloader-package #f root)) (when bootcfg (install-boot-config bootcfg bootcfg-location root))) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 92b3f4424e..ece2d02f51 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -235,7 +235,9 @@ used in the image." #:deduplicate? #f #:system-directory #$os #:bootloader-package - #$(bootloader-package bootloader) + #+(bootloader-package bootloader) + #:bootloader-installer + #+(bootloader-installer bootloader) #:bootcfg #$bootcfg #:bootcfg-location #$(bootloader-configuration-file bootloader))))) -- cgit v1.2.3 From 7d4ecda63caa9f566620844dbc800a8158f861a6 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:09:58 +0200 Subject: system: image: Correct genimage configuration file indentation. * gnu/system/image.scm (system-disk-image): Fix genimage configuration file indentation. --- gnu/system/image.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index ece2d02f51..67cf5fdddc 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -261,10 +261,10 @@ used in the image." (image (partition-image partition)) (offset (partition-offset partition))) #~(format #f "~/partition ~a { - ~/~/partition-type = ~a - ~/~/image = \"~a\" - ~/~/offset = \"~a\" - ~/}" +~/~/partition-type = ~a +~/~/image = \"~a\" +~/~/offset = \"~a\" +~/}" #$label #$dos-type #$image -- cgit v1.2.3 From 05f37c16a3b159e58ce7343383b44073bd6cac9f Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:10:04 +0200 Subject: image: Use grub-efi to install the EFI bootloader. * gnu/build/image.scm (initialize-efi-partition): Rename bootloader-package argument to grub-efi. * gnu/system/image.scm (system-disk-image): Adapt accordingly to pass grub-efi package. --- gnu/build/image.scm | 4 ++-- gnu/system/image.scm | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index 49faeab466..a8594e202b 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -146,10 +146,10 @@ deduplicates files common to CLOSURE and the rest of PREFIX." (define* (initialize-efi-partition root #:key - bootloader-package + grub-efi #:allow-other-keys) "Install in ROOT directory, an EFI loader using BOOTLOADER-PACKAGE." - (install-efi-loader bootloader-package root)) + (install-efi-loader grub-efi root)) (define* (initialize-root-partition root #:key diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 67cf5fdddc..93b95b307b 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -234,6 +234,7 @@ used in the image." #:references-graphs '#$graph #:deduplicate? #f #:system-directory #$os + #:grub-efi #+grub-efi #:bootloader-package #+(bootloader-package bootloader) #:bootloader-installer -- cgit v1.2.3 From 749381051d9b43fd4944b44e734c6fd9fced9030 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:10:07 +0200 Subject: system: image: Fix image-with-os. * gnu/system/image.scm (image-with-os): Do not reorder partitions, as we want them to be created according to definition order. --- gnu/system/image.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 93b95b307b..53f68c097d 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -420,18 +420,18 @@ to OS. Also set the UUID and the size of the root partition." (string=? (file-system-mount-point fs) "/")) (operating-system-file-systems os))) - (let*-values (((partitions) (image-partitions base-image)) - ((root-partition other-partitions) - (srfi-1:partition root-partition? partitions))) - (image - (inherit base-image) - (operating-system os) - (partitions - (cons (partition - (inherit (car root-partition)) - (uuid (file-system-device root-file-system)) - (size (root-size base-image))) - other-partitions))))) + (image + (inherit base-image) + (operating-system os) + (partitions + (map (lambda (p) + (if (root-partition? p) + (partition + (inherit p) + (uuid (file-system-device root-file-system)) + (size (root-size base-image))) + p)) + (image-partitions base-image))))) (define (operating-system-for-image image) "Return an operating-system based on the one specified in IMAGE, but -- cgit v1.2.3 From b7b45372e713a53ffa852aec1d3bfb743bb79124 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 29 May 2020 09:05:53 +0200 Subject: image: Add a post-MBR gap to the default image. The generic 'efi-disk-image' needs to be bootable on systems without EFI. To do that, GRUB is installed in the post-MBR gap. Make sure that the first partition starts with an offset, to make this gap large enough for GRUB. * gnu/system/image.scm (root-offset, root-label): New variables, (esp-partition): use 'root-offset' as the partition offset, (root-partition): use 'root-label' as the partition label. --- gnu/system/image.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 53f68c097d..02c026b88c 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -65,9 +65,17 @@ ;;; Images definitions. ;;; +;; This is the offset before the first partition. GRUB will install itself in +;; this post-MBR gap. +(define root-offset (* 512 2048)) + +;; Generic root partition label. +(define root-label "Guix_image") + (define esp-partition (partition (size (* 40 (expt 2 20))) + (offset root-offset) (label "GNU-ESP") ;cosmetic only ;; Use "vfat" here since this property is used when mounting. The actual ;; FAT-ness is based on file system size (16 in this case). @@ -78,7 +86,7 @@ (define root-partition (partition (size 'guess) - (label "Guix_image") + (label root-label) (file-system "ext4") (flags '(boot)) (initializer (gexp initialize-root-partition)))) -- cgit v1.2.3 From e3f0155c41b28510f77e113ca2d37f0e7d90a2ca Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:10:28 +0200 Subject: image: Do not use VM to create disk-images. Now that installing Grub on raw disk-images is supported, we do not need to rely on (gnu system vm) module. * gnu/system/image.scm (make-system-image): Rename to ... (system-image): ... this, and remove the compatibility wrapper. (find-image): Turn to a monadic procedure. This will become useful when introducing Hurd support, to be able to detect the target system. * gnu/ci.scm (qemu-jobs): Use lower-object now that system-image returns a file-like object. * gnu/tests/install.scm (run-install): Ditto. * guix/scripts/system.scm (system-derivation-for-action): Add a 'base-image' argument, (perform-action): adapt accordingly. --- gnu/ci.scm | 20 +++++++++++--------- gnu/system/image.scm | 40 ++++++---------------------------------- gnu/tests/install.scm | 8 ++++---- guix/scripts/system.scm | 16 +++++++++------- 4 files changed, 30 insertions(+), 54 deletions(-) diff --git a/gnu/ci.scm b/gnu/ci.scm index b61181be51..fa67168e22 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -219,19 +219,21 @@ system.") (run-with-store store (mbegin %store-monad (set-guile-for-build (default-guile)) - (system-image - (image - (inherit efi-disk-image) - (size (* 1500 MiB)) - (operating-system installation-os)))))) + (lower-object + (system-image + (image + (inherit efi-disk-image) + (size (* 1500 MiB)) + (operating-system installation-os))))))) (->job 'iso9660-image (run-with-store store (mbegin %store-monad (set-guile-for-build (default-guile)) - (system-image - (image - (inherit iso9660-image) - (operating-system installation-os))))))) + (lower-object + (system-image + (image + (inherit iso9660-image) + (operating-system installation-os)))))))) '())) (define channel-build-system diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 02c026b88c..f44886c137 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -492,7 +492,7 @@ it can be used for bootloading." (type root-file-system-type)) file-systems-to-keep))))) -(define* (make-system-image image) +(define* (system-image image) "Return the derivation of IMAGE. It can be a raw disk-image or an ISO9660 image, depending on IMAGE format." (define substitutable? (image-substitutable? image)) @@ -525,38 +525,10 @@ image, depending on IMAGE format." "Find and return an image that could match the given FILE-SYSTEM-TYPE. This is useful to adapt to interfaces written before the addition of the record." - ;; XXX: Add support for system and target here, or in the caller. - (match file-system-type - ("iso9660" iso9660-image) - (_ efi-disk-image))) - -(define (system-image image) - "Wrap 'make-system-image' call, so that it is used only if the given IMAGE -is supported. Otherwise, fallback to image creation in a VM. This is -temporary and should be removed once 'make-system-image' is able to deal with -all types of images." - (define substitutable? (image-substitutable? image)) - (define volatile-root? (image-volatile-root? image)) - - (let* ((image-os (image-operating-system image)) - (image-root-filesystem-type (image->root-file-system image)) - (bootloader (bootloader-configuration-bootloader - (operating-system-bootloader image-os))) - (bootloader-name (bootloader-name bootloader)) - (size (image-size image)) - (format (image-format image))) - (mbegin %store-monad - (if (and (or (eq? bootloader-name 'grub) - (eq? bootloader-name 'extlinux)) - (eq? format 'disk-image)) - ;; Fallback to image creation in a VM when it is not yet supported - ;; by this module. - (system-disk-image-in-vm image-os - #:disk-image-size size - #:file-system-type image-root-filesystem-type - #:volatile? volatile-root? - #:substitutable? substitutable?) - (lower-object - (make-system-image image)))))) + (mbegin %store-monad + (return + (match file-system-type + ("iso9660" iso9660-image) + (_ efi-disk-image))))) ;;; image.scm ends here diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index cea26c8ef3..6bd8c7d3d2 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -228,18 +228,18 @@ packages defined in installation-os." (mlet* %store-monad ((_ (set-grafting #f)) (system (current-system)) (target (operating-system-derivation target-os)) + (base-image (find-image + installation-disk-image-file-system-type)) ;; Since the installation system has no network access, ;; we cheat a little bit by adding TARGET to its GC ;; roots. This way, we know 'guix system init' will ;; succeed. Also add guile-final, which is pulled in ;; through provenance.drv and may not always be present. - (image + (image -> (system-image (image - (inherit - (find-image - installation-disk-image-file-system-type)) + (inherit base-image) (size install-size) (operating-system (operating-system-with-gc-roots diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 3efd113ac8..3d7aa77cb7 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -670,7 +670,7 @@ checking this by themselves in their 'check' procedure." ;;; Action. ;;; -(define* (system-derivation-for-action os action +(define* (system-derivation-for-action os base-image action #:key image-size file-system-type full-boot? container-shared-network? mappings) @@ -694,11 +694,12 @@ checking this by themselves in their 'check' procedure." (* 70 (expt 2 20))) #:mappings mappings)) ((disk-image) - (system-image - (image - (inherit (find-image file-system-type)) - (size image-size) - (operating-system os)))) + (lower-object + (system-image + (image + (inherit base-image) + (size image-size) + (operating-system os))))) ((docker-image) (system-docker-image os #:shared-network? container-shared-network?)))) @@ -800,7 +801,8 @@ static checks." (check-initrd-modules os))) (mlet* %store-monad - ((sys (system-derivation-for-action os action + ((image (find-image file-system-type)) + (sys (system-derivation-for-action os image action #:file-system-type file-system-type #:image-size image-size #:full-boot? full-boot? -- cgit v1.2.3 From 72d1562a4da8909b1990687d6f33b543bd215541 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 29 May 2020 12:20:15 +0200 Subject: build: image: Fix initialize-efi-partition docstring. * gnu/build/image.scm (initialize-efi-partition): Turn BOOTLOADER-PACKAGE into GRUB-EFI. --- gnu/build/image.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index a8594e202b..14503b02ba 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -148,7 +148,7 @@ deduplicates files common to CLOSURE and the rest of PREFIX." #:key grub-efi #:allow-other-keys) - "Install in ROOT directory, an EFI loader using BOOTLOADER-PACKAGE." + "Install in ROOT directory, an EFI loader using GRUB-EFI." (install-efi-loader grub-efi root)) (define* (initialize-root-partition root -- cgit v1.2.3 From ebfe0e65842d64d9cbc4987530aa361fec70a7f1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 27 May 2020 12:01:34 +0200 Subject: gnu: autorandr: Update to 1.10.1. * gnu/packages/xdisorg.scm (autorandr): Update to 1.10.1. --- gnu/packages/xdisorg.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 5e4e275073..1325fbc821 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -162,7 +162,7 @@ program.") (define-public autorandr (package (name "autorandr") - (version "1.9") + (version "1.10.1") (home-page "https://github.com/phillipberndt/autorandr") (source (origin @@ -172,8 +172,10 @@ program.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1bb0l7fcm5lcx9y02zdxv7pfdqf4v4gsc5br3v1x9gzjvqj64l7n")))) + (base32 "0msw9b1hdy3gbq9w5d04mfizhyirz1c648x84mlcbzl8salm7vpg")))) (build-system python-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs `(("xrandr" ,xrandr) ("libxcb" ,libxcb))) @@ -188,7 +190,11 @@ program.") (("/usr") (assoc-ref outputs "out"))) (substitute* "autorandr.py" (("popen\\(\"xrandr") (string-append "popen(\"" xrandr)) - (("\\[\"xrandr") (string-append "[\"" xrandr)))) + (("\\[\"xrandr") (string-append "[\"" xrandr))) + (substitute* "contrib/autorandr_launcher/autorandr_launcher.c" + (("/usr/bin/autorandr") + (string-append (assoc-ref outputs "out") "/bin/autorandr"))) + (setenv "CC" "gcc")) #t)) (add-after 'install 'install-contrib (lambda* (#:key outputs #:allow-other-keys) @@ -196,10 +202,8 @@ program.") (string-append "DESTDIR=" (assoc-ref outputs "out")) "PREFIX=" "BASH_COMPLETIONS_DIR=etc/bash_completiond.d" - "install_manpage" - "install_bash_completion" - "install_launcher" - "install_autostart_config")))))) + "install" + "TARGETS=autorandr launcher manpage bash_completion")))))) (synopsis "Auto-detect connected displays and load appropriate setup") (description "Autorandr wraps around xrandr to help with X11 multi-screen configuration management. It allows the user to create profiles -- cgit v1.2.3 From 93fc9b6abf6123c665288b180a8da6e9fac61602 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 14:18:14 +0200 Subject: gnu: love: Remove unused input. * gnu/packages/game-development.scm (love)[inputs]: Remove PHYSFS. --- gnu/packages/game-development.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 185f1bebf3..f16b84d5ae 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -680,7 +680,6 @@ archive on a per-file basis.") ("mesa" ,mesa) ("mpg123" ,mpg123) ("openal" ,openal) - ("physfs" ,physfs) ("sdl2" ,sdl2) ("zlib" ,zlib))) (synopsis "2D game framework for Lua") -- cgit v1.2.3 From a904223ec55a61e6597c88da01426d9ff8a40537 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 14:18:52 +0200 Subject: gnu: physfs: Do not build the static library. * gnu/packages/game-development.scm (physfs)[arguments]: Add #:configure-flags. --- gnu/packages/game-development.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index f16b84d5ae..fae5d591aa 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -631,6 +631,7 @@ garbage collection and can be extended with plugins.") (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target + #:configure-flags '("-DPHYSFS_BUILD_STATIC=OFF") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-CMakeLists.txt (lambda _ -- cgit v1.2.3 From 7c8eb479a4be745deddce3cc651aeba0ba99050f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 May 2020 13:11:12 +0200 Subject: gnu: ruby-spec-its: Accept any version of ruby-ffi. * gnu/packages/ruby.scm (ruby-rspec-its)[arguments]: Change Gemfile substitution so that any ffi gem is accepted. While at it, tighten the regex and rename the phase to be more accurate. --- gnu/packages/ruby.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 82911a6866..bc48bc1576 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -645,10 +645,12 @@ outcomes of a code example.") (("rspec rspec-core rspec-expectations rspec-mocks rspec-support") "")) #t)) - (add-before 'build 'update-ffi-in-gemfile + (add-before 'build 'loosen-ffi-requirement (lambda _ + ;; Accept any version of ruby-ffi. (substitute* "Gemfile" - ((" gem 'ffi', '~> 1.9.25'") " gem 'ffi', '~> 1.10.0'")) + ((" gem 'ffi', '~> 1\\.9\\.25'") + " gem 'ffi'")) #t)) (add-before 'build 'remove-unnecessary-dependency-versions-from-gemfile (lambda _ -- cgit v1.2.3 From 77209ddd51f010b92ff18a865da10e8def7cde5e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 May 2020 14:03:07 +0200 Subject: gnu: ruby-ffi: Update to 1.12.2. * gnu/packages/libffi.scm (ruby-ffi): Update to 1.12.2. --- gnu/packages/libffi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index b0098389c0..329eabd634 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -182,13 +182,13 @@ project.") (define-public ruby-ffi (package (name "ruby-ffi") - (version "1.10.0") + (version "1.12.2") (source (origin (method url-fetch) (uri (rubygems-uri "ffi" version)) (sha256 (base32 - "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p")))) + "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4")))) (build-system ruby-build-system) ;; FIXME: Before running tests the build system attempts to build libffi ;; from sources. -- cgit v1.2.3 From 7ac6bd0091188115af1a6c65e0f1718d70662aaa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 May 2020 17:52:39 +0200 Subject: gnu: ruby-rake-compiler: Update to 1.1.0. * gnu/packages/ruby.scm (ruby-rake-compiler): Update to 1.1.0. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index bc48bc1576..8581d3e8e2 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -381,13 +381,13 @@ announcement.") (define-public ruby-rake-compiler (package (name "ruby-rake-compiler") - (version "1.0.4") + (version "1.1.0") (source (origin (method url-fetch) (uri (rubygems-uri "rake-compiler" version)) (sha256 (base32 - "1xpdi4w8zaklk1i9ps8g3k0icw3v5fcks092l84w28rgrpx82qip")))) + "0l4hg21v0phfrfsc2hilgmwvn2imxr0byqh8dv16bya1s5d3km0q")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; needs cucumber -- cgit v1.2.3 From f0f5f2d3c7d55f27516da1f0b18677a3f487cb9a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 May 2020 17:53:44 +0200 Subject: gnu: ruby-rubygems-tasks: Update to 0.2.5. * gnu/packages/ruby.scm (ruby-rubygems-tasks): Update to 0.2.5. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8581d3e8e2..6e6add928d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2265,13 +2265,13 @@ two hashes.") (define-public ruby-rubygems-tasks (package (name "ruby-rubygems-tasks") - (version "0.2.4") + (version "0.2.5") (source (origin (method url-fetch) (uri (rubygems-uri "rubygems-tasks" version)) (sha256 (base32 - "16cp45qlbcglnqdm4f1vj3diywdz4v024saqpgrz6palf0wmgz2j")))) + "1x3sz3n2dlknd3v7w1mrq6f0ag6pwzhjvg7z29p75w3p42ma1gbx")))) (build-system ruby-build-system) ;; Tests need Internet access. (arguments `(#:tests? #f)) -- cgit v1.2.3 From 075afce25eb1de1710bd3f93bd42b49343af4222 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 May 2020 18:51:32 +0200 Subject: gnu: ruby-libffi: Enable tests and unbundle LibFFI. * gnu/packages/libffi.scm (ruby-ffi)[source]: Change to GIT-FETCH. [arguments]: Remove #:tests?. Add #:phases. --- gnu/packages/libffi.scm | 58 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 329eabd634..da0c9dcf47 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016, 2017 Ben Woodcroft -;;; Copyright © 2017, 2019 Marius Bakke +;;; Copyright © 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer ;;; @@ -28,6 +28,7 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (gnu packages check) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -184,15 +185,58 @@ project.") (name "ruby-ffi") (version "1.12.2") (source (origin - (method url-fetch) - (uri (rubygems-uri "ffi" version)) + ;; Pull from git because the RubyGems release bundles LibFFI, + ;; and comes with a gemspec that makes it difficult to unbundle. + (method git-fetch) + (uri (git-reference + (url "https://github.com/ffi/ffi") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4")))) + "1cvqsbjr2gfjgqggq9kdx90qhhzr7qkyr9wmxdsfsik6cnxnnpmd")))) (build-system ruby-build-system) - ;; FIXME: Before running tests the build system attempts to build libffi - ;; from sources. - (arguments `(#:tests? #f)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'do-not-depend-on-ccache + (lambda _ + (substitute* "spec/ffi/fixtures/GNUmakefile" + (("^CCACHE := .*") + "")) + #t)) + (replace 'replace-git-ls-files + (lambda _ + ;; Do not try to execute git, or include the (un)bundled LibFFI. + (substitute* "ffi.gemspec" + (("git ls-files -z") + "find * -type f -print0 | sort -z") + (("lfs \\+?= .*") + "lfs = []\n")) + (substitute* "Rakefile" + (("LIBFFI_GIT_FILES = .*") + "LIBFFI_GIT_FILES = []\n")) + #t)) + (replace 'build + (lambda _ + ;; Tests depend on the native extensions, so we build it + ;; beforehand without going through the gem machinery. + (invoke "rake" "compile") + + ;; XXX: Ideally we'd use "rake native gem" here to prevent the + ;; install phase from needlessly rebuilding everything, but that + ;; requires the bundled LibFFI, and the install phase can not + ;; deal with such gems anyway. + (invoke "gem" "build" "ffi.gemspec"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (setenv "MAKE" "make") + (setenv "CC" "gcc") + (invoke "rspec" "spec")) + (format #t "test suite not run~%")) + #t))))) (native-inputs `(("ruby-rake-compiler" ,ruby-rake-compiler) ("ruby-rspec" ,ruby-rspec) -- cgit v1.2.3 From a84a185abda610e6ebfb5601385bfdc09cd42c55 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 May 2020 14:08:55 +0200 Subject: gnu: ruby-crass: Update to 1.0.6. * gnu/packages/ruby.scm (ruby-crass): Update to 1.0.6. [source]: Switch to GIT-FETCH. [native-inputs]: Remove. --- gnu/packages/ruby.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 6e6add928d..fdba903cbb 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5269,21 +5269,22 @@ multibyte strings, internationalization, time zones, and testing.") (define-public ruby-crass (package (name "ruby-crass") - (version "1.0.4") + (version "1.0.6") + (home-page "https://github.com/rgrove/crass") (source (origin - (method url-fetch) - (uri (rubygems-uri "crass" version)) + ;; The gem does not contain tests, so pull from git. + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi")))) + "1gbsb81psgb6xhnwpx4s409jc0mk0gijh039sy5xyi8jpaaadp40")))) (build-system ruby-build-system) - (native-inputs - `(("bundler" ,bundler) - ("ruby-minitest" ,ruby-minitest))) (synopsis "Pure Ruby CSS parser") (description "Crass is a pure Ruby CSS parser based on the CSS Syntax Level 3 spec.") - (home-page "https://github.com/rgrove/crass/") (license license:expat))) (define-public ruby-nokogumbo -- cgit v1.2.3 From 62cc7344ffe90226a67e3fc4aaede7845e47b45a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 May 2020 14:09:57 +0200 Subject: gnu: ruby-nokogiri: Update to 1.10.9. * gnu/packages/ruby.scm (ruby-nokogiri): Update to 1.10.9. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index fdba903cbb..87c1e999de 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4123,13 +4123,13 @@ to reproduce user environments.") (define-public ruby-nokogiri (package (name "ruby-nokogiri") - (version "1.10.5") + (version "1.10.9") (source (origin (method url-fetch) (uri (rubygems-uri "nokogiri" version)) (sha256 (base32 - "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7")))) + "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm")))) (build-system ruby-build-system) (arguments ;; Tests fail because Nokogiri can only test with an installed extension, -- cgit v1.2.3 From 2e366b0a8337b7b5f01a88edf209dc92c2530238 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 May 2020 14:19:23 +0200 Subject: gnu: ruby-nokogumbo: Update to 2.0.2. * gnu/packages/ruby.scm (ruby-nokogumbo): Update to 2.0.2. [arguments]: Remove. [native-inputs]: Add RUBY-RAKE-COMPILER. --- gnu/packages/ruby.scm | 87 +++++++++++++++------------------------------------ 1 file changed, 26 insertions(+), 61 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 87c1e999de..396d4a021f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5288,68 +5288,33 @@ multibyte strings, internationalization, time zones, and testing.") (license license:expat))) (define-public ruby-nokogumbo - (let ((commit "fb51ff299a1c34346837580b6d1d9a60fadf5dbd")) - (package - (name "ruby-nokogumbo") - (version (string-append "1.4.7-1." (string-take commit 8))) - (source (origin - ;; We use the git reference, because there's no Rakefile in the - ;; published gem and the tarball on Github is outdated. - (method git-fetch) - (uri (git-reference - (url "https://github.com/rubys/nokogumbo.git") - (commit "d56f954d20a"))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0bnppjy96xiadrsrc9dp8y6wvdwnkfa930n7acrp0mqm4qywl2wl")))) - (build-system ruby-build-system) - (arguments - `(#:modules ((guix build ruby-build-system) - (guix build utils) - (ice-9 rdelim)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'build-gemspec - (lambda _ - (substitute* "Rakefile" - ;; Build Makefile even without a copy of gumbo-parser sources - (("'gumbo-parser/src',") "") - ;; We don't bundle gumbo-parser sources - (("'gumbo-parser/src/\\*',") "") - (("'gumbo-parser/visualc/include/\\*',") "") - ;; The definition of SOURCES will be cut in gemspec, and - ;; "FileList" will be undefined. - (("SOURCES \\+ FileList\\[") - "['ext/nokogumboc/extconf.rb', 'ext/nokogumboc/nokogumbo.c', ")) - - ;; Copy the Rakefile and cut out the gemspec. - (copy-file "Rakefile" ".gemspec") - (with-atomic-file-replacement ".gemspec" - (lambda (in out) - (let loop ((line (read-line in 'concat)) - (skipping? #t)) - (if (eof-object? line) - #t - (let ((skip-next? (if skipping? - (not (string-prefix? "SPEC =" line)) - (string-prefix? "end" line)))) - (when (or (not skipping?) - (and skipping? (not skip-next?))) - (format #t "~a" line) - (display line out)) - (loop (read-line in 'concat) skip-next?)))))) - #t))))) - (inputs - `(("gumbo-parser" ,gumbo-parser))) - (propagated-inputs - `(("ruby-nokogiri" ,ruby-nokogiri))) - (synopsis "Ruby bindings to the Gumbo HTML5 parser") - (description - "Nokogumbo allows a Ruby program to invoke the Gumbo HTML5 parser and + (package + (name "ruby-nokogumbo") + (version "2.0.2") + (source (origin + ;; We use the git reference, because there's no Rakefile in the + ;; published gem and the tarball on Github is outdated. + (method git-fetch) + (uri (git-reference + (url "https://github.com/rubys/nokogumbo.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1qg0iyw450lw6d0j1ghzg79a6l60nm1m4qmrzwzybi585861jxcx")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-rake-compiler" ,ruby-rake-compiler))) + (inputs + `(("gumbo-parser" ,gumbo-parser))) + (propagated-inputs + `(("ruby-nokogiri" ,ruby-nokogiri))) + (synopsis "Ruby bindings to the Gumbo HTML5 parser") + (description + "Nokogumbo allows a Ruby program to invoke the Gumbo HTML5 parser and access the result as a Nokogiri parsed document.") - (home-page "https://github.com/rubys/nokogumbo/") - (license license:asl2.0)))) + (home-page "https://github.com/rubys/nokogumbo/") + (license license:asl2.0))) (define-public ruby-sanitize (package -- cgit v1.2.3 From f362b53c40b166b6e1fae1c38b00023d88e0cedd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 May 2020 14:31:29 +0200 Subject: gnu: ruby-sanitize: Update to 5.1.0. * gnu/packages/patches/ruby-sanitize-system-libxml.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/ruby.scm (ruby-sanitize): Update to 5.1.0. [source]: Change to GIT-FETCH. Add patch. [native-inputs]: Remove BUNDLER, RUBY-REDCARPET, and RUBY-YARD. --- gnu/local.mk | 3 +- .../patches/ruby-sanitize-system-libxml.patch | 38 ++++++++++++++++++++++ gnu/packages/ruby.scm | 23 +++++++------ 3 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/ruby-sanitize-system-libxml.patch diff --git a/gnu/local.mk b/gnu/local.mk index de51c21014..663e687bd6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1464,7 +1464,8 @@ dist_patch_DATA = \ %D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/racket-store-checksum-override.patch \ %D%/packages/patches/retroarch-disable-online-updater.patch \ - %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ + %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ + %D%/packages/patches/ruby-sanitize-system-libxml.patch \ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ %D%/packages/patches/runc-CVE-2019-5736.patch \ %D%/packages/patches/rust-1.19-mrustc.patch \ diff --git a/gnu/packages/patches/ruby-sanitize-system-libxml.patch b/gnu/packages/patches/ruby-sanitize-system-libxml.patch new file mode 100644 index 0000000000..d19eb07294 --- /dev/null +++ b/gnu/packages/patches/ruby-sanitize-system-libxml.patch @@ -0,0 +1,38 @@ +Fix test failures that occur when nokogiri is using system libxml: + + https://github.com/rgrove/sanitize/issues/198 + +Taken from upstream: +https://github.com/rgrove/sanitize/commit/21da9b62baf9ea659811d92e6b574130aee57eba + +diff --git a/test/test_malicious_html.rb b/test/test_malicious_html.rb +index 2c23074..0756de0 100644 +--- a/test/test_malicious_html.rb ++++ b/test/test_malicious_html.rb +@@ -135,6 +135,8 @@ + # The relevant libxml2 code is here: + # + describe 'unsafe libxml2 server-side includes in attributes' do ++ using_unpatched_libxml2 = Nokogiri::VersionInfo.instance.libxml2_using_system? ++ + tag_configs = [ + { + tag_name: 'a', +@@ -166,6 +168,8 @@ + input = %[<#{tag_name} #{attr_name}='example.com'>foo] + + it 'should escape unsafe characters in attributes' do ++ skip "behavior should only exist in nokogiri's patched libxml" if using_unpatched_libxml2 ++ + # This uses Nokogumbo's HTML-compliant serializer rather than + # libxml2's. + @s.fragment(input). +@@ -191,6 +195,8 @@ + input = %[<#{tag_name} #{attr_name}='example.com'>foo] + + it 'should not escape characters unnecessarily' do ++ skip "behavior should only exist in nokogiri's patched libxml" if using_unpatched_libxml2 ++ + # This uses Nokogumbo's HTML-compliant serializer rather than + # libxml2's. + @s.fragment(input). diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 396d4a021f..08c55e4e3c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5319,33 +5319,32 @@ access the result as a Nokogiri parsed document.") (define-public ruby-sanitize (package (name "ruby-sanitize") - (version "4.6.3") + (version "5.1.0") + (home-page "https://github.com/rgrove/sanitize") (source (origin - (method url-fetch) + (method git-fetch) ;; The gem does not include the Rakefile, so we download the - ;; release tarball from Github. - (uri (string-append "https://github.com/rgrove/" - "sanitize/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + ;; source from Github. + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (patches (search-patches "ruby-sanitize-system-libxml.patch")) (sha256 (base32 - "1fmqppwif3cm8h79006jfzkdnlxxzlry9kzk03psk0d5xpg55ycc")))) + "0lj0q9yhjp0q0in5majkshnki07mw8m2vxgndx4m5na6232aszl0")))) (build-system ruby-build-system) (propagated-inputs `(("ruby-crass" ,ruby-crass) ("ruby-nokogiri" ,ruby-nokogiri) ("ruby-nokogumbo" ,ruby-nokogumbo))) (native-inputs - `(("bundler" ,bundler) - ("ruby-minitest" ,ruby-minitest) - ("ruby-redcarpet" ,ruby-redcarpet) - ("ruby-yard" ,ruby-yard))) + `(("ruby-minitest" ,ruby-minitest))) (synopsis "Whitelist-based HTML and CSS sanitizer") (description "Sanitize is a whitelist-based HTML and CSS sanitizer. Given a list of acceptable elements, attributes, and CSS properties, Sanitize will remove all unacceptable HTML and/or CSS from a string.") - (home-page "https://github.com/rgrove/sanitize/") (license license:expat))) (define-public ruby-oj -- cgit v1.2.3 From fb9a57a8e6a28093f5138a6c484442f8b3a8cd7e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 May 2020 18:53:13 +0200 Subject: utils: Add 'cc-for-target'. * guix/utils.scm (cc-for-target): New procedure. --- guix/utils.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/guix/utils.scm b/guix/utils.scm index d7b197fa44..69e3f0a934 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2015 David Thompson ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018, 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -78,6 +78,8 @@ target-aarch64? target-arm? target-64bit? + cc-for-target + version-compare version>? version>=? @@ -506,6 +508,11 @@ a character other than '@'." (%current-system)))) (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "ppc64"))) +(define* (cc-for-target #:optional (target (%current-target-system))) + (if target + (string-append target "-gcc") + "gcc")) + (define version-compare (let ((strverscmp (let ((sym (or (dynamic-func "strverscmp" (dynamic-link)) -- cgit v1.2.3 From 1ca44ae34cb4324427f232035b00c11dfa712139 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 May 2020 18:57:46 +0200 Subject: gnu: Use 'cc-for-target' instead of custom implementations. * gnu/packages/compression.scm (ecm)[arguments]: In #:make-flags, remove TARGET binding and use CC-FOR-TARGET instead. * gnu/packages/linux.scm (powerstat, crda, cachefilesd)[arguments]: Likewise. * gnu/packages/mail.scm (alpine)[arguments]: Likewise. * gnu/packages/music.scm (lsp-plugins)[arguments]: Likewise. * gnu/packages/radio.scm (dump1090)[arguments]: Likewise. * gnu/packages/suckless.scm (blind, dmenu, spoon, slock, st, surf, sent, wificurse, sbm, prout, noice, human, fortify-headers, colors, libutf, scron)[arguments]: Likewise. --- gnu/packages/compression.scm | 7 +-- gnu/packages/linux.scm | 22 ++----- gnu/packages/mail.scm | 5 +- gnu/packages/music.scm | 6 +- gnu/packages/radio.scm | 7 +-- gnu/packages/suckless.scm | 134 +++++++++++++------------------------------ 6 files changed, 52 insertions(+), 129 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 38adf35e33..cdab7408ed 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2207,11 +2207,8 @@ computations.") (arguments `(#:tests? #f ; no check target #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "DESTDIR=" (assoc-ref %outputs "out")))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "DESTDIR=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (replace 'configure diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b159ff7b22..0a154fd6cc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1222,11 +1222,8 @@ at login. Local and dynamic reconfiguration are its key features.") (build-system gnu-build-system) (arguments `(#:make-flags - (let* ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "prefix=" (assoc-ref %outputs "out")))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "prefix=" (assoc-ref %outputs "out"))) #:tests? #f ; no test suite #:phases (modify-phases %standard-phases @@ -3377,12 +3374,9 @@ interface.") #t)))) #:test-target "verify" #:make-flags (let ((out (assoc-ref %outputs "out")) - (regdb (assoc-ref %build-inputs "wireless-regdb")) - (target ,(%current-target-system))) + (regdb (assoc-ref %build-inputs "wireless-regdb"))) (list - (string-append - "CC=" (if target - (string-append target "-gcc") "gcc")) + (string-append "CC=" ,(cc-for-target)) "V=1" ;; Disable signature-checking on 'regulatory.bin'. @@ -7040,12 +7034,8 @@ system boot process.") `(#:tests? #f ; there are no tests #:make-flags (let ((prefix-dir (lambda (var dir) - (string-append var "=" %output "/" dir))) - (target ,(%current-target-system))) - (list (string-append "CC=" - (if target - (string-append target "-gcc") - "gcc")) + (string-append var "=" %output "/" dir)))) + (list (string-append "CC=" ,(cc-for-target)) (prefix-dir "SBINDIR" "sbin/") (prefix-dir "ETCDIR" "etc/") (prefix-dir "MANDIR" "share/man/"))) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b44afd360e..8fb2a3c39e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2697,10 +2697,7 @@ operators and scripters.") (build-system gnu-build-system) (arguments `(#:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")))) + (list (string-append "CC=" ,(cc-for-target))) #:configure-flags (list (string-append "--with-ssl-include-dir=" (assoc-ref %build-inputs "openssl") "/include/openssl") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index e4414dafd6..09827c7c93 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4886,11 +4886,7 @@ and reverb.") (arguments `(#:make-flags (list - (string-append "CC=" - (if ,(%current-target-system) - (string-append (assoc-ref %build-inputs "cross-gcc") - "/bin/" ,(%current-target-system) "-gcc") - "gcc")) + (string-append "CC=" ,(cc-for-target)) "BUILD_MODULES=\"lv2 ladspa jack\"" "VST_UI=0" (string-append "PREFIX=" (assoc-ref %outputs "out")) (string-append "ETC_PATH=" (assoc-ref %outputs "out") "/etc")) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 5d58602ab0..b3a7cc0e97 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1018,11 +1018,8 @@ gain and standing wave ratio.") (arguments `(#:test-target "test" #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - "BLADERF=no")) + (list (string-append "CC=" ,(cc-for-target)) + "BLADERF=no") #:phases (modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 5cabb40eb0..c10226bb32 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -46,6 +46,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) #:use-module (guix packages)) (define-public blind @@ -62,12 +63,8 @@ (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target - #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + #:make-flags (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -152,14 +149,11 @@ optimising the environment for the application in use and the task performed.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output) - (string-append "FREETYPEINC=" - (assoc-ref %build-inputs "freetype") - "/include/freetype2"))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output) + (string-append "FREETYPEINC=" + (assoc-ref %build-inputs "freetype") + "/include/freetype2")) #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs @@ -190,11 +184,8 @@ numbers of user-defined menu items efficiently.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)))) (inputs `(("libx11" ,libx11) ("libxkbfile" ,libxkbfile) @@ -221,11 +212,8 @@ numbers of user-defined menu items efficiently.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs `(("libx11" ,libx11) @@ -253,11 +241,8 @@ numbers of user-defined menu items efficiently.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure) @@ -298,11 +283,8 @@ drawing.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure) @@ -347,14 +329,11 @@ point surf to another URI by setting its XProperties.") (delete 'configure)) ; no configuration #:tests? #f ; no test suite #:make-flags - (let ((target ,(%current-target-system)) - (pkg-config (lambda (flag) + (let ((pkg-config (lambda (flag) (string-append "$(shell pkg-config " flag " " "xft fontconfig x11 libpng)")))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) + (list (string-append "CC=" ,(cc-for-target)) (string-append "PREFIX=" %output) (string-append "INCS=-I. " (pkg-config "--cflags")) (string-append "LIBS=" (pkg-config "--libs") " -lm"))))) @@ -390,11 +369,8 @@ few minutes.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)))) (inputs `(("libx11" ,libx11))) (home-page "https://git.2f30.org/xbattmon/") @@ -452,11 +428,8 @@ drivers capable of injecting packets in wireless networks.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -484,11 +457,8 @@ left.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -514,11 +484,8 @@ left.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -550,11 +517,8 @@ cups server to be installed.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script @@ -588,11 +552,8 @@ cups server to be installed.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -621,11 +582,8 @@ environment variable.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -666,11 +624,8 @@ initially intended to be used on musl-based Linux distributions. (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -707,11 +662,8 @@ colormap to stdout.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -756,11 +708,8 @@ as -1, to be used instead of U+FFFD. (arguments `(#:test-target "test" #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script @@ -805,11 +754,8 @@ chat output in the background.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script -- cgit v1.2.3 From 29e1553344864db55de6af225b16ac74d84a078a Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:04:11 -0700 Subject: gnu: Add ghc-inspection-testing. * gnu/packages/haskell-check.scm (ghc-inspection-testing): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-check.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index d571d46945..bb7f57b49d 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Tonton ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2019 Timothy Sample +;;; Copyright © 2020 John Soo ;;; ;;; This file is part of GNU Guix. ;;; @@ -996,3 +997,43 @@ values (similar to @code{toEnum} but for any algebraic data type). This can be used for SmallCheck-style systematic testing, QuickCheck-style random testing, and hybrids of the two.") (license license:bsd-3))) + +(define-public ghc-inspection-testing + (package + (name "ghc-inspection-testing") + (version "0.4.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/inspection-testing/" + "inspection-testing-" version ".tar.gz")) + (sha256 + (base32 + "1bppz99p6ix6hah8lbr9mapl2zxgmkg9i7h6hk8wq6zf54hwz3yp")))) + (build-system haskell-build-system) + (home-page + "https://github.com/nomeata/inspection-testing") + (synopsis "GHC plugin to do inspection testing") + (description + "Some carefully crafted libraries make promises to their users beyond +functionality and performance. + +Examples are: Fusion libraries promise intermediate data structures to be +eliminated. Generic programming libraries promise that the generic +implementation is identical to the hand-written one. Some libraries may +promise allocation-free or branch-free code. + +Conventionally, the modus operandi in all these cases is that the library +author manually inspects the (intermediate or final) code produced by the +compiler. This is not only tedious, but makes it very likely that some change, +either in the library itself or the surrounding eco-system, breaks the +library's promised without anyone noticing. + +This package provides a disciplined way of specifying such properties, and +have them checked by the compiler. This way, this checking can be part of the +ususal development cycle and regressions caught early. + +See the documentation in \"Test.Inspection\" or the project webpage for more +examples and more information.") + (license license:expat))) -- cgit v1.2.3 From 82c36002ded75b136a5bdd23d7e32cfeaa341e3c Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:05:16 -0700 Subject: gnu: Add ghc-data-fix. * gnu/packages/haskell-xyz.scm (ghc-data-fix): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 29d3077755..52b2faaa39 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2018, 2019 Gabriel Hondet ;;; Copyright © 2019 Robert Vollmert ;;; Copyright © 2019 Jacob MacDonald -;;; Copyright © 2019 John Soo +;;; Copyright © 2019,2020 John Soo ;;; Copyright © 2019 Kyle Meyer ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2020 Brett Gilio @@ -2724,6 +2724,28 @@ package.") package.") (license license:bsd-3))) +(define-public ghc-data-fix + (package + (name "ghc-data-fix") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/data-fix/" + "data-fix-" version ".tar.gz")) + (sha256 + (base32 "14hk6hq5hdb3l5bhmzhw086jpzlvp9qbw9dzw30wlz5jbh2ihmvy")))) + (build-system haskell-build-system) + (home-page "https://github.com/spell-music/data-fix") + (synopsis "Fixpoint data types") + (description + "Fixpoint types and recursion schemes. If you define your AST as +fixpoint type, you get fold and unfold operations for free. + +Thanks for contribution to: Matej Kollar, Herbert Valerio Riedel") + (license license:bsd-3))) + (define-public ghc-data-hash (package (name "ghc-data-hash") -- cgit v1.2.3 From 6ba536a1cd128d755b37a5f408d5fa9a58ffc142 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:06:15 -0700 Subject: gnu: Add ghc-cborg. * gnu/packages/haskell-xyz.scm (ghc-cborg): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 52b2faaa39..b3d37abeee 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1535,6 +1535,54 @@ constructor which can be parameterised by a string-like type like: the resulting type will be insensitive to cases.") (license license:bsd-3))) +(define-public ghc-cborg + (package + (name "ghc-cborg") + (version "0.2.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/cborg/cborg-" + version + ".tar.gz")) + (sha256 + (base32 + "1rdnvy0w17s70ikmbyrnwax5rvqh19l95sh8i7ipgxi23z1r0bp1")))) + (build-system haskell-build-system) + (inputs + `(("ghc-half" ,ghc-half) + ("ghc-primitive" ,ghc-primitive))) + (native-inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-base16-bytestring" ,ghc-base16-bytestring) + ("ghc-fail" ,ghc-fail) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-scientific" ,ghc-scientific) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-vector" ,ghc-vector))) + (home-page "http://hackage.haskell.org/package/cborg") + (synopsis "Concise Binary Object Representation") + (description + "This package (formerly binary-serialise-cbor) provides an +efficient implementation of the Concise Binary Object +Representation (CBOR), as specified by RFC 7049 at +https://tools.ietf.org/html/rfc7049. + +If you are looking for a library for serialisation of Haskell values, have a +look at the @url{https://hackage.haskell.org/package/serialise} package, which +is built upon this library. + +An implementation of the standard bijection between CBOR and JSON is provided +by the @url{https://hackage.haskell.org/package/cborg-json} package. + +Also see @code{https://hackage.haskell.org/package/cbor-tool} for a convenient +command-line utility for working with CBOR data.") + (license license:bsd-3))) + (define-public ghc-cereal (package (name "ghc-cereal") -- cgit v1.2.3 From 5434fec95da8f73f0422140f6b61cc918184a77e Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:07:44 -0700 Subject: gnu: Add ghc-cborg-json. * gnu/packages/haskell-xyz.scm (ghc-cborg-json): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b3d37abeee..7ca80d6bae 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1583,6 +1583,34 @@ Also see @code{https://hackage.haskell.org/package/cbor-tool} for a convenient command-line utility for working with CBOR data.") (license license:bsd-3))) +(define-public ghc-cborg-json + (package + (name "ghc-cborg-json") + (version "0.2.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/cborg-json/cborg-json-" + version + ".tar.gz")) + (sha256 + (base32 "0ysilz7rrjk94sqr3a61s98hr9qfi1xg13bskmlpc6mpgi2s4s5b")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-aeson-pretty" ,ghc-aeson-pretty) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-scientific" ,ghc-scientific) + ("ghc-vector" ,ghc-vector) + ("ghc-cborg" ,ghc-cborg))) + (home-page "https://github.com/well-typed/cborg") + (synopsis "A library for encoding JSON as CBOR") + (description + "This package implements the bijection between JSON and CBOR +defined in the CBOR specification, RFC 7049.") + (license license:bsd-3))) + (define-public ghc-cereal (package (name "ghc-cereal") -- cgit v1.2.3 From 2b2c8911c6357312ca577c20dbe6fc58ffa98aa5 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:08:27 -0700 Subject: gnu: Add ghc-dotgen. * gnu/packages/haskell-xyz.scm (ghc-dotgen): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 7ca80d6bae..fb26de2669 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3342,6 +3342,30 @@ It is modeled after doctest for Python, see @uref{https://docs.python.org/library/doctest.html, the Doctest website}.") (license license:expat))) +(define-public ghc-dotgen + (package + (name "ghc-dotgen") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/dotgen/dotgen-" + version + ".tar.gz")) + (sha256 + (base32 + "148q93qsmqgr5pzdwvpjqfd6bdm1pwzcp2rblfwswx2x8c5f43fg")))) + (build-system haskell-build-system) + (home-page "https://github.com/ku-fpg/dotgen") + (synopsis + "Simple interface for building .dot graph files") + (description + "This package provides a simple interface for building .dot graph +files, for input into the dot and graphviz tools. It includes a +monadic interface for building graphs.") + (license license:bsd-3))) + (define-public ghc-double-conversion (package (name "ghc-double-conversion") -- cgit v1.2.3 From 89e9082e4e90c9e593ed8584ff6978ecf91dfe24 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:09:02 -0700 Subject: gnu: Add ghc-generic-random. * gnu/packages/haskell-xyz.scm (ghc-generic-random): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index fb26de2669..d828501593 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4481,6 +4481,46 @@ specific Windows, Mac, and Linux file system event notification.") deriving mechanism in Haskell to arbitrary classes.") (license license:bsd-3))) +(define-public ghc-generic-random + (package + (name "ghc-generic-random") + (version "1.2.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/generic-random/" + "generic-random-" version ".tar.gz")) + (sha256 + (base32 "130lmblycxnpqbsl7vf6a90zccibnvcb5zaclfajcn3by39007lv")))) + (build-system haskell-build-system) + (inputs `(("ghc-quickcheck" ,ghc-quickcheck))) + (native-inputs + `(("ghc-inspection-testing" ,ghc-inspection-testing))) + (arguments + `(#:cabal-revision + ("1" "1d0hx41r7yq2a86ydnfh2fv540ah8cz05l071s2z4wxcjw0ymyn4"))) + (home-page + "https://github.com/lysxia/generic-random") + (synopsis + "Generic random generators for QuickCheck") + (description + "Derive instances of @code{Arbitrary} for QuickCheck, with various options +to customize implementations. + +Automating the arbitrary boilerplate also ensures that when a type changes to +have more or fewer constructors, then the generator either fixes itself to +generate that new case (when using the uniform distribution) or causes a +compilation error so you remember to fix it (when using an explicit +distribution). + +This package also offers a simple (optional) strategy to ensure termination +for recursive types: make @code{Test.QuickCheck.Gen}'s size parameter decrease +at every recursive call; when it reaches zero, sample directly from a +trivially terminating generator given explicitly (@code{genericArbitraryRec} +and @code{withBaseCase}) or implicitly (@code{genericArbitrary'}).") + (license license:expat))) + (define-public ghc-generics-sop (package (name "ghc-generics-sop") -- cgit v1.2.3 From 714e5605b6e8a9a3c7560c8c42b508c485f641b0 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:09:59 -0700 Subject: gnu: Add ghc-text-manipulate. * gnu/packages/haskell-xyz.scm (ghc-text-manipulate): New variable. fix text-manipulate. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d828501593..41f7e14233 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -12029,6 +12029,44 @@ instances for strict and lazy text types for versions older than 1.2.1 of the text package.") (license license:bsd-2))) +(define-public ghc-text-manipulate + (package + (name "ghc-text-manipulate") + (version "0.2.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/text-manipulate" + "/text-manipulate-" + version + ".tar.gz")) + (sha256 + (base32 + "0bwxyjj3ll45srxhsp2ihikgqglvjc6m02ixr8xpvyqwkcfwgsg0")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page + "https://github.com/brendanhay/text-manipulate") + (synopsis + "Case conversion, word boundary manipulation, and textual subjugation") + (description + "Manipulate identifiers and structurally non-complex pieces of text by +delimiting word boundaries via a combination of whitespace, +control-characters, and case-sensitivity. + +Has support for common idioms like casing of programmatic variable names, +taking, dropping, and splitting by word, and modifying the first character of +a piece of text. + +Caution: this library makes heavy use of the text library's internal loop +optimisation framework. Since internal modules are not guaranteed to have a +stable API there is potential for build breakage when the text dependency is +upgraded. Consider yourself warned!") + (license license:mpl2.0))) + (define-public ghc-text-metrics (package (name "ghc-text-metrics") -- cgit v1.2.3 From a152258be2cda989d64dd9c9bb7db8d52a325077 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:10:29 -0700 Subject: gnu: Add ghc-spoon. * gnu/packages/haskell-xyz.scm (ghc-spoon): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 41f7e14233..b483b71d21 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11218,6 +11218,37 @@ internal state).") (native-inputs '()) (properties '((hidden? #t))))) +(define-public ghc-spoon + (package + (name "ghc-spoon") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/spoon/spoon-" + version + ".tar.gz")) + (sha256 + (base32 + "1m41k0mfy6fpfrv2ym4m5jsjaj9xdfl2iqpppd3c4d0fffv51cxr")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" + "09s5jjcsg4g4qxchq9g2l4i9d5zh3rixpkbiysqcgl69kj8mwv74"))) + (home-page + "http://hackage.haskell.org/package/spoon") + (synopsis + "Catch errors thrown from pure computations") + (description + "Takes an error-throwing expression and puts it back in the Maybe it +belongs in. + +Note that this suffers from the +@url{https://ghc.haskell.org/trac/ghc/ticket/5902}. Buyer beware.") + (license license:bsd-3))) + (define-public ghc-statevar (package (name "ghc-statevar") -- cgit v1.2.3 From 4c77a1a00bc39e977e48301849941ae4bf5ee560 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:11:00 -0700 Subject: gnu: Add ghc-special-values. * gnu/packages/haskell-xyz.scm (ghc-special-values): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b483b71d21..7f152e7e92 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11145,6 +11145,32 @@ core of @url{https://hackage.haskell.org/package/generics-sop, generics-sop}.") (license license:bsd-3))) +(define-public ghc-special-values + (package + (name "ghc-special-values") + (version "0.1.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/special-values/" + "special-values-" version ".tar.gz")) + (sha256 + (base32 + "1kkdw2c4d2hha99v9f89ahmifjxp7fxmxyfwq9a8xk6s0h9xs51w")))) + (build-system haskell-build-system) + (inputs + `(("ghc-scientific" ,ghc-scientific) + ("ghc-ieee754" ,ghc-ieee754) + ("ghc-nats" ,ghc-nats))) + (home-page + "https://github.com/minad/special-values#readme") + (synopsis "Typeclass providing special values") + (description + "Special values are provided by a SpecialValues typeclass. Those can be +used for example by QuickCheck, see quickcheck-special." ) + (license license:expat))) + (define-public ghc-split (package (name "ghc-split") -- cgit v1.2.3 From 47c526df631f4354a93881934c3d8e1c674528b6 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:11:37 -0700 Subject: gnu: Add ghc-serialise. * gnu/packages/haskell-xyz.scm (ghc-serialise): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 7f152e7e92..20f738eeff 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10804,6 +10804,56 @@ semigroup.") ("ghc-hashable" ,ghc-hashable-bootstrap))) (properties '((hidden? #t))))) +(define-public ghc-serialise + (package + (name "ghc-serialise") + (version "0.2.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/serialise/serialise-" + version + ".tar.gz")) + (sha256 + (base32 + "19ary6ivzk8z7wcxhm860qmh7pwqj0qjqzav1h42y85l608zqgh4")))) + (build-system haskell-build-system) + (inputs + `(("ghc-cborg" ,ghc-cborg) + ("ghc-half" ,ghc-half) + ("ghc-hashable" ,ghc-hashable) + ("ghc-primitive" ,ghc-primitive) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances))) + (arguments + `(#:cabal-revision + ("1" "1rknhad1i8bpknsnphmcmb6dnb48c2p2c13ia2qqch3hkhsvfpr6"))) + (home-page "https://github.com/well-typed/cborg") + (synopsis "Binary serialisation library for Haskell values") + (description + "This package (formerly binary-serialise-cbor) provides pure, +efficient serialization of Haskell values directly into ByteStrings for +storage or transmission purposes. By providing a set of type class instances, +you can also serialise any custom data type you have as well. + +The underlying binary format used is the 'Concise Binary Object +Representation', or CBOR, specified in RFC 7049. As a result, serialised +Haskell values have implicit structure outside of the Haskell program itself, +meaning they can be inspected or analyzed without custom tools. + +An implementation of the standard bijection between CBOR and JSON is +provided by the https://hackage.haskell.org/package/cborg-json +package. Also see https://hackage.haskell.org/package/cbor-tool for a +convenient command-line utility for working with CBOR data.") + (license license:bsd-3))) + (define-public ghc-setenv (package (name "ghc-setenv") -- cgit v1.2.3 From f011e3d6698b45cb13f5d03b72b235a55455bb47 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:12:25 -0700 Subject: gnu: Add ghc-pretty-simple. * gnu/packages/haskell-xyz.scm (ghc-pretty-simple): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 20f738eeff..53d7ab47ce 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9370,6 +9370,33 @@ complex generic values into an interactive Html page, for easier examination.") (license license:expat))) +(define-public ghc-pretty-simple + (package + (name "ghc-pretty-simple") + (version "2.2.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/pretty-simple/" + "pretty-simple-" version ".tar.gz")) + (sha256 + (base32 "0wsi9235ihm15s145lxi7325vv2k4bhighc5m88kn1lk0pl81aqq")))) + (build-system haskell-build-system) + (inputs + `(("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-glob" ,ghc-glob) + ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-aeson" ,ghc-aeson))) + (native-inputs + `(("ghc-doctest" ,ghc-doctest))) + (home-page "https://github.com/cdepillabout/pretty-simple") + (synopsis "Pretty printer for data types with a 'Show' instance") + (description + "Pretty-simple is a pretty printer for Haskell data types that have a +Show instance.") + (license license:bsd-3))) + (define-public ghc-primitive (package (name "ghc-primitive") -- cgit v1.2.3 From 0fb342352878b57acc3391e1ff3e6a7da440f996 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:13:20 -0700 Subject: gnu: Add ghc-pgp-wordlist. * gnu/packages/haskell-xyz.scm (ghc-pgp-wordlist): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 53d7ab47ce..cbbfbf4951 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9161,6 +9161,45 @@ the persistent interface, not for users of the persistent suite of database libraries.") (license license:expat))) +(define-public ghc-pgp-wordlist + (package + (name "ghc-pgp-wordlist") + (version "0.1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/pgp-wordlist/pgp-wordlist-" + version + ".tar.gz")) + (sha256 + (base32 + "15g6qh0fb7kjj3l0w8cama7cxgnhnhybw760md9yy7cqfq15cfzg")))) + (build-system haskell-build-system) + (inputs + `(("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-doctest" ,ghc-doctest))) + (home-page + "https://github.com/quchen/pgp-wordlist") + (synopsis + "Translate between binary data and a human-readable collection of words") + (description + "The PGP Word List consists of two phonetic alphabets, each with one word +per possible byte value. A string of bytes is translated with these +alphabets, alternating between them at each byte. + +The PGP words corresponding to the bytes 5B 1D CA 6E are \"erase breakaway +spellbind headwaters\", for example. + +For further information, see +@url{http://en.wikipedia.org/wiki/PGP_word_list}.") + (license license:bsd-3))) + (define-public ghc-pipes (package (name "ghc-pipes") -- cgit v1.2.3 From 6f1477d2184094ec2c29664ab9645efb4fb4a691 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:13:54 -0700 Subject: gnu: Add ghc-optional-args. * gnu/packages/haskell-xyz.scm (ghc-optional-args): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index cbbfbf4951..844287330e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8373,6 +8373,29 @@ replay capababilities, implementing fast parser monads, designing monadic DSLs, etc.") (license license:bsd-3))) +(define-public ghc-optional-args + (package + (name "ghc-optional-args") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/optional-args/optional-args-" + version + ".tar.gz")) + (sha256 + (base32 + "1r5hhn6xvc01grggxdyy48daibwzi0aikgidq0ahpa6bfynm8d1f")))) + (build-system haskell-build-system) + (home-page + "http://hackage.haskell.org/package/optional-args") + (synopsis "Optional function arguments") + (description + "This library provides a type for specifying @code{Optional} function +arguments.") + (license license:bsd-3))) + (define-public ghc-options (package (name "ghc-options") -- cgit v1.2.3 From 9f776fe2531bcca37287c897b4425bc32b8d2cba Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:14:59 -0700 Subject: gnu: Add ghc-turtle. * gnu/packages/haskell-xyz.scm (ghc-turtle): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 844287330e..686b898b2f 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -12933,6 +12933,69 @@ generating functions similar to those in @code{Data.List} for tuples of statically known size.") (license license:bsd-3))) +(define-public ghc-turtle + (package + (name "ghc-turtle") + (version "1.5.15") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/turtle/turtle-" + version + ".tar.gz")) + (sha256 + (base32 + "0yckgsc2a4g5x867gni80ldp226bsnhncfbil4ql6v2zwm4r8p7f")))) + (build-system haskell-build-system) + (inputs + `(("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) + ("ghc-async" ,ghc-async) + ("ghc-clock" ,ghc-clock) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-foldl" ,ghc-foldl) + ("ghc-hostname" ,ghc-hostname) + ("ghc-managed" ,ghc-managed) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-system-filepath" ,ghc-system-filepath) + ("ghc-system-fileio" ,ghc-system-fileio) + ("ghc-streaming-commons" ,ghc-streaming-commons) + ("ghc-temporary" ,ghc-temporary) + ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-optional-args" ,ghc-optional-args) + ("ghc-unix-compat" ,ghc-unix-compat))) + (native-inputs + `(("ghc-doctest" ,ghc-doctest) + ("ghc-fail" ,ghc-fail))) + (arguments + `(#:cabal-revision + ("1" "02q1rv7zx31xz9wnmcqwd4w3iw7623p07iyi21zr0cqlignic5pg"))) + (home-page + "http://hackage.haskell.org/package/turtle") + (synopsis "Shell programming, Haskell-style") + (description + "Turtle is a reimplementation of the Unix command line environment in +Haskell so that you can use Haskell as both a shell and a scripting +language. Features include: + +@itemize +@item Batteries included: Command an extended suite of predefined utilities. +@item Interoperability: You can still run external shell commands. +@item Portability: Works on Windows, OS X, and Linux. +@item Exception safety: Safely acquire and release resources. +@item Streaming: Transform or fold command output in constant space. +@item Patterns: Use typed regular expressions that can parse structured values. +@item Formatting: Type-safe printf-style text formatting. +@item Modern: Supports text and system-filepath. +@end itemize + +Read \"Turtle.Tutorial\" for a detailed tutorial or \"Turtle.Prelude\" for a +quick-start guide. Turtle is designed to be beginner-friendly, but as a +result lacks certain features, like tracing commands. If you feel comfortable +using turtle then you should also check out the Shelly library which provides +similar functionality.") + (license license:bsd-3))) + (define-public ghc-typed-process (package (name "ghc-typed-process") -- cgit v1.2.3 From bcfe9dba4dfc95b294cf7b72fd77a39fbbc22f39 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:15:54 -0700 Subject: gnu: Add ghc-managed. * gnu/packages/haskell-xyz.scm (ghc-managed): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 686b898b2f..cef3261f45 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7137,6 +7137,42 @@ With it, you can determine the type of a file by examining its contents rather than its name.") (license license:bsd-3))) +(define-public ghc-managed + (package + (name "ghc-managed") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/managed/managed-" + version + ".tar.gz")) + (sha256 + (base32 + "1kbrw99yh5x5blykmx2n88mplbbi4ss1ij5j17b7asw6q0ihm9zi")))) + (build-system haskell-build-system) + (home-page "http://hackage.haskell.org/package/managed") + (synopsis "Monad for managed values") + (description + "In Haskell you very often acquire values using the with... idiom using +functions of type (a -> IO r) -> IO r. This idiom forms a Monad, which is a +special case of the ContT monad (from transformers) or the Codensity +monad (from kan-extensions). The main purpose behind this package is to +provide a restricted form of these monads specialized to this unusually common +case. + +The reason this package defines a specialized version of these types +is to: + +@itemize +@item be more beginner-friendly, +@item simplify inferred types and error messages, and: +@item provide some additional type class instances that would otherwise be +orphan instances +@end itemize") + (license license:bsd-3))) + (define-public ghc-markdown-unlit (package (name "ghc-markdown-unlit") -- cgit v1.2.3 From bcd35444ca64131784799731e92042902615ad65 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:17:48 -0700 Subject: gnu: Add ghc-lens-family-core. * gnu/packages/haskell-xyz.scm (ghc-lens-family-core): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index cef3261f45..510a77d9fb 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6660,6 +6660,42 @@ of getters, folds, isomorphisms, traversals, setters and lenses and their indexed variants.") (license license:bsd-3))) +(define-public ghc-lens-family-core + (package + (name "ghc-lens-family-core") + (version "1.2.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/lens-family-core/lens-family-core-" + version + ".tar.gz")) + (sha256 + (base32 + "009rf10pj1cb50v44cc1pq7qvfrmkkk9dikahs9qmvbvgl3mykwi")))) + (build-system haskell-build-system) + (home-page + "http://hackage.haskell.org/package/lens-family-core") + (synopsis "Haskell 98 Lens Families") + (description + "This package provides first class functional references. In addition to +the usual operations of getting, setting and composition, plus integration +with the state monad, lens families provide some unique features: + +@itemize +@item Polymorphic updating +@item Traversals +@item Cast projection functions to read-only lenses +@item Cast @code{toList} functions to read-only traversals +@item Cast semantic editor combinators to modify-only traversals +@end itemize + +For optimal first-class support use the lens-family package with rank 2/rank N +polymorphism. @code{Lens.Family.Clone} allows for first-class support of +lenses and traversals for those who require Haskell 98.") + (license license:bsd-3))) + (define-public ghc-libffi (package (name "ghc-libffi") -- cgit v1.2.3 From 2fad2bf7d7becc64a32082392e3499e6a27cda72 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:18:37 -0700 Subject: gnu: Add ghc-prettyprinter. * gnu/packages/haskell-xyz.scm (ghc-prettyprinter): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 510a77d9fb..fa4e9a707c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9456,6 +9456,35 @@ provides the pretty printing class and instances for the Prelude types.") (license license:bsd-3))) +(define-public ghc-prettyprinter + (package + (name "ghc-prettyprinter") + (version "1.2.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/prettyprinter/prettyprinter-" + version + ".tar.gz")) + (sha256 + (base32 "1p9c3q55hba4c0zyxc624g5df7wgsclpsmd8wqpdnmib882q9d1v")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-doctest" ,ghc-doctest) + ("ghc-pgp-wordlist" ,ghc-pgp-wordlist) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (home-page "https://github.com/quchen/prettyprinter") + (synopsis + "Modern, easy to use, well-documented, extensible pretty-printer") + (description + "A prettyprinter/text rendering engine. Easy to use, well-documented, +ANSI terminal backend exists, HTML backend is trivial to implement, no name +clashes, @code{Text}-based, extensible.") + (license license:bsd-2))) + (define-public ghc-pretty-hex (package (name "ghc-pretty-hex") -- cgit v1.2.3 From 798a2df47f7f84e2cda2c110b6afb6610ee04583 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:19:29 -0700 Subject: gnu: Add ghc-repline. * gnu/packages/haskell-xyz.scm (ghc-repline): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index fa4e9a707c..97df51cd5a 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10242,6 +10242,28 @@ inspired by libtre.") "This provides an extra text interface for regex-tdfa.") (license license:bsd-3))) +(define-public ghc-repline + (package + (name "ghc-repline") + (version "0.2.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/repline/repline-" + version + ".tar.gz")) + (sha256 + (base32 + "1ph21kbbanlcs8n5lwk16g9vqkb98mkbz5mzwrp8j2rls2921izc")))) + (build-system haskell-build-system) + (home-page "https://github.com/sdiehl/repline") + (synopsis "Haskeline wrapper for GHCi-like REPL interfaces") + (description + "Haskeline wrapper for GHCi-like REPL interfaces. Composable with +normal mtl transformers.") + (license license:expat))) + (define-public ghc-rerebase (package (name "ghc-rerebase") -- cgit v1.2.3 From dd26713e16e0ed6798820eabf1af7aef34ece12f Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:19:59 -0700 Subject: gnu: Add ghc-haskeline-0.8. * gnu/packages/haskell-xyz.scm (ghc-haskeline-0.8): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 97df51cd5a..13a89e94b1 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5274,6 +5274,37 @@ monad, as well as a typeclass abstracting their common operations, and a set of wrappers to use the hash tables in the IO monad.") (license license:bsd-3))) +(define-public ghc-haskeline-0.8 + (package + (name "ghc-haskeline") + (version "0.8.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/haskeline/haskeline-" + version + ".tar.gz")) + (sha256 + (base32 + "0gqsa5s0drim9m42hv4wrq61mnvcdylxysfxfw3acncwilfrn9pb")))) + (build-system haskell-build-system) + (inputs `(("ghc-exceptions" ,ghc-exceptions))) + (native-inputs `(("ghc-hunit" ,ghc-hunit))) + ;; FIXME: Tests failing + (arguments `(#:tests? #f)) + (home-page "https://github.com/judah/haskeline") + (synopsis + "Command-line interface for user input, written in Haskell") + (description + "Haskeline provides a user interface for line input in command-line +programs. This library is similar in purpose to readline, but since it is +written in Haskell it is (hopefully) more easily used in other Haskell +programs. + +Haskeline runs both on POSIX-compatible systems and on Windows.") + (license license:bsd-3))) + (define-public ghc-haskell-lexer (package (name "ghc-haskell-lexer") -- cgit v1.2.3 From 6c0858dda26dc1d3af8e546d9b1fda59175da9a0 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:20:34 -0700 Subject: gnu: Add ghc-repline-0.3. * gnu/packages/haskell-xyz.scm (ghc-repline-0.3): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 13a89e94b1..30a09bde8b 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10295,6 +10295,24 @@ inspired by libtre.") normal mtl transformers.") (license license:expat))) +(define-public ghc-repline-0.3 + (package + (inherit ghc-repline) + (version "0.3.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/repline/repline-" + version + ".tar.gz")) + (sha256 + (base32 + "0niihfyggg2qisadg7w49cr5k5qyyynia93iip0ng2bbmzwi88g8")))) + (inputs + `(("ghc-exceptions" ,ghc-exceptions) + ("ghc-haskeline" ,ghc-haskeline-0.8))))) + (define-public ghc-rerebase (package (name "ghc-rerebase") -- cgit v1.2.3 From 2496e49f85b59d1b95e720344d4cd5dcc08f4aa3 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:21:06 -0700 Subject: gnu: Add ghc-prettyprinter-1.6. * gnu/packages/haskell-xyz.scm (ghc-prettyprinter-1.6): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 30a09bde8b..6ec349e575 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9516,6 +9516,23 @@ ANSI terminal backend exists, HTML backend is trivial to implement, no name clashes, @code{Text}-based, extensible.") (license license:bsd-2))) +(define-public ghc-prettyprinter-1.6 + (package + (inherit ghc-prettyprinter) + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/prettyprinter/prettyprinter-" + version + ".tar.gz")) + (sha256 + (base32 "10fphxh8lvdaw7i8jyllwmj87w02db92mf99zfw5vddp9mv6b5rz")))) + (inputs + `(("ghc-quickckeck-instances" , ghc-quickcheck-instances) + ,@(package-inputs ghc-prettyprinter))))) + (define-public ghc-pretty-hex (package (name "ghc-pretty-hex") -- cgit v1.2.3 From b4f24d668b8cb408ff794bddf135146e4147e5bd Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:21:32 -0700 Subject: gnu: Add ghc-prettyprinter-ansi-terminal. * gnu/packages/haskell-xyz.scm (ghc-prettyprinter-ansi-terminal): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 6ec349e575..2b9ad860e8 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9533,6 +9533,30 @@ clashes, @code{Text}-based, extensible.") `(("ghc-quickckeck-instances" , ghc-quickcheck-instances) ,@(package-inputs ghc-prettyprinter))))) +(define-public ghc-prettyprinter-ansi-terminal + (package + (name "ghc-prettyprinter-ansi-terminal") + (version "1.1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/prettyprinter-ansi-terminal/" + "prettyprinter-ansi-terminal-" version ".tar.gz")) + (sha256 + (base32 "0ha6vz707qzb5ky7kdsnw2zgphg2dnxrpbrxy8gaw119vwhb9q6k")))) + (build-system haskell-build-system) + (inputs + `(("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-prettyprinter" ,ghc-prettyprinter-1.6))) + (native-inputs `(("ghc-doctest" ,ghc-doctest))) + (home-page + "https://github.com/quchen/prettyprinter") + (synopsis + "ANSI terminal backend for the prettyprinter package") + (description "ANSI terminal backend for the prettyprinter package.") + (license license:bsd-2))) + (define-public ghc-pretty-hex (package (name "ghc-pretty-hex") -- cgit v1.2.3 From 23e4b264d7ce196f660c5a92cc0a83c73b5e8b8e Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:22:09 -0700 Subject: gnu: Add ghc-generic-random-1.3.0.1. * gnu/packages/haskell-xyz.scm (ghc-generic-random-1.3.0.1): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 2b9ad860e8..8e18644f51 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4521,6 +4521,20 @@ trivially terminating generator given explicitly (@code{genericArbitraryRec} and @code{withBaseCase}) or implicitly (@code{genericArbitrary'}).") (license license:expat))) +(define-public ghc-generic-random-1.3.0.1 + (package + (inherit ghc-generic-random) + (version "1.3.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/generic-random/" + "generic-random-" version ".tar.gz")) + (sha256 + (base32 "0d9w7xcmsb31b95fr9d5jwbsajcl1yi4347dlbw4bybil2vjwd7k")))) + (arguments '()))) + (define-public ghc-generics-sop (package (name "ghc-generics-sop") -- cgit v1.2.3 From b7250901f6e0143a6838d924742397986c1764b0 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:22:42 -0700 Subject: gnu: Add ghc-atomic-write-0.2.0.7. * gnu/packages/haskell-xyz.scm (ghc-atomic-write-0.2.0.7): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 8e18644f51..64c09c9274 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -567,6 +567,21 @@ will destroy the permissions on the original file. This library preserves permissions while atomically writing to a file.") (license license:expat))) +(define-public ghc-atomic-write-0.2.0.7 + (package + (inherit ghc-atomic-write) + (version "0.2.0.7") + (source + (origin + (inherit (package-source ghc-atomic-write)) + (uri (string-append + "https://hackage.haskell.org/package/atomic-write/atomic-write-" + version + ".tar.gz")) + (sha256 + (base32 + "03cn3ii74h0w3g4h78xsx9v2sn58r3qsr2dbdwq340xwhiwcgxdm")))))) + (define-public ghc-attoparsec (package (name "ghc-attoparsec") -- cgit v1.2.3 From 9ff667ea05d0807b4e6512c92914ae517b9ec755 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:01:46 -0700 Subject: gnu: Add dhall. * gnu/packages/dhall.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. (dist_patch_DATA): Add new patch. * gnu/packages/patches/dhall-remove-network-tests.patch: Add patch to remove dhall network tests. Signed-off-by: Leo Famulari --- gnu/local.mk | 2 + gnu/packages/dhall.scm | 133 +++++++++++++++++++++ .../patches/dhall-remove-network-tests.patch | 97 +++++++++++++++ 3 files changed, 232 insertions(+) create mode 100644 gnu/packages/dhall.scm create mode 100644 gnu/packages/patches/dhall-remove-network-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 663e687bd6..768943a67a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -157,6 +157,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/debian.scm \ %D%/packages/debug.scm \ %D%/packages/dejagnu.scm \ + %D%/packages/dhall.scm \ %D%/packages/dico.scm \ %D%/packages/dictionaries.scm \ %D%/packages/diffoscope.scm \ @@ -862,6 +863,7 @@ dist_patch_DATA = \ %D%/packages/patches/desmume-gcc6-fixes.patch \ %D%/packages/patches/desmume-gcc7-fixes.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ + %D%/packages/patches/dhall-remove-network-tests.patch \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/dkimproxy-add-ipv6-support.patch \ %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \ diff --git a/gnu/packages/dhall.scm b/gnu/packages/dhall.scm new file mode 100644 index 0000000000..bbe2d271d7 --- /dev/null +++ b/gnu/packages/dhall.scm @@ -0,0 +1,133 @@ +;;; Copyright © 2020 John Soo +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages dhall) + #:use-module (gnu packages) + #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages haskell-check) + #:use-module (gnu packages haskell-crypto) + #:use-module (gnu packages haskell-web) + #:use-module (guix download) + #:use-module (guix build-system haskell) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) + +(define-public dhall + (package + (name "dhall") + (version "1.31.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/dhall/dhall-" + version + ".tar.gz")) + (sha256 + (base32 + "18v7vvcbcm9s7slh6h43rj9yakkkxwnwgj6kv84i6qzd2j7d80mc")) + (patches (search-patches "dhall-remove-network-tests.patch")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-aeson-pretty" ,ghc-aeson-pretty) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-atomic-write" ,ghc-atomic-write-0.2.0.7) + ("ghc-case-insensitive" ,ghc-case-insensitive) + ("ghc-cborg" ,ghc-cborg) + ("ghc-cborg-json" ,ghc-cborg-json) + ("ghc-contravariant" ,ghc-contravariant) + ("ghc-data-fix" ,ghc-data-fix) + ("ghc-diff" ,ghc-diff) + ("ghc-dotgen" ,ghc-dotgen) + ("ghc-either" ,ghc-either) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-hashable" ,ghc-hashable) + ("ghc-lens-family-core" ,ghc-lens-family-core) + ("ghc-megaparsec" ,ghc-megaparsec) + ("ghc-memory" ,ghc-memory) + ("ghc-network-uri" ,ghc-network-uri) + ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-parsers" ,ghc-parsers) + ("ghc-parser-combinators" ,ghc-parser-combinators) + ("ghc-prettyprinter" ,ghc-prettyprinter-1.6) + ("ghc-prettyprinter-ansi-terminal" ,ghc-prettyprinter-ansi-terminal) + ("ghc-pretty-simple" ,ghc-pretty-simple) + ("ghc-profunctors" ,ghc-profunctors) + ("ghc-repline" ,ghc-repline-0.3) + ("ghc-serialise" ,ghc-serialise) + ("ghc-scientific" ,ghc-scientific) + ("ghc-text-manipulate" ,ghc-text-manipulate) + ("ghc-th-lift-instances" ,ghc-th-lift-instances) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-uri-encode" ,ghc-uri-encode) + ("ghc-vector" ,ghc-vector) + ("ghc-cryptonite" ,ghc-cryptonite) + ("ghc-http-types" ,ghc-http-types) + ("ghc-http-client" ,ghc-http-client) + ("ghc-http-client-tls" ,ghc-http-client-tls))) + (native-inputs + `(("ghc-foldl" ,ghc-foldl) + ("ghc-generic-random" ,ghc-generic-random-1.3.0.1) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-special-values" ,ghc-special-values) + ("ghc-spoon" ,ghc-spoon) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-turtle" ,ghc-turtle) + ("ghc-mockery" ,ghc-mockery) + ("ghc-doctest" ,ghc-doctest))) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Remove tests that require network + (add-after 'unpack 'remove-more-tests + (lambda _ + (substitute* "src/Dhall/Tutorial.hs" + (((string-append + "-- >>> input auto " + "\"https://raw.githubusercontent.com/dhall-lang" + "/dhall-haskell/18e4e9a18dc53271146df3ccf5b4177c3552236b/" + "examples/True\" :: IO Bool")) + "") + (((string-append + "-- >>> input auto " + "\"False == " + "https://raw.githubusercontent.com/dhall-lang" + "/dhall-haskell/18e4e9a18dc53271146df3ccf5b4177c3552236b/" + "examples/True\" :: IO Bool")) + "")) + #t))))) + (home-page + "https://dhall-lang.org/") + (synopsis + "Configuration language guaranteed to terminate") + (description + "Dhall is an explicitly typed configuration language that is not Turing +complete. Despite being Turing incomplete, Dhall is a real programming +language with a type-checker and evaluator. + +Use this library to parse, type-check, evaluate, and pretty-print the Dhall +configuration language. This package also includes an executable which +type-checks a Dhall file and reduces the file to a fully evaluated normal +form.") + (license license:bsd-3))) diff --git a/gnu/packages/patches/dhall-remove-network-tests.patch b/gnu/packages/patches/dhall-remove-network-tests.patch new file mode 100644 index 0000000000..c260e7844d --- /dev/null +++ b/gnu/packages/patches/dhall-remove-network-tests.patch @@ -0,0 +1,97 @@ +diff a/dhall-lang/tests/import/failure/referentiallyInsane.dhall b/dhall-lang/tests/import/failure/referentiallyInsane.dhall +--- a/dhall-lang/tests/import/failure/referentiallyInsane.dhall ++++ /dev/null +@@ -1,13 +0,0 @@ +-{- The following remote import attempts to import an environment variable, which +- must be disallowed by the referential sanity check +- +- One reason for doing this is to protect against remote imports exfiltrating +- environment variables (such as via custom headers). Only referentially +- opaque imports (i.e. local imports) have permission to refer to other +- referentially opaque imports in order to protect against this attack. +- +- The referential sanity check also ensures that remote imports are +- referentially transparent. Or in other words, any import that is globally +- addressable must have a meaning that is not context-sensitive. +--} +-https://raw.githubusercontent.com/dhall-lang/dhall-lang/master/tests/import/data/referentiallyOpaque.dhall +diff a/dhall-lang/tests/import/success/customHeadersA.dhall b/dhall-lang/tests/import/success/customHeadersA.dhall +--- a/dhall-lang/tests/import/success/customHeadersA.dhall ++++ /dev/null +@@ -1,3 +0,0 @@ +-https://httpbin.org/user-agent +- using [ { mapKey = "User-Agent", mapValue = "Dhall" } ] +- as Text +diff a/dhall-lang/tests/import/success/noHeaderForwardingA.dhall b/dhall-lang/tests/import/success/noHeaderForwardingA.dhall +--- a/dhall-lang/tests/import/success/noHeaderForwardingA.dhall ++++ /dev/null +@@ -1,6 +0,0 @@ +-{- The purpose of this test is to verify that the custom headers supplied to +- this import are not forwarded to the transitive import of +- https://httpbin.org/user-agent +--} +-https://raw.githubusercontent.com/dhall-lang/dhall-lang/master/tests/import/success/customHeadersA.dhall +- using [ { mapKey = "User-Agent", mapValue = "Secret" } ] +diff a/dhall-lang/tests/import/success/unit/RemoteAsTextA.dhall b/dhall-lang/tests/import/success/unit/RemoteAsTextA.dhall +--- a/dhall-lang/tests/import/success/unit/RemoteAsTextA.dhall ++++ /dev/null +@@ -1 +0,0 @@ +-https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/example.txt as Text +diff a/dhall-lang/tests/import/success/unit/SimpleRemoteA.dhall b/dhall-lang/tests/import/success/unit/SimpleRemoteA.dhall +--- a/dhall-lang/tests/import/success/unit/SimpleRemoteA.dhall ++++ /dev/null +@@ -1 +0,0 @@ +-https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simple.dhall +diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain1A.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChain1A.dhall +--- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain1A.dhall ++++ /dev/null +@@ -1 +0,0 @@ +-https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simpleLocation.dhall +diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain2A.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChain2A.dhall +--- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain2A.dhall ++++ /dev/null +@@ -1 +0,0 @@ +-https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/Canonicalize3A.dhall +diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain3A.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChain3A.dhall +--- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain3A.dhall ++++ /dev/null +@@ -1 +0,0 @@ +-https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/Canonicalize5A.dhall +diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainEnvA.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChainEnvA.dhall +--- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainEnvA.dhall ++++ /dev/null +@@ -1,5 +0,0 @@ +-{- +- This test verifies that `env:VAR as Location` isn't rejected as referentially opaque, +- as `env:VAR` on its own would. +--} +-https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/EnvA.dhall +diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainMissingA.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChainMissingA.dhall +--- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainMissingA.dhall ++++ /dev/null +@@ -1,6 +0,0 @@ +-{- This test verifies that `missing as Location` succeeds when chained since: +- * The `missing` is never actually resolved (due to the `as Location`) +- * The `missing` should be treated as referentially transparent (and therefore +- be a valid transitive dependency of a remote import) +--} +-https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/MissingA.dhall +diff a/dhall-lang/tests/type-inference/success/CacheImportsA.dhall b/dhall-lang/tests/type-inference/success/CacheImportsA.dhall +--- a/dhall-lang/tests/type-inference/success/CacheImportsA.dhall ++++ /dev/null +@@ -1,6 +0,0 @@ +-{- +- This URL returns (probably) a different result for each request. This test +- ensures that import results for a given URL are correctly cached within an +- execution of dhall. +--} +-let _ = assert : https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text === https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text in 0 +diff a/dhall-lang/tests/type-inference/success/CacheImportsCanonicalizeA.dhall b/dhall-lang/tests/type-inference/success/CacheImportsCanonicalizeA.dhall +--- a/dhall-lang/tests/type-inference/success/CacheImportsCanonicalizeA.dhall ++++ /dev/null +@@ -1,5 +0,0 @@ +-{- +- This URL returns (probably) a different result for each request. This test +- ensures that import locations are canonicalized before being cached. +--} +-let _ = assert : https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text === https://csrng.net/csrng/../csrng/csrng.php?min=0&max=1000 as Text in 0 -- cgit v1.2.3 From 60b81ec2f324c18d026e9ae05199493bc644960b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 May 2020 18:28:23 +0200 Subject: gnu: emacs-2048-game: Update home page. * gnu/packages/emacs-xyz.scm (emacs-2048-game)[home-page]: Update URL. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e845ca9097..7f34c691df 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5641,7 +5641,7 @@ orange and red as accent colors.") (base32 "0gy2pvz79whpavp4jmz8h9krzn7brmvv3diixi1d4w51pcdvaldd")))) (build-system emacs-build-system) - (home-page "https://bitbucket.org/zck/2048.el") + (home-page "https://hg.sr.ht/~zck/game-2048") (synopsis "Implementation of the game 2048 in Emacs Lisp") (description "This program is an implementation of 2048 for Emacs. -- cgit v1.2.3 From 36640207c9543e48cd6daa92930f023f80065a5d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 29 May 2020 16:33:09 +0200 Subject: quirks: Build 'compute-guix-derivation' modules with 2.2 when needed. Fixes . Reported by Jan Nieuwenhuizen . * guix/quirks.scm (requires-guile-2.2?): New procedure. (%quirks): Add it. (%bug-41214-patch): Comment. --- guix/quirks.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/guix/quirks.scm b/guix/quirks.scm index d180bd2c09..d292f4e932 100644 --- a/guix/quirks.scm +++ b/guix/quirks.scm @@ -57,6 +57,18 @@ #f (apply throw args))))) +(define (requires-guile-2.2? source) + "Return true if SOURCE uses Guile 2.2 for the shebang of +'compute-guix-derivation'." + (define content + (call-with-input-file (string-append source "/" %self-build-file) + read-string)) + + ;; The 'find-best-packages-by-name' call is inserted by %BUG-41214-PATCH. + (string-contains content + (object->string + '(find-best-packages-by-name "guile" "2.2")))) + (define (guile-2.2.4) (module-ref (resolve-interface '(gnu packages guile)) 'guile-2.2.4)) @@ -66,7 +78,8 @@ ;; about specific Guile versions that old Guix revisions might need to use ;; just to be able to build and run the trampoline in %SELF-BUILD-FILE. See ;; - `((,syscalls-reexports-local-variables? . ,guile-2.2.4))) + `((,syscalls-reexports-local-variables? . ,guile-2.2.4) + (,requires-guile-2.2? . ,guile-2.2.4))) ;;; @@ -143,6 +156,7 @@ corresponds to the given Guix COMMIT, a SHA1 hexadecimal string." (define (build-with-guile-2.2 source) (substitute* (string-append source "/" %self-build-file) (("\\(default-guile\\)") + ;; Note: This goes hand in hand with the 'requires-guile-2.2?' quirk. (object->string '(car (find-best-packages-by-name "guile" "2.2")))) (("\\(find-best-packages-by-name \"guile-gcrypt\" #f\\)") (object->string '(find-best-packages-by-name "guile2.2-gcrypt" #f)))) -- cgit v1.2.3 From b56cbe8974c328a6c7bc28906478ef1b191ada4c Mon Sep 17 00:00:00 2001 From: Jesse Dowell Date: Fri, 29 May 2020 16:39:39 +0200 Subject: syscalls: Properly match %HOST-TYPE. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Regression introduced in 0d371c633f7308cfde2432d6119d386a5c63198c. * guix/build/syscalls.scm (write-socket-address!) (read-socket-address): Use 'string-contains' instead of 'string-suffix?'. Signed-off-by: Ludovic Courtès --- guix/build/syscalls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 8070c5546f..6be322d68f 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -1404,7 +1404,7 @@ bytevector BV at INDEX." (error "unsupported socket address" sockaddr))))) (define write-socket-address! - (if (string-suffix? "linux-gnu" %host-type) + (if (string-contains %host-type "linux-gnu") write-socket-address!/linux write-socket-address!/hurd)) @@ -1436,7 +1436,7 @@ bytevector BV at INDEX." (vector family))))) (define read-socket-address - (if (string-suffix? "linux-gnu" %host-type) + (if (string-contains %host-type "linux-gnu") read-socket-address/linux read-socket-address/hurd)) -- cgit v1.2.3 From 17a102332a253f0e3b1f511fa7bda2094264a77c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 29 May 2020 16:44:27 +0200 Subject: syscalls: 'terminal-dimension' ignores EPERM. Fixes . Reported by Tobias Geerinckx-Rice . * guix/build/syscalls.scm (terminal-dimension): Add EPERM to the list of errno code for FALL-BACK. --- guix/build/syscalls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 6be322d68f..d69b178a0a 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -2052,8 +2052,8 @@ correspond to a terminal, return the value returned by FALL-BACK." ;; would return EINVAL instead in some cases: ;; . ;; Furthermore, some FUSE file systems like unionfs return ENOSYS for - ;; that ioctl. - (if (memv errno (list ENOTTY EINVAL ENOSYS)) + ;; that ioctl, and bcachefs returns EPERM. + (if (memv errno (list ENOTTY EINVAL ENOSYS EPERM)) (fall-back) (apply throw args)))))) -- cgit v1.2.3 From e65a44649e8d7698c4a888f1de625a67052520e9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 29 May 2020 18:19:07 +0200 Subject: maint: Git pre-push hook runs "make authenticate check-channel-news". * etc/git/pre-push: Change to run "make authenticate check-channel-news". --- etc/git/pre-push | 49 +++++-------------------------------------------- 1 file changed, 5 insertions(+), 44 deletions(-) diff --git a/etc/git/pre-push b/etc/git/pre-push index 9206a2dfe5..59294f0ffb 100755 --- a/etc/git/pre-push +++ b/etc/git/pre-push @@ -1,7 +1,6 @@ #!/bin/sh -# This hook script prevents the user from pushing to Savannah if any of the new -# commits' OpenPGP signatures cannot be verified. +# A hook script that prevents the user from pushing unsigned commits. # Called by "git push" after it has checked the remote status, but before # anything has been pushed. If this script exits with a non-zero status nothing @@ -19,51 +18,13 @@ # # -z40=0000000000000000000000000000000000000000 - # Only use the hook when pushing to Savannah. case "$2" in -*git.sv.gnu.org*) - break + *.gnu.org*) + exec make authenticate check-channel-news + exit 127 ;; -*) + *) exit 0 ;; esac - -while read local_ref local_sha remote_ref remote_sha -do - if [ "$local_sha" = $z40 ] - then - # Handle delete - : - else - if [ "$remote_sha" = $z40 ] - then - # We are pushing a new branch. To prevent wasting too - # much time for this relatively rare case, we examine - # all commits since the first signed commit, rather than - # the full history. This check *will* fail, and the user - # will need to temporarily disable the hook to push the - # new branch. - range="e3d0fcbf7e55e8cbe8d0a1c5a24d73f341d7243b..$local_sha" - else - # Update to existing branch, examine new commits - range="$remote_sha..$local_sha" - fi - - # Verify the signatures of all commits being pushed. - ret=0 - for commit in $(git rev-list $range) - do - if ! git verify-commit $commit >/dev/null 2>&1 - then - printf "%s failed signature check\n" $commit - ret=1 - fi - done - exit $ret - fi -done - -exit 0 -- cgit v1.2.3 From e70e097882699865f63eabc5fb29b4fe4468a97b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 26 May 2020 15:30:25 +0200 Subject: size: Document that positional arguments can be store items. * guix/scripts/size.scm (show-help): Mention STORE-ITEM positional argument alternative. --- guix/scripts/size.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/scripts/size.scm b/guix/scripts/size.scm index 2446b84587..c42f4f7782 100644 --- a/guix/scripts/size.scm +++ b/guix/scripts/size.scm @@ -230,8 +230,8 @@ the name of a PNG file." ;;; (define (show-help) - (display (G_ "Usage: guix size [OPTION]... PACKAGE -Report the size of PACKAGE and its dependencies.\n")) + (display (G_ "Usage: guix size [OPTION]... PACKAGE|STORE-ITEM +Report the size of the PACKAGE or STORE-ITEM, with its dependencies.\n")) (display (G_ " --substitute-urls=URLS fetch substitute from URLS if they are authorized")) -- cgit v1.2.3 From 776409c5069de949da328b769132fa009477668c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 26 May 2020 15:36:58 +0200 Subject: doc: Add example to calculate the size a system. * doc/guix.texi (Invoking `guix size'): Add guix size example for store item. --- doc/guix.texi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 5b9942d420..ba5729bd41 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10112,6 +10112,13 @@ libraries. (That libc and GCC's libraries represent a large fraction of the closure is not a problem @i{per se} because they are always available on the system anyway.) +Since the command also accepts store file names, assessing the size of +a build result is straightforward: + +@example +guix size $(guix system build config.scm) +@end example + When the package(s) passed to @command{guix size} are available in the store@footnote{More precisely, @command{guix size} looks for the @emph{ungrafted} variant of the given package(s), as returned by -- cgit v1.2.3 From ac2fc1340647298874f35b4be5861d1e437d0a24 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 29 May 2020 23:42:48 +0530 Subject: gnu: aptdec: Update source and home page URIs. * gnu/packages/radio.scm (aptdec)[source, home-page]: Update URI. --- gnu/packages/radio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index b3a7cc0e97..53eb3da147 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019 Arun Isaac +;;; Copyright © 2017, 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2019, 2020 Christopher Howard ;;; Copyright © 2019, 2020 Evan Straw ;;; Copyright © 2020 Guillaume Le Vaillant @@ -192,7 +192,7 @@ memory contents between them.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/csete/aptdec") + (url "https://github.com/Xerbo/aptdec") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -213,7 +213,7 @@ memory contents between them.") (let ((out (assoc-ref outputs "out"))) (install-file "atpdec" (string-append out "/bin"))) #t))))) - (home-page "https://github.com/csete/aptdec") + (home-page "https://github.com/Xerbo/aptdec") (synopsis "NOAA Automatic Picture Transmission (APT) decoder") (description "Aptdec decodes Automatic Picture Transmission (APT) images. These are medium resolution images of the Earth transmitted by, among other -- cgit v1.2.3 From 319a73e7b63ab939bd357666245c14ff241d0c1f Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 30 May 2020 00:01:57 +0530 Subject: gnu: aptdec: Do not hard-code CC=gcc. * gnu/packages/radio.scm (aptdec)[arguments]: Do not hard-code CC=gcc in the make-flags. Use the compiler appropriate for the target. --- gnu/packages/radio.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 53eb3da147..d18af8f75c 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -203,7 +203,15 @@ memory contents between them.") `(("libpng" ,libpng) ("libsndfile" ,libsndfile))) (arguments - `(#:make-flags (list "CC=gcc") + `(#:make-flags + (list + (string-append "CC=" + (if ,(%current-target-system) + (string-append (assoc-ref %build-inputs "cross-gcc") + "/bin/" ,(%current-target-system) "-gcc") + "gcc")) + (string-append "PREFIX=" %output) + (string-append "RPM_BUILD_ROOT=" %output)) #:tests? #f ; no tests #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 41a2d6a8b9294a6eb8e97aaefd569e755f5f461e Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 30 May 2020 00:35:06 +0530 Subject: gnu: emacs-evil: Update to 1.14.0. * gnu/packages/emacs-xyz.scm (emacs-evil): Update to 1.14.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7f34c691df..4f7b4cf6cc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8350,7 +8350,7 @@ news items, openrc and runscripts.") (define-public emacs-evil (package (name "emacs-evil") - (version "1.2.14") + (version "1.14.0") (source (origin (method git-fetch) @@ -8360,7 +8360,7 @@ news items, openrc and runscripts.") (file-name (git-file-name name version)) (sha256 (base32 - "1833w397xhac5g3pp25szr2gyvclxy91aw27azvbmsx94pyk2a3q")))) + "17xrn3s6a4afmls8fw8nnxa1jq9dmj2qqrxa2vngh50hxpz8840p")))) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 57fa9cd8206ffb2afefd5fb66326cfdc7c156714 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 30 May 2020 00:45:55 +0530 Subject: gnu: fortune-mod: Update to 2.22.0. * gnu/packages/games.scm (fortune-mod): Update to 2.22.0. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ee7f001f20..1c27561834 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Steve Webber ;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira -;;; Copyright © 2017, 2018 Arun Isaac +;;; Copyright © 2017, 2018, 2020 Arun Isaac ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2019 nee ;;; Copyright © 2017 Clément Lassieur @@ -6376,7 +6376,7 @@ original.") (define-public fortune-mod (package (name "fortune-mod") - (version "2.12.0") + (version "2.22.0") (source (origin (method git-fetch) @@ -6386,7 +6386,7 @@ original.") (file-name (git-file-name name version)) (sha256 (base32 - "0laxgqsdg7kvpvvm1f54b94ga9r0cr9g3ffii8avg8fy65x6pzc9")))) + "17h2g35j8nzljsqaqhrsx75jakbmlqnsa150g2xw414fcbnjbyps")))) (build-system cmake-build-system) (arguments `(#:test-target "check" -- cgit v1.2.3 From 0c82f6ad0ef92a5ee4b181ab9033dd3aaf2813e7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 May 2020 22:46:58 +0200 Subject: gnu: cdogs-sdl: Update to 0.8.0. * gnu/packages/games.scm (cdogs-sdl): Update to 0.8.0. [native-inputs]: Add `pkg-config'. [inputs]: Add `gtk+'. --- gnu/packages/games.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1c27561834..210cf8ab58 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4819,24 +4819,27 @@ emerges from a sewer hole and pulls her below ground.") (define-public cdogs-sdl (package (name "cdogs-sdl") - (version "0.6.9") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cxong/cdogs-sdl.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "13gyv2hzk43za1n3lsjnd5v64xlzfzq7n10scd1rcbsnk1n007zr")))) + (version "0.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cxong/cdogs-sdl.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0vx37zb2iw7sfw5a2bs97ydlmb301nvy485ybdm8g46c5hn9s13c")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list (string-append "-DCDOGS_DATA_DIR=" (assoc-ref %outputs "out") "/share/cdogs-sdl/")))) + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs - `(("mesa" ,mesa) + `(("gtk+" ,gtk+) + ("mesa" ,mesa) ("sdl2" ,sdl2) ("sdl2-image" ,sdl2-image) ("sdl2-mixer" ,sdl2-mixer))) -- cgit v1.2.3 From 91c8b23e571b90e2d263194c9fbb2b05c0475dc1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 May 2020 23:02:59 +0200 Subject: gnu: popt: Remove defunct mirror. * gnu/packages/popt.scm (popt)[source](uri): Remove the canonical rpm5.org URI. --- gnu/packages/popt.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/popt.scm b/gnu/packages/popt.scm index 2e77368d20..95a9ea9211 100644 --- a/gnu/packages/popt.scm +++ b/gnu/packages/popt.scm @@ -62,13 +62,11 @@ line syntax.") (version "1.16") (source (origin (method url-fetch) - (uri (list (string-append "http://rpm5.org/files/popt/popt-" - version ".tar.gz") - ;; The rpm5.org domain does not resolve since 2019-06-13, - ;; so fallback to Debians copy. - (string-append "https://deb.debian.org/debian/pool/main" - "/p/popt/popt_" version ".orig.tar.gz"))) - ;; Ensure the file name stays the same. + ;; The original rpm5.org domain is not accessible since + ;; 2019-06-13, so use Debians copy of the tarball. + (uri (string-append "https://deb.debian.org/debian/pool/main" + "/p/popt/popt_" version ".orig.tar.gz")) + ;; Ensure the file name stays the same to prevent rebuilds. (file-name (string-append "popt-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From fa3e71d67474775da193f5bf3d6d0b329522dbbb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 May 2020 23:23:38 +0200 Subject: gnu: mpg123: Update to 1.26.0. * gnu/packages/mp3.scm (mpg123): Update to 1.26.0. [inputs]: Re-order alphabetically. --- gnu/packages/mp3.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index ae234afa29..60ef5560a1 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -309,22 +309,24 @@ This package contains the binary.") (define-public mpg123 (package (name "mpg123") - (version "1.25.13") - (source (origin - (method url-fetch) - (uri (list (string-append "mirror://sourceforge/mpg123/mpg123/" - version "/mpg123-" version ".tar.bz2") - (string-append - "https://www.mpg123.org/download/mpg123-" - version ".tar.bz2"))) - (sha256 - (base32 - "02l915jq0ymndb082g6w89bpf66z04ifa1lr7ga3yycw6m46hc4h")))) + (version "1.26.0") + (source + (origin + (method url-fetch) + (uri (list (string-append "mirror://sourceforge/mpg123/mpg123/" + version "/mpg123-" version ".tar.bz2") + (string-append + "https://www.mpg123.org/download/mpg123-" + version ".tar.bz2"))) + (sha256 + (base32 "0s62k45mz6264h0ljkrrs9vyagvl78q9pxhi7dnbk56pmgs0br74")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-default-audio=pulse"))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("pulseaudio" ,pulseaudio) - ("alsa-lib" ,alsa-lib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("pulseaudio" ,pulseaudio))) (home-page "https://www.mpg123.org/") (synopsis "Console MP3 player and decoder library") (description -- cgit v1.2.3 From 031315e4f0fbc4e04ffc8adee04128c23173a1f7 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 30 May 2020 00:56:42 +0530 Subject: gnu: glade3: Update to 3.36.0. * gnu/packages/gnome.scm (glade3): Update to 3.36.0. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9f7b3eeecb..1745bf7906 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -2090,7 +2091,7 @@ API add-ons to make GTK+ widgets OpenGL-capable.") (define-public glade3 (package (name "glade") - (version "3.22.1") + (version "3.36.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2098,7 +2099,7 @@ API add-ons to make GTK+ widgets OpenGL-capable.") name "-" version ".tar.xz")) (sha256 (base32 - "16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z")))) + "023gx8rj51njn8fsb6ma5kz1irjpxi4js0n8rwy22inc4ysldd8r")))) (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; needs X, GL, and software rendering -- cgit v1.2.3 From 49de32748ddcbe5026b23ffc5365a3ca524790ec Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 26 May 2020 16:19:40 -0400 Subject: gnu: xaos: Update to 4.0. * gnu/packages/maths.scm (xaos): Update to 4.0. [source]: Use git-fetch. [native-inputs]: Add qtbase and qttools. [arguments]: Remove #:make-flags options; replace 'configure' phase; add 'make-qt-deterministic' and 'install-data' phases. [home-page]: Update URL. --- gnu/packages/maths.scm | 55 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e1c8f8b559..9a24625a52 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4046,30 +4046,69 @@ evaluates expressions using the standard order of operations.") (define-public xaos (package (name "xaos") - (version "3.6") + (version "4.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/xaos/XaoS/" version - "/xaos-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/xaos-project/XaoS") + (commit (string-append "release-" version)))) (sha256 (base32 - "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq")))) + "00110p5xscjsmn7avfqgydn656zbmdj3l3y2fpv9b4ihzpid8n7a")))) (build-system gnu-build-system) - (native-inputs `(("gettext" ,gettext-minimal))) + (native-inputs `(("gettext" ,gettext-minimal) + ("qtbase" ,qtbase) + ("qttools" ,qttools))) (inputs `(("libx11" ,libx11) ("zlib" ,zlib) ("libpng" ,libpng) ("gsl" ,gsl))) + ;; The upstream project file ("XaoS.pro") and the Makefile it generates are + ;; not enough for this package to install properly. These phases fix that. (arguments `(#:tests? #f ;no "check" target - #:make-flags '("LOCALEDIR=$DATAROOTDIR/locale"))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'make-qt-deterministic + (lambda _ + ;; Make Qt deterministic. + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t)) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; The DESTDIR is originally set to install the xaos binary to + ;; the "bin" folder inside the build directory. Setting make + ;; flags doesn't seem to change this. + (substitute* "XaoS.pro" + (("DESTDIR.*$") + (string-append "DESTDIR=" out "/bin"))) + (substitute* "src/include/config.h" + (("/usr/share/XaoS") + (string-append out "/share/XaoS"))) + (invoke "qmake")))) + (add-after 'install 'install-data + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share"))) + (mkdir-p share) + (for-each + (lambda (folder) + (copy-recursively folder + (string-append share "/XaoS/" folder))) + '("catalogs" "examples" "tutorial")) + (install-file "xdg/xaos.png" + (string-append share "/pixmaps")) + (install-file "xdg/xaos.desktop" + (string-append share "/applications"))) + #t))))) (synopsis "Real-time fractal zoomer") (description "GNU XaoS is a graphical program that generates fractal patterns and allows you to zoom in and out of them infinitely in a fluid, continuous manner. It also includes tutorials that help to explain how fractals are built. It can generate many different fractal types such as the Mandelbrot set.") - (home-page "https://www.gnu.org/software/xaos/") + (home-page "https://xaos-project.github.io/") (license license:gpl2+))) (define-public hypre -- cgit v1.2.3 From c08fac0f7d175b9deb182c597cecdae997efce9d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 24 May 2020 15:04:45 -0400 Subject: services: nfs: Expose configuration options for TCP and UDP. * gnu/services/nfs.scm ()[nfsd-tcp?, nfsd-udp?]: New fields. (nfs-shepherd-services)[rpc.nfsd]: Populate the --{no-,}tcp and --{no-,}udp command line options based on the values of the nfsd-tcp? and nfsd-upd? fields. * doc/guix.texi (Network File System): Add doc. --- doc/guix.texi | 6 ++++++ gnu/services/nfs.scm | 14 +++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index ba5729bd41..beeda34ea2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -22858,6 +22858,12 @@ The network port that the @command{nfsd} daemon should use. @item @code{nfsd-threads} (default: @code{8}) The number of threads used by the @command{nfsd} daemon. +@item @code{nfsd-tcp?} (default: @code{#t}) +Whether the @command{nfsd} daemon should listen on a TCP socket. + +@item @code{nfsd-udp?} (default: @code{#f}) +Whether the @command{nfsd} daemon should listen on a UDP socket. + @item @code{pipefs-directory} (default: @code{"/var/lib/nfs/rpc_pipefs"}) The directory where the pipefs file system is mounted. diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index 4e358197e2..859097e788 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 John Darrington ;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -261,6 +262,10 @@ (default 2049)) (nfsd-threads nfs-configuration-nfsd-threads (default 8)) + (nfsd-tcp? nfs-configuration-nfsd-tcp? + (default #t)) + (nfsd-udp? nfs-configuration-nfsd-udp? + (default #f)) (pipefs-directory nfs-configuration-pipefs-directory (default default-pipefs-directory)) ;; List of modules to debug; any of nfsd, nfs, rpc, idmap, statd, or mountd. @@ -272,6 +277,7 @@ (match-record config (nfs-utils nfs-versions exports rpcmountd-port rpcstatd-port nfsd-port nfsd-threads + nfsd-tcp? nfsd-udp? pipefs-directory debug) (list (shepherd-service (documentation "Mount the nfsd pseudo file system.") @@ -332,7 +338,13 @@ #$@(map (lambda (version) (string-append "--nfs-version=" version)) nfs-versions) - #$(number->string nfsd-threads)))))) + #$(number->string nfsd-threads) + #$(if nfsd-tcp? + "--tcp" + "--no-tcp") + #$(if nfsd-udp? + "--udp" + "--no-udp")))))) (stop #~(lambda _ (zero? -- cgit v1.2.3 From e7b86a0d88760275afefa0c44a3c30602f80aac0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 27 May 2020 22:44:28 -0400 Subject: bootloader: grub: Rename the btrfs-subvolume-file-name parameter. Following discussion in , it seems more appropriate to give the parameter a more generic name that better describes what it does. * gnu/bootloader/grub.scm (normalize-file): Rename the BTRFS-SUBVOLUME-FILE-NAME parameter to STORE-DIRECTORY-PREFIX, and always assume this argument to be a string. (eye-candy): Likewise. Default STORE-DIRECTORY-PREFIX to "". (grub-configuration-file): Likewise. * gnu/system.scm (operating-system-bootcfg): Adapt. --- gnu/bootloader/grub.scm | 47 ++++++++++++++++++++++------------------------- gnu/system.scm | 2 +- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 40918ea307..2d9a39afc3 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -58,8 +58,8 @@ ;;; ;;; Code: -(define* (normalize-file file mount-point btrfs-subvolume-file-name) - "Strip MOUNT-POINT and prepend BTRFS-SUBVOLUME-FILE-NAME to FILE, a +(define* (normalize-file file mount-point store-directory-prefix) + "Strip MOUNT-POINT and prepend STORE-DIRECTORY-PREFIX, if any, to FILE, a G-expression or other lowerable object denoting a file name." (define (strip-mount-point mount-point file) @@ -72,13 +72,13 @@ G-expression or other lowerable object denoting a file name." file))) file)) - (define (prepend-btrfs-subvolume-file-name btrfs-subvolume-file-name file) - (if btrfs-subvolume-file-name - #~(string-append #$btrfs-subvolume-file-name #$file) + (define (prepend-store-directory-prefix store-directory-prefix file) + (if store-directory-prefix + #~(string-append #$store-directory-prefix #$file) file)) - (prepend-btrfs-subvolume-file-name btrfs-subvolume-file-name - (strip-mount-point mount-point file))) + (prepend-store-directory-prefix store-directory-prefix + (strip-mount-point mount-point file))) @@ -135,14 +135,14 @@ file with the resolution provided in CONFIG." (_ #f))))) (define* (eye-candy config store-device store-mount-point - #:key btrfs-store-subvolume-file-name system port) + #:key store-directory-prefix system port) "Return a gexp that writes to PORT (a port-valued gexp) the 'grub.cfg' part concerned with graphics mode, background images, colors, and all that. STORE-DEVICE designates the device holding the store, and STORE-MOUNT-POINT is its mount point; these are used to determine where the background image and fonts must be searched for. SYSTEM must be the target system string---e.g., -\"x86_64-linux\". BTRFS-STORE-SUBVOLUME-FILE-NAME is the file name of the -Btrfs subvolume, to be prepended to any store path, if any." +\"x86_64-linux\". STORE-DIRECTORY-PREFIX is a directory prefix to prepend to +any store file name." (define setup-gfxterm-body (let ((gfxmode (or (and-let* ((theme (bootloader-configuration-theme config)) @@ -181,12 +181,12 @@ fi~%" #+font-file) (define font-file (normalize-file (file-append grub "/share/grub/unicode.pf2") store-mount-point - btrfs-store-subvolume-file-name)) + store-directory-prefix)) (define image (normalize-file (grub-background-image config) store-mount-point - btrfs-store-subvolume-file-name)) + store-directory-prefix)) (and image #~(format #$port " @@ -320,13 +320,13 @@ code." #:key (system (%current-system)) (old-entries '()) - btrfs-subvolume-file-name) + store-directory-prefix) "Return the GRUB configuration file corresponding to CONFIG, a object, and where the store is available at -STORE-FS, a object. OLD-ENTRIES is taken to be a list -of menu entries corresponding to old generations of the system. -BTRFS-SUBVOLUME-FILE-NAME may be used to specify on which subvolume a -Btrfs root file system resides." +STORE-FS, a object. OLD-ENTRIES is taken to be a list of menu +entries corresponding to old generations of the system. +STORE-DIRECTORY-PREFIX may be used to specify a store prefix, as is required +when booting a root file system on a Btrfs subvolume." (define all-entries (append entries (bootloader-configuration-menu-entries config))) (define (menu-entry->gexp entry) @@ -336,17 +336,14 @@ Btrfs root file system resides." (arguments (menu-entry-linux-arguments entry)) (kernel (normalize-file (menu-entry-linux entry) device-mount-point - btrfs-subvolume-file-name)) + store-directory-prefix)) (initrd (normalize-file (menu-entry-initrd entry) device-mount-point - btrfs-subvolume-file-name))) + store-directory-prefix))) ;; Here DEVICE is the store and DEVICE-MOUNT-POINT is its mount point. ;; Use the right file names for KERNEL and INITRD in case ;; DEVICE-MOUNT-POINT is not "/", meaning that the store is on a ;; separate partition. - - ;; When BTRFS-SUBVOLUME-FILE-NAME is defined, prepend it the kernel and - ;; initrd paths, to allow booting from a Btrfs subvolume. #~(format port "menuentry ~s { ~a linux ~a ~a @@ -360,7 +357,7 @@ Btrfs root file system resides." (eye-candy config (menu-entry-device (first all-entries)) (menu-entry-device-mount-point (first all-entries)) - #:btrfs-store-subvolume-file-name btrfs-subvolume-file-name + #:store-directory-prefix store-directory-prefix #:system system #:port #~port)) @@ -371,8 +368,8 @@ Btrfs root file system resides." (keymap* (and layout (keyboard-layout-file layout #:grub grub))) (keymap (and keymap* - (if btrfs-subvolume-file-name - #~(string-append #$btrfs-subvolume-file-name + (if store-directory-prefix + #~(string-append #$store-directory-prefix #$keymap*) keymap*)))) #~(when #$keymap diff --git a/gnu/system.scm b/gnu/system.scm index d929187695..ac8bbd1d16 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1118,7 +1118,7 @@ a list of , to populate the \"old entries\" menu." (generate-config-file bootloader-conf (list entry) #:old-entries old-entries - #:btrfs-subvolume-file-name + #:store-directory-prefix (btrfs-store-subvolume-file-name file-systems)))) (define* (operating-system-boot-parameters os root-device -- cgit v1.2.3 From 36757e02c62c01186e62de674f9f93a984c72474 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 30 May 2020 15:54:12 +0200 Subject: gnu: mpfi: Update to 1.5.4. * gnu/packages/multiprecision.scm (mpfi): Update to 1.5.4. [source]: Hard-code project name. [arguments]: Disable tests, utterly broken in this release. Do not build static libraries. [native-inputs]: Add automake, autoreconf, libtool, texinfo. --- gnu/packages/multiprecision.scm | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 2848e63d60..a14b69e9e6 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2015, 2018 Andreas Enge -;;; Copyright © 2016 Nicolas Goaziou +;;; Copyright © 2016, 2020 Nicolas Goaziou ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Eric Bavier @@ -29,6 +29,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages m4) #:use-module (gnu packages gcc) + #:use-module (gnu packages texinfo) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) @@ -156,17 +157,27 @@ precision and correctly rounds the results.") (define-public mpfi (package (name "mpfi") - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) (uri (string-append "https://gforge.inria.fr/frs/download.php" - "/latestfile/181/" name "-" version ".tar.bz2")) + "/latestfile/181/mpfi-" version ".tgz")) (sha256 - (base32 "0bqr8yibl7jbrp0bw7xk1lm7nis7rv26jsz6y8ycvih8n9bx90r3")))) + (base32 "0mismr1ll3wp788dq2n22s5irm0dziy75byyfdwz22kjbmckhf9v")))) (build-system gnu-build-system) - (propagated-inputs `(("gmp" ,gmp) ; refers to both - ("mpfr" ,mpfr))) + (arguments + `(#:tests? #f ;tests are broken in this release + #:configure-flags '("--enable-static=no"))) + (native-inputs + `(("automake" ,automake) + ("autoreconf" ,autoconf) + ("libtool" ,libtool) + ("texinfo" ,texinfo))) + (propagated-inputs + `(("gmp" ,gmp) ; refers to both + ("mpfr" ,mpfr))) + (home-page "https://perso.ens-lyon.fr/nathalie.revol/software.html") (synopsis "C library for arbitrary-precision interval arithmetic") (description "@acronym{MPFI, Multiple Precision Floating-point Interval} is a portable C @@ -178,8 +189,7 @@ Floating-Point Reliably} libraries. The purpose of arbitrary-precision interval arithmetic is to get results that are both guaranteed, thanks to interval computation, and accurate, thanks to multiple-precision arithmetic.") - (license lgpl2.1+) - (home-page "https://perso.ens-lyon.fr/nathalie.revol/software.html"))) + (license lgpl2.1+))) (define-public irram (package -- cgit v1.2.3 From 968612b76a157a5270f7b959a09d6e2268f04c4c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 30 May 2020 15:56:40 +0200 Subject: gnu: mpfi: Update home page. * gnu/packages/multiprecision.scm (mpfi): Use more specific home page. --- gnu/packages/multiprecision.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index a14b69e9e6..b3a5ec5894 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -177,7 +177,7 @@ precision and correctly rounds the results.") (propagated-inputs `(("gmp" ,gmp) ; refers to both ("mpfr" ,mpfr))) - (home-page "https://perso.ens-lyon.fr/nathalie.revol/software.html") + (home-page "https://gforge.inria.fr/projects/mpfi/") (synopsis "C library for arbitrary-precision interval arithmetic") (description "@acronym{MPFI, Multiple Precision Floating-point Interval} is a portable C -- cgit v1.2.3 From ce1cd4340455b7599385dba2248888a72d3e4d4f Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 27 May 2020 01:44:02 +0100 Subject: gnu: Add spectacle-analyzer. * gnu/packages/music.scm (spectacle-analyzer): new variable. Signed-off-by: Marius Bakke --- gnu/packages/music.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 09827c7c93..ac149a804c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -141,6 +141,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages video) + #:use-module (gnu packages vim) ;for 'xxd' #:use-module (gnu packages web) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml) @@ -4940,6 +4941,49 @@ and debugging of event signal flows inside plugin graphs.") (home-page "https://open-music-kontrollers.ch/lv2/sherlock/") (license license:artistic2.0))) +(define-public spectacle-analyzer + (package + (name "spectacle-analyzer") + (version "1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jpcima/spectacle.git") + (commit (string-append "v" version)) + ;; Bundles a specific commit of the DISTRHO plugin framework. + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xiqa6z8g68lcvnwhws4j7c4py35r9d20cirrili7ycyp3a6149a")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no check target + #:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("xxd" ,xxd))) + (inputs + `(("cairo", cairo) + ("fftw", fftw) + ("fftwf", fftwf) + ("jack", jack-1) + ("lv2", lv2) + ("mesa", mesa))) + (synopsis "Realtime graphical spectrum analyzer") + (description "Spectacle is a real-time spectral analyzer using the +short-time Fourier transform, available as LV2 audio plugin and JACK client.") + (home-page "https://github.com/jpcima/spectacle") + ;; The project is licensed under the ISC license, and files in + ;; sources/plugin carry the Expat license. + (license (list license:isc license:expat)))) + (define-public x42-plugins (package (name "x42-plugins") -- cgit v1.2.3 From cc6653e7a13d42dbbba398e6b4597b2c544274e6 Mon Sep 17 00:00:00 2001 From: TomZ Date: Wed, 27 May 2020 13:21:58 +0200 Subject: gnu: flowee: Really disable black-box test. * gnu/packages/finance.scm (flowee)[arguments]: The test 'api' has some timeouts which fail half the time in a build, so really disable the test. Signed-off-by: Marius Bakke --- gnu/packages/finance.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index f182057bb4..28789c02d7 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1546,6 +1546,8 @@ like Flowee the Hub, which Fulcrum connects to over RPC.") (lambda _ (substitute* "testing/CMakeLists.txt" (("test_api") "")) + (substitute* "testing/CMakeLists.txt" + (("add_subdirectory\\(api\\)") "")) #t)) (add-after 'configure 'set-build-info ;; Their genbuild.sh to generate a build.h fails in guix (no .git dir) . -- cgit v1.2.3 From c2e19b6291cc4981e39d01aae85af0899614061d Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Thu, 28 May 2020 18:01:34 +0000 Subject: gnu: python-pylint: Udpate to 2.5.2. * gnu/packages/check.scm (python-pylint): Update to 2.5.2. [arguments]: New field. (python2-pylint)[arguments]: Do not inherit #:tests?. Signed-off-by: Marius Bakke --- gnu/packages/check.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 7d7fd189bc..8d99e67514 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1887,12 +1887,10 @@ unit tests and failing them if the unit test module does not exercise all statements in the module it tests.") (license license:gpl3+))) -;; Further releases, up to 2.4.3, have failing unit tests. See: -;; https://github.com/PyCQA/pylint/issues/3198. (define-public python-pylint (package (name "python-pylint") - (version "2.3.1") + (version "2.5.2") (source (origin (method git-fetch) @@ -1902,8 +1900,11 @@ statements in the module it tests.") (file-name (git-file-name name version)) (sha256 (base32 - "17vvzbcqmkhr4icq5p3737nbiiyj1y3g1pa08n9mb1bsnvxmqq0z")))) + "150x679mrlgm1s4ym7irf9mnsjilqyaakss4spc4pbrzkl11agnh")))) (build-system python-build-system) + ;; FIXME: Tests are failing since version 2.4.3, see: + ;; https://github.com/PyCQA/pylint/issues/3198. + (arguments '(#:tests? #f)) (native-inputs `(("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner) @@ -1945,7 +1946,7 @@ possible to write plugins to add your own checks.") (base32 "02a89d8a47s7nfiv1ady3j0sg2sbyja3np145brarfp5x9qxz9x2")))) (arguments - `(,@(package-arguments pylint) + `(,@(strip-keyword-arguments '(#:tests?) (package-arguments pylint)) #:phases (modify-phases %standard-phases (replace 'check -- cgit v1.2.3 From 14491e79a0daec796fe170dc7cc16dbbf28f0ced Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Tue, 26 May 2020 11:30:22 +0200 Subject: gnu: python-widgetsnbextension: Update to 3.5.1. * gnu/packages/python-xyz.scm (python-widgetsnbextension): Update to 3.5.1. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4cbf20ebcd..3a1f9fb43f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8996,14 +8996,14 @@ interactive computing.") (define-public python-widgetsnbextension (package (name "python-widgetsnbextension") - (version "3.4.2") + (version "3.5.1") (source (origin (method url-fetch) (uri (pypi-uri "widgetsnbextension" version)) (sha256 (base32 - "0rc2nivdy7k4m3vljx7wdh2jh11djapcgwhvzlbs0isl8gl8nqgs")))) + "1ismyaxbv9d56yqqqb8xl58hg0iq0bbyy014a53y1g3hfbc8g7q7")))) (build-system python-build-system) (propagated-inputs `(("python-ipykernel" ,python-ipykernel) -- cgit v1.2.3 From 2d6972b2a08920906b7d4486f5cd9b1905e1e3bf Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Tue, 26 May 2020 11:31:13 +0200 Subject: gnu: python-ipywidgets: Update to 7.5.1. * gnu/packages/python-xyz.scm (python-ipywidgets): Update to 7.5.1. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3a1f9fb43f..da19fd9d62 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9023,14 +9023,14 @@ notebooks.") (define-public python-ipywidgets (package (name "python-ipywidgets") - (version "5.2.2") + (version "7.5.1") (source (origin (method url-fetch) (uri (pypi-uri "ipywidgets" version)) (sha256 (base32 - "1lk0qrr5l9a0z7qkkn30hv5832whxwxymf1l576fmmad0n7hkxms")))) + "15sww2mvnkqlvx55gwa82v05062a8j1xpncnqna4k9sl53hgcig9")))) (build-system python-build-system) (propagated-inputs `(("python-ipython" ,python-ipython) -- cgit v1.2.3 From 5b4cb2b993c78fce7536fb897af3c65c431b4cf8 Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Tue, 26 May 2020 11:33:57 +0200 Subject: gnu: python-jupyter-console: Update to 6.1.0. * /gnu/packages/python-xyz.scm (python-jupyter-console): Update to 6.1.0. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index da19fd9d62..b968a6c9a9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9053,14 +9053,14 @@ in the data.") (define-public python-jupyter-console (package (name "python-jupyter-console") - (version "6.0.0") + (version "6.1.0") (source (origin (method url-fetch) (uri (pypi-uri "jupyter_console" version)) (sha256 (base32 - "1xdjw11cppf1fxvwkw2bk13ckkwas3bdah8baingn9296mvfi31h")))) + "06s3kr5vx0l1y1b7fxb04dmrppscl7q69sl9yyfr0d057d1ssvkg")))) (build-system python-build-system) (propagated-inputs `(("python-ipykernel" ,python-ipykernel) -- cgit v1.2.3 From bcbd63407e933ce04aef72757387a0bacdb07e77 Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Tue, 26 May 2020 13:21:19 +0200 Subject: gnu: python-iml: Move nose from propagated to native input. * gnu/packages/machine-learning.scm (python-iml)[propagated-inputs]: Move PYTHON-NOSE ... [native-inputs]: ... here. Signed-off-by: Marius Bakke --- gnu/packages/machine-learning.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 1b678d3d20..17d01bc656 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Konrad Hinsen +;;; Copyright © 2020 Edouard Klein ;;; ;;; This file is part of GNU Guix. ;;; @@ -1817,10 +1818,11 @@ advanced research.") (build-system python-build-system) (propagated-inputs `(("ipython" ,python-ipython) - ("nose" ,python-nose) ("numpy" ,python-numpy) ("pandas" ,python-pandas) ("scipy" ,python-scipy))) + (native-inputs + `(("nose" ,python-nose))) (home-page "https://github.com/interpretable-ml/iml") (synopsis "Interpretable Machine Learning (iML) package") (description "Interpretable ML (iML) is a set of data type objects, -- cgit v1.2.3 From 32ba87c14fd5e5b54d95211cd9a159d568ce7c67 Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Tue, 26 May 2020 15:53:49 +0200 Subject: gnu: python-prompt-toolkit: Update to 3.0.5. * gnu/packages/machine-learning.scm (python-iml)[propagated-inputs]: Pin implicit python-prompt-toolkit dependency to version 2. * gnu/packages/python-xyz.scm (python-widgetsnbextension)[propagated-inputs]: Pin implicit python-prompt-toolkit dependency to version 2. (python-ipywidgets)[propagated-inputs]: Pin implicit python-prompt-toolkit dependency to version 2. (python-jupyter-console)[propagated-inputs]: Pin explicit python-prompt-toolkit dependency to version 2. (python-prompt-toolkit): Update to version 3.0.5. [propagated-inputs]: Remove PYTHON-SIX and PYTHON-PYGMENTS. [home-page]: Adjust to current. (python-prompt-toolkit-2): New variable. (prompt-toolkit-2-instead-of-prompt-toolkit): New variable. (python2-prompt-toolkit): Keep at version 2. (python-prompt-toolkit-1): Inherit from version 2. Signed-off-by: Marius Bakke --- gnu/packages/machine-learning.scm | 3 ++- gnu/packages/python-xyz.scm | 48 ++++++++++++++++++++++++++++----------- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 17d01bc656..e26768267b 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1817,7 +1817,8 @@ advanced research.") "1k8szlpm19rcwcxdny9qdm3gmaqq8akb4xlvrzyz8c2d679aak6l")))) (build-system python-build-system) (propagated-inputs - `(("ipython" ,python-ipython) + `(("ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit + python-ipython)) ("numpy" ,python-numpy) ("pandas" ,python-pandas) ("scipy" ,python-scipy))) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b968a6c9a9..8f1c3bb6ee 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9006,7 +9006,8 @@ interactive computing.") "1ismyaxbv9d56yqqqb8xl58hg0iq0bbyy014a53y1g3hfbc8g7q7")))) (build-system python-build-system) (propagated-inputs - `(("python-ipykernel" ,python-ipykernel) + `(("python-ipykernel" + ,(prompt-toolkit-2-instead-of-prompt-toolkit python-ipykernel)) ("python-notebook" ,python-notebook))) (native-inputs `(("python-certifi" ,python-certifi) @@ -9033,7 +9034,8 @@ notebooks.") "15sww2mvnkqlvx55gwa82v05062a8j1xpncnqna4k9sl53hgcig9")))) (build-system python-build-system) (propagated-inputs - `(("python-ipython" ,python-ipython) + `(("python-ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit + python-ipython)) ("python-traitlets" ,python-traitlets) ("python-widgetsnbextension" ,python-widgetsnbextension))) (native-inputs @@ -9063,9 +9065,10 @@ in the data.") "06s3kr5vx0l1y1b7fxb04dmrppscl7q69sl9yyfr0d057d1ssvkg")))) (build-system python-build-system) (propagated-inputs - `(("python-ipykernel" ,python-ipykernel) + `(("python-ipykernel" ,(prompt-toolkit-2-instead-of-prompt-toolkit + python-ipykernel)) ("python-jupyter-client" ,python-jupyter-client) - ("python-prompt-toolkit" ,python-prompt-toolkit) + ("python-prompt-toolkit" ,python-prompt-toolkit-2) ("python-pygments" ,python-pygments))) (native-inputs `(("python-nose" ,python-nose))) @@ -12131,14 +12134,14 @@ collections of data.") (define-public python-prompt-toolkit (package (name "python-prompt-toolkit") - (version "2.0.7") + (version "3.0.5") (source (origin (method url-fetch) - (uri (pypi-uri "prompt_toolkit" version ".tar.gz")) + (uri (pypi-uri "prompt_toolkit" version)) (sha256 (base32 - "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx")))) + "1j3x5s4gp4ih73sbcni0a0vffbzvrxbrbnkvb3fzjgxn810ilgan")))) (build-system python-build-system) (arguments `(#:phases @@ -12152,12 +12155,11 @@ collections of data.") (add-installed-pythonpath inputs outputs) (invoke "py.test")))))) (propagated-inputs - `(("python-wcwidth" ,python-wcwidth) - ("python-six" ,python-six) - ("python-pygments" ,python-pygments))) + `(("python-wcwidth" ,python-wcwidth))) (native-inputs `(("python-pytest" ,python-pytest))) - (home-page "https://github.com/jonathanslenders/python-prompt-toolkit") + (home-page + "https://github.com/prompt-toolkit/python-prompt-toolkit") (synopsis "Library for building command line interfaces in Python") (description "Prompt-Toolkit is a library for building interactive command line @@ -12167,11 +12169,31 @@ code completion, incremental search, support for Chinese double-width characters, mouse support, and auto suggestions.") (license license:bsd-3))) +(define-public python-prompt-toolkit-2 + (package (inherit python-prompt-toolkit) + (name "python-prompt-toolkit") + (version "2.0.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "prompt_toolkit" version)) + (sha256 + (base32 + "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx")))) + (propagated-inputs + `(("python-wcwidth" ,python-wcwidth) + ("python-six" ,python-six) + ("python-pygments" ,python-pygments))))) + +(define-public prompt-toolkit-2-instead-of-prompt-toolkit + (package-input-rewriting/spec + `(("python-prompt-toolkit" . ,(const python-prompt-toolkit-2))))) + (define-public python2-prompt-toolkit - (package-with-python2 python-prompt-toolkit)) + (package-with-python2 python-prompt-toolkit-2)) (define-public python-prompt-toolkit-1 - (package (inherit python-prompt-toolkit) + (package (inherit python-prompt-toolkit-2) (version "1.0.15") (source (origin -- cgit v1.2.3 From 85c331f7c1c3ec75ad94a4b212d0e69424589a25 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Thu, 28 May 2020 22:30:30 -0300 Subject: gnu: Add liferea. * gnu/packages/syndication.scm (liferea): New variable. Signed-off-by: Marius Bakke --- gnu/packages/syndication.scm | 64 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 3d33ee521f..3bb461dca8 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2020 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix packages) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) @@ -28,6 +30,10 @@ #:use-module (gnu packages curl) #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gstreamer) + #:use-module (gnu packages gtk) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -36,6 +42,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages sqlite) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xml)) (define-public newsboat @@ -89,6 +96,63 @@ file system, and many more features.") (license (list license:gpl2+ ; filter/* license:expat)))) ; everything else +(define-public liferea + (package + (name "liferea") + (version "1.12.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lwindolf/liferea/" + "releases/download/v" version "/liferea-" + version "b.tar.bz2")) + (sha256 + (base32 "03pr1gmiv5y0i92bkhcxr8s311ll91chz19wb96jkixx32xav91d")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'prepare-build-environment + (lambda* (#:key inputs #:allow-other-keys) + ;; Workaround for https://github.com/lwindolf/liferea/issues/767. + (setenv "WEBKIT_DISABLE_COMPOSITING_MODE" "1"))) + (add-after 'install 'wrap-gi-python + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (python-path (getenv "PYTHONPATH"))) + (wrap-program (string-append out "/bin/liferea") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) + `("PYTHONPATH" ":" prefix (,python-path)))) + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("glib-networking" ,glib-networking) + ("gnome-keyring" ,gnome-keyring) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gstreamer" ,gstreamer) + ("json-glib" ,json-glib) + ("libnotify" ,libnotify) + ("libpeas" ,libpeas) + ("libsecret" ,libsecret) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("python" ,python) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject) + ("webkitgtk" ,webkitgtk))) + (home-page "https://lzone.de/liferea/") + (synopsis "News reader for GTK/GNOME") + (description "Liferea is a desktop feed reader/news aggregator that +brings together all of the content from your favorite subscriptions into +a simple interface that makes it easy to organize and browse feeds.") + (license license:gpl2+))) + (define-public rtv (package (name "rtv") -- cgit v1.2.3 From f5edd85d86f408c219679bee3c835f7a34d554ed Mon Sep 17 00:00:00 2001 From: Hamzeh Nasajpour Date: Fri, 29 May 2020 11:34:28 +0430 Subject: gnu: python-peewee: Update to 3.9.6. * gnu/packages/databases.scm (python-peewee): Update to 3.9.6. Signed-off-by: Marius Bakke --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 3b1b9ed366..ba15260c1f 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2179,14 +2179,14 @@ on another machine, accessed via TCP/IP.") (define-public python-peewee (package (name "python-peewee") - (version "2.10.2") + (version "3.9.6") (source (origin (method url-fetch) (uri (pypi-uri "peewee" version)) (sha256 (base32 - "10f2mrd5hw6rjklrzaix2lsxlgc8vx3xak54arcy6yd791zhchi3")))) + "1j4sh946k0736m7pd54z0y6i2hjhgg3kdllx1pwq8xkzzcgrx1xw")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; Fails to import test data -- cgit v1.2.3 From d6f5120d5b0cc7e92d7ba0dccbccac7339ea1479 Mon Sep 17 00:00:00 2001 From: Hamzeh Nasajpour Date: Fri, 29 May 2020 12:02:48 +0430 Subject: gnu: python-orderedmultidict: Update to 1.0. * gnu/packages/python-xyz.scm (python-orderedmultidict): Update to 1.0. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8f1c3bb6ee..baec999247 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5082,14 +5082,14 @@ where key might be occurred more than once in the container.") (define-public python-orderedmultidict (package (name "python-orderedmultidict") - (version "0.7.11") + (version "1.0") (source (origin (method url-fetch) (uri (pypi-uri "orderedmultidict" version)) (sha256 (base32 - "0dls862ibm7qbq4fnvwx0xn1v9hwyzywbff8xjjdr42dd75208yw")))) + "1idjbl933avgaadscrjw1np3xkvnz3phq0l8vw5qs0rqcjx9b65q")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From f55152cec4d200d59bc503c0442b96827dd8c0e2 Mon Sep 17 00:00:00 2001 From: Hamzeh Nasajpour Date: Fri, 29 May 2020 12:10:49 +0430 Subject: gnu: python-furl: Update to 2.0.0. * gnu/packages/python-web.scm (python-furl): Update to 2.0.0. [native-inputs]: Remove PYTHON-PYCODESTYLE. Add PYTHON-FLAKE8. Signed-off-by: Marius Bakke --- gnu/packages/python-web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index cd8ce8a83f..61d21418d4 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -324,20 +324,20 @@ over a different origin than that of the web application.") (define-public python-furl (package (name "python-furl") - (version "0.5.6") + (version "2.0.0") (source (origin (method url-fetch) (uri (pypi-uri "furl" version)) (sha256 (base32 - "0lzpfpm686hvz3sr1mcrnd1b3lgmnw8v59gb43wfi98r3b671pqc")))) + "1v2lakx03d5w8954a39ki44xv5mllnq0a0avhxykv9hrzg0yvjpx")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six) ("python-orderedmultidict" ,python-orderedmultidict))) (native-inputs - `(("python-pycodestyle" ,python-pycodestyle))) + `(("python-flake8" ,python-flake8))) (home-page "https://github.com/gruns/furl") (synopsis "URL manipulation in Python") (description "Furl provides an easy-to-use alternative to the -- cgit v1.2.3 From e552fca96ce249b253f522e51e8f8bd769d166cf Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Fri, 29 May 2020 10:14:39 +0100 Subject: gnu: bemenu: Update to 0.4.1. * gnu/packages/xdisorg.scm (bemenu): Update to 0.4.1. Signed-off-by: Marius Bakke --- gnu/packages/xdisorg.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 1325fbc821..3c98836102 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2018 Nam Nguyen ;;; Copyright © 2019 Wiktor Żelazny ;;; Copyright © 2019 Kyle Andrews -;;; Copyright © 2019 Josh Holland +;;; Copyright © 2019, 2020 Josh Holland ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 David Wilson @@ -215,7 +215,7 @@ used to further tweak the behaviour of the different profiles.") (define-public bemenu (package (name "bemenu") - (version "0.2.0") + (version "0.4.1") (source (origin (method git-fetch) @@ -224,10 +224,18 @@ used to further tweak the behaviour of the different profiles.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0piax49az5kp96r1g6dcgj87fi6p4jl286wlkxsdvljzpkn8q6gv")))) - (build-system cmake-build-system) + (base32 "1fjcs9d3533ay3nz79cx3c0lmy2chgragr2lhsy0xl2ckr0iins0")))) + (build-system gnu-build-system) (arguments - '(#:configure-flags '("-DBEMENU_WAYLAND_RENDERER=ON"))) + '(#:tests? #f + #:make-flags (list "CC=gcc" + "CFLAGS=-O2 -fPIC" + (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) (inputs `(("cairo" ,cairo) ("libx11" ,libx11) @@ -246,7 +254,7 @@ used to further tweak the behaviour of the different profiles.") "bemenu is a dynamic menu which allows the user to flexibly select from a list of options (usually programs to launch). It renders the menu graphically with X11 or Wayland, or in a text terminal with ncurses.") - (license (list license:gpl3+ ; client program[s] and other sources + (license (list license:gpl3+ ; client program[s] and other sources license:lgpl3+)))) ; library and bindings (define-public copyq -- cgit v1.2.3 From 4ef531cd5dcc7c9c7f97597d7434c528dc0c12e2 Mon Sep 17 00:00:00 2001 From: Simon South Date: Fri, 29 May 2020 09:20:55 -0400 Subject: gnu: emacs-elpher: Update to 2.7.8. * gnu/packages/emacs-xyz.scm (emacs-elpher): Update to 2.7.8. Signed-off-by: Marius Bakke --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4f7b4cf6cc..6d82e1921c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20837,7 +20837,7 @@ it forcibly (define-public emacs-elpher (package (name "emacs-elpher") - (version "2.7.4") + (version "2.7.8") (source (origin (method git-fetch) @@ -20847,7 +20847,7 @@ it forcibly (file-name (git-file-name name version)) (sha256 (base32 - "13ba72sjfyg1xvam131iapzqdf9pkwpn67zlyydmm6bv9pxlr431")))) + "1x86c2lmqpmi5my356iz7lbygwpmp956dc50ng762ld0savzxff0")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) -- cgit v1.2.3 From 8d6ead32a09e31534ac4bab3a9ea8ca81f16e405 Mon Sep 17 00:00:00 2001 From: Mike Rosset Date: Fri, 29 May 2020 07:20:46 -0700 Subject: gnu: emacsy-minimal: Inputs now use guile version 2.2. * gnu/packages/guile-xyz.scm (emacsy-minimal)[inputs]: Use guile2.2-lib and guile2.2-readline instead of the 3.0 variants. Signed-off-by: Marius Bakke --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 6a8bf54bf8..0942e7cf74 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2890,8 +2890,8 @@ in C using Gtk+-3 and WebKitGtk.") (build-system gnu-build-system) (inputs `(("guile" ,guile-2.2) - ("guile-lib" ,guile-lib) - ("guile-readline" ,guile-readline))) + ("guile-lib" ,guile2.2-lib) + ("guile-readline" ,guile2.2-readline))) (propagated-inputs '()) (arguments `(#:configure-flags '("--without-examples") -- cgit v1.2.3 From 839dba3a1f5abd1c71838556aefb84ef6798c659 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 30 May 2020 00:40:05 +0800 Subject: gnu: Add font-sarasa-gothic. * gnu/packages/fonts.scm (font-sarasa-gothic): New variable. Signed-off-by: Marius Bakke --- gnu/packages/fonts.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 14cf5b2dea..3be57eca3f 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2020 John Soo ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 Julien Lepiller +;;; Copyright © 2020 Zhu Zihao Date: Sat, 30 May 2020 13:17:53 +0200 Subject: gnu: facter: Update to 4.0.25. * gnu/packages/admin.scm (facter): Update to 4.0.25. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 36f063ca96..c331a662a7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -434,7 +434,7 @@ graphs and can export its output to different formats.") (define-public facter (package (name "facter") - (version "4.0.24") + (version "4.0.25") (source (origin (method git-fetch) (uri (git-reference @@ -443,7 +443,7 @@ graphs and can export its output to different formats.") (file-name (git-file-name name version)) (sha256 (base32 - "1n8yd2p7m0jf0wld6q43f2gqxyz8fiamz3p79wbl53q5qih0vba2")))) + "04nbk9rn5lfhbivsx68dggsp05czm7mzfr1i7yv6168bl92d233y")))) (build-system ruby-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From bbad1f972777f6a66a05ab1bcfbd886fc50ca2d8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 13:18:07 +0200 Subject: gnu: doctest: Update to 2.3.8. * gnu/packages/check.scm (doctest): Update to 2.3.8. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 8d99e67514..adc872764e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -396,7 +396,7 @@ and it supports a very flexible form of test discovery.") (define-public doctest (package (name "doctest") - (version "2.3.7") + (version "2.3.8") (home-page "https://github.com/onqtam/doctest") (source (origin (method git-fetch) @@ -404,7 +404,7 @@ and it supports a very flexible form of test discovery.") (file-name (git-file-name name version)) (sha256 (base32 - "134lx7pjnglrl4wdmyr9dz3rjb6d4ir6rvapg00gp52n44dbhnrq")))) + "16w907750jnp98vdzkn72lzwy1zyryaqvfi80lbdp398pj23rq65")))) (build-system cmake-build-system) (synopsis "C++ test framework") (description -- cgit v1.2.3 From 369114bef074de5e5595ada35d4335f9b75c4009 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 13:18:18 +0200 Subject: gnu: electron-cash: Update to 4.0.15. * gnu/packages/finance.scm (electron-cash): Update to 4.0.15. --- gnu/packages/finance.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 28789c02d7..78dc412340 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Vasile Dumitrascu -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2018 Adriano Peluso ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou @@ -475,7 +475,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (define-public electron-cash (package (name "electron-cash") - (version "4.0.14") + (version "4.0.15") (source (origin (method git-fetch) @@ -484,7 +484,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1dp7cj1185h6xfz6jzh0iq58zvg3wq9hl96bkgxkf5h4ygni2vm6")))) + (base32 "0bvj64fdxpi0dbivhgv509kqq503zjp7r7xckl8q5c48j5h1zik2")))) (build-system python-build-system) (inputs `(("libevent" ,libevent) -- cgit v1.2.3 From eaf98d92e7319094b49f8eb701612221d77c3aab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 13:31:05 +0200 Subject: gnu: font-tamzen: Update to 1.11.5. * gnu/packages/fonts.scm (font-tamzen): Update to 1.11.5. --- gnu/packages/fonts.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 3be57eca3f..58fba69802 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1068,7 +1068,7 @@ vector graphics.") (define-public font-tamzen (package (name "font-tamzen") - (version "1.11.4") + (version "1.11.5") (source (origin (method git-fetch) @@ -1077,8 +1077,7 @@ vector graphics.") (commit (string-append "Tamzen-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "17kgmvg6q32mqhx9g44hjvzv0si0mnpprga4z7na930g2zdd8846")))) + (base32 "00x5fipzqimglvshhqwycdhaqslbvn3rl06jnswhyxfvz16ymj7s")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 4d1cb5f9e562866681cb794170ccb7033f03ffd4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 16:05:57 +0200 Subject: gnu: lilv: Update to 0.24.8. * gnu/packages/audio.scm (lilv): Update to 0.24.8. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 358eddb22e..70746b8dfe 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1961,14 +1961,14 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.") (define-public lilv (package (name "lilv") - (version "0.24.6") + (version "0.24.8") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/lilv-" version ".tar.bz2")) (sha256 (base32 - "1p3hafsxgs5d4za7n66lf5nz74qssfqpmk520cm7iq2njvvlqm2z")))) + "0063i5zgf3d3accwmyx651hw0wh5ik7kji2hvfkcdbl1qia3dp6a")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From d9a7102c9874d6d0d57cf254526ff4b5d352adab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 00:17:43 +0200 Subject: gnu: libhx: Update to 3.25. * gnu/packages/c.scm (libhx): Update to 3.25. --- gnu/packages/c.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 5c0209f42d..3e227decc9 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -236,15 +236,14 @@ whose behaviour is inconsistent across *NIX flavours.") (define-public libhx (package (name "libhx") - (version "3.24") + (version "3.25") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libhx/libHX/" "libHX-" version ".tar.xz")) (sha256 - (base32 - "0i8v2464p830c15myknvvs6bhxaf663lrqgga95l94ygfynkw6x5")))) + (base32 "12avn16f8aqb0cq6jplz0sv7rh6f07m85dwc8dasnnwsvijwbpbj")))) (build-system gnu-build-system) (home-page "http://libhx.sourceforge.net") (synopsis "C library with common data structures and functions") -- cgit v1.2.3 From c2b27220e5bc7bbd2298d5f3db4291de7787b3ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 02:00:38 +0200 Subject: gnu: fio: Update to 3.20. * gnu/packages/benchmark.scm (fio): Update to 3.20. --- gnu/packages/benchmark.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 4e6c416518..0ac1833487 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -46,14 +46,14 @@ (define-public fio (package (name "fio") - (version "3.19") + (version "3.20") (source (origin (method url-fetch) (uri (string-append "https://brick.kernel.dk/snaps/" "fio-" version ".tar.bz2")) (sha256 (base32 - "01nc7igmcc6hda32d1y8vidd9x9pdlxvf3i1pwrzvmi6xvmbfvab")))) + "1mwqafn81a9pxy2kw9rl4p3r2brhg2ckwrcwzy0q4gffxgn3k9c7")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From a29a8a91fda99c5bba996b80707b8d42f2aa5080 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 02:00:54 +0200 Subject: gnu: ccache: Update to 3.7.9. * gnu/packages/ccache.scm (ccache): Update to 3.7.9. --- gnu/packages/ccache.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index 529742403e..fc915965b4 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2018 Eric Bavier ;;; Copyright © 2016, 2017 Efraim Flashner -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,14 +30,14 @@ (define-public ccache (package (name "ccache") - (version "3.7.7") + (version "3.7.9") (source (origin (method url-fetch) (uri (string-append "https://github.com/ccache/ccache/releases/download/v" version "/ccache-" version ".tar.xz")) (sha256 - (base32 "1kcqii3hr1008gj6jgfsjibwh2ryhsplc9z99m18xwa2zvbddhdp")))) + (base32 "0jzl9idnjd9jq64qd8kny7gfd0ydvz5kyq2yslmigfdz8dsxm4zq")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ; for test/run ("which" ,(@ (gnu packages base) which)))) -- cgit v1.2.3 From ec8dc2157ae26025ab8f54fb53d818afed5f3ff6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 02:03:44 +0200 Subject: gnu: cloc: Update to 1.86. * gnu/packages/code.scm (cloc): Update to 1.86. --- gnu/packages/code.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 2285b519a0..a50ac3506a 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -222,7 +222,7 @@ COCOMO model or user-provided parameters.") (define-public cloc (package (name "cloc") - (version "1.84") + (version "1.86") (source (origin (method git-fetch) @@ -231,7 +231,7 @@ COCOMO model or user-provided parameters.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "14xikdwcr6pcnkk2i43zrsj88z8b3mrv0svbnbvxvarw1id83pnn")))) + (base32 "082gj2b3x11bilz8c572dd60vn6n0fhld5zhi7wk7g1wy9wlgm9w")))) (build-system gnu-build-system) (inputs `(("coreutils" ,coreutils) -- cgit v1.2.3 From 6dcc17105e1fa86513dc29395a79d789216990b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 02:24:34 +0200 Subject: gnu: abseil-cpp: Update to 20200225.2. * gnu/packages/cpp.scm (abseil-cpp): Update to 20200225.2. --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index b32f4201c0..a1d82ccbc1 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -458,7 +458,7 @@ point and then, after each tween step, plugging back the result.") (define-public abseil-cpp (package (name "abseil-cpp") - (version "20200225.1") + (version "20200225.2") (source (origin (method git-fetch) (uri (git-reference @@ -467,7 +467,7 @@ point and then, after each tween step, plugging back the result.") (file-name (git-file-name name version)) (sha256 (base32 - "035bffayslawc19q2gmlkr6n6r7k7mvriaq7352rv6gyzaplr98w")))) + "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" -- cgit v1.2.3 From 8e3a1a62ae496a6d32c8b0d4f89bc3e220d5d6e9 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 30 May 2020 20:12:57 +0200 Subject: gnu: emacs-helm-fish-completion: Update to 0.4. * gnu/packages/emacs-xyz.scm (emacs-helm-fish-completion): Update to 0.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6d82e1921c..e516d96fc4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21711,7 +21711,7 @@ Google guidelines.") (define-public emacs-helm-fish-completion (package (name "emacs-helm-fish-completion") - (version "0.3") + (version "0.4") (home-page "https://github.com/emacs-helm/helm-fish-completion") (source (origin @@ -21721,7 +21721,7 @@ Google guidelines.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1iv0hwr74hzgrvrr31nlnswvi87lvpg24rd1rhkr5kjicr2295fq")))) + (base32 "0mh10qq3r16hjrayrbns51gmjpjnmpzy4i05rwn14rf2icvhs6x8")))) (build-system emacs-build-system) (propagated-inputs `(("helm" ,emacs-helm) -- cgit v1.2.3 From d1e77d69c1e04f402cec2e63553c001b1a4664ed Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 30 May 2020 22:52:36 +0300 Subject: gnu: rust-xml-rs-0.8: Fix build. * gnu/packages/crates-io.scm (rust-xml-rs-0.8)[source]: Add snippet to change doctests into regular tests. --- gnu/packages/crates-io.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2c4c6d4bb6..9a88708227 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27443,7 +27443,14 @@ to XDG Base Directory specification") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0c905wsmk995xypxljpxzq6vv660r1pzgyrpsfiz13kw3hf0dzcs")))) + "0c905wsmk995xypxljpxzq6vv660r1pzgyrpsfiz13kw3hf0dzcs")) + (modules '((guix build utils))) + (snippet + '(begin + ;; 'doctest' isn't stable until rust-1.40 + (substitute* "src/lib.rs" + (("\\(doctest") "(test")) + #t)))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs -- cgit v1.2.3 From a2437468160ca933554c63531d51b3cf8624c389 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 30 May 2020 23:03:47 +0300 Subject: gnu: rust-xml-rs-0.8: Update to 0.8.3. * gnu/packages/crates-io.scm (rust-mlx-rs-0.8): Update to 0.8.3. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9a88708227..a7d0b718a1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27434,7 +27434,7 @@ to XDG Base Directory specification") (define-public rust-xml-rs-0.8 (package (name "rust-xml-rs") - (version "0.8.1") + (version "0.8.3") (source (origin (method url-fetch) @@ -27443,7 +27443,7 @@ to XDG Base Directory specification") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0c905wsmk995xypxljpxzq6vv660r1pzgyrpsfiz13kw3hf0dzcs")) + "12ndxyhzxw2zdr76ql8nfdwb2vwhvdkrxwk4pbjafqfglmjv0zdh")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From fb872fdf63cc8a8b9d15d5a2a1c2fc584371feef Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 30 May 2020 23:03:47 +0300 Subject: gnu: rust-xml-rs-0.8: Update to 0.8.3. * gnu/packages/crates-io.scm (rust-mlx-rs-0.8): Update to 0.8.3. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2c4c6d4bb6..20f0567c51 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27434,7 +27434,7 @@ to XDG Base Directory specification") (define-public rust-xml-rs-0.8 (package (name "rust-xml-rs") - (version "0.8.1") + (version "0.8.3") (source (origin (method url-fetch) @@ -27443,7 +27443,7 @@ to XDG Base Directory specification") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0c905wsmk995xypxljpxzq6vv660r1pzgyrpsfiz13kw3hf0dzcs")))) + "12ndxyhzxw2zdr76ql8nfdwb2vwhvdkrxwk4pbjafqfglmjv0zdh")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs -- cgit v1.2.3 From 29334165ff01b1957dae5f2bac15ac7dfa021b6e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 May 2020 23:09:29 +0200 Subject: Revert "gnu: python-pylint: Udpate to 2.5.2." This update broke 'Totem', see . This reverts commit c2e19b6291cc4981e39d01aae85af0899614061d. --- gnu/packages/check.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index adc872764e..0c4ab0b2db 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1887,10 +1887,12 @@ unit tests and failing them if the unit test module does not exercise all statements in the module it tests.") (license license:gpl3+))) +;; Further releases, up to 2.4.3, have failing unit tests. See: +;; https://github.com/PyCQA/pylint/issues/3198. (define-public python-pylint (package (name "python-pylint") - (version "2.5.2") + (version "2.3.1") (source (origin (method git-fetch) @@ -1900,11 +1902,8 @@ statements in the module it tests.") (file-name (git-file-name name version)) (sha256 (base32 - "150x679mrlgm1s4ym7irf9mnsjilqyaakss4spc4pbrzkl11agnh")))) + "17vvzbcqmkhr4icq5p3737nbiiyj1y3g1pa08n9mb1bsnvxmqq0z")))) (build-system python-build-system) - ;; FIXME: Tests are failing since version 2.4.3, see: - ;; https://github.com/PyCQA/pylint/issues/3198. - (arguments '(#:tests? #f)) (native-inputs `(("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner) @@ -1946,7 +1945,7 @@ possible to write plugins to add your own checks.") (base32 "02a89d8a47s7nfiv1ady3j0sg2sbyja3np145brarfp5x9qxz9x2")))) (arguments - `(,@(strip-keyword-arguments '(#:tests?) (package-arguments pylint)) + `(,@(package-arguments pylint) #:phases (modify-phases %standard-phases (replace 'check -- cgit v1.2.3 From a8c7d4b0c326905b71680783ced6b68d25fb3bfd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 May 2020 23:11:37 +0200 Subject: gnu: fonts.scm: Add missing '>' in copyright header. * gnu/packages/fonts.scm: Add missing > in email address. --- gnu/packages/fonts.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 58fba69802..5964294202 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2020 John Soo ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 Julien Lepiller -;;; Copyright © 2020 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From aba53e7013aff6c978fafffbd7223365b56963c7 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 30 May 2020 21:27:49 +0200 Subject: gnu: python-astroid: Update to 2.4.1. * gnu/packages/python-xyz.scm (python-astroid): Update to 2.4.1. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index baec999247..79816ddc2f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -80,6 +80,7 @@ ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Josh Holland ;;; Copyright © 2020 Yuval Kogman +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -13905,13 +13906,13 @@ clone, while other processes access the original tree.") (define-public python-astroid (package (name "python-astroid") - (version "2.3.3") + (version "2.4.1") (source (origin (method url-fetch) (uri (pypi-uri "astroid" version)) (sha256 - (base32 "0fnibsl2cb5mvzbfm7sycj85smx48f8w8m7ks1sqlmpr9ps0gski")))) + (base32 "1h99jal7ax07xna1djw5z7hpgb8vjrl3hrrg49p1phljwniww5sc")))) (build-system python-build-system) (propagated-inputs `(("python-lazy-object-proxy" ,python-lazy-object-proxy) @@ -13923,19 +13924,6 @@ clone, while other processes access the original tree.") ("python-nose" ,python-nose) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-spurious-test - (lambda _ - ;; This can be removed after upgrading from python-3.7 - ;; https://github.com/PyCQA/astroid/issues/593 - ;; https://bugs.python.org/issue34056 - (delete-file "astroid/tests/unittest_modutils.py") - #t)) - (replace 'check - (lambda _ - (invoke "pytest" "astroid")))))) (home-page "https://github.com/PyCQA/astroid") (synopsis "Common base representation of python source code for pylint and other projects") -- cgit v1.2.3 From f008bb0b2456c8c940a4ae0bd7bb1c4a3570d1da Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 May 2020 23:12:04 +0200 Subject: gnu: python-astroid: Remove unused inputs. * gnu/packages/python-xyz.scm (python-astroid)[propagated-inputs]: Remove PYTHON-TYPED-AST. [native-inputs]: Remove PYTHON-NOSE. --- gnu/packages/python-xyz.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 79816ddc2f..0caa271fca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13917,11 +13917,9 @@ clone, while other processes access the original tree.") (propagated-inputs `(("python-lazy-object-proxy" ,python-lazy-object-proxy) ("python-six" ,python-six) - ("python-typed-ast" ,python-typed-ast) ("python-wrapt" ,python-wrapt))) (native-inputs `(("python-dateutil" ,python-dateutil) - ("python-nose" ,python-nose) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) (home-page "https://github.com/PyCQA/astroid") -- cgit v1.2.3 From 42f48c664b3868d3f15d9f130004fb647267e25d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 May 2020 23:12:54 +0200 Subject: gnu: python-toml: Update to 0.10.1. * gnu/packages/python-xyz.scm (python-toml): Update to 0.10.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0caa271fca..6aa666430a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3727,14 +3727,14 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.") (define-public python-toml (package (name "python-toml") - (version "0.9.4") + (version "0.10.1") (source (origin (method url-fetch) (uri (pypi-uri "toml" version)) (sha256 (base32 - "0bdbpbip67wdm6c7xwc6mmbmskyradj4cdxn1iibj4fcx1nbv1lf")))) + "03wbqm5cn685cwx2664hjdpz370njl7lf0yal8s0dkp5w4mn2swj")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;no tests suite in release -- cgit v1.2.3 From 20dadf4e5d391a88254ef8769fd489a60a8d4991 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 30 May 2020 19:50:02 +0200 Subject: gnu: Add emacs-bm. * gnu/packages/emacs-xyz.scm (emacs-bm): New variable. Signed-off-by: Marius Bakke --- gnu/packages/emacs-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e516d96fc4..2a76e534cb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1918,6 +1918,26 @@ code@{emacs-wiki.el}, it facilitates using hyperlinks and doing full-text searches. Unlike code@{emacs-wiki.el}, it can be combined with any format.") (license license:gpl1+))) +(define-public emacs-bm + (package + (name "emacs-bm") + (version "201905") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/joodland/bm.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "180b3rc13asrmsdh7v405d54jkrininvaj52xhp71vw91ng51dkn")))) + (build-system emacs-build-system) + (home-page "https://github.com/joodland/bm") + (synopsis "Visual bookmarks for Emacs") + (description "This package provides visible, buffer local bookmarks and +the ability to jump forward and backward to the next bookmark.") + (license license:gpl2+))) + (define-public emacs-calfw (package (name "emacs-calfw") -- cgit v1.2.3 From 11f1001c37a865ab3e43de1c354d90e2f1ff8d3c Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Sat, 30 May 2020 16:33:52 -0400 Subject: gnu: Add mspdebug. * gnu/packages/debug.scm (mspdebug): New variable. Signed-off-by: Marius Bakke --- gnu/packages/debug.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 4a264427c2..cceebb00c8 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2019 Pkill -9 ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Morgan Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages golang) #:use-module (gnu packages image) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages ncurses) @@ -596,3 +598,37 @@ GDB with very efficient reverse-execution, which in combination with standard GDB/x86 features like hardware data watchpoints, makes debugging much more fun.") (license license:expat))) + +(define-public mspdebug + (package + (name "mspdebug") + (version "0.25") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dlbeer/mspdebug.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no test suite + #:phases + (modify-phases %standard-phases + (delete 'configure)) ; no configure script + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + "INSTALL=install" + (string-append "PREFIX=" %output)))) + (inputs + `(("libusb-compat" ,libusb-compat) + ("readline" ,readline))) + (synopsis "Debugging tool for MSP430 MCUs") + (description "MspDebug supports FET430UIF, eZ430, RF2500 and Olimex +MSP430-JTAG-TINY programmers, as well as many other compatible +devices. It can be used as a proxy for gdb or as an independent +debugger with support for programming, disassembly and reverse +engineering.") + (home-page "https://github.com/dlbeer/mspdebug") + (license license:gpl2+))) -- cgit v1.2.3 From ceac05b8ebb2f81a2a36c596231a515ea2558b1d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2020 00:00:29 +0200 Subject: Revert "Revert "gnu: python-pylint: Udpate to 2.5.2."" This reverts commit 29334165ff01b1957dae5f2bac15ac7dfa021b6e. --- gnu/packages/check.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0c4ab0b2db..adc872764e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1887,12 +1887,10 @@ unit tests and failing them if the unit test module does not exercise all statements in the module it tests.") (license license:gpl3+))) -;; Further releases, up to 2.4.3, have failing unit tests. See: -;; https://github.com/PyCQA/pylint/issues/3198. (define-public python-pylint (package (name "python-pylint") - (version "2.3.1") + (version "2.5.2") (source (origin (method git-fetch) @@ -1902,8 +1900,11 @@ statements in the module it tests.") (file-name (git-file-name name version)) (sha256 (base32 - "17vvzbcqmkhr4icq5p3737nbiiyj1y3g1pa08n9mb1bsnvxmqq0z")))) + "150x679mrlgm1s4ym7irf9mnsjilqyaakss4spc4pbrzkl11agnh")))) (build-system python-build-system) + ;; FIXME: Tests are failing since version 2.4.3, see: + ;; https://github.com/PyCQA/pylint/issues/3198. + (arguments '(#:tests? #f)) (native-inputs `(("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner) @@ -1945,7 +1946,7 @@ possible to write plugins to add your own checks.") (base32 "02a89d8a47s7nfiv1ady3j0sg2sbyja3np145brarfp5x9qxz9x2")))) (arguments - `(,@(package-arguments pylint) + `(,@(strip-keyword-arguments '(#:tests?) (package-arguments pylint)) #:phases (modify-phases %standard-phases (replace 'check -- cgit v1.2.3 From 9c12c277b1400b896f547465907b8f09eb90953f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 22:22:47 +0200 Subject: gnu: python-pylint: Add missing propagated input. This follows up on commit c2e19b6291cc4981e39d01aae85af0899614061d. * gnu/packages/check.scm (python-pylint)[propagated-inputs]: Add python-toml. --- gnu/packages/check.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index adc872764e..9837ea9756 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1913,7 +1913,8 @@ statements in the module it tests.") `(("python-astroid" ,python-astroid) ("python-isort" ,python-isort) ("python-mccabe" ,python-mccabe) - ("python-six" ,python-six))) + ("python-six" ,python-six) + ("python-toml" ,python-toml))) (home-page "https://github.com/PyCQA/pylint") (synopsis "Python source code analyzer which looks for coding standard errors") -- cgit v1.2.3 From 2a9761b13b44032f8d902e0fcfecd0659cbfa8c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2020 00:00:46 +0200 Subject: gnu: totem: Don't use NAME in source URI. * gnu/packages/gnome.scm (totem)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1745bf7906..03de03559d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4889,9 +4889,9 @@ discovery protocols.") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/totem/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "totem-" version ".tar.xz")) (sha256 (base32 "028sc6xbyi7rs884862d8f3di6zhcm0lhvlpc3r69ifzjsq9my3b")))) -- cgit v1.2.3 From 187d02cd437ae9e6d2a67e56c82502c6feea73cf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2020 00:14:37 +0200 Subject: gnu: totem: Remove python-pylint native input. It's optional & runs a pointless lint check that fails with pylint 2.5. * gnu/packages/gnome.scm (totem)[native-inputs]: Remove python-pylint. --- gnu/packages/gnome.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 03de03559d..fe71e316f3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4904,7 +4904,6 @@ discovery protocols.") ("intltool" ,intltool) ("itstool" ,itstool) ("xmllint" ,libxml2) - ("python-pylint" ,python-pylint) ("xorg-server" ,xorg-server-for-tests))) (propagated-inputs `(("dconf" ,dconf))) -- cgit v1.2.3 From d818256e467af8fba9e80454ff29eccde3fae9ba Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 May 2020 00:20:27 +0200 Subject: gnu: csound: Update to 6.14.0. * gnu/packages/audio.scm (csound): Update to 6.14.0. [inputs]: move gettext-minimal... [native-inputs]: ... there. Also re-order inputs alphabetically. --- gnu/packages/audio.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 70746b8dfe..2d22dfc85a 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -851,30 +851,30 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.") (define-public csound (package (name "csound") - (version "6.13.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/csound/csound.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "14822ybqyp31z18gky2y9zadr9dkbhabg97y139py73w7v3af1bh")))) + (version "6.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/csound/csound.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sr9knfhbm2m0wpkjq2l5n471vnl51wy4p6j4m95zqybimzb4s2j")))) (build-system cmake-build-system) - (inputs - `(("alsa-lib" ,alsa-lib) - ("boost" ,boost) - ("pulseaudio" ,pulseaudio) - ("libsndfile" ,libsndfile) - ("liblo" ,liblo) - ("ladspa" ,ladspa) - ("jack" ,jack-1) - ("gettext" ,gettext-minimal))) (native-inputs `(("bison" ,bison) ("flex" ,flex) + ("gettext" ,gettext-minimal) ("zlib" ,zlib))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("boost" ,boost) + ("jack" ,jack-1) + ("ladspa" ,ladspa) + ("liblo" ,liblo) + ("libsndfile" ,libsndfile) + ("pulseaudio" ,pulseaudio))) (home-page "https://csound.com/") (synopsis "Sound and music computing system") (description -- cgit v1.2.3 From 248af68449e33c621afbff9d05bcb77d1097c1d6 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Thu, 28 May 2020 11:35:07 -0400 Subject: gnu: Add opendoas. * gnu/packages/admin.scm (opendoas): New variable. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/admin.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c331a662a7..0bc1d160fb 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Morgan Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -1456,6 +1457,53 @@ commands and their arguments.") ;; See . (license license:x11))) +(define-public opendoas + (package + (name "opendoas") + (version "6.6.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Duncaen/OpenDoas.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07kkc5729p654jrgfsc8zyhiwicgmq38yacmwfvay2b3gmy728zn")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + ;; The configure script doesn't accept most of the default flags. + (lambda* (#:key configure-flags #:allow-other-keys) + ;; The configure script can only be told which compiler to use + ;; through environment variables. + (setenv "CC" ,(cc-for-target)) + (apply invoke "./configure" configure-flags))) + (add-before 'install 'fix-makefile + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "bsd.prog.mk" + (("^\tchown.*$") "")) + #t))) + #:configure-flags + (list (string-append "--prefix=" (assoc-ref %outputs "out")) + (string-append "--target=" (or ,(%current-target-system) "")) + "--with-timestamp") + ;; Compiler choice is not carried over from the configure script. + #:make-flags + (list (string-append "CC=" ,(cc-for-target))) + #:tests? #f)) ; no test suite + (native-inputs + `(("bison" ,bison))) + (home-page "https://github.com/Duncaen/OpenDoas") + (synopsis "Portable version of OpenBSD's doas command") + (description "Doas is a minimal replacement for the venerable sudo. It was +initially written by Ted Unangst of the OpenBSD project to provide 95% of the +features of sudo with a fraction of the codebase.") + (license (list license:bsd-3 ; libbsd/* + license:isc)))) ; everything else + (define-public wpa-supplicant-minimal (package (name "wpa-supplicant-minimal") -- cgit v1.2.3 From b40ba288f139787a447707aff16b8f06f1e05f04 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2020 01:30:08 +0200 Subject: gnu: mu: Update to 1.4.8. * gnu/packages/mail.scm (mu): Update to 1.4.8. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8fb2a3c39e..1a81389d18 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -711,15 +711,15 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.4.7") + (version "1.4.8") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/" - "download/1,4.7/" ; sic + "download/" version "/" "mu-" version ".tar.xz")) (sha256 (base32 - "19qmz9fgnjpj0cxb8y9nb2dfk7pc0a9kwfiysa0f13ps3d5k4mhm")))) + "0vww8n7r6pfl4jyijhzas3fpdl6v1ndhc99zr1fsamjldxqpxk5m")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From b378297798ce207a47d348788785266b0047db68 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2020 01:53:33 +0200 Subject: gnu: opendoas: Don't pass unused target to ./configure. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (opendoas)[arguments]: Remove ‘--target=…’ from the #:configure-flags for now. --- gnu/packages/admin.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 0bc1d160fb..2bd1922fea 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1488,7 +1488,8 @@ commands and their arguments.") #t))) #:configure-flags (list (string-append "--prefix=" (assoc-ref %outputs "out")) - (string-append "--target=" (or ,(%current-target-system) "")) + ;; Nothing is done with this value (yet?) but it's supported. + ;; (string-append "--target=" (or ,(%current-target-system) "")) "--with-timestamp") ;; Compiler choice is not carried over from the configure script. #:make-flags -- cgit v1.2.3 From 47c2db84b81344865969c64b1aac889c4f989d51 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 May 2020 01:57:20 +0200 Subject: gnu: eternalterminal: Update to 6.0.7. * gnu/packages/terminals.scm (eternalterminal): Update to 6.0.7. [arguments]: Remove unnecessary phases. The removed directories no longer exist. --- gnu/packages/terminals.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 226f3ee05a..335b8d3ae1 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1036,7 +1036,7 @@ comfortably in a pager or editor. (define-public eternalterminal (package (name "eternalterminal") - (version "5.1.10") + (version "6.0.7") (source (origin (method git-fetch) @@ -1045,7 +1045,7 @@ comfortably in a pager or editor. (commit (string-append "et-v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0jh89229bd9s82h3aj6faaybwr5xvnk8w2kgz47gq263pz021zpl")))) + (base32 "03pdspggqxkmz95qb96pig5x0xw18hy9a7ivszydr32ry6kxxx1h")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_TEST=ON") @@ -1055,12 +1055,6 @@ comfortably in a pager or editor. (lambda* (#:key inputs #:allow-other-keys) (let ((tests (assoc-ref inputs "googletest"))) (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"))) - (delete-file-recursively (string-append out "/include")) - (delete-file-recursively (string-append out "/lib"))) #t))))) (inputs `(("gflags" ,gflags) -- cgit v1.2.3 From 776ecaaa0fb7201ae34653aa4c33e240b6d7b901 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 May 2020 02:15:08 +0200 Subject: gnu: emacs-bbdb: Update to 3.2. * gnu/packages/emacs-xyz.scm (emacs-bbdb): Update to 3.2. [source]: Use GNU ELPA. [build-system]: Use emacs-build-system. [arguments]: Ignore "bbdb-vm.el". Remove unnecessary phases. [home-page]: Switch to GNU ELPA URI. --- gnu/packages/emacs-xyz.scm | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2a76e534cb..3b08ff5393 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1605,36 +1605,21 @@ letter to each link using avy.") (define-public emacs-bbdb (package (name "emacs-bbdb") - (version "3.1.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://savannah/bbdb/bbdb-" - version ".tar.gz")) - (sha256 - (base32 - "1gs16bbpiiy01w9pyg12868r57kx1v3hnw04gmqsmpc40l1hyy05")) - (modules '((guix build utils))) - (snippet - ;; We don't want to build and install the PDF. - '(begin - (substitute* "doc/Makefile.in" - (("^doc_DATA = .*$") - "doc_DATA =\n")) - #t)))) - (build-system gnu-build-system) + (version "3.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "bbdb-" version ".tar")) + (sha256 + (base32 "1p56dg0mja2b2figy7yhdx714zd5j6njzn0k07zjka3jc06izvjx")))) + (build-system emacs-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - ;; Add an autoloads file with the right name for guix.el. - (let* ((out (assoc-ref outputs "out")) - (site (string-append out "/share/emacs/site-lisp"))) - (with-directory-excursion site - (symlink "bbdb-loaddefs.el" "bbdb-autoloads.el"))) - #t))))) - (native-inputs `(("emacs" ,emacs-minimal))) - (home-page "https://savannah.nongnu.org/projects/bbdb/") + ;; XXX: The following file cannot be byte-compiled, because et requires + ;; `vm-autoloads', from the VM package, with is neither in Emacs nor + ;; packaged in Guix. So, don't bother for now. + `(#:exclude '("bbdb-vm\\.el"))) + (home-page "http://elpa.gnu.org/packages/bbdb.html") (synopsis "Contact management utility for Emacs") (description "BBDB is the Insidious Big Brother Database for GNU Emacs. It provides -- cgit v1.2.3 From 19a651cbffcf8602a6a1d5c4669f85f72406dc9a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 May 2020 02:19:37 +0200 Subject: gnu: emacs-bongo: Update to 1.1. * gnu/packages/emacs-xyz.scm (emacs-bongo): Update to 1.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3b08ff5393..f3ce3be2b6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12224,7 +12224,7 @@ features and provides Vim-like key bindings.") (define-public emacs-bongo (package (name "emacs-bongo") - (version "1.0") + (version "1.1") (source (origin (method git-fetch) @@ -12233,7 +12233,7 @@ features and provides Vim-like key bindings.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1q3ws2vn062dh7ci6jn2k2bcn7szh3ap64sgwkzdd6f1pas37fnr")))) + (base32 "1nszph9mn98flyhn1jq3y6mdh6jymjkvj5ng36ql016dj92apvhv")))) (build-system emacs-build-system) (home-page "https://github.com/dbrock/bongo") (synopsis "Media player for Emacs") -- cgit v1.2.3 From bb78d75c58b313481792aba26f128e50b65a38cc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 May 2020 02:22:53 +0200 Subject: gnu: emacs-csv-mode: Update to 1.12. * gnu/packages/emacs-xyz.scm (emacs-csv-mode): Update to 1.12. --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f3ce3be2b6..d00cf5d885 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11967,14 +11967,14 @@ let users kill or mark things easily.") (define-public emacs-csv-mode (package (name "emacs-csv-mode") - (version "1.10") + (version "1.12") (source (origin (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/csv-mode-" - version ".el")) + (uri (string-append "https://elpa.gnu.org/packages/" + "csv-mode-" version ".tar")) (sha256 - (base32 "0q7j2cmj7vs6hz8cnf7j7lmlcjmig3jn2p6az345z96agl8a5xsq")))) + (base32 "0bya12smlrzwv4cbcmch4kg1fazp4k0ndrh1z17ix9p8c14d0v1j")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/csv-mode.html") (synopsis "Major mode for editing comma/char separated values") -- cgit v1.2.3 From fc1a9df2b73e852721758582cf18f6c5ac0b4df1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 May 2020 02:24:34 +0200 Subject: gnu: emacs-adaptive-wrap: Update to 0.7. * gnu/packages/emacs-xyz.scm (emacs-adaptive-wrap): Update to 0.7. --- gnu/packages/emacs-xyz.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d00cf5d885..a51f844324 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9911,15 +9911,14 @@ consistent and well-integrated user interface.") (define-public emacs-adaptive-wrap (package (name "emacs-adaptive-wrap") - (version "0.5.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://elpa.gnu.org/packages/adaptive-wrap-" - version ".el")) - (sha256 - (base32 - "0qi7gjprcpywk2daivnlavwsx53hl5wcqvpxbwinvigg42vxh3ll")))) + (version "0.7") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "adaptive-wrap-" version ".el")) + (sha256 + (base32 "10fb8gzvkbnrgzv28n1rczs03dvapr7rvi0kd73j6yf1zg2iz6qp")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/adaptive-wrap.html") (synopsis "Smart line-wrapping with wrap-prefix") -- cgit v1.2.3 From 018cffc9c9e5a5855733f5f45a1c4d396bb6a321 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 May 2020 02:26:34 +0200 Subject: gnu: emacs-tramp: Update to 2.4.3.5. * gnu/packages/emacs-xyz.scm (emacs-tramp): Update to 2.4.3.5. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a51f844324..08730fc574 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20349,14 +20349,14 @@ SSH servers.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.4.3.4") + (version "2.4.3.5") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "01il42xb6s38qnb7bhn9d7gscc5p5y4da5a4dp1i1cyi823sfp8f")))) + (base32 "14djizi4ivwv4ad4nymday86jbh45w14wdhlm96743ffwr45dd2m")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs ;need D-Bus -- cgit v1.2.3 From bf6438f46583003cfd851c9f8ff4104aa3107c4d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 31 May 2020 14:56:57 +0200 Subject: gnu: ccl: Prevent creating invalid derivation on unsupported platforms. * gnu/packages/lisp.scm (ccl)[inputs]: For the "ccl-bootstrap" input, use the x86 origin as the fallback entry. [arguments]: Add (ice-9 match) in #:modules. Rewrite phases to use the scoped SYSTEM variable instead of splicing in a match on %CURRENT-SYSTEM. --- gnu/packages/lisp.scm | 50 ++++++++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 21e1a0449b..97b8f0d80d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -592,25 +592,24 @@ statistical profiler, a code coverage tool, and many other extensions.") (uri (string-append "https://github.com/Clozure/ccl/releases/download/v" version "/" (match (%current-system) - ((or "i686-linux" "x86_64-linux") "linuxx86") ("armhf-linux" "linuxarm") - ;; Prevent errors when querying this package on unsupported - ;; platforms, e.g. when running "guix package --search=" - (_ "UNSUPPORTED")) + ;; XXX: This source only works on x86, but provide it as a + ;; catch-all to prevent errors when querying this package + ;; on unsupported platforms. + (_ "linuxx86")) ".tar.gz")) (sha256 (base32 (match (%current-system) - ((or "i686-linux" "x86_64-linux") - "15l7cfa4a7jkfwdzsfm4q3n22jnb57imxahpql3h77xin57v1gbz") ("armhf-linux" "0x4bjx6cxsjvxyagijhlvmc7jkyxifdvz5q5zvz37028va65243c") - (_ "")))))))) + (_ "15l7cfa4a7jkfwdzsfm4q3n22jnb57imxahpql3h77xin57v1gbz")))))))) (native-inputs `(("m4" ,m4))) (arguments `(#:tests? #f ;no 'check' target - #:modules ((srfi srfi-26) + #:modules ((ice-9 match) + (srfi srfi-26) (guix build utils) (guix build gnu-build-system)) #:phases @@ -622,19 +621,16 @@ statistical profiler, a code coverage tool, and many other extensions.") (add-before 'build 'pre-build ;; Enter the source directory for the current platform's lisp ;; kernel, and run 'make clean' to remove the precompiled one. - (lambda _ + (lambda* (#:key system #:allow-other-keys) (substitute* "lisp-kernel/m4macros.m4" (("/bin/pwd") (which "pwd"))) (chdir (string-append "lisp-kernel/" - ,(match (or (%current-target-system) (%current-system)) - ("i686-linux" "linuxx8632") - ("x86_64-linux" "linuxx8664") - ("armhf-linux" "linuxarm") - ;; Prevent errors when querying this package - ;; on unsupported platforms, e.g. when running - ;; "guix package --search=" - (_ "UNSUPPORTED")))) + (match system + ("i686-linux" "linuxx8632") + ("x86_64-linux" "linuxx8664") + ("armhf-linux" "linuxarm") + (_ (string-append "unknown system: " system))))) (substitute* '("Makefile") (("/bin/rm") "rm")) (setenv "CC" "gcc") @@ -642,7 +638,7 @@ statistical profiler, a code coverage tool, and many other extensions.") ;; XXX Do we need to recompile the heap image as well for Guix? ;; For now just use the one we already got in the tarball. (replace 'install - (lambda* (#:key outputs inputs #:allow-other-keys) + (lambda* (#:key outputs inputs system #:allow-other-keys) ;; The lisp kernel built by running 'make' in lisp-kernel/$system ;; is put back into the original directory, so go back. The heap ;; image is there as well. @@ -653,20 +649,18 @@ statistical profiler, a code coverage tool, and many other extensions.") (wrapper (string-append bindir "ccl")) (bash (assoc-ref inputs "bash")) (kernel - ,(match (or (%current-target-system) (%current-system)) - ("i686-linux" "lx86cl") - ("x86_64-linux" "lx86cl64") - ("armhf-linux" "armcl") - ;; Prevent errors when querying this package - ;; on unsupported platforms, e.g. when running - ;; "guix package --search=" - (_ "UNSUPPORTED"))) + (match system + ("i686-linux" "lx86cl") + ("x86_64-linux" "lx86cl64") + ("armhf-linux" "armcl") + ;; Unlikely to work, but try it anyway... + (_ system))) (heap (string-append kernel ".image"))) (install-file kernel libdir) (install-file heap libdir) - (let ((dirs '("lib" "library" "examples" "tools" "objc-bridge" - ,@(match (%current-system) + (let ((dirs `("lib" "library" "examples" "tools" "objc-bridge" + ,@(match system ("x86_64-linux" '("x86-headers64")) ("i686-linux" -- cgit v1.2.3 From 9f6efa117cd309cb9b467b96dd2d6bb472df7abb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 31 May 2020 19:16:35 +0300 Subject: gnu: chess: Update to 6.2.7. * gnu/packages/games.scm (chess): Update to 6.2.7. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 210cf8ab58..bf68c34f5a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2053,7 +2053,7 @@ asynchronously and at a user-defined speed.") (define-public chess (package (name "chess") - (version "6.2.6") + (version "6.2.7") (source (origin (method url-fetch) @@ -2061,7 +2061,7 @@ asynchronously and at a user-defined speed.") ".tar.gz")) (sha256 (base32 - "0kxhdv01ia91v2y0cmzbll391ns2vbmn65jjrv37h4s1srszh5yn")))) + "0ilq4bfl0lwyzf11q7n2skydjhalfn3bgxhrp5hjxs5bc5d6fdp5")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/chess/") (synopsis "Full chess implementation") -- cgit v1.2.3 From 620daa6b342d4d72fef2d9ce1ba2fbd11a65266b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 31 May 2020 21:15:38 +0200 Subject: gnu: sbcl: Update to 2.0.5. * gnu/packages/lisp.scm (sbcl): Update to 2.0.5. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 97b8f0d80d..498eee9526 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -372,14 +372,14 @@ an interpreter, a compiler, a debugger, and much more.") (define-public sbcl (package (name "sbcl") - (version "2.0.4") + (version "2.0.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "1lc2i4qq1kfdybmxnj2zq2hn3hfx0vvlqim4gvlgvs3bfr0lcaqj")))) + (base32 "1jz26w1i3riv032aa35vww4cv7cjk2ww7dp70c7wk4r8s66zhl00")))) (build-system gnu-build-system) (outputs '("out" "doc")) (native-inputs -- cgit v1.2.3 From 3b00a6b008be168cf378edef4543858439d212ae Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Thu, 28 May 2020 20:49:24 -0300 Subject: gnu: Add emacs-dracula-theme. * gnu/packages/emacs-xyz.scm (emacs-dracula-theme): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 08730fc574..4a2452577c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9080,6 +9080,27 @@ known loosely as deftheme. Many mode-specific customizations are included.") by zenburn, sinburn and similar themes, but slowly diverging from them.") (license license:gpl3+)))) +(define-public emacs-dracula-theme + (package + (name "emacs-dracula-theme") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dracula/emacs") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15y2djc5jljlvls1x9kp50m1kp0dcksmyixafsyimj66xpq9ngh0")))) + (build-system emacs-build-system) + (home-page "https://draculatheme.com/") + (synopsis "Dark theme for Emacs") + (description + "Dracula is a dark color theme for many editors, shells and more. This +package provides the Emacs theme.") + (license license:expat))) + (define-public emacs-auto-complete (package (name "emacs-auto-complete") -- cgit v1.2.3 From c7210b9613372dffa7b1926832b1ec1ff97d4bbf Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 31 May 2020 13:03:23 -0300 Subject: gnu: homebank: Add libofx dependency. * gnu/packages/finance.scm (homebank)[inputs]: Add libofx. Signed-off-by: Nicolas Goaziou --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 78dc412340..dba7db8680 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2020 Christopher Lemmer Webber ;;; Copyright © 2020 Tom Zander ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -186,9 +187,8 @@ line client and a client based on Qt.") ("intltool" ,intltool))) (inputs `(("gtk+" ,gtk+) + ("libofx" ,libofx) ("libsoup" ,libsoup))) - (arguments - `(#:configure-flags (list "-without-ofx"))) ; libofx is not available yet (home-page "http://homebank.free.fr/") (synopsis "Graphical personal accounting application") (description "HomeBank allows you to manage your personal accounts at -- cgit v1.2.3 From 115a1ed2b84006a409811605ba818ce599082401 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 31 May 2020 13:03:24 -0300 Subject: gnu: homebank: Update to 5.4.2. * gnu/packages/finance.scm (homebank): Update to 5.4.2. Signed-off-by: Nicolas Goaziou --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index dba7db8680..552c2abed3 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -173,14 +173,14 @@ line client and a client based on Qt.") (define-public homebank (package (name "homebank") - (version "5.2.8") + (version "5.4.2") (source (origin (method url-fetch) (uri (string-append "http://homebank.free.fr/public/homebank-" version ".tar.gz")) (sha256 (base32 - "13ampiv68y30kc0p2560g3yz8whqpwnidfcnb9lndv93b9ca767y")))) + "0bkjvd819kw9cwmr3macggbg8yil3yc8v2za8pjrl6g746s89kn6")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 6c3d3f2949278055124f5070112b4149b8105503 Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Fri, 29 May 2020 18:35:55 -0700 Subject: gnu: Add emacs-buffer-move. * gnu/packages/emacs-xyz.scm (emacs-buffer-move): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4a2452577c..7c014cfd4c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -73,6 +73,7 @@ ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Ryan Desfosses ;;; Copyright © 2020 Marcin Karpezo +;;; Copyright © 2020 Fredrik Salomonsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -22457,6 +22458,29 @@ text, such a marking style might be used to show externally included text or example code.") (license license:gpl3+)))) +(define-public emacs-buffer-move + (package + (name "emacs-buffer-move") + (version "0.6.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lukhas/buffer-move.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xdks4jfqyhkh34y48iq3gz8swp0f526kwnaai5mhgvazvs4za8c")))) + (build-system emacs-build-system) + (home-page "https://github.com/lukhas/buffer-move") + (synopsis "Functions for moving Emacs' buffers around") + (description + "This package define functions for swapping buffers between windows +contained in the same frame. An alternate behavior is to have the current +window switch to the previous buffer instead of swapping with the other +window.") + (license license:gpl3+))) + (define-public emacs-company-ebdb (package (name "emacs-company-ebdb") -- cgit v1.2.3 From 14c79f171f037b62385caeaa75a4bb2904ad8a13 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2020 23:51:21 +0200 Subject: gnu: youtube-dl: Update to 2020.05.29. * gnu/packages/video.scm (youtube-dl): Update to 2020.05.29. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e541016010..ccefb0c4f4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1611,7 +1611,7 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2020.05.08") + (version "2020.05.29") (source (origin (method url-fetch) (uri (string-append "https://github.com/ytdl-org/youtube-dl/" @@ -1619,7 +1619,7 @@ To load this plugin, specify the following option when starting mpv: version ".tar.gz")) (sha256 (base32 - "16zxa8ss2rka7cvkqyi67s8i1h9f4nxx88w9vjbxchbga6w0scc6")))) + "111ganbfi76ipfq5gjgamjbqd7m8l4lim9wwmfnc04bzvwqqzfi3")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From c727df6f5475481156609628bb9b3341964d79b1 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 31 May 2020 23:54:27 +0200 Subject: gnu: sameboy: Update to 0.13. * gnu/packages/emulators.scm (sameboy): Update to 0.13. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 7fad8a775b..14c438337c 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -470,7 +470,7 @@ and Game Boy Color games.") (define-public sameboy (package (name "sameboy") - (version "0.12.3") + (version "0.13") (source (origin (method git-fetch) @@ -479,7 +479,7 @@ and Game Boy Color games.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0m5rv2x8qck1kr43xq186pp4kaiay7gd1x775n9qrljcd7z4x6fs")))) + (base32 "0cp126sd76h1c6pj7cmsgzn5kd471524ikhyspv7flcm8nmz9mq0")))) (build-system gnu-build-system) (native-inputs `(("rgbds" ,rgbds) -- cgit v1.2.3 From 6f6758c45d3913dbf98bb8e50f21f7bfb25b40ea Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 30 May 2020 16:36:59 +0200 Subject: maint: Adjust comment in 'pre-push' hook. * etc/git/pre-push: Adjust comment. --- etc/git/pre-push | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/git/pre-push b/etc/git/pre-push index 59294f0ffb..415345fc75 100755 --- a/etc/git/pre-push +++ b/etc/git/pre-push @@ -1,6 +1,8 @@ #!/bin/sh -# A hook script that prevents the user from pushing unsigned commits. +# This hook script prevents the user from pushing to Savannah if any of the new +# commits' OpenPGP signatures cannot be verified, or if a commit is signed +# with an unauthorized key. # Called by "git push" after it has checked the remote status, but before # anything has been pushed. If this script exits with a non-zero status nothing -- cgit v1.2.3 From 912be8ec342a04bd4f50c353f2776408fbcfea74 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 31 May 2020 18:55:51 +0200 Subject: gnu: biber: Update to 2.12. Fixes . Reported by Mikhail Tsykalov . This essentially reverts 40fd909e3ddee2c46a27a4fe92ed49d3e7ffb413. This is a followup to the TeX Live 2019 update in 85892948bd9fb5fcc3409a60204cc8b14a4eb030. * gnu/packages/tex.scm (biber): Update to 2.12. --- gnu/packages/patches/biber-sortinithash.patch | 9 +++++++++ gnu/packages/tex.scm | 7 +++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/patches/biber-sortinithash.patch b/gnu/packages/patches/biber-sortinithash.patch index 1f054d25e4..5a626705e6 100644 --- a/gnu/packages/patches/biber-sortinithash.patch +++ b/gnu/packages/patches/biber-sortinithash.patch @@ -17,6 +17,15 @@ index b4f641e..c6f86c7 100644 \field{extraname}{1} \field{sortinit}{L} - \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f} ++ \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c} + \field{labelnamesource}{author} + \field{labeltitlesource}{title} + \field{title}{The Title} +@@ -116,7 +116,7 @@ my $ann2 = q| \entry{ann2}{misc}{} + \strng{authorfullhash}{90ae96c82de92e36949bc64254bbde0c} + \field{extraname}{2} + \field{sortinit}{L} +- \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f} + \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c} \field{labelnamesource}{author} \field{labeltitlesource}{title} diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 683f9d7283..137e000bc5 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -5916,8 +5916,11 @@ values (strings, macros, or numbers) pasted together.") (define-public biber (package + ;; Note: When updating Biber, make sure it matches our BibLaTeX version by + ;; checking the Biber/BibLaTeX compatibility matrix in the BibLaTeX manual + ;; at . (name "biber") - (version "2.11") + (version "2.12") (source (origin (method git-fetch) (uri (git-reference @@ -5930,7 +5933,7 @@ values (strings, macros, or numbers) pasted together.") "biber-sortinithash.patch")) (sha256 (base32 - "0qgkc1k9n36yfmndwz879pak6mjphld0p85lzn9g2ng0vhxsifzz")))) + "1g1hi6zvf2hmrjly1sidjaxy5440gfqm4p7p3n7kayshnjsmlskx")))) (build-system perl-build-system) (arguments `(#:phases -- cgit v1.2.3 From 625cdb05d71fd60eecad5f4673fa94af3472061b Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 22 May 2020 16:02:26 +0200 Subject: gnu: Add pypy3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (pypy3): New public variable. * gnu/packages/patches/pypy3-7.3.1-fix-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/patches/pypy3-7.3.1-fix-tests.patch | 278 +++++++++++++++++++++++ gnu/packages/python.scm | 171 ++++++++++++++ 3 files changed, 450 insertions(+) create mode 100644 gnu/packages/patches/pypy3-7.3.1-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 768943a67a..fd787299d2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1439,6 +1439,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-waitress-fix-tests.patch \ + %D%/packages/patches/pypy3-7.3.1-fix-tests.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qt4-ldflags.patch \ diff --git a/gnu/packages/patches/pypy3-7.3.1-fix-tests.patch b/gnu/packages/patches/pypy3-7.3.1-fix-tests.patch new file mode 100644 index 0000000000..464aad967f --- /dev/null +++ b/gnu/packages/patches/pypy3-7.3.1-fix-tests.patch @@ -0,0 +1,278 @@ +Fix a few testcases. Adapted from python-3-fix-tests.patch. + +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/ctypes/test/test_callbacks.py pypy3.6-v7.3.1-src/lib-python/3/ctypes/test/test_callbacks.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/ctypes/test/test_callbacks.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/ctypes/test/test_callbacks.py 2020-05-21 14:19:14.827288853 +0200 +@@ -4,6 +4,7 @@ + from ctypes import * + from ctypes.test import need_symbol + import _ctypes_test ++import platform + + class Callbacks(unittest.TestCase): + functype = CFUNCTYPE +@@ -178,6 +179,8 @@ + + self.assertLess(diff, 0.01, "%s not less than 0.01" % diff) + ++ @unittest.skipIf(platform.machine() in ['mips64'], ++ "This test fails on this platform") + def test_issue_8959_a(self): + from ctypes.util import find_library + libc_path = find_library("c") +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/ctypes/test/test_libc.py pypy3.6-v7.3.1-src/lib-python/3/ctypes/test/test_libc.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/ctypes/test/test_libc.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/ctypes/test/test_libc.py 2020-05-21 14:19:14.827288853 +0200 +@@ -2,6 +2,7 @@ + + from ctypes import * + import _ctypes_test ++import platform + + lib = CDLL(_ctypes_test.__file__) + +@@ -17,6 +18,8 @@ + import math + self.assertEqual(lib.my_sqrt(2.0), math.sqrt(2.0)) + ++ @unittest.skipIf(platform.machine() in ['mips64'], ++ "This test fails on this platform") + def test_qsort(self): + comparefunc = CFUNCTYPE(c_int, POINTER(c_char), POINTER(c_char)) + lib.my_qsort.argtypes = c_void_p, c_size_t, c_size_t, comparefunc +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/distutils/tests/test_archive_util.py pypy3.6-v7.3.1-src/lib-python/3/distutils/tests/test_archive_util.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/distutils/tests/test_archive_util.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/distutils/tests/test_archive_util.py 2020-05-21 14:19:14.827288853 +0200 +@@ -333,6 +333,7 @@ + self.assertEqual(os.path.basename(res), 'archive.tar.xz') + self.assertEqual(self._tarinfo(res), self._created_files) + ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_make_archive_owner_group(self): + # testing make_archive with owner and group, with various combinations + # this works even if there's not gid/uid support +@@ -362,6 +363,7 @@ + + @unittest.skipUnless(ZLIB_SUPPORT, "Requires zlib") + @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_tarfile_root_owner(self): + tmpdir = self._create_files() + base_name = os.path.join(self.mkdtemp(), 'archive') +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/distutils/tests/test_sdist.py pypy3.6-v7.3.1-src/lib-python/3/distutils/tests/test_sdist.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/distutils/tests/test_sdist.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/distutils/tests/test_sdist.py 2020-05-21 14:19:14.827288853 +0200 +@@ -443,6 +443,7 @@ + "The tar command is not found") + @unittest.skipIf(find_executable('gzip') is None, + "The gzip command is not found") ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_make_distribution_owner_group(self): + # now building a sdist + dist, cmd = self.get_cmd() +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_asyncio/test_base_events.py pypy3.6-v7.3.1-src/lib-python/3/test/test_asyncio/test_base_events.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_asyncio/test_base_events.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_asyncio/test_base_events.py 2020-05-21 14:19:14.827288853 +0200 +@@ -1296,6 +1296,8 @@ + self._test_create_connection_ip_addr(m_socket, False) + + @patch_socket ++ @unittest.skipUnless(support.is_resource_enabled('network'), ++ 'network is not enabled') + def test_create_connection_service_name(self, m_socket): + m_socket.getaddrinfo = socket.getaddrinfo + sock = m_socket.socket.return_value +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_generators.py pypy3.6-v7.3.1-src/lib-python/3/test/test_generators.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_generators.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_generators.py 2020-05-21 14:19:14.827288853 +0200 +@@ -35,6 +35,7 @@ + else: + return "FAILED" + ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment') + def test_raise_and_yield_from(self): + gen = self.generator1() + gen.send(None) +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/_test_multiprocessing.py pypy3.6-v7.3.1-src/lib-python/3/test/_test_multiprocessing.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/_test_multiprocessing.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/_test_multiprocessing.py 2020-05-21 14:19:14.827288853 +0200 +@@ -1212,6 +1212,7 @@ + if pid is not None: + os.kill(pid, signal.SIGINT) + ++ @unittest.skipIf(True, "This fails for unknown reasons on Guix") + def test_wait_result(self): + if isinstance(self, ProcessesMixin) and sys.platform != 'win32': + pid = os.getpid() +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_normalization.py pypy3.6-v7.3.1-src/lib-python/3/test/test_normalization.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_normalization.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_normalization.py 2020-05-21 14:19:14.827288853 +0200 +@@ -2,6 +2,7 @@ + import unittest + + from http.client import HTTPException ++from urllib.error import URLError + import sys + from unicodedata import normalize, unidata_version + +@@ -43,6 +44,8 @@ + except PermissionError: + self.skipTest(f"Permission error when downloading {TESTDATAURL} " + f"into the test data directory") ++ except URLError: ++ self.skipTest("DNS lookups are not enabled.") + except (OSError, HTTPException): + self.fail(f"Could not retrieve {TESTDATAURL}") + +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_pathlib.py pypy3.6-v7.3.1-src/lib-python/3/test/test_pathlib.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_pathlib.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_pathlib.py 2020-05-21 14:19:14.827288853 +0200 +@@ -2130,8 +2130,7 @@ + self.assertEqual(given, expect) + self.assertEqual(set(p.rglob("FILEd*")), set()) + +- @unittest.skipUnless(hasattr(pwd, 'getpwall'), +- 'pwd module does not expose getpwall()') ++ @unittest.skipIf(True, "Guix builder home is '/' which causes trouble for these tests") + def test_expanduser(self): + P = self.cls + support.import_module('pwd') +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_pdb.py pypy3.6-v7.3.1-src/lib-python/3/test/test_pdb.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_pdb.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_pdb.py 2020-05-21 14:20:24.377203281 +0200 +@@ -1136,11 +1136,11 @@ + > (6)test_function() + -> print('pdb %d: %s' % (i, sess._previous_sigint_handler)) + (Pdb) continue +- pdb 1: ++ pdb 1: Handlers.SIG_IGN + > (6)test_function() + -> print('pdb %d: %s' % (i, sess._previous_sigint_handler)) + (Pdb) continue +- pdb 2: ++ pdb 2: Handlers.SIG_IGN + """ + + class PdbTestCase(unittest.TestCase): +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_regrtest.py pypy3.6-v7.3.1-src/lib-python/3/test/test_regrtest.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_regrtest.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_regrtest.py 2020-05-21 14:19:14.827288853 +0200 +@@ -766,6 +766,7 @@ + output = self.run_tests('--fromfile', filename) + self.check_executed_tests(output, tests) + ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') + def test_interrupted(self): + code = TEST_INTERRUPTED + test = self.create_test('sigint', code=code) +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_resource.py pypy3.6-v7.3.1-src/lib-python/3/test/test_resource.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_resource.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_resource.py 2020-05-21 14:19:14.827288853 +0200 +@@ -146,6 +146,7 @@ + + @unittest.skipUnless(hasattr(resource, 'prlimit'), 'no prlimit') + @support.requires_linux_version(2, 6, 36) ++ @unittest.skipIf(True, "Bug: the PermissionError is not raised") + def test_prlimit(self): + self.assertRaises(TypeError, resource.prlimit) + self.assertRaises(ProcessLookupError, resource.prlimit, +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_shutil.py pypy3.6-v7.3.1-src/lib-python/3/test/test_shutil.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_shutil.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_shutil.py 2020-05-21 14:19:14.827288853 +0200 +@@ -1138,6 +1138,7 @@ + self.assertRaises(ValueError, make_archive, base_name, 'xxx') + + @support.requires_zlib ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_make_archive_owner_group(self): + # testing make_archive with owner and group, with various combinations + # this works even if there's not gid/uid support +@@ -1166,6 +1167,7 @@ + + + @support.requires_zlib ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") + def test_tarfile_root_owner(self): + root_dir, base_dir = self._create_files() +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_socket.py pypy3.6-v7.3.1-src/lib-python/3/test/test_socket.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_socket.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_socket.py 2020-05-21 14:19:14.827288853 +0200 +@@ -815,6 +815,8 @@ + if not fqhn in all_host_names: + self.fail("Error testing host resolution mechanisms. (fqdn: %s, all: %s)" % (fqhn, repr(all_host_names))) + ++ @unittest.skipUnless(support.is_resource_enabled('network'), ++ 'network is not enabled') + def test_host_resolution(self): + for addr in [support.HOST, '10.0.0.1', '255.255.255.255']: + self.assertEqual(socket.gethostbyname(addr), addr) +@@ -934,6 +936,8 @@ + self.assertRaises(OverflowError, socket.htonl, k) + self.assertRaises(OverflowError, socket.htons, k) + ++ @unittest.skipUnless(os.path.exists("/etc/services"), ++ "getservbyname uses /etc/services, which is not in the chroot") + def testGetServBy(self): + eq = self.assertEqual + # Find one service that exists, then check all the related interfaces. +@@ -1278,6 +1282,8 @@ + raise + self.assertRaises(TypeError, s.ioctl, socket.SIO_LOOPBACK_FAST_PATH, None) + ++ @unittest.skipUnless(os.path.exists("/etc/gai.conf"), ++ "getaddrinfo() will fail") + def testGetaddrinfo(self): + try: + socket.getaddrinfo('localhost', 80) +@@ -1357,6 +1363,8 @@ + # only IP addresses are allowed + self.assertRaises(OSError, socket.getnameinfo, ('mail.python.org',0), 0) + ++ @unittest.skipUnless(os.path.exists("/etc/gai.conf"), ++ "getaddrinfo() will fail") + @unittest.skipUnless(support.is_resource_enabled('network'), + 'network is not enabled') + def test_idna(self): +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_spwd.py pypy3.6-v7.3.1-src/lib-python/3/test/test_spwd.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_spwd.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_spwd.py 2020-05-21 14:19:14.827288853 +0200 +@@ -5,8 +5,7 @@ + spwd = support.import_module('spwd') + + +-@unittest.skipUnless(hasattr(os, 'geteuid') and os.geteuid() == 0, +- 'root privileges required') ++@unittest.skipUnless(os.path.exists("/etc/shadow"), 'spwd tests require /etc/shadow') + class TestSpwdRoot(unittest.TestCase): + + def test_getspall(self): +@@ -56,8 +55,7 @@ + self.assertRaises(TypeError, spwd.getspnam, bytes_name) + + +-@unittest.skipUnless(hasattr(os, 'geteuid') and os.geteuid() != 0, +- 'non-root user required') ++@unittest.skipUnless(os.path.exists("/etc/shadow"), 'spwd tests require /etc/shadow') + class TestSpwdNonRoot(unittest.TestCase): + + def test_getspnam_exception(self): +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_tarfile.py pypy3.6-v7.3.1-src/lib-python/3/test/test_tarfile.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_tarfile.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_tarfile.py 2020-05-21 14:19:14.827288853 +0200 +@@ -2491,9 +2491,12 @@ + import pwd, grp + except ImportError: + return False +- if pwd.getpwuid(0)[0] != 'root': +- return False +- if grp.getgrgid(0)[0] != 'root': ++ try: ++ if pwd.getpwuid(0)[0] != 'root': ++ return False ++ if grp.getgrgid(0)[0] != 'root': ++ return False ++ except KeyError: + return False + return True + diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1ec002df73..9469f89bcf 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -80,12 +80,17 @@ #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages certs) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages dbm) #:use-module (gnu packages hurd) #:use-module (gnu packages libffi) + #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages shells) #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages tls) @@ -631,3 +636,169 @@ run within just 256k of code space and 16k of RAM. MicroPython aims to be as compatible with normal Python as possible to allow you to transfer code with ease from the desktop to a microcontroller or embedded system.") (license license:expat))) + +(define-public pypy3 + (package + (name "pypy3") + (version "7.3.1") + (source (origin + (method url-fetch) + (uri (string-append "https://bitbucket.org/pypy/pypy/downloads/" ; + "pypy3.6-v" version "-src.tar.bz2")) + (sha256 + (base32 + "10zsk8jby8j6visk5mzikpb1cidvz27qq4pfpa26jv53klic6b0c")) + (patches (search-patches "pypy3-7.3.1-fix-tests.patch")))) + (build-system gnu-build-system) + (native-inputs + `(("python-2" ,python-2) + ("pkg-config" ,pkg-config) + ("tar" ,tar) ; Required for package.py + ("python2-pycparser" ,python2-pycparser) + ("python2-hypothesis" ,python2-hypothesis) + ("nss-certs" ,nss-certs) ; For ssl tests + ("gzip" ,gzip))) + (inputs + `(("libffi" ,libffi) + ("zlib" ,zlib) + ("ncurses" ,ncurses) + ("openssl" ,openssl) + ("expat" ,expat) + ("bzip2" ,bzip2) + ("sqlite" ,sqlite) + ("gdbm" ,gdbm) + ("tcl" ,tcl) + ("tk" ,tk) + ("glibc" ,glibc) + ("bash-minimal" ,bash-minimal) ; Used as /bin/sh + ("xz" ,xz))) ; liblzma + (arguments + `(#:tests? #f ;FIXME: Disabled for now, there are many tests failing. + #:modules ((ice-9 ftw) (ice-9 match) + (guix build utils) (guix build gnu-build-system)) + #:phases (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'patch-source + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* '("rpython/rlib/clibffi.py") + ;; find_library does not work for libc + (("ctypes\\.util\\.find_library\\('c'\\)") "'libc.so'")) + (substitute* '("lib_pypy/cffi/_pycparser/ply/cpp.py") + ;; Make reproducible (XXX: unused?) + (("time\\.localtime\\(\\)") "time.gmtime(0)")) + (substitute* '("pypy/module/sys/version.py") + ;; Make reproducible + (("t\\.gmtime\\(\\)") "t.gmtime(0)")) + (substitute* '("lib_pypy/_tkinter/tklib_build.py") + ;; Link to versioned libtcl and libtk + (("linklibs = \\['tcl', 'tk'\\]") + "linklibs = ['tcl8.6', 'tk8.6']") + (("incdirs = \\[\\]") + (string-append "incdirs = ['" + (assoc-ref inputs "tcl") + "/include', '" + (assoc-ref inputs "tk") + "/include']"))) + (substitute* '("lib_pypy/_curses_build.py") + ;; Find curses + (("/usr/local") (assoc-ref inputs "ncurses"))) + (substitute* '("lib_pypy/_sqlite3_build.py") + ;; Always use search paths + (("sys\\.platform\\.startswith\\('freebsd'\\)") "True") + ;; Find sqlite3 + (("/usr/local") (assoc-ref inputs "sqlite")) + (("libname = 'sqlite3'") + (string-append "libname = '" + (assoc-ref inputs "sqlite") + "/lib/libsqlite3.so.0'"))) + (substitute* '("lib-python/3/subprocess.py") + ;; Fix shell path + (("/bin/sh") + (string-append (assoc-ref inputs "bash-minimal") "/bin/sh"))) + (substitute* '("lib-python/3/distutils/unixccompiler.py") + ;; gcc-toolchain does not provide symlink cc -> gcc + (("\"cc\"") "\"gcc\"")) + #t)) + (add-after + 'unpack 'set-source-file-times-to-1980 + ;; copied from python package, required by zip testcase + (lambda _ + (let ((circa-1980 (* 10 366 24 60 60))) + (ftw "." (lambda (file stat flag) + (utime file circa-1980 circa-1980) + #t)) + #t))) + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "pypy/goal" + ;; Build with jit optimization. + (invoke "python2" + "../../rpython/bin/rpython" + (string-append "--make-jobs=" + (number->string (parallel-job-count))) + "-Ojit" + "targetpypystandalone")) + ;; Build c modules and package everything, so tests work. + (with-directory-excursion "pypy/tool/release" + (unsetenv "PYTHONPATH") ; Do not use the system’s python libs: + ; AttributeError: module 'enum' has no + ; attribute 'IntFlag' + (invoke "python2" "package.py" + "--archive-name" "pypy-dist" + "--builddir" (getcwd))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (setenv "HOME" "/tmp") ; test_with_pip tries to + ; access ~/.cache/pip + ;; Run library tests only (no interpreter unit + ;; tests). This is what Gentoo does. + (invoke + "python2" + "pypy/test_all.py" + "--pypy=pypy/tool/release/pypy-dist/bin/pypy3" + "lib-python")) + (format #t "test suite not run~%")) + #t)) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (with-directory-excursion "pypy/tool/release" + ;; Delete test data. + (for-each + (lambda (x) + (delete-file-recursively (string-append + "pypy-dist/lib-python/3/" x))) + '("tkinter/test" + "test" + "sqlite3/test" + "lib2to3/tests" + "idlelib/idle_test" + "distutils/tests" + "ctypes/test" + "unittest/test")) + ;; Patch shebang referencing python2 + (substitute* '("pypy-dist/lib-python/3/cgi.py" + "pypy-dist/lib-python/3/encodings/rot_13.py") + (("#!.+/bin/python") + (string-append "#!" (assoc-ref outputs "out") "/bin/pypy3"))) + (with-fluids ((%default-port-encoding "ISO-8859-1")) + (substitute* '("pypy-dist/lib_pypy/_md5.py" + "pypy-dist/lib_pypy/_sha1.py") + (("#!.+/bin/python") + (string-append "#!" (assoc-ref outputs "out") "/bin/pypy3")))) + (copy-recursively "pypy-dist" (assoc-ref outputs "out"))) + #t))))) + (home-page "https://www.pypy.org/") + (synopsis "Python implementation with just-in-time compilation") + (description "PyPy is a faster, alternative implementation of the Python +programming language employing a just-in-time compiler. It supports most +Python code natively, including C extensions.") + (license (list license:expat ; pypy itself; _pytest/ + license:psfl ; python standard library in lib-python/ + license:asl2.0 ; dotviewer/font/ and some of lib-python/ + license:gpl3+ ; ./rpython/rlib/rvmprof/src/shared/libbacktrace/dwarf2.* + license:bsd-3 ; lib_pypy/cffi/_pycparser/ply/ + (license:non-copyleft + "http://www.unicode.org/copyright.html"))))) + -- cgit v1.2.3 From 53c41e958ffe2d7f8f58d70ab8f5ef6518484b3e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jan 2020 21:56:33 -0500 Subject: gnu: libsoup: Add the missing PHP dependency. * gnu/packages/gnome.scm (libsoup)[native-inputs]: Add php. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fe71e316f3..fa9a8fc168 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -145,6 +145,7 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages photo) + #:use-module (gnu packages php) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages popt) @@ -3718,8 +3719,7 @@ libxml to ease remote use of the RESTful API.") ("pkg-config" ,pkg-config) ("python" ,python-wrapper) ("vala" ,vala) - ;; These are needed for the tests. - ;; FIXME: Add PHP once available. + ("php" ,php) ("curl" ,curl) ("gnutls" ,gnutls) ;for 'certtool' ("httpd" ,httpd))) -- cgit v1.2.3 From 43b6b45e7be8cc25eba9f606015bee9653730b43 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jan 2020 21:57:33 -0500 Subject: gnu: Add libsoup-minimal. * gnu/packages/gnome.scm (libsoup-minimal): New variable. --- gnu/packages/gnome.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fa9a8fc168..6d0f7fe2a4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -183,6 +183,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu artwork) + #:use-module ((guix build utils) #:select (modify-phases)) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) @@ -3741,6 +3742,22 @@ libxml to ease remote use of the RESTful API.") and the GLib main loop, to integrate well with GNOME applications.") (license license:lgpl2.0+))) + +;;; A minimal version of libsoup used to prevent a cycle with Inkscape. +(define-public libsoup-minimal + (package + (inherit libsoup) + (name "libsoup-minimal") + (outputs (delete "doc" (package-outputs libsoup))) + (arguments + (substitute-keyword-arguments (package-arguments libsoup) + ((#:configure-flags configure-flags) + `(delete "-Dgtk_doc=true" ,configure-flags)) + ((#:phases phases) + `(modify-phases ,phases + (delete 'move-doc))))) + (native-inputs (alist-delete "gtk-doc" (package-native-inputs libsoup))))) + (define-public libsecret (package (name "libsecret") -- cgit v1.2.3 From 0e3897187c6e3fc821b59153b6b632896a1a380e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jan 2020 23:18:17 -0500 Subject: gnu: Add at-spi2-atk-minimal. * gnu/packages/gtk.scm (at-spi2-atk-minimal): New variable. --- gnu/packages/gtk.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 385e4e97e4..f6a50f0058 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2020 Brendan Tildesley ;;; Copyright © 2020 Guillaume Le Vaillant +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -649,6 +650,24 @@ is part of the GNOME accessibility project.") (license license:lgpl2.0+) (home-page "https://projects.gnome.org/accessibility/"))) +;;; A minimal variant used to prevent a cycle with Inkscape. +(define at-spi2-core-minimal + (package + (inherit at-spi2-core) + (name "at-spi2-core-minimal") + (outputs (delete "doc" (package-outputs at-spi2-core))) + (arguments + (substitute-keyword-arguments (package-arguments at-spi2-core) + ((#:configure-flags configure-flags) + `(delete "-Ddocs=true" ,configure-flags)) + ((#:phases phases) + `(modify-phases ,phases + (delete 'set-documentation-path) + (delete 'prepare-doc-directory) + (delete 'move-documentation))))) + (native-inputs + (alist-delete "gtk-doc" (package-native-inputs at-spi2-core))))) + (define-public at-spi2-atk (package (name "at-spi2-atk") -- cgit v1.2.3 From 88e61bd4a4e14061f194b4e883ee6af8850ecb1f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jan 2020 23:01:24 -0500 Subject: gnu: Add gdl. * gnu/packages/gnome.scm (gdl): New variable. --- gnu/packages/gnome.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6d0f7fe2a4..c5e0959b23 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1501,6 +1501,53 @@ accessing key stores. It also provides the viewer for crypto files on the GNOME Desktop.") (license license:lgpl2.1+))) +(define-public gdl + (package + (name "gdl") + (version "3.34.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/GNOME/gdl.git") + (commit (string-append "GDL_" (string-map (match-lambda + (#\. #\_) + (c c)) + version))))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "154qcr0x6f68f4q526y87imv0rscmp34n47nk1pp82rsq52h2zna")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + ;; The autogen.sh script in gnome-common will run ./configure + ;; by default, which is problematic because source shebangs + ;; have not yet been patched. + (setenv "NOCONFIGURE" "t") + (invoke "sh" "autogen.sh")))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("glib" ,glib "bin") ; for glib-genmarshal, etc. + ("gnome-common" ,gnome-common) + ("gtk-doc" ,gtk-doc) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("libtool" ,libtool) + ("which" ,which))) + (inputs + `(("libxml2" ,libxml2))) + (propagated-inputs + ;; The gdl-3.0.pc file 'Requires' GTK+. + `(("gtk+" ,gtk+))) + (home-page "https://gitlab.gnome.org/GNOME/gdl/") + (synopsis "GNOME docking library") + (description "This library provides docking features for gtk+.") + (license license:lgpl2.1+))) + (define-public libgnome-keyring (package (name "libgnome-keyring") -- cgit v1.2.3 From ca3adf26072c759b198042ced866efc423dd4b97 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jan 2020 23:01:59 -0500 Subject: gnu: Add gdl-minimal. * gnu/packages/gnome.scm (gdl-minimal): New variable. --- gnu/packages/gnome.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c5e0959b23..da69f1bdeb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1548,6 +1548,27 @@ GNOME Desktop.") (description "This library provides docking features for gtk+.") (license license:lgpl2.1+))) +;;; A minimal variant used to break a cycle with Inkscape. +(define-public gdl-minimal + (package + (inherit gdl) + (name "gdl-minimal") + (arguments + (substitute-keyword-arguments (package-arguments gdl) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'disable-doc-generation + ;; XXX: There is no easy way to disable generating the + ;; documentation. + (lambda _ + (substitute* "configure.in" + (("GTK_DOC_CHECK.*") "") + (("docs/.*") "")) + (substitute* "Makefile.am" + (("gdl docs po") "gdl po")) + #t)))))) + (native-inputs (alist-delete "gtk-doc" (package-native-inputs gdl))))) + (define-public libgnome-keyring (package (name "libgnome-keyring") -- cgit v1.2.3 From 89c34f5e48431de070c057cf4162a4519afbb0ba Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jan 2020 23:20:31 -0500 Subject: gnu: Add lib2geom. * gnu/packages/graphics.scm (lib2geom): New variable. * gnu/packages/patches/lib2geom-enable-assertions.patch, lib2geom-link-tests-against-glib.patch, lib2geom-use-system-googletest.patch: New files. * gnu/local.mk (dist_patch_DATA): Register new patches. --- gnu/local.mk | 3 + gnu/packages/graphics.scm | 77 ++++++++++++++++++ .../patches/lib2geom-enable-assertions.patch | 36 +++++++++ .../patches/lib2geom-link-tests-against-glib.patch | 34 ++++++++ .../patches/lib2geom-use-system-googletest.patch | 94 ++++++++++++++++++++++ 5 files changed, 244 insertions(+) create mode 100644 gnu/packages/patches/lib2geom-enable-assertions.patch create mode 100644 gnu/packages/patches/lib2geom-link-tests-against-glib.patch create mode 100644 gnu/packages/patches/lib2geom-use-system-googletest.patch diff --git a/gnu/local.mk b/gnu/local.mk index fd787299d2..befe89ff3e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1159,6 +1159,9 @@ dist_patch_DATA = \ %D%/packages/patches/ldc-disable-phobos-tests.patch \ %D%/packages/patches/leela-zero-gtest.patch \ %D%/packages/patches/less-hurd-path-max.patch \ + %D%/packages/patches/lib2geom-enable-assertions.patch \ + %D%/packages/patches/lib2geom-link-tests-against-glib.patch \ + %D%/packages/patches/lib2geom-use-system-googletest.patch \ %D%/packages/patches/liba52-enable-pic.patch \ %D%/packages/patches/liba52-link-with-libm.patch \ %D%/packages/patches/liba52-set-soname.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 664e3fab45..75e6d48196 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Raghav Gururajan +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,6 +62,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) @@ -328,6 +330,81 @@ quaternions and other useful 2D and 3D math functions. Iex is an exception-handling library.") (license license:bsd-3))) +(define-public lib2geom + ;; Use the latest master commit, as the 1.0 release suffer build problems. + (let ((revision "1") + (commit "42e119d94934a9514c61571cfb6b4af503ece082")) + (package + (name "lib2geom") + (version (git-version "1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/inkscape/lib2geom.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "195rs0kdbs8w62irha1nwy83bccz04wglmk578qrj1mky7fc4rjv")) + (patches + ;; Patch submitted to upstream (see: + ;; https://gitlab.com/inkscape/lib2geom/merge_requests/17). + (search-patches "lib2geom-enable-assertions.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix py2geom module initialization (see: + ;; https://gitlab.com/inkscape/lib2geom/merge_requests/18). + (substitute* "src/py2geom/__init__.py" + (("_py2geom") "py2geom._py2geom")) + #t)))) + (build-system cmake-build-system) + (arguments + `(#:imported-modules ((guix build python-build-system) + ,@%cmake-build-system-modules) + #:configure-flags '("-D2GEOM_BUILD_SHARED=ON" + "-D2GEOM_BOOST_PYTHON=ON" + ;; Compiling the Cython bindings fail (see: + ;; https://gitlab.com/inkscape/lib2geom/issues/21). + "-D2GEOM_CYTHON_BINDINGS=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-python-lib-install-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((python-version (@ (guix build python-build-system) + python-version)) + (python-maj-min-version (python-version + (assoc-ref inputs "python"))) + (site-package (string-append + (assoc-ref outputs "out") + "/lib/python" python-maj-min-version + "/site-packages"))) + (substitute* '("src/cython/CMakeLists.txt" + "src/py2geom/CMakeLists.txt") + (("PYTHON_LIB_INSTALL \"[^\"]*\"") + (format #f "PYTHON_LIB_INSTALL ~s" site-package)))) + #t))))) + (native-inputs `(("python" ,python-wrapper) + ("googletest" ,googletest) + ("pkg-config" ,pkg-config))) + (inputs `(("cairo" ,cairo) + ("pycairo" ,python-pycairo) + ("double-conversion" ,double-conversion) + ("glib" ,glib) + ("gsl" ,gsl))) + (propagated-inputs + `(("boost" ,boost))) ;referred to in 2geom/pathvector.h. + (home-page "https://gitlab.com/inkscape/lib2geom/") + (synopsis "C++ 2D graphics library") + (description "2geom is a C++ library of mathematics for paths, curves, +and other geometric calculations. Designed for vector graphics, it tackles +Bézier curves, conic sections, paths, intersections, transformations, and +basic geometries.") + ;; Because the library is linked with the GNU Scientific Library + ;; (GPLv3+), the combined work must be licensed as GPLv3+ (see: + ;; https://gitlab.com/inkscape/inkscape/issues/784). + (license license:gpl3+)))) + (define-public ogre (package (name "ogre") diff --git a/gnu/packages/patches/lib2geom-enable-assertions.patch b/gnu/packages/patches/lib2geom-enable-assertions.patch new file mode 100644 index 0000000000..8feb44acbf --- /dev/null +++ b/gnu/packages/patches/lib2geom-enable-assertions.patch @@ -0,0 +1,36 @@ +From 4aa78f52232682b353eb15c219171e466987bac7 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Thu, 16 Jan 2020 00:19:29 -0500 +Subject: [PATCH] build: Enable assertions for the RelWithDebugInfo build type. + +This fixes issue #5 (see: +https://gitlab.com/inkscape/lib2geom/issues/5). + +* CMakeLists.txt: Remove the "-DNDEBUG" CXX flag from the default +configuration for the RelWithDebugInfo build type. +--- + CMakeLists.txt | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bfeb8f03..a663a1b0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,6 +19,14 @@ enable_testing() + + include(CheckCXXSourceCompiles) + ++# Enable assertions for the RelWithDebugInfo build type. This is ++# useful as some tests make use of it (see: ++# https://gitlab.com/inkscape/lib2geom/issues/5). ++if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") ++ string(REPLACE "-DNDEBUG" "" ++ CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") ++endif() ++ + # Find dependencies + find_package(Boost 1.40 REQUIRED) + find_package(DoubleConversion REQUIRED) +-- +2.24.1 + diff --git a/gnu/packages/patches/lib2geom-link-tests-against-glib.patch b/gnu/packages/patches/lib2geom-link-tests-against-glib.patch new file mode 100644 index 0000000000..2b4f7ca6bf --- /dev/null +++ b/gnu/packages/patches/lib2geom-link-tests-against-glib.patch @@ -0,0 +1,34 @@ +From f95925afef451755fc1449e57fbfdc2e7277f4b4 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Sat, 11 Jan 2020 00:44:55 -0500 +Subject: [PATCH 1/3] tests: Link against GLib. + +This resolves an error about not finding when linking the +tests that make use of GLib. + +* src/tests/CMakeLists.txt[2GEOM_GTESTS_SRC]: Add the glib library to +the link target libraries. +--- + src/tests/CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt +index 5ddf7f9c..626cfd87 100644 +--- a/src/tests/CMakeLists.txt ++++ b/src/tests/CMakeLists.txt +@@ -32,8 +32,10 @@ sbasis-test + + foreach(source ${2GEOM_GTESTS_SRC}) + add_executable(${source} ${source}.cpp) +- target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS}) +- target_link_libraries(${source} 2geom gtest_main gtest ${GSL_LIBRARIES} ${GTK3_LIBRARIES}) ++ target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} ++ ${GTK3_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS}) ++ target_link_libraries(${source} 2geom gtest_main gtest ${GSL_LIBRARIES} ++ ${GTK3_LIBRARIES} ${GLIB_LIBRARIES}) + add_test(NAME ${source} COMMAND ${source}) + endforeach() + +-- +2.24.1 + diff --git a/gnu/packages/patches/lib2geom-use-system-googletest.patch b/gnu/packages/patches/lib2geom-use-system-googletest.patch new file mode 100644 index 0000000000..16cce1799f --- /dev/null +++ b/gnu/packages/patches/lib2geom-use-system-googletest.patch @@ -0,0 +1,94 @@ +From 6693b9c8ff1ae1ec02c9002c0a8f5f416f0c88f0 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Sun, 12 Jan 2020 23:23:33 -0500 +Subject: [PATCH 3/3] build: Prefer googletest from the system. + +Fixes issue #4. + +The build system now look for a system installed googletest or falls +back to the bundled copy of googletest otherwise. + +* CMakeLists.txt: Add call to find_package(GTest). +(include_directories): Remove "src/googletest/googletest/include" from +arg. +* src/CMakeLists.txt[NOT GTEST_FOUND]: Define the gtest and gtest_main +libraries when GTEST_FOUND is false. Globally include the googletest +headers here. Define aliases for the gtest and gtest_main libraries +that match those defined by the FindGTest module. +* src/tests/CMakeLists.txt: Replace references to gtest_main and gtest +by GTest::Main and GTest::GTest, respectively. +--- + CMakeLists.txt | 3 ++- + src/CMakeLists.txt | 15 +++++++++++---- + src/tests/CMakeLists.txt | 6 +++--- + 3 files changed, 16 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bfeb8f03..96fbd58c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,13 +25,14 @@ find_package(DoubleConversion REQUIRED) + find_package(PkgConfig REQUIRED) + find_package(Cython) + find_package(Threads) ++find_package(GTest) + pkg_check_modules(GTK3 gtk+-3.0) + pkg_check_modules(GLIB glib-2.0) + pkg_check_modules(CAIRO cairo) + pkg_check_modules(GSL gsl) + + # Add global include and link directories +-include_directories(src src/googletest/googletest/include ${CMAKE_CURRENT_BINARY_DIR}) ++include_directories(src ${CMAKE_CURRENT_BINARY_DIR}) + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/2geom) + + check_cxx_source_compiles("#include \nint main() { double a=0.5,b=0.5,c=0.5; sincos(a, &b, &c); return 0; }" HAVE_SINCOS) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index eefb3ac5..941dc4c7 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,7 +1,14 @@ +-add_library(gtest SHARED googletest/googletest/src/gtest-all.cc) +-target_include_directories(gtest PRIVATE googletest/googletest) +-target_link_libraries(gtest Threads::Threads) +-add_library(gtest_main STATIC googletest/googletest/src/gtest_main.cc) ++if(NOT GTEST_FOUND) ++ message("No system googletest library: using bundled copy.") ++ add_library(gtest SHARED googletest/googletest/src/gtest-all.cc) ++ add_library(gtest_main STATIC googletest/googletest/src/gtest_main.cc) ++ target_include_directories(gtest PRIVATE googletest/googletest) ++ target_link_libraries(gtest Threads::Threads) ++ include_directories(SYSTEM googletest/googletest/include) ++ # Aliases to share the same nomenclature with FindGTest. ++ add_library(GTest::GTest ALIAS gtest) ++ add_library(GTest::Main ALIAS gtest_main) ++endif() + + add_subdirectory(2geom) + add_subdirectory(tests) +diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt +index 626cfd87..3538f8cf 100644 +--- a/src/tests/CMakeLists.txt ++++ b/src/tests/CMakeLists.txt +@@ -34,15 +34,15 @@ foreach(source ${2GEOM_GTESTS_SRC}) + add_executable(${source} ${source}.cpp) + target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} + ${GTK3_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS}) +- target_link_libraries(${source} 2geom gtest_main gtest ${GSL_LIBRARIES} +- ${GTK3_LIBRARIES} ${GLIB_LIBRARIES}) ++ target_link_libraries(${source} 2geom GTest::Main GTest::GTest ++ ${GSL_LIBRARIES} ${GTK3_LIBRARIES} ${GLIB_LIBRARIES}) + add_test(NAME ${source} COMMAND ${source}) + endforeach() + + foreach(source ${2GEOM_TESTS_SRC}) + add_executable(${source} ${source}.cpp) + target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS}) +- target_link_libraries(${source} 2geom gtest ${GSL_LIBRARIES} ${GTK3_LIBRARIES}) ++ target_link_libraries(${source} 2geom GTest::GTest ${GSL_LIBRARIES} ${GTK3_LIBRARIES}) + add_test(NAME ${source} COMMAND ${source}) + endforeach(source) + +-- +2.24.1 + -- cgit v1.2.3 From f977fe92c4456c3a051832a96c5338e646771c05 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 24 Jan 2020 23:13:46 -0500 Subject: gnu: plotutils: Build libplotter. * gnu/packages/plotutils.scm (plotutils)[origin]: Port the patch to a snippet, which catches all the problematic occurrences. [configure-flags]: Pass "--enable-libplotter". [description]: Mention the newly added C++ libplotter library. --- gnu/local.mk | 1 - gnu/packages/patches/plotutils-libpng-jmpbuf.patch | 23 --------------------- gnu/packages/plotutils.scm | 24 ++++++++++++++-------- 3 files changed, 15 insertions(+), 33 deletions(-) delete mode 100644 gnu/packages/patches/plotutils-libpng-jmpbuf.patch diff --git a/gnu/local.mk b/gnu/local.mk index befe89ff3e..6d775828e0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1377,7 +1377,6 @@ dist_patch_DATA = \ %D%/packages/patches/plink-endian-detection.patch \ %D%/packages/patches/plib-CVE-2011-4620.patch \ %D%/packages/patches/plib-CVE-2012-4552.patch \ - %D%/packages/patches/plotutils-libpng-jmpbuf.patch \ %D%/packages/patches/podofo-cmake-3.12.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ diff --git a/gnu/packages/patches/plotutils-libpng-jmpbuf.patch b/gnu/packages/patches/plotutils-libpng-jmpbuf.patch deleted file mode 100644 index 07ef60996c..0000000000 --- a/gnu/packages/patches/plotutils-libpng-jmpbuf.patch +++ /dev/null @@ -1,23 +0,0 @@ -Use the `png_jmpbuf' accessor, as recommended since libpng 1.4.0: -http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt . - ---- plotutils-2.6/libplot/z_write.c 2013-07-12 17:19:12.000000000 +0200 -+++ plotutils-2.6/libplot/z_write.c 2013-07-12 17:19:07.000000000 +0200 -@@ -164,7 +164,7 @@ _pl_z_maybe_output_image (S___(Plotter * - } - - /* cleanup after libpng errors (error handler does a longjmp) */ -- if (setjmp (png_ptr->jmpbuf)) -+ if (setjmp (png_jmpbuf (png_ptr))) - { - png_destroy_write_struct (&png_ptr, (png_info **)NULL); - return -1; -@@ -444,7 +444,7 @@ _our_error_fn_stdio (png_struct *png_ptr - #endif - } - -- longjmp (png_ptr->jmpbuf, 1); -+ longjmp (png_jmpbuf (png_ptr), 1); - } - - static void diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index edd492c711..f6881f6776 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016, 2017, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,7 +57,6 @@ (sha256 (base32 "1arkyizn5wbgvbh53aziv3s6lmd3wm9lqzkhxb3hijlp1y124hjg")) - (patches (search-patches "plotutils-libpng-jmpbuf.patch")) (modules '((guix build utils))) (snippet ;; Force the use of libXaw7 instead of libXaw. When not doing @@ -67,22 +67,28 @@ (substitute* "configure" (("-lXaw") "-lXaw7")) + ;; Use the `png_jmpbuf' accessor, as recommended since libpng + ;; 1.4.0 (see: + ;; http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt). + (substitute* "libplot/z_write.c" + (("png_ptr->jmpbuf") + "png_jmpbuf (png_ptr)")) #t)))) (build-system gnu-build-system) + (arguments + `(#:configure-flags (list "--enable-libplotter"))) (inputs `(("libpng" ,libpng) ("libx11" ,libx11) ("libxt" ,libxt) ("libxaw" ,libxaw))) - - (home-page - "https://www.gnu.org/software/plotutils/") + (home-page "https://www.gnu.org/software/plotutils/") (synopsis "Plotting utilities and library") (description - "GNU Plotutils is a package for plotting and working with 2D graphics. -It includes a library, \"libplot\", for C and C++ for exporting 2D vector -graphics in many file formats. It also has support for 2D vector graphics -animations. The package also contains command-line programs for plotting -scientific data.") + "GNU Plotutils is a package for plotting and working with 2D graphics. +It includes the C library @code{libplot} and the C++ @code{libplotter} library +for exporting 2D vector graphics in many file formats. It also has support +for 2D vector graphics animations. The package also contains command-line +programs for plotting scientific data.") (license license:gpl2+))) (define-public guile-charting -- cgit v1.2.3 From 2f6d51ef9ae904aa857bed635750b857873408d1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 24 Jan 2020 23:40:38 -0500 Subject: gnu: Add pstoedit. * gnu/packages/graphics.scm (pstoedit): New variable. --- gnu/packages/graphics.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 75e6d48196..16ffda835e 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -68,6 +68,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages plotutils) #:use-module (gnu packages pth) #:use-module (gnu packages pulseaudio) ; libsndfile, libsamplerate #:use-module (gnu packages python) @@ -405,6 +406,45 @@ basic geometries.") ;; https://gitlab.com/inkscape/inkscape/issues/784). (license license:gpl3+)))) +(define-public pstoedit + (package + (name "pstoedit") + (version "3.75") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/pstoedit/pstoedit/" + version "/pstoedit-" version ".tar.gz")) + (sha256 + (base32 + "1kv46g2wsvsvcngkavxl5gnw3l6g5xqnh4kmyx4b39a01d8xiddp")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("ghostscript" ,ghostscript) + ("imagemagick" ,imagemagick) + ("libplot" ,plotutils) + ("libjpeg" ,libjpeg-turbo) + ("zlib" ,zlib))) ;else libp2edrvmagick++.so fails to link + (home-page "http://www.pstoedit.net/") + (synopsis "Converter for PostScript and PDF graphics") + (description "The @code{pstoedit} utility allows translating graphics +in the PostScript or PDF (Portable Document Format) formats to various +other vector formats such as: +@itemize +@item Tgif (.obj) +@item gnuplot +@item xfig (.fig) +@item Flattened PostScript +@item DXF, a CAD (Computed-Aided Design) exchange format +@item PIC (for troff/groff) +@item MetaPost (for usage with TeX/LaTeX) +@item LaTeX2e picture +@item GNU Metafile (for use with plotutils/libplot) +@item Any format supported by ImageMagick +@end itemize") + (license license:gpl2+))) + (define-public ogre (package (name "ogre") -- cgit v1.2.3 From 5ee8c1411dbbb752c1da1fcb4be4bf14dc87c72e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 25 Jan 2020 00:33:14 -0500 Subject: gnu: Add autotrace. * gnu/packages/graphics.scm (autotrace): New variable. --- gnu/packages/graphics.scm | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 16ffda835e..b2bc63b9d0 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost) @@ -52,6 +53,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -146,6 +148,61 @@ objects!") (home-page "http://www.fox-toolkit.org") (license license:lgpl2.1+))) +(define-public autotrace + (let ((commit "travis-20190624.59") + (version-base "0.40.0")) + (package + (name "autotrace") + (version (string-append version-base "-" + (if (string-prefix? "travis-" commit) + (string-drop commit 7) + commit))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/autotrace/autotrace.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mk4yavy42dj0pszr1ggnggpvmzs4ds46caa9wr55cqsypn7bq6s")))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + ;; See: https://github.com/autotrace/autotrace/issues/27. + (add-after 'unpack 'include-spline.h-header + (lambda _ + (substitute* "Makefile.am" + ((".*src/types.h.*" all) + (string-append all "\t\tsrc/spline.h \\\n"))) + #t)) + ;; See: https://github.com/autotrace/autotrace/issues/26. + (replace 'check + (lambda _ + (invoke "sh" "tests/runtests.sh")))))) + (native-inputs + `(("which" ,which) + ("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("intltool" ,intltool) + ("libtool" ,libtool) + ("gettext" ,gettext-minimal))) + (inputs + `(("glib" ,glib) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("imagemagick" ,imagemagick) + ("pstoedit" ,pstoedit))) + (home-page "https://github.com/autotrace/autotrace") + (synopsis "Bitmap to vector graphics converter") + (description "AutoTrace is a utility for converting bitmap into vector +graphics. It can trace outlines and midlines, effect color reduction or +despeckling and has support for many input and output formats. It can be used +with the @command{autotrace} utility or as a C library, @code{libautotrace}.") + (license (list license:gpl2+ ;for the utility itself + license:lgpl2.1+))))) ;for use as a library + (define-public blender (package (name "blender") -- cgit v1.2.3 From 7f05493da3521ce4c470935d9b82fbde8e0836c6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 28 Jan 2020 00:15:29 -0500 Subject: gnu: Add drm-tools. * gnu/packages/textutils.scm (drm-tools): New variable. --- gnu/packages/textutils.scm | 106 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 6fdcfd227e..b6732dbae1 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2019 Yoshinori Arai ;;; Copyright © 2019 Mădălin Ionel Patrașcu ;;; Copyright © 2019 Wiktor Żelazny +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,6 +54,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages java) #:use-module (gnu packages ncurses) + #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -725,6 +727,110 @@ categories.") (license (list license:lgpl2.1 ; Main distribution. license:asl1.1)))) ; src/readdir.{c,h} +(define-public drm-tools + (package + (name "drm-tools") + (version "1.1.33") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/drmtools/drm_tools-" + version ".tar.gz")) + (sha256 + (base32 + "187zbxw21zcg8gpyc13gxlycfw0n05a6rmqq6im5wr9zk1v1wj80")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;the test suite fails + #:phases (modify-phases %standard-phases + (add-after 'unpack 'set-install-prefixes + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* "CMakeLists.txt" + (("tmp/testinstall") + (string-drop out 1)) + (("/man/man1") + "/share/man/man1")) + #t))) + (add-after 'unpack 'adjust-test-paths + (lambda _ + (substitute* '("test_extract_increment.sh" + "test_extract_features.sh" + "test_extract_features2.sh" + "test_dmath.sh") + (("\\./extract") "extract") + (("\\./dmath") "dmath") + (("/usr/local/bin/") "") + (("/bin/rm") "rm") + (("/bin/cp") "cp")) + #t)) + (delete 'check) + ;; The produced binaries are written directly to %output/bin. + (delete 'install) + (add-after 'build 'check + (lambda* (#:key outputs tests? #:allow-other-keys) + (when tests? + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (setenv "PATH" (string-append bin ":" + (getenv "PATH"))) + (with-directory-excursion + (format #f "../drm_tools-~a" ,version) + (invoke "sh" "test_all.sh"))))))))) + (native-inputs `(("which" ,which))) ;for tests + (inputs `(("pcre" ,pcre))) + (home-page "http://drmtools.sourceforge.net/") + (synopsis "Utilities to manipulate text and binary files") + (description "The drm_tools package contains the following commands: +@table @command +@item accudate +An extended version of the \"date\" program that has sub-second accuracy. +@item binformat +Format complex binary data into text. +@item binload +Load data into a binary file using simple commands from the input. +@item binorder +Sort, merge, search, retrieve or generate test data consisting of fixed size +binary records. +@item binreplace +Find or find/replace in binary files. +@item binsplit +Split test data consisting of fixed size binary records into one or more +output streams. +@item chardiff +Find changes between two files at the character level. Unlike \"diff\", it +lists just the characters that differ, so if the 40,000th character is +different only that one character will be shown, not the entire line. +@item columnadd +Add columns of integers, decimals, and/or times. +@item datasniffer +A utility for formatting binary data dumps. +@item dmath +Double precision interactive command line math calculator. +@item extract +Extract and emit data from text files based on character or token position. +@item execinput +A utility that reads from STDIN and executes each line as a command in a +sub-process. +@item indexed_text +A utility for rapid retrieval of text by line numbers, in any order, from a +text file. +@item mdump +Format binary data. +@item msgqueue +Create message queues and send/receive messages. +@item mbin +@itemx mbout +Multiple buffer in and out. Used for buffering a lot of data between a slow +device and a fast device. Mostly for buffering streaming tape drives for use +with slower network connections, so that streaming is maintained as much as +possible to minimize wear on the tape device. +@item pockmark +Corrupt data streams - useful for testing error correction and data recovery. +@item tarsieve +Filter, list, or split a tar file. +@end table") + (license license:gpl2+))) + (define-public java-rsyntaxtextarea (package (name "java-rsyntaxtextarea") -- cgit v1.2.3 From 3f1f98d9d8c4e7f5dfca921fe1957e4d53783e35 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 28 Jan 2020 01:21:24 -0500 Subject: gnu: Add libuemf. * gnu/packages/image.scm (libuemf): New variable. --- gnu/packages/image.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 24f1b1570c..05b64dd716 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2018 Rutger Helling ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2020 R Veera Kumar +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,6 +75,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sphinx) + #:use-module (gnu packages textutils) #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages xml) @@ -856,6 +858,55 @@ compose, and analyze GIF images.") (home-page "http://giflib.sourceforge.net/") (license license:x11))) +(define-public libuemf + (package + (name "libuemf") + (version "0.2.7") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/libuemf/libUEMF-" + version ".tar.gz")) + (sha256 + (base32 + "05djs99vqf067x81xfpskh7a66y5x7b4mmjavybcy7swnm0swg7v")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Overriding CMAKE_INSTALL_PREFIX is not a good idea. + (add-after 'unpack 'fix-CMakeLists.txt + (lambda _ + (substitute* "CMakeLists.txt" + ((".*SET\\(CMAKE_INSTALL_PREFIX.*") "")) + #t)) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (sources (string-append "../libUEMF-" ,version)) + (drm-tools (assoc-ref inputs "drm-tools")) + (extract (string-append drm-tools "/bin/extract")) + (execinput (string-append drm-tools "/bin/execinput"))) + (with-directory-excursion sources + (substitute* "testit.sh" + (("^EPATH=.*") + (format #f "EPATH=~a~%" bin)) + (("`which diff`") + "diff") + (("^EXTRACT=.*") + (format #f "EXTRACT=~a~%" extract)) + (("^EXECINPUT=.*") + (format #f "EXECINPUT=~a~%" execinput))) + (invoke "sh" "testit.sh")))))))) + (native-inputs `(("drm-tools" ,drm-tools))) ;for tests + (home-page "http://libuemf.sourceforge.net/") + (synopsis "Library for working with WFM, EMF and EMF+ images") + (description "The libUEMF library is a portable C99 implementation for +reading and writing @abbr{WFM, Windows Metafile}, @abbr{EMF, Enhanced +Metafile}, and @abbr{EMF+, Enhanced Metafile Plus} files.") + (license license:gpl2+))) + (define-public libungif (package (name "libungif") -- cgit v1.2.3 From ff8a1a88d934bb31339ad1c9aaa201ec837cb743 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jan 2020 16:37:44 -0500 Subject: gnu: inkscape: Add inkscape-1.0. * gnu/packages/inkscape.scm (inkscape-1.0): New variable. * gnu/packages/gtk.scm (at-spi2-atk): Add a TODO comment. --- gnu/packages/gtk.scm | 2 + gnu/packages/inkscape.scm | 173 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f6a50f0058..24089668d2 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -690,6 +690,8 @@ is part of the GNOME accessibility project.") (setenv "DBUS_FATAL_WARNINGS" "0") (invoke "dbus-launch" "meson" "test")))))) (propagated-inputs + ;; TODO: Replace by at-spi2-core-minimal in the next staging window, or + ;; when Inkscape 0.92 is upgraded to 1.0 to avoid a cycle. `(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc (inputs `(("atk" ,atk))) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 26d4642547..b0707d6eff 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2017, 2020 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,8 +31,13 @@ #:use-module (gnu packages aspell) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages graphics) #:use-module (gnu packages gtk) + #:use-module (gnu packages imagemagick) + #:use-module (gnu packages libreoffice) #:use-module (gnu packages maths) #:use-module (gnu packages perl) #:use-module (gnu packages pdf) @@ -107,3 +113,170 @@ apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard, as the native format.") (license license:gpl2+))) + +(define-public inkscape-1.0 + (package + (name "inkscape") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://media.inkscape.org/dl/" + "resources/file/" + "inkscape-" version ".tar.xz")) + (sha256 + (base32 + "1fwl7yjkykqb86555k4fm24inhc40mrvxqwgl2v2vi9alv8j7hc9")) + (modules '((guix build utils) + (ice-9 format))) + (snippet + '(begin + (let-syntax + ;; XXX: The build system doesn't currently support using + ;; system libraries over bundled ones (see: + ;; https://gitlab.com/inkscape/inkscape/issues/876). + ((unbundle + (syntax-rules () + ((_ (name source-dir use-pkg-config?) ...) + (begin + ;; Delete bundled source directories. + (delete-file-recursively source-dir) ... + (substitute* '("src/CMakeLists.txt" + "src/3rdparty/CMakeLists.txt") + (((string-append ".*add_subdirectory\\(" + (basename source-dir) "\\).*")) + "") ...) + ;; Remove bundled entries from INKSCAPE_TARGET_LIBS. + (substitute* "src/CMakeLists.txt" + (((string-append name "_LIB.*")) "") ...) + ;; Register the external libraries, so that their + ;; headers are added to INKSCAPE_INCS_SYS and their + ;; shared libraries added to INKSCAPE_LIBS. + (if use-pkg-config? + (let* ((width (string-length "pkg_check_modules(")) + (indent (string-join (make-list width " ") ""))) + (substitute* "CMakeScripts/DefineDependsandFlags.cmake" + (("^pkg_check_modules\\(INKSCAPE_DEP REQUIRED.*" start) + (string-append start + (format #f "~a~a~%" indent name))))) + (substitute* "CMakeScripts/DefineDependsandFlags.cmake" + (("^find_package\\(Iconv REQUIRED\\).*" start) + (string-append (format #f " +find_path(~a_INCLUDE_DIR NAMES ~:*~a/~:*~a.h ~:*~a.h) +if(NOT ~:*~a_INCLUDE_DIR) + message(FATAL_ERROR \"~:*~a headers not found\") +else() + list(APPEND INKSCAPE_INCS_SYS ${~:*~a_INCLUDE_DIR}) +endif() + +find_library(~:*~a_LIB NAMES ~:*~a) +if(NOT ~:*~a_LIB) + message(FATAL_ERROR \"~:*~a library not found\") +else() + list(APPEND INKSCAPE_LIBS ~:*~a_LIB) +endif()~%~%" + name) + start)))) ... + ;; Fix the references to the headers of the + ;; unbundled libraries. + (substitute* (find-files "." "\\.h$|\\.cpp$") + (((string-append "#include (\"|<)3rdparty/" + (basename source-dir)) _ quote) + (string-append "#include " quote + (basename source-dir))) + ...)))))) + (unbundle ("2geom" "src/2geom" #t) + ;; libcroco cannot be unbundled as it is heavily + ;; modified (see: + ;; https://gitlab.com/inkscape/inkscape/issues/876#note_276114904). + ;; ("croco" "src/3rdparty/libcroco" #t) + ;; FIXME: Unbundle the following libraries once they + ;; have been packaged. + ;; ("cola" "src/3rdparty/adaptagrams/libcola") + ;; ("avoid" "src/3rdparty/adaptagrams/libavoid") + ;; ("vpsc" "src/3rdparty/adaptagrams/libvpsc") + ;; libuemf cannot be unbundled as it slightly modified + ;; from upstream (see: + ;; https://gitlab.com/inkscape/inkscape/issues/973). + ;; ("uemf" "src/3rdparty/libuemf" #f) + ;; FIXME: libdepixelize upstream is ancient and doesn't + ;; build with a recent lib2geom + ;; (see: https://bugs.launchpad.net/libdepixelize/+bug/1862458). + ;;("depixelize" "src/3rdparty/libdepixelize") + ("autotrace" "src/3rdparty/autotrace" #t))) + ;; Lift the requirement on the double-conversion library, as + ;; it is only needed by lib2geom, which is now unbundled. + (substitute* "CMakeScripts/DefineDependsandFlags.cmake" + ((".*find_package\\(DoubleConversion.*") "")) + #t)))) + (build-system cmake-build-system) + (arguments + `(#:tests? #t + #:test-target "check" ;otherwise some test binaries are missing + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-icon-cache-generator + (lambda _ + (substitute* "share/icons/application/CMakeLists.txt" + (("gtk-update-icon-cache") "true")) + #t)) + (add-after 'unpack 'disable-latex-export-tests + ;; FIXME: For some reason the test.pdf_tex file generated by the + ;; "--export-latex" lacks "some text" in its content when run in + ;; the build environment. Skip the related tests. + (lambda _ + (substitute* "testfiles/cli_tests/CMakeLists.txt" + (("add_cli_test\\(export-latex") + "message(TEST_DISABLED: export-latex")) + #t)) + (add-after 'unpack 'set-home + ;; Mute Inkscape warnings during tests. + (lambda _ + (setenv "HOME" (getcwd)) + (format #t "ARGS is set to: ~a" (getenv "ARGS")) + #t)) + ;; Move the check phase after the install phase, as when run in the + ;; tests, Inkscape relies on files that are not yet installed, such + ;; as the "share/inkscape/ui/units.xml" file. + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check))))) + (inputs + `(("aspell" ,aspell) + ("autotrace" ,autotrace) + ("gdl" ,gdl-minimal) + ("gtkmm" ,gtkmm) + ("gtk" ,gtk+) + ("gtkspell3" ,gtkspell3) + ("gsl" ,gsl) + ("poppler" ,poppler) + ("lib2geom" ,lib2geom) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("libgc" ,libgc) + ("libsoup" ,libsoup-minimal) + ("libcdr" ,libcdr) + ("libvisio" ,libvisio) + ("libwpd" ,libwpd) + ("libwpg" ,libwpg) + ("freetype" ,freetype) + ("popt" ,popt) + ("potrace" ,potrace) + ("lcms" ,lcms) + ("boost" ,boost))) + (native-inputs + `(("imagemagick" ,imagemagick) ;for tests + ("intltool" ,intltool) + ("glib" ,glib "bin") + ("googletest" ,googletest) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (home-page "https://inkscape.org/") + (synopsis "Vector graphics editor") + (description "Inkscape is a vector graphics editor. What sets Inkscape +apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard, +as the native format.") + (license license:gpl3+))) ;see the file COPYING -- cgit v1.2.3 From 70cf011390d92e44877502bc5765a3c87834dac2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 1 Jun 2020 08:44:21 +0300 Subject: gnu: gdl: Don't use custom bootstrap phase. * gnu/packages/gnome.scm (gdl)[arguments]: Remove custom boostrap phase. (gdl-minimal)[arguments]: Don't inherit arguments from gdl. --- gnu/packages/gnome.scm | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index da69f1bdeb..2be117d21b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1518,16 +1518,6 @@ GNOME Desktop.") (base32 "154qcr0x6f68f4q526y87imv0rscmp34n47nk1pp82rsq52h2zna")))) (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - ;; The autogen.sh script in gnome-common will run ./configure - ;; by default, which is problematic because source shebangs - ;; have not yet been patched. - (setenv "NOCONFIGURE" "t") - (invoke "sh" "autogen.sh")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -1554,19 +1544,18 @@ GNOME Desktop.") (inherit gdl) (name "gdl-minimal") (arguments - (substitute-keyword-arguments (package-arguments gdl) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'disable-doc-generation - ;; XXX: There is no easy way to disable generating the - ;; documentation. - (lambda _ - (substitute* "configure.in" - (("GTK_DOC_CHECK.*") "") - (("docs/.*") "")) - (substitute* "Makefile.am" - (("gdl docs po") "gdl po")) - #t)))))) + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-doc-generation + ;; XXX: There is no easy way to disable generating the + ;; documentation. + (lambda _ + (substitute* "configure.in" + (("GTK_DOC_CHECK.*") "") + (("docs/.*") "")) + (substitute* "Makefile.am" + (("gdl docs po") "gdl po")) + #t))))) (native-inputs (alist-delete "gtk-doc" (package-native-inputs gdl))))) (define-public libgnome-keyring -- cgit v1.2.3 From 48fd0de9629b707815fd490aa5a0c3410721ae3a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 1 Jun 2020 09:16:54 +0300 Subject: gnu: enlightenment: Update to 0.24.1. * gnu/packages/enlightenment.scm (enlightenment): Update to 0.24.1. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 4d8c12ed3b..d852cbb275 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -292,7 +292,7 @@ Libraries with some extra bells and whistles.") (define-public enlightenment (package (name "enlightenment") - (version "0.24.0") + (version "0.24.1") (source (origin (method url-fetch) (uri @@ -300,7 +300,7 @@ Libraries with some extra bells and whistles.") "enlightenment/enlightenment-" version ".tar.xz")) (sha256 (base32 - "01053hxdmyjfb6gmz1pqmw0llrgc4356np515h5vsqcn59mhvfz7")) + "02aadl5fqvpmpjnisrc4aw7ffwyp1109y4k1wvmp33ciihbvdqmf")) (patches (search-patches "enlightenment-fix-setuid-path.patch")))) (build-system meson-build-system) (arguments -- cgit v1.2.3 From fabfe0b99c4500e3e381933ab769e462c95555e1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jun 2020 10:54:22 +0200 Subject: gnu: emacspeak: Update to 52.0. * gnu/packages/emacs-xyz.scm (emacspeak): Update to 52.0. [arguments]: Add phase to remove a non-existing file. Change executable. [inputs]: Use espeak-ng instead of espeak. [description]: Typographic fix. --- gnu/packages/emacs-xyz.scm | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7c014cfd4c..c1f7f1fe06 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9853,7 +9853,7 @@ highlights quasi-quoted expressions.") (define-public emacspeak (package (name "emacspeak") - (version "50.0") + (version "52.0") (source (origin (method url-fetch) @@ -9861,14 +9861,17 @@ highlights quasi-quoted expressions.") "https://github.com/tvraman/emacspeak/releases/download/" version "/emacspeak-" version ".tar.bz2")) (sha256 - (base32 - "0rsj7rzfyqmyidfsjrhjnxi2d43axx6r3gac1fhv5xkkbiiqzqkb")))) + (base32 "0x5b0s38r5ih2lk7f5hasi9arrgxlmmq5jaddadbxi8in2gw2jzl")))) (build-system gnu-build-system) (arguments '(#:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'delete-broken-symlink + (lambda _ + (delete-file "lisp/sudoku.el") + #t)) (replace 'configure (lambda _ (setenv "SHELL" (which "sh")) @@ -9893,12 +9896,12 @@ highlights quasi-quoted expressions.") '("etc" "info" "js" "lisp" "media" "servers" "sounds" "stumpwm" "xsl")) ;; Make sure emacspeak is loaded from the correct directory. - (substitute* "etc/emacspeak.sh" - (("/lisp/emacspeak-setup.el") + (substitute* "run" + (("\\./lisp/emacspeak-setup.el") (string-append lisp "/lisp/emacspeak-setup.el"))) ;; Install the convenient startup script. (mkdir-p bin) - (copy-file "etc/emacspeak.sh" (string-append bin "/emacspeak"))) + (copy-file "run" (string-append bin "/emacspeak"))) #t)) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) @@ -9911,10 +9914,10 @@ highlights quasi-quoted expressions.") (wrap-program emacspeak `("DTK_PROGRAM" ":" prefix (,espeak))) #t)))) - #:tests? #f)) ; no check target + #:tests? #f)) ; no check target (inputs `(("emacs" ,emacs) - ("espeak" ,espeak) + ("espeak" ,espeak-ng) ("perl" ,perl) ("tcl" ,tcl) ("tclx" ,tclx))) @@ -9922,12 +9925,12 @@ highlights quasi-quoted expressions.") (synopsis "Audio desktop interface for Emacs") (description "Emacspeak is a speech interface that allows visually impaired users to -interact independently and efficiently with the computer. Audio formatting ---a technique pioneered by AsTeR-- and full support for W3C's Aural CSS (ACSS) -allows Emacspeak to produce rich aural presentations of electronic information. -By seamlessly blending all aspects of the Internet such as Web-surfing and -messaging, Emacspeak speech-enables local and remote information via a -consistent and well-integrated user interface.") +interact independently and efficiently with the computer. Audio +formatting---a technique pioneered by AsTeR---and full support for W3C's Aural +CSS (ACSS) allows Emacspeak to produce rich aural presentations of electronic +information. By seamlessly blending all aspects of the Internet such as +Web-surfing and messaging, Emacspeak speech-enables local and remote +information via a consistent and well-integrated user interface.") (license license:gpl2+))) (define-public emacs-adaptive-wrap -- cgit v1.2.3 From 7a99c58c4597a550703f32018efafb0fe84d5c72 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 1 Jun 2020 05:41:13 +0530 Subject: combinators: Recurse fold2 to named let loop. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/combinators.scm (fold2): Recurse to named let loop, not fold2 itself. Signed-off-by: Jakub Kądziołka --- guix/combinators.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/combinators.scm b/guix/combinators.scm index 11cad62ccf..4707b59363 100644 --- a/guix/combinators.scm +++ b/guix/combinators.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2014 Eric Bavier +;;; Copyright © 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,7 +57,7 @@ (call-with-values (lambda () (proc (car lst1) (car lst2) result1 result2)) (lambda (result1 result2) - (fold2 proc result1 result2 (cdr lst1) (cdr lst2))))))))) + (loop result1 result2 (cdr lst1) (cdr lst2))))))))) (define (fold-tree proc init children roots) "Call (PROC NODE RESULT) for each node in the tree that is reachable from -- cgit v1.2.3 From f20d1cfb51ed14f325da000406807076323f70bc Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Wed, 8 Apr 2020 12:21:42 +0200 Subject: gnu: ghc-7: Clean up package definition. * gnu/packages/haskell.scm (ghc-7)[modules, imported-modules]: Remove the unused rpath module. [phases]: Use invoke instead of system*. --- gnu/packages/haskell.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e9c8e7f82a..94671ee54d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -178,11 +178,8 @@ top of CLISP.") #:modules ((guix build gnu-build-system) (guix build utils) - (guix build rpath) (srfi srfi-26) (srfi srfi-1)) - #:imported-modules (,@%gnu-build-system-modules - (guix build rpath)) #:configure-flags (list (string-append "--with-gmp-libraries=" @@ -209,7 +206,7 @@ top of CLISP.") (with-directory-excursion ".." (copy-file (assoc-ref inputs "ghc-testsuite") "ghc-testsuite.tar.xz") - (system* "tar" "xvf" "ghc-testsuite.tar.xz")) + (invoke "tar" "xvf" "ghc-testsuite.tar.xz")) (substitute* (list "testsuite/timeout/Makefile" "testsuite/timeout/timeout.py" @@ -228,7 +225,7 @@ top of CLISP.") (with-directory-excursion ghc-bootstrap-path (copy-file (assoc-ref inputs "ghc-binary") "ghc-bin.tar.xz") - (zero? (system* "tar" "xvf" "ghc-bin.tar.xz")))) + (invoke "tar" "xvf" "ghc-bin.tar.xz"))) (alist-cons-before 'install-bin 'configure-bin (lambda* (#:key inputs outputs #:allow-other-keys) @@ -260,7 +257,7 @@ top of CLISP.") (setenv "LD_LIBRARY_PATH" gmp-lib) ;; The binaries have "/lib64/ld-linux-x86-64.so.2" hardcoded. (for-each - (cut system* "patchelf" "--set-interpreter" ld-so <>) + (cut invoke "patchelf" "--set-interpreter" ld-so <>) binaries) ;; The binaries include a reference to libtinfo.so.5 which ;; is a subset of libncurses.so.5. We create a symlink in a @@ -279,7 +276,7 @@ top of CLISP.") (setenv "PATH" (string-append (getenv "PATH") ":" ghc-bootstrap-prefix "/bin")) - (system* + (invoke (string-append (getcwd) "/configure") (string-append "--prefix=" ghc-bootstrap-prefix) (string-append "--with-gmp-libraries=" gmp-lib) @@ -289,7 +286,7 @@ top of CLISP.") (lambda* (#:key inputs outputs #:allow-other-keys) (with-directory-excursion (string-append ghc-bootstrap-path "/ghc-7.8.4") - (zero? (system* "make" "install")))) + (invoke "make" "install"))) %standard-phases))))))) (native-search-paths (list (search-path-specification (variable "GHC_PACKAGE_PATH") -- cgit v1.2.3 From 1a5706df6fea263d8319217334ee92329ff544f2 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 1 Jun 2020 14:29:38 +0200 Subject: gnu: emacs-perspective: Update to 2.8. * gnu/packages/emacs-xyz.scm (emacs-perspective): Update to 2.8. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c1f7f1fe06..5f0a0184f9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5897,7 +5897,7 @@ regexp that matches all known keywords.") (define-public emacs-perspective (package (name "emacs-perspective") - (version "2.2") + (version "2.8") (source (origin (method git-fetch) @@ -5907,7 +5907,7 @@ regexp that matches all known keywords.") (file-name (git-file-name name version)) (sha256 (base32 - "0pd5sqrrz6y3md20yh6ffy32jdcgb1gc9b4j14pm6r54bqxik68h")))) + "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g")))) (build-system emacs-build-system) (home-page "https://github.com/nex3/perspective-el") (synopsis "Switch between named \"perspectives\"") -- cgit v1.2.3 From 5b588f2c9ba9c40dc32aed7c3cdaa45e8f920509 Mon Sep 17 00:00:00 2001 From: tsmish Date: Sat, 9 May 2020 15:51:53 +0000 Subject: gnu: vis: Fix configuration load order. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/text-editors.scm (vis)[native-search-paths]: Remove. There is no need to set $VIS_PATH to $prefix/share/vis as VIS_PATH (#define), which is also in search path (https://github.com/martanne/vis/blob/7648280a95954304e5e935e2cead16d836b86eda/vis-lua.c#L2662), is already set by Makefile to $prefix/share/vis (https://github.com/martanne/vis/blob/7648280a95954304e5e935e2cead16d836b86eda/Makefile#L37). This fixes issue https://issues.guix.gnu.org/39394 Signed-off-by: Jakub Kądziołka --- gnu/packages/text-editors.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index d6c0aa7acb..9e73959dd8 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -102,10 +102,6 @@ `("LUA_PATH" ":" prefix (,LUA_PATH)) `("LUA_CPATH" ":" prefix (,LUA_CPATH))) #t)))))) - (native-search-paths - (list (search-path-specification - (variable "VIS_PATH") - (files '("share/vis"))))) (inputs `(("lua" ,lua) ("ncurses" ,ncurses) ("libtermkey" ,libtermkey) -- cgit v1.2.3 From 27b9fe86b1baabb6520647633baa137df49c68b5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2020 17:38:14 +0200 Subject: gnu: dash: Update to 0.5.11. * gnu/packages/shells.scm (dash): Update to 0.5.11. --- gnu/packages/shells.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index a82f1c8b26..74d08e02bc 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -64,15 +64,14 @@ (define-public dash (package (name "dash") - (version "0.5.10.2") + (version "0.5.11") (source (origin (method url-fetch) (uri (string-append "http://gondor.apana.org.au/~herbert/dash/files/" "dash-" version ".tar.gz")) (sha256 - (base32 - "0wb0bwmqc661hylqcfdp7l7x12myw3vpqk513ncyqrjwvhckjriw")) + (base32 "1jwilfsy249d3q7fagg1ga4bgc2bg1fzw63r2nan0m77bznsdnad")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From eeaeac23549597cec0d445bafc4e9f94f79910c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2020 17:38:23 +0200 Subject: gnu: wireguard-tools: Update to 1.0.20200513. * gnu/packages/vpn.scm (wireguard-tools): Update to 1.0.20200513. --- gnu/packages/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index dbfd11626a..0f0157806c 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -551,7 +551,7 @@ WireGuard was added to Linux 5.6.") (define-public wireguard-tools (package (name "wireguard-tools") - (version "1.0.20200206") + (version "1.0.20200513") (source (origin (method git-fetch) @@ -560,7 +560,7 @@ WireGuard was added to Linux 5.6.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ivc08lds5w39a6f2xdfih9wlk5g724hl3kpdvxvh5yff4l84qb7")))) + (base32 "1yk8hng0qw2rf76hnawjbdpjssmah88bd5fk20h1c0j1yazlx0a9")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 125aacaa095e8933c1a73909647a15e1ea1f3174 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2020 17:49:14 +0200 Subject: gnu: exim: Update to 4.94. * gnu/packages/mail.scm (exim): Update to 4.94. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 1a81389d18..5ed7197b40 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1259,7 +1259,7 @@ delivery.") (define-public exim (package (name "exim") - (version "4.93.0.4") + (version "4.94") (source (origin (method url-fetch) @@ -1273,7 +1273,7 @@ delivery.") (string-append "https://ftp.exim.org/pub/exim/exim4/old/" file-name)))) (sha256 - (base32 "01g4sfycv13glnmfrapwhjbdw6z1z7w5bwjldxjmglwfw5p3czak")))) + (base32 "1nsb2i5mqxfz1sl1bmbxmpb2qiaf3wffhfiw4j9vfpagy3xfhzpp")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb-5.3) ; ‘#error Version 6 and later BDB API is not supported’ -- cgit v1.2.3 From 2ad9ac0cf0341c62fad0e0858459bf9795716d9e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Jun 2020 20:24:24 +0200 Subject: gnu: emacs-cyberpunk-theme: Update to 1.22. * gnu/packages/emacs-xyz.scm (emacs-cyberpunk-theme): Update to 1.22. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5f0a0184f9..60469f93fa 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9009,7 +9009,7 @@ Flx has support for ido (interactively do things) through flx-ido.") (define-public emacs-cyberpunk-theme (package (name "emacs-cyberpunk-theme") - (version "1.21") + (version "1.22") (source (origin (method git-fetch) @@ -9018,7 +9018,7 @@ Flx has support for ido (interactively do things) through flx-ido.") (commit version))) (sha256 (base32 - "05mfgr9aj7knn7niadv9p6z3qrfpq2lbbi2wxxx62xywim9maw2y")) + "06nff38pcy5rgz13svkajsg0jjk73qy4a8m7p9f76yxcywxlgxlc")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (home-page "https://github.com/n3mo/cyberpunk-theme.el") -- cgit v1.2.3 From 8159ce1970d91567468cf1bacac313099a009d2a Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 21 May 2019 05:00:30 +0000 Subject: gnu: bootstrap: Add powerpc64-linux dynamic linker. This makes it possible to build bootstrap binaries for powerpc64-linux: guix build --target=powerpc64-linux-gnu bootstrap-tarballs * gnu/packages/bootstrap.scm (glibc-dynamic-linker): Add an entry for powerpc64-linux. Signed-off-by: Chris Marusich --- gnu/packages/bootstrap.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index a3ecb6e692..c39e60ec8b 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017, 2020 Efraim Flashner ;;; Copyright © 2018, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019 Carl Dong +;;; Copyright © 2019 Léo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -285,6 +286,7 @@ or false to signal an error." ((string=? system "i686-gnu") "/lib/ld.so.1") ((string=? system "aarch64-linux") "/lib/ld-linux-aarch64.so.1") ((string=? system "powerpc-linux") "/lib/ld.so.1") + ((string=? system "powerpc64-linux") "/lib/ld64.so.1") ((string=? system "powerpc64le-linux") "/lib/ld64.so.2") ((string=? system "alpha-linux") "/lib/ld-linux.so.2") ((string=? system "s390x-linux") "/lib/ld64.so.1") -- cgit v1.2.3 From f8072794e4b3cc4e812bd8f52551ab34be206f0e Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 2 Jun 2020 00:11:36 +0530 Subject: gnu: swaks: Update to 20190914.0. * gnu/packages/mail.scm (swaks): Update to 20190914.0. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 5ed7197b40..a408c84dfb 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2016, 2017 Troy Sankey ;;; Copyright © 2016, 2017, 2018 Nikita ;;; Copyright © 2016 Clément Lassieur -;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016, 2018 Marius Bakke ;;; Copyright © 2017 Thomas Danckaert @@ -2622,7 +2622,7 @@ on the fly. Both programs are written in C and are very fast.") (define-public swaks (package (name "swaks") - (version "20181104.0") + (version "20190914.0") (source (origin (method url-fetch) @@ -2631,7 +2631,7 @@ on the fly. Both programs are written in C and are very fast.") version ".tar.gz")) (sha256 (base32 - "0n1yd27xcyb1ylp5gln3yv5gzi9r377hjy1j32367kgb3247ygq2")))) + "12awq5z4sdd54cxprj834zajxhkpy4jwhzf1fhigcx1zbhdaacsp")))) (build-system perl-build-system) (inputs `(("perl-net-dns" ,perl-net-dns) -- cgit v1.2.3 From a0362fdea9369b7927704e48cfc6c578213019ce Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 28 May 2020 10:34:40 +0100 Subject: gnu: ikiwiki: Revert to standard wrapper. * gnu/packages/web.scm (ikiwiki)[arguments]: Remove unnecessary 'include-PERL5LIB-in-wrapper' phase. The PERL5LIB environment variable may be set in the user's setup file instead. --- gnu/packages/web.scm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 64671842a7..b020a6f16a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4850,15 +4850,6 @@ NetSurf project.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'include-PERL5LIB-in-wrapper - (lambda _ - (substitute* "IkiWiki/Wrapper.pm" - (("^@wrapper\\_hooks") - (string-append - "@wrapper_hooks\n" - " addenv(\"PERL5LIB\", \"" - (getenv "PERL5LIB") - "\");"))))) (add-after 'patch-source-shebangs 'patch-Makefiles (lambda _ (substitute* "Makefile.PL" -- cgit v1.2.3 From db144a52a3edae6374a81632f9c10281d80cba8c Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 28 May 2020 15:53:43 +0100 Subject: gnu: ikiwiki: Propagate some inputs. * gnu/packages/web.scm (ikiwiki)[inputs]: Move perl-cgi-formbuilder, perl-cgi-session, perl-mail-sendmail, perl-timedate and perl-xml-simple to... [propagated-inputs]: ...here. --- gnu/packages/web.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b020a6f16a..44fe403489 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4894,28 +4894,28 @@ NetSurf project.") (inputs `(("python" ,python-wrapper) ("perl-authen-passphrase" ,perl-authen-passphrase) - ("perl-cgi-formbuilder" ,perl-cgi-formbuilder) - ("perl-cgi-session" ,perl-cgi-session) ("perl-cgi-simple" ,perl-cgi-simple) ("perl-db-file" ,perl-db-file) ("perl-file-mimeinfo" ,perl-file-mimeinfo) ("perl-html-tagset" ,perl-html-tagset) ("perl-image-magick" ,perl-image-magick) ("perl-lwpx-paranoidagent" ,perl-lwpx-paranoidagent) - ("perl-mail-sendmail" ,perl-mail-sendmail) - ("perl-timedate" ,perl-timedate) ("perl-xml-feed" ,perl-xml-feed) ("perl-xml-sax" ,perl-xml-sax) - ("perl-xml-simple" ,perl-xml-simple) ("perl-xml-twig" ,perl-xml-twig) ("po4a" ,po4a))) (propagated-inputs - `(("perl-html-parser" ,perl-html-parser) + `(("perl-cgi-formbuilder" ,perl-cgi-formbuilder) + ("perl-cgi-session" ,perl-cgi-session) + ("perl-html-parser" ,perl-html-parser) ("perl-html-scrubber" ,perl-html-scrubber) ("perl-html-template" ,perl-html-template) ("perl-json" ,perl-json) + ("perl-mail-sendmail" ,perl-mail-sendmail) ("perl-text-markdown-discount" ,perl-text-markdown-discount) + ("perl-timedate" ,perl-timedate) ("perl-uri" ,perl-uri) + ("perl-xml-simple" ,perl-xml-simple) ("perl-yaml-libyaml" ,perl-yaml-libyaml))) (home-page "https://ikiwiki.info/") (synopsis "Wiki compiler, capable of generating HTML") -- cgit v1.2.3 From e642f78f2eaf1d53d656ff3cd86d4dd186e8eb52 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 1 Jun 2020 13:12:44 +0100 Subject: gnu: ikiwiki: Add missing input. * gnu/packages/web.scm (ikiwiki)[inputs]: Add perl-ipc-run. [arguments]: Set PERL5LIB and CC for IPC::Run in 'pre-check' phase. --- gnu/packages/web.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 44fe403489..6e5bc81660 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4867,11 +4867,31 @@ NetSurf project.") "touch" "{}" "+") #t)) (add-before 'check 'pre-check - ;; XDG_DATA_DIRS is needed by the podcast.t test. (lambda* (#:key inputs #:allow-other-keys) + ;; Six tests use IPC::Run. For these tests the PERL5LIB + ;; variable is needed in the runtime environment and also + ;; in the search path list in the setup file. + (substitute* + '("t/aggregate-file.t" "t/git-cgi.t" "t/git-untrusted.t" + "t/passwordauth.t" "t/relativity.t" "t/wrapper-environ.t") + (("(.*)\"perl\"(.*)$" _ prefix suffix) + (string-append prefix "qw(env), 'PERL5LIB='.$ENV{PERL5LIB}" + ", qw(perl)" suffix)) + (("(.*) PERL5LIB=(.*) perl(.*)$" _ prefix middle suffix) + (string-append prefix "), 'PERL5LIB='.$ENV{PERL5LIB}.':" + middle "', qw(perl" suffix)) + (("(.*)setup(.* )getcwd(.*)$" _ prefix middle suffix) + (string-append prefix "setup" middle + "$ENV{PERL5LIB}.':'.getcwd" suffix)) + (("^ENV(.*): '(.*)$" _ middle suffix) + (string-append "ENV" middle + ": '$ENV{PERL5LIB}:" suffix))) + ;; XDG_DATA_DIRS is needed by the podcast.t test. (setenv "XDG_DATA_DIRS" (string-append (assoc-ref inputs "shared-mime-info") "/share")) + ;; CC is needed by IkiWiki/Wrapper.pm. + (setenv "CC" "gcc") #t)) (add-after 'install 'wrap-programs (lambda* (#:key outputs #:allow-other-keys) @@ -4899,6 +4919,7 @@ NetSurf project.") ("perl-file-mimeinfo" ,perl-file-mimeinfo) ("perl-html-tagset" ,perl-html-tagset) ("perl-image-magick" ,perl-image-magick) + ("perl-ipc-run" ,perl-ipc-run) ("perl-lwpx-paranoidagent" ,perl-lwpx-paranoidagent) ("perl-xml-feed" ,perl-xml-feed) ("perl-xml-sax" ,perl-xml-sax) -- cgit v1.2.3 From f3ed5297392fd7fe9cb6fc003824ce34130e80bd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jun 2020 23:31:22 +0200 Subject: gnu: geany: Fix crash when displaying file selection * gnu/packages/text-editors.scm (geany)[arguments]: Wrap GTK to prevent errors when opening file selection menu. --- gnu/packages/text-editors.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 9e73959dd8..0095fcd839 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -821,7 +821,12 @@ and multiple fonts.") `(("gtk+" ,gtk+) ("scintilla" ,scintilla))) (arguments - `(#:phases + `(#:imported-modules ((guix build glib-or-gtk-build-system) + ,@%gnu-build-system-modules) + #:modules (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build gnu-build-system) + (guix build utils)) + #:phases (modify-phases %standard-phases (add-after 'unpack 'use-scintilla-shared-library (lambda* (#:key inputs #:allow-other-keys) @@ -838,7 +843,9 @@ and multiple fonts.") (substitute* "tests/Makefile.am" (("AM_LDFLAGS =" all) (string-append all " -lscintilla"))) (for-each delete-file (list "autogen.sh" "configure" "Makefile.in")) - #t))))) + #t)) + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (home-page "https://www.geany.org") (synopsis "Fast and lightweight IDE") (description "Geany is a small and fast Integrated Development -- cgit v1.2.3 From 9e03ddc5175a09f408bdca91ea5ccecdfd8fb9af Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jun 2020 23:35:26 +0200 Subject: gnu: geany: Un-unbundle scintilla * gnu/packages/text-editors.scm (geany)[source]: Do not un-bundle scintilla. [arguments]: Remove phase using our shared library. Use bundled one instead. --- gnu/packages/text-editors.scm | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 0095fcd839..e80e9dcbe5 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -796,17 +796,13 @@ and multiple fonts.") (package (name "geany") (version "1.36") - (source (origin - (method url-fetch) - (uri (string-append "https://download.geany.org/" - "geany-" version ".tar.bz2")) - (sha256 - (base32 - "0gnm17cr4rf3pmkf0axz4a0fxwnvp55ji0q0lzy88yqbshyxv14i")) - (modules '((guix build utils))) - (snippet '(begin - (delete-file-recursively "scintilla") - #t)))) + (source + (origin + (method url-fetch) + (uri (string-append "https://download.geany.org/" + "geany-" version ".tar.bz2")) + (sha256 + (base32 "0gnm17cr4rf3pmkf0axz4a0fxwnvp55ji0q0lzy88yqbshyxv14i")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -819,7 +815,10 @@ and multiple fonts.") ("python-docutils" ,python-docutils))) ;for rst2html (inputs `(("gtk+" ,gtk+) - ("scintilla" ,scintilla))) + ;; FIXME: Geany bundles a 3.X release of Scintilla. It is not + ;; currently possible to replace it with our Scintilla package. + ;; ("scintilla" ,scintilla) + )) (arguments `(#:imported-modules ((guix build glib-or-gtk-build-system) ,@%gnu-build-system-modules) @@ -828,22 +827,6 @@ and multiple fonts.") (guix build utils)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'use-scintilla-shared-library - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "configure.ac" - (("scintilla/Makefile") "") - (("scintilla/include/Makefile") "")) - (substitute* "Makefile.am" - (("scintilla ") "")) - (substitute* "src/Makefile.am" - (("\\$\\(top_builddir\\)/scintilla/libscintilla.la") "") - (("geany_LDFLAGS =" all) (string-append all " -lscintilla"))) - (substitute* "doc/Makefile.am" - (("\\$\\(INSTALL_DATA\\) \\$\\(top_srcdir\\)/scintilla/License.txt \\$\\(DOCDIR\\)/ScintillaLicense.txt") "")) - (substitute* "tests/Makefile.am" - (("AM_LDFLAGS =" all) (string-append all " -lscintilla"))) - (for-each delete-file (list "autogen.sh" "configure" "Makefile.in")) - #t)) (add-after 'install 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (home-page "https://www.geany.org") -- cgit v1.2.3 From b2dbc53ec2806f05d6c98287f79ee162d335050d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jun 2020 23:40:46 +0200 Subject: gnu: scintilla: Update to 4.4.0. * gnu/packages/text-editors.scm (scintilla): Update to 4.4.0. [arguments]: Remove phase building shared library. This is now done out of the box. --- gnu/packages/text-editors.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index e80e9dcbe5..8e4e49112d 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -743,14 +743,14 @@ and Octave. TeXmacs is completely extensible via Guile.") (define-public scintilla (package (name "scintilla") - (version "4.3.3") + (version "4.4.0") (source (origin (method url-fetch) (uri (let ((v (apply string-append (string-split version #\.)))) (string-append "https://www.scintilla.org/scintilla" v ".tgz"))) (sha256 - (base32 "0zh8c19r1zd4kr9jg2ws0n2n5ic2siz5zbns6cvylyfbpf69ghy2")))) + (base32 "10qnab10gfkzdfyqpmsl4c3mhh7533l4q6jrdfy5ssvj4da6hawd")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk") @@ -758,20 +758,14 @@ and Octave. TeXmacs is completely extensible via Guile.") #:phases (modify-phases %standard-phases (delete 'configure) ;no configure script - (add-after 'unpack 'build-shared-library - (lambda _ - (substitute* "gtk/makefile" - (("scintilla\\.a") "libscintilla.so") - (("\\$\\(AR\\) \\$\\(ARFLAGS\\) \\$@ \\$\\^") - "$(CC) -shared $^ -o $@") - (("\\$\\(RANLIB\\) \\$@") "")) - #t)) (replace 'install + ;; Upstream provides no install script. (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib")) (include (string-append out "/include"))) - (install-file "bin/libscintilla.so" lib) + (for-each (lambda (f) (install-file f lib)) + (find-files "bin/" "\\.so$")) (for-each (lambda (f) (install-file f include)) (find-files "include/" ".")) #t)))))) -- cgit v1.2.3 From 7e80c8e827e1a7694e5bedceab03a7af8e8d90a2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jun 2020 23:56:58 +0200 Subject: gnu: fet: Update to 5.44.8. * gnu/packages/education.scm (fet): Update to 5.44.8. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index f8e77f07ad..550925d638 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -606,14 +606,14 @@ Portuguese, Spanish and Italian.") (define-public fet (package (name "fet") - (version "5.44.7") + (version "5.44.8") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "19b22brpb2mpvg14c2a0xmv8ipq5jg7yjmly8y3gfy8gmc3wqg5m")))) + (base32 "1i59xpkdnrd3qzgqs11vsws57g33zvkad5q3an56vd94aw7z3kpw")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From d4ad8fd39864db09e7fac40b8156fce298e16a4c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Jun 2020 00:07:12 +0200 Subject: gnu: rclone: Update to 1.52.0. * gnu/packages/sync.scm (rclone): Update to 1.52.0. --- gnu/packages/sync.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 89dbe4578b..abaf0f7cbc 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -360,14 +360,14 @@ over the Internet in an HTTP and CDN friendly way; (define-public rclone (package (name "rclone") - (version "1.51.0") + (version "1.52.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/rclone/rclone/releases/download/" "v" version "/rclone-v" version ".tar.gz")) (sha256 - (base32 "1vi7sbdr5irlgxn080nwzs9lr893cxk59y4vnannzr8prvzvgd9y")))) + (base32 "06zkxnz0ggv8k4ayv3a8jx6ch0hclgs613wagskklqm15zv0dkdq")))) ;; FIXME: Rclone bundles some libraries Guix already provides. Need to ;; un-bundle them. (build-system go-build-system) -- cgit v1.2.3 From 8fc6059b024a42f73cc0203ce62a7baf0d64763c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 00:28:09 +0200 Subject: gnu: lmdb: Update to 0.9.25. * gnu/packages/databases.scm (lmdb): Update to 0.9.25. [source]: Fetch from OpenLDAP repository. --- gnu/packages/databases.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ba15260c1f..a73ac80637 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2078,16 +2078,16 @@ database.") (define-public lmdb (package (name "lmdb") - (version "0.9.24") + (version "0.9.25") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/LMDB/lmdb.git") + (url "https://git.openldap.org/openldap/openldap.git") (commit (string-append "LMDB_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "088q6m8fvr12w43s461h7cvpg5hj8csaqj6n9pci150dz7bk5lxm")))) + (base32 "0i60zlca8r6fib23gdgl4c80gxpx24772ggpvz94yr7zaai4k11w")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From ddde8a079c89d5301b06007f9922f648daf6622b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2020 21:03:02 +0200 Subject: gnu: xarchiver: Update to 0.5.4.15. * gnu/packages/compression.scm (xarchiver): Update to 0.5.4.15. --- gnu/packages/compression.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index cdab7408ed..568de1cfb2 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2101,7 +2101,7 @@ file compression algorithm.") (define-public xarchiver (package (name "xarchiver") - (version "0.5.4.14") + (version "0.5.4.15") (source (origin (method git-fetch) @@ -2110,7 +2110,7 @@ file compression algorithm.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1iklwgykgymrwcc5p1cdbh91v0ih1m58s3w9ndl5kyd44bwlb7px")))) + (base32 "0a3y54r5zp2c0cqm77r07qrl1vh200wvqmbhm35diy22fvkq5mwc")))) (build-system glib-or-gtk-build-system) (native-inputs `(("gettext" ,gettext-minimal) @@ -2118,7 +2118,7 @@ file compression algorithm.") ("libxslt" ,libxslt) ("pkg-config" ,pkg-config))) (inputs - `(("adwaita-icon-theme" ,adwaita-icon-theme) ; Hard-coded theme + `(("adwaita-icon-theme" ,adwaita-icon-theme) ; hard-coded theme ("gtk+" ,gtk+))) (home-page "https://github.com/ib/xarchiver") (synopsis "Graphical front-end for archive operations") -- cgit v1.2.3 From 8db562d7302006a6d2e825c4d0859cf426f7efb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2020 21:03:13 +0200 Subject: gnu: fasm: Update to 1.73.24. * gnu/packages/assembly.scm (fasm): Update to 1.73.24. --- gnu/packages/assembly.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index c775603445..19be69ae9f 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -149,14 +149,14 @@ to the clients.") (define-public fasm (package (name "fasm") - (version "1.73.22") + (version "1.73.24") (source (origin (method url-fetch) (uri (string-append "https://flatassembler.net/fasm-" version ".tgz")) (sha256 - (base32 "1pb0rcfdsb0h89khjjrbikz5wjdllavj3ajim0rcyh7x12xr1hw5")))) + (base32 "142vxhs8mh8isvlzq7ir0asmqda410phzxmk9gk9b43dldskkj7k")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests exist -- cgit v1.2.3 From 669fde534a3b8d4862e3cbf82f7e6b1bc87076a4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2020 21:14:30 +0200 Subject: gnu: lmdb: Update home page. * gnu/packages/databases.scm (lmdb)[home-page]: Update. --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a73ac80637..ae74e3c019 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2099,7 +2099,7 @@ database.") (substitute* "Makefile" (("/usr/local") (assoc-ref outputs "out"))) #t))))) - (home-page "https://symas.com/products/lightning-memory-mapped-database") + (home-page "https://symas.com/lmdb/") (synopsis "Lightning Memory-Mapped Database library") (description "The @dfn{Lightning Memory-Mapped Database} (LMDB) is a high-performance -- cgit v1.2.3 From 870788719d35ac631847b12b05906663e5d1b406 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2020 21:24:29 +0200 Subject: gnu: mariadb-connector-c: Update to 3.1.8. * gnu/packages/databases.scm (mariadb-connector-c): Update to 3.1.8. --- gnu/packages/databases.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ae74e3c019..c8cbac5a07 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -933,7 +933,7 @@ as a drop-in replacement of MySQL.") (define-public mariadb-connector-c (package (name "mariadb-connector-c") - (version "3.1.6") + (version "3.1.8") (source (origin (method url-fetch) (uri (string-append @@ -942,13 +942,12 @@ as a drop-in replacement of MySQL.") version "-src.tar.gz")) (sha256 (base32 - "083724f5daaqyzdcx508caz6fk2hs89jff85zg28ih43vxkvnrnj")))) + "0yrzhsxmjiwkhchagx8dymzhvxl3k5h40wn9wpicqjvgjb9k8523")))) (inputs `(("openssl" ,openssl))) (build-system cmake-build-system) (arguments - ;; No tests. - '(#:tests? #f)) + '(#:tests? #f)) ; no tests (home-page "https://mariadb.com/kb/en/mariadb-connector-c/") (synopsis "Client library to connect to MySQL or MariaDB") (description "The MariaDB Connector/C is used to connect applications -- cgit v1.2.3 From d038100ef08a03b9294e03e19f76d187fe5f9abe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2020 21:29:00 +0200 Subject: gnu: ropgadget: Update to 6.3. * gnu/packages/cybersecurity.scm (ropgadget): Update to 6.3. --- gnu/packages/cybersecurity.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cybersecurity.scm b/gnu/packages/cybersecurity.scm index aedac03b8a..8ded081c50 100644 --- a/gnu/packages/cybersecurity.scm +++ b/gnu/packages/cybersecurity.scm @@ -26,14 +26,13 @@ (define-public ropgadget (package (name "ropgadget") - (version "6.2") + (version "6.3") (source (origin (method url-fetch) (uri (pypi-uri "ROPGadget" version)) (sha256 - (base32 - "0idiicgpijar9l9kqmfdh865c2mkfgxg0q7lpz77jc09l6q0afjh")))) + (base32 "0v34w88if3p4vn46aby24msfnxj6znmkf4848n4d24jnykxcsqk9")))) (build-system python-build-system) (propagated-inputs `(("python-capstone" ,python-capstone))) -- cgit v1.2.3 From 22da777040876b9faf4af93689d093315f2e0b04 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 00:27:16 +0200 Subject: gnu: xa: Update to 2.3.11. * gnu/packages/assembly.scm (xa): Update to 2.3.11. --- gnu/packages/assembly.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 19be69ae9f..c9582bc596 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -347,14 +347,14 @@ Supported architectures are: (define-public xa (package (name "xa") - (version "2.3.10") + (version "2.3.11") (source (origin (method url-fetch) (uri (string-append "https://www.floodgap.com/retrotech/xa" "/dists/xa-" version ".tar.gz")) (sha256 (base32 - "0y5sd247g11jfk5msxy91hz2nhpy7smj125dzfyfhjsjnqk5nyw6")))) + "0b81r7mvzqxgnbbmhixcnrf9nc72v1nqaw19k67221g3k561dwij")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; TODO: custom test harness, not sure how it works -- cgit v1.2.3 From e7da8055892510fcb5cf4b51479a0897e18a205e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 00:27:33 +0200 Subject: gnu: hplip: Update to 3.20.5. * gnu/packages/cups.scm (hplip): Update to 3.20.5. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 0250f16db3..86281b9320 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -435,14 +435,14 @@ should only be used as part of the Guix cups-pk-helper service.") (define-public hplip (package (name "hplip") - (version "3.20.3") + (version "3.20.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hplip/hplip/" version "/hplip-" version ".tar.gz")) (sha256 (base32 - "0sh6cg7yjc11x1cm4477iaslj9n8ksghs85hqwgfbk7m5b2pw2a1")) + "0nj79r61fzddwwzf8kcc0qkp4y9qx46v15iarz6h6y3v91wbsjq0")) (modules '((guix build utils))) (patches (search-patches "hplip-remove-imageprocessor.patch")) (snippet -- cgit v1.2.3 From cef87bfea8a842d7dcf9a44c2305478fa6cca9b2 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 2 Jun 2020 04:35:25 +0530 Subject: gnu: emacs-evil-surround: Update to 1.1.0. * gnu/packages/emacs-xyz.scm (emacs-evil-surround): Update to 1.1.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 60469f93fa..b64a964916 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10735,7 +10735,7 @@ pressed simultaneously or a single key quickly pressed twice.") (define-public emacs-evil-surround (package (name "emacs-evil-surround") - (version "1.0.4") + (version "1.1.0") (source (origin (method git-fetch) @@ -10744,7 +10744,7 @@ pressed simultaneously or a single key quickly pressed twice.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1ajsi6xn8mliwzl24h6pp9rd91z7f20yvkphr9q7k6zpjrd7fb9q")))) + (base32 "15v2spg5rhddr97pxjfvxj36sh7knp753a9qpw8v5zjnp65kf2kn")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) -- cgit v1.2.3 From 61aa30df3254fb094dc5da715763f6dcfd6435d2 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 2 Jun 2020 07:07:26 +0530 Subject: gnu: go-github-com-robfig-cron: Update to 3.0.1. * gnu/packages/golang.scm (go-github-com-robfig-cron): Update to 3.0.1. --- gnu/packages/golang.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8dd276562a..ae0b7c6779 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -15,7 +15,7 @@ ;;; Copyright @ 2018, 2019 Katherine Cox-Buday ;;; Copyright @ 2019 Giovanni Biscuolo ;;; Copyright @ 2019, 2020 Alex Griffin -;;; Copyright © 2019 Arun Isaac +;;; Copyright © 2019, 2020 Arun Isaac ;;; Copyright © 2020 Jack Hill ;;; ;;; This file is part of GNU Guix. @@ -3214,7 +3214,7 @@ and aid debugging.") (define-public go-github-com-robfig-cron (package (name "go-github-com-robfig-cron") - (version "3.0.0") + (version "3.0.1") (source (origin (method git-fetch) @@ -3224,7 +3224,7 @@ and aid debugging.") (file-name (git-file-name name version)) (sha256 (base32 - "0bvq5gxkhyj21lq32nma23i4dpwp7bswnp2yks6372ilkcyisx2z")))) + "1agzbw2dfk2d1mpmddr85s5vh6ygm8kqrvfg87i9d2wqnlsnliqm")))) (build-system go-build-system) (arguments `(#:import-path "github.com/robfig/cron")) -- cgit v1.2.3 From 74f017587031dc59a02de966fc09d886f1e9b1eb Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 2 Jun 2020 07:31:56 +0530 Subject: gnu: python-axolotl-curve25519: Update to 0.4.1.post2. * gnu/packages/python-crypto.scm (python-axolotl-curve25519): Update to 0.4.1.post2. [source]: Use PyPI URI. [arguments]: Remove --root=/ configure flag. --- gnu/packages/python-crypto.scm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index fc451e83ef..59beacf6e0 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus ;;; Copyright © 2016 Danny Milosavljevic -;;; Copyright © 2016, 2017 Arun Isaac +;;; Copyright © 2016, 2017, 2020 Arun Isaac ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018 Nicolas Goaziou @@ -611,22 +611,15 @@ library.") (define-public python-axolotl-curve25519 (package (name "python-axolotl-curve25519") - (version "0.1") + (version "0.4.1.post2") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tgalal/python-axolotl-curve25519") - (commit "e4a9c4de0eae27223200579c58d1f8f6d20637e2"))) - (file-name (string-append name "-" version "-checkout")) + (method url-fetch) + (uri (pypi-uri "python-axolotl-curve25519" version)) (sha256 (base32 - "0agap5q0hmvf6cwzjqc05kw53pjgf6942pcivpazksmg1vk400ra")))) + "18v3rfyv7xi26fb97nw1xc0l6x8wi0i4xj8dlq4gblpbjxiac187")))) (build-system python-build-system) - (arguments - `(;; Prevent creation of the egg. This works around - ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765 - #:configure-flags '("--root=/"))) (home-page "https://github.com/tgalal/python-axolotl-curve25519") (synopsis "Python wrapper for curve25519 library") (description "This is a python wrapper for the curve25519 library -- cgit v1.2.3 From b578168f439d030097d03ecf7449261c0954ddfc Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 2 Jun 2020 07:33:29 +0530 Subject: gnu: python-axolotl: Update to 0.2.3. * gnu/packages/python-crypto.scm (python-axolotl): Update to 0.2.3. [source]: Use PyPI URI. [propagated-inputs]: Remove python-dateutil and python-pycrypto. Add python-cryptography. --- gnu/packages/python-crypto.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 59beacf6e0..b30a887429 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -635,17 +635,14 @@ python-axolotl.") (define-public python-axolotl (package (name "python-axolotl") - (version "0.1.39") + (version "0.2.3") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tgalal/python-axolotl") - (commit version))) - (file-name (git-file-name name version)) - (patches (search-patches "python-axolotl-AES-fix.patch")) + (method url-fetch) + (uri (pypi-uri "python-axolotl" version)) (sha256 - (base32 "0xm9qgcwf6fq7rhzfcviwhbzcbj4i7wkxkab2z55fy1x82lya9g6")))) + (base32 + "1bwdp24fmriffwx91aigs9k162albb51iskp23nc939z893q23py")))) (build-system python-build-system) (arguments `(#:phases @@ -658,9 +655,8 @@ python-axolotl.") #t))))) (propagated-inputs `(("python-axolotl-curve25519" ,python-axolotl-curve25519) - ("python-dateutil" ,python-dateutil) - ("python-protobuf" ,python-protobuf) - ("python-pycrypto" ,python-pycrypto))) + ("python-cryptography" ,python-cryptography) + ("python-protobuf" ,python-protobuf))) (home-page "https://github.com/tgalal/python-axolotl") (synopsis "Python port of libaxolotl-android") (description "This is a python port of libaxolotl-android. This -- cgit v1.2.3 From b86dcc297a255c4138d282a3e16b6517f279488d Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 2 Jun 2020 07:34:55 +0530 Subject: gnu: gajim-omemo: Update to 2.7.4. * gnu/packages/messaging.scm (gajim-omemo): Update to 2.7.4. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index ce542ad4f4..1ef1cbc3e1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -755,7 +755,7 @@ end-to-end encryption support; XML console.") (define-public gajim-omemo (package (name "gajim-omemo") - (version "2.6.29") + (version "2.7.4") (source (origin (method url-fetch/zipbomb) (uri (string-append @@ -763,7 +763,7 @@ end-to-end encryption support; XML console.") version ".zip")) (sha256 (base32 - "1mif5qkrvxclqbqmq6njini4laznbs5nn82w2f1hkl8c1284dvgi")))) + "00zrj57n86c2m99n0swmmaws4f8zccbgbi8fknv6f9b1vif9jc8p")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 657b60725c4affd213ac907bb01ac0f08ee122d8 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 2 Jun 2020 07:36:16 +0530 Subject: gnu: gajim-omemo: Update home page. * gnu/packages/messaging.scm (gajim-omemo)[home-page]: Update. --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1ef1cbc3e1..12b0cd4782 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -779,7 +779,7 @@ end-to-end encryption support; XML console.") (propagated-inputs `(("python-axolotl" ,python-axolotl))) (home-page - "https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin") + "https://dev.gajim.org/gajim/gajim-plugins/-/wikis/OmemoGajimPlugin") (synopsis "Gajim OMEMO plugin") (description "This package provides the Gajim OMEMO plugin. OMEMO is an XMPP -- cgit v1.2.3 From a7dff9553cb56ed92f7b564223e20eb60cdf29dd Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 25 May 2020 11:57:51 +0200 Subject: gnu: slurm-drmaa: Update to 1.1.1. * gnu/packages/parallel.scm (slurm-drmaa): Update to 1.1.1. --- gnu/packages/parallel.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 575f87930f..30b3c1ddda 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2020 Roel Janssen ;;; ;;; This file is part of GNU Guix. ;;; @@ -192,20 +193,22 @@ by managing a queue of pending work.") (define-public slurm-drmaa (package (name "slurm-drmaa") - (version "1.0.7") + (version "1.1.1") (source (origin (method url-fetch) - (uri "http://apps.man.poznan.pl/trac/slurm-drmaa/downloads/9") - (file-name (string-append name "-" version ".tar.gz")) + (uri (string-append + "https://github.com/natefoo/slurm-drmaa/releases/download/" + version "/slurm-drmaa-" version ".tar.gz")) (sha256 (base32 - "0grw55hmny2mc4nc0y1arnvxd2k0dcdfn476kzs180fibjxgfw14")))) + "19r4cm88pcpm3wli4cc61zq7354pg67cg866f3a430p15hm1knrn")))) (build-system gnu-build-system) + (arguments `(#:tests? #f)) ; The tests require "bats". (inputs `(("slurm" ,slurm))) (native-inputs `(("which" ,which))) - (home-page "http://apps.man.poznan.pl/trac/slurm-drmaa") + (home-page "https://github.com/natefoo/slurm-drmaa") (synopsis "Distributed resource management application API for SLURM") (description "PSNC DRMAA for Simple Linux Utility for Resource Management (SLURM) is -- cgit v1.2.3 From cb21c14b0ae1f4c9fcad4927e3b2eb0c06d7b018 Mon Sep 17 00:00:00 2001 From: Simon South Date: Fri, 29 May 2020 13:53:46 -0400 Subject: tests: Allow passing on systems without support for swap devices. * tests/syscalls.scm ("swapon", "swapoff"): Accept ENOSYS as a valid result. Signed-off-by: Mathieu Othacehe --- tests/syscalls.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/syscalls.scm b/tests/syscalls.scm index 3823de7c1e..6098a09437 100644 --- a/tests/syscalls.scm +++ b/tests/syscalls.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015 David Thompson +;;; Copyright © 2020 Simon South ;;; ;;; This file is part of GNU Guix. ;;; @@ -73,21 +74,21 @@ ;; Note: 'utimensat' does not change 'ctime'. (list (stat:mtime st) (stat:atime st))))) -(test-assert "swapon, ENOENT/EPERM" +(test-assert "swapon, ENOSYS/ENOENT/EPERM" (catch 'system-error (lambda () (swapon "/does-not-exist") #f) (lambda args - (memv (system-error-errno args) (list EPERM ENOENT))))) + (memv (system-error-errno args) (list EPERM ENOENT ENOSYS))))) -(test-assert "swapoff, ENOENT/EINVAL/EPERM" +(test-assert "swapoff, ENOSYS/ENOENT/EINVAL/EPERM" (catch 'system-error (lambda () (swapoff "/does-not-exist") #f) (lambda args - (memv (system-error-errno args) (list EPERM EINVAL ENOENT))))) + (memv (system-error-errno args) (list EPERM EINVAL ENOENT ENOSYS))))) (test-assert "mkdtemp!" (let* ((tmp (or (getenv "TMPDIR") "/tmp")) -- cgit v1.2.3 From 5c3e94cdf8e3966d70be7cd7eff25c2575e25272 Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Mon, 1 Jun 2020 23:06:57 +0200 Subject: doc: cookbook: Add entry about Wireguard VPN. Co-authored-by: Brice Waegeneire * doc/guix-cookbook.texi (Connect to Wireguard VPN): New section. --- doc/guix-cookbook.texi | 80 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 8651bc4429..5574a60857 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -327,7 +327,7 @@ package definitions. @item Inheritance makes it easy to customize a package by inheriting from it and modifying only what is needed. - + @item Batch processing: the whole package collection can be parsed, filtered and processed. Building a headless server with all graphical interfaces stripped @@ -1323,6 +1323,7 @@ reference. @menu * Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System. +* Connecting to Wireguard VPN:: Connecting to a Wireguard VPN. * Customizing a Window Manager:: Handle customization of a Window manager on Guix System. * Setting up a bind mount:: Setting up a bind mount in the file-systems definition. @end menu @@ -1567,6 +1568,83 @@ likely that you'll need to modify the initrd on a machine using a custom kernel, since certain modules which are expected to be built may not be available for inclusion into the initrd. +@node Connecting to Wireguard VPN +@section Connecting to Wireguard VPN + +To connect to a Wireguard VPN server you need the kernel module to be +loaded in memory and a package providing networking tools that support +it (e.g. @code{wireguard-tools} or @code{network-manager}). + +Here is a configuration example for Linux-Libre < 5.6, where the module +is out of tree and need to be loaded manually---following revisions of +the kernel have it built-in and so don't need such configuration: + +@lisp +(use-modules (gnu)) +(use-service-modules desktop) +(use-package-modules vpn) + +(operating-system + ;; … + (services (cons (simple-service 'wireguard-module + kernel-module-loader-service-type + '("wireguard")) + %desktop-services)) + (packages (cons wireguard-tools %base-packages)) + (kernel-loadable-modules (list wireguard-linux-compat))) +@end lisp + +After reconfiguring and restarting your system you can either use +Wireguard tools or NetworkManager to connect to a VPN server. + +@subsection Using Wireguard tools + +To test your Wireguard setup it is convenient to use @command{wg-quick}. +Just give it a configuration file @command{wg-quick up ./wg0.conf}; or +put that file in @file{/etc/wireguard} and run @command{wg-quick up wg0} +instead. + +@quotation Note +Be warned that the author described this command as a: “[…] very quick +and dirty bash script […]”. +@end quotation + +@subsection Using NetworkManager + +Thanks to NetworkManager support for Wireguard we can connect to our VPN +using @command{nmcli} command. Up to this point this guide assumes that +you're using Network Manager service provided by +@code{%desktop-services}. Ortherwise you need to adjust your services +list to load @code{network-manager-service-type} and reconfigure your +Guix system. + +To import your VPN configuration execute nmcli import command: + +@example shell +# nmcli connection import type wireguard file wg0.conf +Connection 'wg0' (edbee261-aa5a-42db-b032-6c7757c60fde) successfully added +@end example + +This will create a configuration file in +@file{/etc/NetworkManager/wg0.nmconnection}. Next connect to the +Wireguard server: + +@example shell +$ nmcli connection up wg0 +Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/6) +@end example + +By default NetworkManager will connect automatically on system boot. To +change that behaviour you need to edit your config: + +@example shell +# nmcli connection modify wg0 connection.autoconnect no +@end example + +For more specific information about NetworkManager and wireguard +@uref{https://blogs.gnome.org/thaller/2019/03/15/wireguard-in-networkmanager/,see +this post by thaller}. + @node Customizing a Window Manager @section Customizing a Window Manager @cindex wm -- cgit v1.2.3 From b41068edcee8ab396feb6657784cb7bb00d08c42 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Jun 2020 12:39:54 +0200 Subject: gnu: emacs-ts: Update to 0.2. * gnu/packages/emacs-xyz.scm (emacs-ts): Update to 0.2. --- gnu/packages/emacs-xyz.scm | 114 ++++++++++++++++++++++----------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b64a964916..ccb6614c74 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13379,67 +13379,67 @@ tables of contents.") (license license:gpl3+))) (define-public emacs-ts - (let ((commit "395649a2f2ba79028331bb1fa9ec08b218950ff6") - (revision "2")) - (package - (name "emacs-ts") - (version (git-version "0.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/alphapapa/ts.el") - (commit commit))) - (sha256 - (base32 - "02603wv66fplsigxd87jy23hrb5g9vigszcpdqrdv0ypaqaxlr3a")) - (file-name (git-file-name name version)))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-s" ,emacs-s) - ("emacs-dash" ,emacs-dash))) - (arguments - ;; XXX: Three tests are failing because of a timezone-related issue - ;; with how they're written. On my machine, all the failing test - ;; results are 18000 seconds (5 hours) off. + (package + (name "emacs-ts") + (version "0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alphapapa/ts.el") + (commit version))) + (sha256 + (base32 "0hmzc1ppnkkr0lfq5fhzqr6icv6iqz824a6bnns7zr466hhqp3qb")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-s" ,emacs-s) + ("emacs-dash" ,emacs-dash))) + (arguments + ;; XXX: Three tests are failing because of a timezone-related issue + ;; with how they're written. On my machine, all the failing test + ;; results are 18000 seconds (5 hours) off. - ;; The ts-parse-org function accepts a string without any timezone - ;; info, not assumed to be in Unix time, and converts it to a so-called - ;; ts struct. The ts-unix function (accessor) accepts a ts struct, - ;; then seems to assume the struct's corresponding time is in terms of - ;; the user's current time zone, before returning a Unix time in - ;; seconds. + ;; The ts-parse-org function accepts a string without any timezone + ;; info, not assumed to be in Unix time, and converts it to a so-called + ;; ts struct. The ts-unix function (accessor) accepts a ts struct, + ;; then seems to assume the struct's corresponding time is in terms of + ;; the user's current time zone, before returning a Unix time in + ;; seconds. - ;; The failing tests all have similar problems, but nothing else about - ;; the library seems particularly off. + ;; The failing tests all have similar problems, but nothing else about + ;; the library seems particularly off. - `(#:tests? #t - #:test-command '("emacs" "--batch" - "-l" "test/test.el" - "-f" "ert-run-tests-batch-and-exit") - #:phases - (modify-phases %standard-phases - (add-before 'check 'make-tests-writable - (lambda _ - (make-file-writable "test/test.el") - #t)) - (add-before 'check 'delete-failing-tests - (lambda _ - (emacs-batch-edit-file "test/test.el" - `(progn (progn - (goto-char (point-min)) - (dolist (test-regexp '("ert-deftest ts-format" - "ert-deftest ts-parse-org\\_>" - "ert-deftest ts-parse-org-element")) - (re-search-forward test-regexp) - (beginning-of-line) - (kill-sexp))) - (basic-save-buffer))) - #t))))) - (home-page "https://github.com/alphapapa/ts.el") - (synopsis "Timestamp and date/time library") - (description "This package facilitates manipulating dates, times, and + `(#:tests? #t + #:test-command '("emacs" "--batch" + "-l" "test/test.el" + "-f" "ert-run-tests-batch-and-exit") + #:phases + (modify-phases %standard-phases + (add-before 'check 'make-tests-writable + (lambda _ + (make-file-writable "test/test.el") + #t)) + (add-before 'check 'delete-failing-tests + (lambda _ + (emacs-batch-edit-file "test/test.el" + `(progn (progn + (goto-char (point-min)) + (dolist (test-regexp + '("ert-deftest ts-format" + "ert-deftest ts-parse-org\\_>" + "ert-deftest ts-parse-org-element" + "ert-deftest ts-update")) + (re-search-forward test-regexp) + (beginning-of-line) + (kill-sexp))) + (basic-save-buffer))) + #t))))) + (home-page "https://github.com/alphapapa/ts.el") + (synopsis "Timestamp and date/time library") + (description "This package facilitates manipulating dates, times, and timestamps by providing a @code{ts} struct.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-peg (package -- cgit v1.2.3 From f51fd97ec54a98668d63c52d8a6bd75d8dc3292e Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 1 Jun 2020 14:59:10 +0200 Subject: build-system: linux-module: Allow passing #:make-flags argument. * guix/build-system/linux-module.scm (linux-module-build): Add #:make-flags. (linux-module-build-cross): Add #:make-flags. * guix/build/linux-module-build-system.scm (install): Pass make-flags. Signed-off-by: Danny Milosavljevic --- guix/build-system/linux-module.scm | 4 ++++ guix/build/linux-module-build-system.scm | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm index ca104f7c75..1077215671 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -129,6 +129,7 @@ (phases '(@ (guix build linux-module-build-system) %standard-phases)) (outputs '("out")) + (make-flags ''()) (system (%current-system)) (guile #f) (substitutable? #t) @@ -156,6 +157,7 @@ #:arch ,(system->arch (or target system)) #:tests? ,tests? #:outputs %outputs + #:make-flags ,make-flags #:inputs %build-inputs))) (define guile-for-build @@ -181,6 +183,7 @@ target native-drvs target-drvs (guile #f) (outputs '("out")) + (make-flags ''()) (search-paths '()) (native-search-paths '()) (tests? #f) @@ -228,6 +231,7 @@ #:target ,target #:arch ,(system->arch (or target system)) #:outputs %outputs + #:make-flags ,make-flags #:inputs %build-target-inputs #:native-inputs %build-host-inputs #:search-paths diff --git a/guix/build/linux-module-build-system.scm b/guix/build/linux-module-build-system.scm index 73d6b101f6..d51d76f94b 100644 --- a/guix/build/linux-module-build-system.scm +++ b/guix/build/linux-module-build-system.scm @@ -58,12 +58,13 @@ ;; This block was copied from make-linux-libre--only took the "modules_install" ;; part. -(define* (install #:key inputs native-inputs outputs #:allow-other-keys) +(define* (install #:key make-flags inputs native-inputs outputs + #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (moddir (string-append out "/lib/modules"))) ;; Install kernel modules (mkdir-p moddir) - (invoke "make" "-C" + (apply invoke "make" "-C" (string-append (assoc-ref inputs "linux-module-builder") "/lib/modules/build") (string-append "M=" (getcwd)) @@ -76,7 +77,8 @@ (string-append "INSTALL_PATH=" out) (string-append "INSTALL_MOD_PATH=" out) "INSTALL_MOD_STRIP=1" - "modules_install"))) + "modules_install" + (or make-flags '())))) (define %standard-phases (modify-phases gnu:%standard-phases @@ -84,7 +86,8 @@ (replace 'build build) (replace 'install install))) -(define* (linux-module-build #:key inputs (phases %standard-phases) +(define* (linux-module-build #:key inputs + (phases %standard-phases) #:allow-other-keys #:rest args) "Build the given package, applying all of PHASES in order, with a Linux kernel in attendance." -- cgit v1.2.3 From 507278f7cd68b86418a8b5a0e9928580d4756aa4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 02:28:43 +0200 Subject: gnu: python-parameterized: Update to 0.7.4. * gnu/packages/check.scm (python-parameterized): Update to 0.7.4. --- gnu/packages/check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 9837ea9756..3edb79d55b 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -584,14 +584,13 @@ but it works for any C/C++ project.") (define-public python-parameterized (package (name "python-parameterized") - (version "0.7.3") + (version "0.7.4") (source (origin (method url-fetch) (uri (pypi-uri "parameterized" version)) (sha256 - (base32 - "0g1q6n7fkanjv7i1djzw62f46xf573jvza7afabh3baqjqxy7rpd")))) + (base32 "1444fdz5bj0k10nmhxv0bv2gfrfisi7hfzqdndb0pvhf4g3qq3qr")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From dc67e9e5b2485e7a2f50b3979bdff968028eec42 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:10:07 +0200 Subject: gnu: asunder: Update to 2.9.6. * gnu/packages/cdrom.scm (asunder): Update to 2.9.6. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index bd44ae8e80..67236f86de 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -686,7 +686,7 @@ information is written to standard error.") (define-public asunder (package (name "asunder") - (version "2.9.5") + (version "2.9.6") (source (origin (method url-fetch) (uri @@ -695,7 +695,7 @@ information is written to standard error.") ".tar.bz2")) (sha256 (base32 - "069x6az2r3wlb2hd07iz0hxpxwknw7s9h7pyhnkmzv1pw9ci3kk4")))) + "1ycnd82lh7qy1pcbngd4b41s16j9hnm2kyfrncg4cwr3bfk7yg7a")))) (build-system glib-or-gtk-build-system) (arguments '(#:out-of-source? #f -- cgit v1.2.3 From 854c39ae42fb67efded29ab8d076aec2a7ba3d1f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:14:19 +0200 Subject: gnu: xbindkeys: Update to 1.8.7. * gnu/packages/xdisorg.scm (xbindkeys): Update to 1.8.7. [native-inputs]: Add pkg-config. [inputs]: Update to guile-2.2. --- gnu/packages/xdisorg.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 3c98836102..5941f63a26 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -899,7 +899,7 @@ transparent text on your screen.") (define-public xbindkeys (package (name "xbindkeys") - (version "1.8.6") + (version "1.8.7") (source (origin (method url-fetch) ;; Download from the savannah mirror list fails @@ -909,11 +909,13 @@ transparent text on your screen.") ".tar.gz")) (sha256 (base32 - "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc")))) + "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2")))) (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs `(("libx11" ,libx11) - ("guile" ,guile-2.0))) + ("guile" ,guile-2.2))) (home-page "https://www.nongnu.org/xbindkeys/") (synopsis "Associate a combination of keys with a shell command") (description -- cgit v1.2.3 From 8e9ccf7af7cc614d04aa71c472f855dd146729eb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:22:21 +0200 Subject: gnu: wpebackend-fdo: Update to 1.6.1. * gnu/packages/webkit.scm (wpebackend-fdo): Update to 1.6.1. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 90be7d2625..3804209841 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -93,14 +93,14 @@ backend which implements them.") (define-public wpebackend-fdo (package (name "wpebackend-fdo") - (version "1.6.0") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append "https://wpewebkit.org/releases/" "wpebackend-fdo-" version ".tar.xz")) (sha256 (base32 - "0rzm16m3mw9dh2jis9avk2rhz7bijanrzlywyiaicyzrv2wxfnvz")))) + "1jdi43gciqjgvhnqxs160f3hmp1hkqhrllb0hhmldyxc4wryw3kl")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no tests -- cgit v1.2.3 From b8186ae606ca774db6ce942a5ffa7db5fcc45b8d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:27:40 +0200 Subject: gnu: youtube-viewer: Update to 3.7.6. * gnu/packages/video.scm (youtube-viewer): Update to 3.7.6. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ccefb0c4f4..162ef953b3 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1798,7 +1798,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") (define-public youtube-viewer (package (name "youtube-viewer") - (version "3.7.5") + (version "3.7.6") (source (origin (method git-fetch) (uri (git-reference @@ -1807,7 +1807,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") (file-name (git-file-name name version)) (sha256 (base32 - "1caz56sxy554avz2vdv9gm7gyqcq0gyixzrh5v9ixmg6vxif5d4f")))) + "1c7wynx0fzs8awb1s4rdrl8xavqlj64z95yckhl1m1gnhahhq291")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) -- cgit v1.2.3 From d9240c705b59337f7d64a348a5ea5951b7012c63 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:39:08 +0200 Subject: gnu: ghostwriter: Update to 1.8.1. * gnu/packages/text-editors.scm (ghostwriter): Update to 1.8.1. --- gnu/packages/text-editors.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 8e4e49112d..1740404709 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -498,7 +498,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. (define-public ghostwriter (package (name "ghostwriter") - (version "1.8.0") + (version "1.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -507,7 +507,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. (file-name (git-file-name name version)) (sha256 (base32 - "13yn82m1l2pq93wbl569a2lzpc3sn8a8g30hsgdch1l9xlmhwran")))) + "0jc6szfh5sdnafhwsr1xv7cn1fznniq58bix41hb9wlbkvq7wzi6")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From fdc61ca1f75b7ed9f4d9bde1a605d420006801bf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:45:18 +0200 Subject: gnu: tmux-xpanes: Update to 4.1.2. * gnu/packages/tmux.scm (tmux-xpanes): Update to 4.1.2. --- gnu/packages/tmux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index 8b54849b18..160dcb3001 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Stefan Reichör -;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Oleg Pykhalov ;;; Copyright © 2020 Brice Waegeneire ;;; @@ -141,7 +141,7 @@ windows.") (define-public tmux-xpanes (package (name "tmux-xpanes") - (version "4.1.1") + (version "4.1.2") (source (origin (method git-fetch) (uri (git-reference @@ -150,7 +150,7 @@ windows.") (file-name (git-file-name name version)) (sha256 (base32 - "13q02vdk229chgbn547wwv29cj4njvz02lmw840g8qmwh73qb2pi")))) + "0vm5mi6dqdbg0b5qh4r8sr1plpc00jryd8a2qxpp3a72cigjvvf0")))) (build-system trivial-build-system) (inputs `(("bash" ,bash))) -- cgit v1.2.3 From 4fbe53a5b84ca2ca53e8ce6c3a0f07085c691dd9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:48:31 +0200 Subject: gnu: openh264: Update to 2.1.1. * gnu/packages/video.scm (openh264): Update to 2.1.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 162ef953b3..261628d795 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2933,7 +2933,7 @@ post-processing of video formats like MPEG2, H.264/AVC, and VC-1.") (define-public openh264 (package (name "openh264") - (version "2.1.0") + (version "2.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -2942,7 +2942,7 @@ post-processing of video formats like MPEG2, H.264/AVC, and VC-1.") (file-name (git-file-name name version)) (sha256 (base32 - "1wba260n1932vafd5ni2jqv9kzc7lj6a1asm1cqk8jv690m6zvpi")))) + "0ffav46pz3sbj92nipd62z03fibyqgclfq9w8lgr80s6za6zdk5s")))) (build-system gnu-build-system) (native-inputs `(("nasm" ,nasm) -- cgit v1.2.3 From 7f85664d0736be2694f7be75997279cfa4eb0525 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:49:14 +0200 Subject: gnu: sakura: Don't use NAME in source URI. * gnu/packages/terminals.scm (sakura)[source]: Hard-code NAME. --- gnu/packages/terminals.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 335b8d3ae1..8447708376 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -676,8 +676,8 @@ eye-candy, customizable, and reasonably lightweight.") (version "3.7.0") (source (origin (method url-fetch) - (uri (string-append "https://launchpad.net/" name "/trunk/" - version "/+download/" name "-" version + (uri (string-append "https://launchpad.net/sakura/trunk/" + version "/+download/sakura-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From cca40dce8c2aed916ccc38bbe0767228d804bdd6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:49:21 +0200 Subject: gnu: sakura: Update to 3.7.1. * gnu/packages/terminals.scm (sakura): Update to 3.7.1. --- gnu/packages/terminals.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 8447708376..3f585cd7f6 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -673,15 +673,15 @@ eye-candy, customizable, and reasonably lightweight.") (define-public sakura (package (name "sakura") - (version "3.7.0") + (version "3.7.1") (source (origin (method url-fetch) (uri (string-append "https://launchpad.net/sakura/trunk/" version "/+download/sakura-" version - ".tar.gz")) + ".tar.bz2")) (sha256 (base32 - "15gskj5yv5qs3cj4ps43735kfx2nzjlhq4dk9ghirl8lvhhxsm5m")))) + "12wjmckf03qbnm8cb7qma0980anzajn3l92rj2yr8hhafl74x6kj")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no check phase -- cgit v1.2.3 From 355d92a6a392823e3fea2a92b2597d753629dece Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:51:44 +0200 Subject: gnu: tilda: Update to 1.5.2. * gnu/packages/terminals.scm (tilda): Update to 1.5.2. --- gnu/packages/terminals.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 3f585cd7f6..b587cbd90e 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -90,7 +90,7 @@ (define-public tilda (package (name "tilda") - (version "1.5.0") + (version "1.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -99,7 +99,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "13djibj3s7ig13c57ywy38pxy3qfmqihii2c0g15fy2h9q8xp1gx")))) + "0psq0f4s0s92bba6wwcf6b0j7i59b76svqxhvpavwv53yvhmmamn")))) (build-system glib-or-gtk-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 027d9a5403029cad6e8949c815cc3144dbbbc3f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 04:12:44 +0200 Subject: gnu: execline: Update to 2.6.0.2. * gnu/packages/skarnet.scm (execline): Update to 2.6.0.2. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 31768c814e..58a99e8e45 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -62,14 +62,14 @@ and file system operations. It is used by all skarnet.org software.") (define-public execline (package (name "execline") - (version "2.6.0.0") + (version "2.6.0.2") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/execline/execline-" version ".tar.gz")) (sha256 - (base32 "1m6pvawxqaqjr49456vyjyl8dnqwvr19v77sjj7dnglfijwza5al")))) + (base32 "0wdg93hwpxxdqmsnd8j1nf3m2pf85n3rxaawzaih1y0ajyz6gwya")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments -- cgit v1.2.3 From f1a4ce2821960f1e1f4d964c64269cdd11c1a86d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 04:15:09 +0200 Subject: gnu: skalibs: Update to 2.9.2.1. * gnu/packages/skarnet.scm (skalibs): Update to 2.9.2.1. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 58a99e8e45..b4cab33271 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -30,14 +30,14 @@ (define-public skalibs (package (name "skalibs") - (version "2.9.2.0") + (version "2.9.2.1") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/skalibs/skalibs-" version ".tar.gz")) (sha256 - (base32 "1i9d7w031kh338aq6xdsf8vl5amxbwxbny8lnrxlzydqvn8nxhz4")))) + (base32 "0ff551181vv9d1z5sv7yg6n4b88ajcdircs4p4nif4yl7nsrj2r5")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests exist -- cgit v1.2.3 From 482b8cb555069866bdfabdef2a026f1cd651d7a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 04:17:24 +0200 Subject: gnu: byobu: Update to 5.133. * gnu/packages/screen.scm (byobu): Update to 5.133. --- gnu/packages/screen.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index c03e2e5e5e..af519de0a3 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,7 +104,7 @@ controlling terminal and attach to it later.") (define-public byobu (package (name "byobu") - (version "5.127") + (version "5.133") (source (origin (method url-fetch) @@ -112,8 +112,7 @@ controlling terminal and attach to it later.") version "/+download/byobu_" version ".orig.tar.gz")) (sha256 - (base32 - "0fznlj454vgxgzfw3avmvvjpawggs66da5l8k6v0lnzzd75wgbsb")) + (base32 "0qvmmdnvwqbgbhn5c8asmrmjhclcl029py2d2zvmd7h5ij7s93jd")) (patches (search-patches "byobu-writable-status.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 1b0e3795ec4b9dba95dbf3d0c095da8f5b6798f0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 04:23:38 +0200 Subject: gnu: ubridge: Update to 0.9.18. * gnu/packages/networking.scm (ubridge): Update to 0.9.18. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index fd29370841..c726b7bcea 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2539,7 +2539,7 @@ SNMP v3 using both IPv4 and IPv6.") (define-public ubridge (package (name "ubridge") - (version "0.9.16") + (version "0.9.18") (source (origin (method git-fetch) @@ -2548,7 +2548,7 @@ SNMP v3 using both IPv4 and IPv6.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1bind7ylgxs743vfdmpdrpp4iamy461bc3i7nxza91kj7hyyjz6h")))) + (base32 "0jg66jhhpv4c9340fsdp64hf9h253i8r81fknxa0gq241ripp3jn")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 2f26e2d6fdb2fb345ab670ecdfde740e5e40ab89 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 04:30:36 +0200 Subject: gnu: samba: Update to 4.12.3. * gnu/packages/samba.scm (samba): Update to 4.12.3. --- gnu/packages/samba.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index b58788719e..a502020121 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -169,15 +169,15 @@ anywhere.") (define-public samba (package (name "samba") - (version "4.12.2") - (source (origin - (method url-fetch) - (uri (string-append "https://download.samba.org/pub/samba/stable/" - "samba-" version ".tar.gz")) - (sha256 - (base32 - "0l514s2xhsy1lspzgvibbzs80zi84zxr2wx4d40hq85yb2lg5434")) - (modules '((guix build utils))) + (version "4.12.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.samba.org/pub/samba/stable/" + "samba-" version ".tar.gz")) + (sha256 + (base32 "09w7aap1cjc41ayhaksm1igc7p7gl40fad4a1l6q4ds9a2jbrb9z")) + (modules '((guix build utils))) (snippet '(begin ;; TODO: also remove the bundled ‘third_party/popt’. -- cgit v1.2.3 From 26fd58f2bbd4a0c64b5563c0c125e4143a6c4c8c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 04:33:19 +0200 Subject: gnu: enet: Update to 1.3.15. * gnu/packages/networking.scm (enet): Update to 1.3.15. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c726b7bcea..593605bb46 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1605,14 +1605,14 @@ HTTP proxies.") (define-public enet (package (name "enet") - (version "1.3.14") + (version "1.3.15") (source (origin (method url-fetch) (uri (string-append "http://enet.bespin.org/download/" "enet-" version ".tar.gz")) (sha256 (base32 - "0w780zc6cy8yq4cskpphx0f91lzh51vh9lwyc5ll8hhamdxgbxlq")))) + "1yxxf9bkx6dx3j8j70fj17c05likyfibb1419ls74hp58qrzdgas")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From a9f862687e297618318028d939b2c33852e5489f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 04:33:27 +0200 Subject: gnu: haproxy: Update to 2.1.5. * gnu/packages/networking.scm (haproxy): Update to 2.1.5. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 593605bb46..ca7b36bb6a 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3103,7 +3103,7 @@ cables.") (define-public haproxy (package (name "haproxy") - (version "2.1.4") + (version "2.1.5") (source (origin (method url-fetch) (uri (string-append "https://www.haproxy.org/download/" @@ -3111,7 +3111,7 @@ cables.") "/src/haproxy-" version ".tar.gz")) (sha256 (base32 - "1kcizs5r538chhpwqykdngxyqfi98i03akfjnii721npjvv0y0si")))) + "188ff33610jj11knjwjqwxci4p0i63n9k0l8bdb47ckahg2ll5s2")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 86a03090afa711dfa2f141caee820b66d7942bc3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 18:15:08 +0200 Subject: gnu: libuemf: Work around Guile texinfo limitations. * gnu/packages/image.scm (libuemf)[description]: Substitute @acronym{} for @abbr{}. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 05b64dd716..94e6abe19f 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -903,8 +903,8 @@ compose, and analyze GIF images.") (home-page "http://libuemf.sourceforge.net/") (synopsis "Library for working with WFM, EMF and EMF+ images") (description "The libUEMF library is a portable C99 implementation for -reading and writing @abbr{WFM, Windows Metafile}, @abbr{EMF, Enhanced -Metafile}, and @abbr{EMF+, Enhanced Metafile Plus} files.") +reading and writing @acronym{WFM, Windows Metafile}, @acronym{EMF, Enhanced +Metafile}, and @acronym{EMF+, Enhanced Metafile Plus} files.") (license license:gpl2+))) (define-public libungif -- cgit v1.2.3 From 15534de8b763d4342281b10528b6807006c7930d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Jun 2020 17:23:34 +0200 Subject: git-authenticate: Rename '%committers' to '%historical-committers'. * build-aux/git-authenticate.scm (%committers): Rename to... (%historical-committers): ... this. (%authorized-signing-keys): Rename to... (%historical-authorized-signing-keys): ... this. (authenticate-commit): Adjust accordingly. --- build-aux/git-authenticate.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index ab50459369..8e679fd5e5 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -42,12 +42,13 @@ (ice-9 pretty-print)) -(define %committers - ;; List of committers. These are the user names found on +(define %historical-committers + ;; List of "historical" committers---people once authorized committers + ;; before the '.guix-authorizations' file was created. + ;; + ;; These are the user names found on ;; along with ;; the fingerprint of the signing (sub)key. - ;; - ;; TODO: Replace this statically-defined list by an in-repo list. '(("andreas" "AD17 A21E F8AE D8F1 CC02 DBD9 F7D5 C9BF 765C 61E3") ("ajgrf" @@ -214,13 +215,13 @@ ("wingo" "FF47 8FB2 64DE 32EC 2967 25A3 DDC0 F535 8812 F8F2"))) -(define %authorized-signing-keys - ;; Fingerprint of authorized signing keys. +(define %historical-authorized-signing-keys + ;; Fingerprint of historically authorized signing keys. (map (match-lambda ((name fingerprint) (base16-string->bytevector (string-downcase (string-filter char-set:graphic fingerprint))))) - %committers)) + %historical-committers)) (define %commits-with-bad-signature ;; Commits with a known-bad signature. @@ -312,7 +313,7 @@ Raise an error when authentication fails." (unless (member (openpgp-public-key-fingerprint signing-key) (commit-authorized-keys repository commit - %authorized-signing-keys)) + %historical-authorized-signing-keys)) (raise (condition (&message (message (format #f (G_ "commit ~a not signed by an authorized \ -- cgit v1.2.3 From c75a80189fc19f6ff8b4c82d1d1801be6763b6d2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 2 Jun 2020 14:50:54 +0200 Subject: doc: Update README to refer to the manual. * README (Requirements): Refer to the manual. (Installation): Update URL of the manual. --- README | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/README b/README index 7121358157..5e9069f80f 100644 --- a/README +++ b/README @@ -18,27 +18,12 @@ Guix is based on the [[https://nixos.org/nix/][Nix]] package manager. * Requirements -GNU Guix currently depends on the following packages: +If you are building Guix from source, please see the manual for build +instructions and requirements, either by running: - - [[https://gnu.org/software/guile/][GNU Guile 2.2.x]] - - [[https://notabug.org/cwebber/guile-gcrypt][Guile-Gcrypt]] 0.1.0 or later - - [[https://www.gnu.org/software/make/][GNU Make]] - - [[https://www.gnutls.org][GnuTLS]] compiled with guile support enabled - - [[https://notabug.org/guile-sqlite3/guile-sqlite3][Guile-SQLite3]], version 0.1.0 or later - - [[https://gitlab.com/guile-git/guile-git][Guile-Git]] - - [[http://www.zlib.net/][zlib]] - - [[https://savannah.nongnu.org/projects/guile-json/][Guile-JSON]] + info -f doc/guix.info "Requirements" -Unless `--disable-daemon' was passed, the following packages are needed: - - - [[https://gnupg.org/][GNU libgcrypt]] - - [[https://sqlite.org/][SQLite 3]] - - [[https://gcc.gnu.org][GCC's g++]] - - optionally [[http://www.bzip.org][libbz2]] - -When `--disable-daemon' was passed, you instead need the following: - - - [[https://nixos.org/nix/][Nix]] +or by checking the [[https://guix.gnu.org/manual/en/html_node/Requirements.html][web copy of the manual]]. * Installation @@ -46,7 +31,7 @@ See the manual for the installation instructions, either by running info -f doc/guix.info "Installation" -or by checking the [[https://www.gnu.org/software/guix/manual/guix.html#Installation][web copy of the manual]]. +or by checking the [[https://guix.gnu.org/manual/en/html_node/Installation.html][web copy of the manual]]. For information on installation from a Git checkout, please see the section "Building from Git" in the manual. -- cgit v1.2.3 From 793a48edc0533cacb193afe18c557e6408f3de22 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 2 Jun 2020 18:26:34 +0200 Subject: gnu: guile-json: Add version 4.0.1. * gnu/packages/guile.scm (guile-json-4): New variable. (guile2.2-json): Use it. --- gnu/packages/guile.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index ef1e19c6b8..c2dc7f6d5f 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -554,12 +554,25 @@ specification. These are the main features: ("guile" ,guile-3.0))) (inputs `(("guile" ,guile-3.0))))) -(define-public guile2.2-json - (package-for-guile-2.2 guile-json-3)) - (define-public guile3.0-json (deprecated-package "guile3.0-json" guile-json-3)) +(define-public guile-json-4 + (package + (inherit guile-json-3) + (name "guile-json") + (version "4.0.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://savannah/guile-json/guile-json-" + version ".tar.gz")) + (sha256 + (base32 + "0f25qak4i57c3x0q9hlrll911l57bb8nz57rjkd02mn2fc2h3730")))))) + +(define-public guile2.2-json + (package-for-guile-2.2 guile-json-4)) + ;; There are two guile-gdbm packages, one using the FFI and one with ;; direct C bindings, hence the verbose name. -- cgit v1.2.3 From 8f7cf3b50cda98afab1bef89bef2d6c01aa2b626 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 2 Jun 2020 18:27:49 +0200 Subject: gnu: guix, guix-jupyter, cuirass, hpcguix-web: Use Guile-JSON 4.0. * gnu/packages/package-management.scm (guix)[native-inputs] [propagated-inputs]: Use GUILE-JSON-4 instead of GUILE-JSON-3. * gnu/packages/ci.scm (cuirass)[inputs]: Likewise. * gnu/packages/package-management.scm (guix-jupyter)[propagated-inputs]: Likewise. * gnu/packages/web.scm (hpcguix-web)[propagated-inputs]: Likewise. --- gnu/packages/ci.scm | 2 +- gnu/packages/package-management.scm | 6 +++--- gnu/packages/web.scm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index ec05523e0d..b74e73ceea 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -123,7 +123,7 @@ `(("guile" ,guile-3.0) ("guile-fibers" ,guile-fibers) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-3) + ("guile-json" ,guile-json-4) ("guile-sqlite3" ,guile-sqlite3) ("guile-git" ,guile-git) ;; FIXME: this is propagated by "guile-git", but it needs to be among diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3fc6fc404a..8ab0c9b746 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -322,7 +322,7 @@ $(prefix)/etc/init.d\n"))) ("guile" ,guile-3.0) ("gnutls" ,gnutls) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-3) + ("guile-json" ,guile-json-4) ("guile-sqlite3" ,guile-sqlite3) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git) @@ -373,7 +373,7 @@ $(prefix)/etc/init.d\n"))) (propagated-inputs `(("gnutls" ,(if (%current-target-system) gnutls-3.6.13 guile3.0-gnutls)) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-3) + ("guile-json" ,guile-json-4) ("guile-sqlite3" ,guile-sqlite3) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git))) @@ -982,7 +982,7 @@ environments.") `(("guix" ,guix) ("guile" ,guile-3.0))) (propagated-inputs - `(("guile-json" ,guile-json-3) + `(("guile-json" ,guile-json-4) ("guile-simple-zmq" ,guile-simple-zmq) ("guile-gcrypt" ,guile-gcrypt))) (synopsis "Guix kernel for Jupyter") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6e5bc81660..bd46ac9c2c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7346,7 +7346,7 @@ compressed JSON header blocks. (propagated-inputs `(("guile" ,guile-3.0) ("guile-commonmark" ,guile-commonmark) - ("guile-json" ,guile-json-3))) + ("guile-json" ,guile-json-4))) (home-page "https://github.com/UMCUGenetics/hpcguix-web") (synopsis "Web interface for cluster deployments of Guix") (description "Hpcguix-web provides a web interface to the list of packages -- cgit v1.2.3 From 7bc396bf353c5550c49b3f8791b34072ba417d90 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 2 Jun 2020 14:05:46 -0400 Subject: gnu: nss: Fix CVE-2020-12399 via graft. * gnu/packages/patches/nss-CVE-2020-12399.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/nss.scm (nss/fixed): New variable. (nss)[replacement]: Add field. --- gnu/local.mk | 1 + gnu/packages/nss.scm | 9 ++ gnu/packages/patches/nss-CVE-2020-12399.patch | 138 ++++++++++++++++++++++++++ 3 files changed, 148 insertions(+) create mode 100644 gnu/packages/patches/nss-CVE-2020-12399.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6d775828e0..4a8a855502 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1297,6 +1297,7 @@ dist_patch_DATA = \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/network-manager-plugin-path.patch \ %D%/packages/patches/nsis-env-passthru.patch \ + %D%/packages/patches/nss-CVE-2020-12399.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-pkgconfig.patch \ %D%/packages/patches/ntfs-3g-CVE-2019-9755.patch \ diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index e423bdd3a2..887860157d 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -73,6 +73,7 @@ in the Mozilla clients.") (package (name "nss") (version "3.50") + (replacement nss/fixed) (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -191,3 +192,11 @@ applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards.") (license license:mpl2.0))) + +(define nss/fixed + (package + (inherit nss) + (source (origin + (inherit (package-source nss)) + (patches (append (search-patches "nss-CVE-2020-12399.patch") + (origin-patches (package-source nss)))))))) diff --git a/gnu/packages/patches/nss-CVE-2020-12399.patch b/gnu/packages/patches/nss-CVE-2020-12399.patch new file mode 100644 index 0000000000..0d91b655e2 --- /dev/null +++ b/gnu/packages/patches/nss-CVE-2020-12399.patch @@ -0,0 +1,138 @@ +Fix CVE-2020-12399 (Timing attack on DSA signature generation: NSS has +shown timing differences when performing DSA signatures, which was +exploitable and could eventually leak private keys.) + +Copied from upstream: + +but with "nss/" inserted into the file name to patch. + +# HG changeset patch +# User Robert Relyea +# Date 1589907685 0 +# Node ID daa823a4a29bcef0fec33a379ec83857429aea2e +# Parent d2cfb4ccdf167e5ea06d2bb5bc39c50f789929c8 +Bug 1631576 - Force a fixed length for DSA exponentiation r=pereida,bbrumley + +Differential Revision: https://phabricator.services.mozilla.com/D72011 + +diff --git a/nss/lib/freebl/dsa.c b/nss/lib/freebl/dsa.c +--- a/nss/lib/freebl/dsa.c ++++ b/nss/lib/freebl/dsa.c +@@ -308,23 +308,24 @@ DSA_NewKeyFromSeed(const PQGParams *para + SECItem seedItem; + seedItem.data = (unsigned char *)seed; + seedItem.len = PQG_GetLength(¶ms->subPrime); + return dsa_NewKeyExtended(params, &seedItem, privKey); + } + + static SECStatus + dsa_SignDigest(DSAPrivateKey *key, SECItem *signature, const SECItem *digest, +- const unsigned char *kb) ++ const unsigned char *kbytes) + { + mp_int p, q, g; /* PQG parameters */ + mp_int x, k; /* private key & pseudo-random integer */ + mp_int r, s; /* tuple (r, s) is signature) */ + mp_int t; /* holding tmp values */ + mp_int ar; /* holding blinding values */ ++ mp_digit fuzz; /* blinding multiplier for q */ + mp_err err = MP_OKAY; + SECStatus rv = SECSuccess; + unsigned int dsa_subprime_len, dsa_signature_len, offset; + SECItem localDigest; + unsigned char localDigestData[DSA_MAX_SUBPRIME_LEN]; + SECItem t2 = { siBuffer, NULL, 0 }; + + /* FIPS-compliance dictates that digest is a SHA hash. */ +@@ -368,31 +369,46 @@ dsa_SignDigest(DSAPrivateKey *key, SECIt + CHECK_MPI_OK(mp_init(&q)); + CHECK_MPI_OK(mp_init(&g)); + CHECK_MPI_OK(mp_init(&x)); + CHECK_MPI_OK(mp_init(&k)); + CHECK_MPI_OK(mp_init(&r)); + CHECK_MPI_OK(mp_init(&s)); + CHECK_MPI_OK(mp_init(&t)); + CHECK_MPI_OK(mp_init(&ar)); ++ + /* + ** Convert stored PQG and private key into MPI integers. + */ + SECITEM_TO_MPINT(key->params.prime, &p); + SECITEM_TO_MPINT(key->params.subPrime, &q); + SECITEM_TO_MPINT(key->params.base, &g); + SECITEM_TO_MPINT(key->privateValue, &x); +- OCTETS_TO_MPINT(kb, &k, dsa_subprime_len); ++ OCTETS_TO_MPINT(kbytes, &k, dsa_subprime_len); ++ ++ /* k blinding create a single value that has the high bit set in ++ * the mp_digit*/ ++ if (RNG_GenerateGlobalRandomBytes(&fuzz, sizeof(mp_digit)) != SECSuccess) { ++ PORT_SetError(SEC_ERROR_NEED_RANDOM); ++ rv = SECFailure; ++ goto cleanup; ++ } ++ fuzz |= 1ULL << ((sizeof(mp_digit) * PR_BITS_PER_BYTE - 1)); + /* + ** FIPS 186-1, Section 5, Step 1 + ** + ** r = (g**k mod p) mod q + */ +- CHECK_MPI_OK(mp_exptmod(&g, &k, &p, &r)); /* r = g**k mod p */ +- CHECK_MPI_OK(mp_mod(&r, &q, &r)); /* r = r mod q */ ++ CHECK_MPI_OK(mp_mul_d(&q, fuzz, &t)); /* t = q*fuzz */ ++ CHECK_MPI_OK(mp_add(&k, &t, &t)); /* t = k+q*fuzz */ ++ /* length of t is now fixed, bits in k have been blinded */ ++ CHECK_MPI_OK(mp_exptmod(&g, &t, &p, &r)); /* r = g**t mod p */ ++ /* r is now g**(k+q*fuzz) == g**k mod p */ ++ CHECK_MPI_OK(mp_mod(&r, &q, &r)); /* r = r mod q */ ++ + /* + ** FIPS 186-1, Section 5, Step 2 + ** + ** s = (k**-1 * (HASH(M) + x*r)) mod q + */ + if (DSA_NewRandom(NULL, &key->params.subPrime, &t2) != SECSuccess) { + PORT_SetError(SEC_ERROR_NEED_RANDOM); + rv = SECFailure; +@@ -406,25 +422,34 @@ dsa_SignDigest(DSAPrivateKey *key, SECIt + goto cleanup; + } + SECITEM_TO_MPINT(t2, &ar); /* ar <-$ Zq */ + SECITEM_FreeItem(&t2, PR_FALSE); + + /* Using mp_invmod on k directly would leak bits from k. */ + CHECK_MPI_OK(mp_mul(&k, &ar, &k)); /* k = k * ar */ + CHECK_MPI_OK(mp_mulmod(&k, &t, &q, &k)); /* k = k * t mod q */ +- CHECK_MPI_OK(mp_invmod(&k, &q, &k)); /* k = k**-1 mod q */ ++ /* k is now k*t*ar */ ++ CHECK_MPI_OK(mp_invmod(&k, &q, &k)); /* k = k**-1 mod q */ ++ /* k is now (k*t*ar)**-1 */ + CHECK_MPI_OK(mp_mulmod(&k, &t, &q, &k)); /* k = k * t mod q */ +- SECITEM_TO_MPINT(localDigest, &s); /* s = HASH(M) */ ++ /* k is now (k*ar)**-1 */ ++ SECITEM_TO_MPINT(localDigest, &s); /* s = HASH(M) */ + /* To avoid leaking secret bits here the addition is blinded. */ +- CHECK_MPI_OK(mp_mul(&x, &ar, &x)); /* x = x * ar */ +- CHECK_MPI_OK(mp_mulmod(&x, &r, &q, &x)); /* x = x * r mod q */ ++ CHECK_MPI_OK(mp_mul(&x, &ar, &x)); /* x = x * ar */ ++ /* x is now x*ar */ ++ CHECK_MPI_OK(mp_mulmod(&x, &r, &q, &x)); /* x = x * r mod q */ ++ /* x is now x*r*ar */ + CHECK_MPI_OK(mp_mulmod(&s, &ar, &q, &t)); /* t = s * ar mod q */ +- CHECK_MPI_OK(mp_add(&t, &x, &s)); /* s = t + x */ +- CHECK_MPI_OK(mp_mulmod(&s, &k, &q, &s)); /* s = s * k mod q */ ++ /* t is now hash(M)*ar */ ++ CHECK_MPI_OK(mp_add(&t, &x, &s)); /* s = t + x */ ++ /* s is now (HASH(M)+x*r)*ar */ ++ CHECK_MPI_OK(mp_mulmod(&s, &k, &q, &s)); /* s = s * k mod q */ ++ /* s is now (HASH(M)+x*r)*ar*(k*ar)**-1 = (k**-1)*(HASH(M)+x*r) */ ++ + /* + ** verify r != 0 and s != 0 + ** mentioned as optional in FIPS 186-1. + */ + if (mp_cmp_z(&r) == 0 || mp_cmp_z(&s) == 0) { + PORT_SetError(SEC_ERROR_NEED_RANDOM); + rv = SECFailure; + goto cleanup; + -- cgit v1.2.3 From 833252a88bd9a11b7bd431877130dd80f1d548f2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 2 Jun 2020 00:24:56 -0400 Subject: gnu: icecat: Update to 68.9.0-guix0-preview1 [security fixes]. Includes fixes for CVE-2020-12399 and CVE-2020-12405. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update gnuzilla commit, base version, and hashes. * gnu/packages/patches/icecat-makeicecat.patch: Adapt to new version. --- gnu/packages/gnuzilla.scm | 12 ++++++------ gnu/packages/patches/icecat-makeicecat.patch | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 7bf9850e97..e00a09e989 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -556,8 +556,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "68.8.0-guix0-preview1") -(define %icecat-build-id "20200505000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "68.9.0-guix0-preview1") +(define %icecat-build-id "20200602000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -579,11 +579,11 @@ from forcing GEXP-PROMISE." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0hp8cc7xk6qj4q1s8n97qv9sdrypkzvphik96m5qv1r5s9k24nzs")))) + "01s41p985g6v544lf08zch3myssn5c76jwmkzzd68zd9m3hhalck")))) - (upstream-icecat-base-version "68.8.0") ; maybe older than base-version + (upstream-icecat-base-version "68.9.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "5358ff2963a6136f8acafdc598cad540231ad23e") + (gnuzilla-commit "d7acf32ad905a3382cb2353577a96d29aa58f589") (gnuzilla-source (origin (method git-fetch) @@ -595,7 +595,7 @@ from forcing GEXP-PROMISE." (string-take gnuzilla-commit 8))) (sha256 (base32 - "1bq0qzgkxz9q61g48bc05i0zx1z8k0pklxnmn54ch136aqgsyli4")))) + "0m49zm05m3n95diij2zyvpm74q66zxjhv9rp8zvaab0h7v2s09n9")))) (makeicecat-patch (local-file (search-patch "icecat-makeicecat.patch"))) diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index 2978a5789e..d3d95cbf28 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -25,7 +25,7 @@ index 8be2362..48716f2 100755 -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc -gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 -gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc --echo -n fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-echo -n 935105e1a8a97d64daffb372690e2b566b5f07641f01470929dbbc82d20d4407 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - - -echo Extracting Firefox tarball -tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -37,7 +37,7 @@ index 8be2362..48716f2 100755 +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc +# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 +# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc -+# echo -n fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++# echo -n 935105e1a8a97d64daffb372690e2b566b5f07641f01470929dbbc82d20d4407 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz -- cgit v1.2.3 From 3ee51d616c3615ab34e2eb156ba2bc6250c3d7e8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Jun 2020 21:12:35 +0300 Subject: gnu: libreoffice: Update to 4.4.2.2. * gnu/packages/libreoffice.scm (libreoffice): Update to 4.4.2.2. [arguments]: Remove unrecognized configure-flag. --- gnu/packages/libreoffice.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index a3a6ea5d1a..01d33dc03c 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2016, 2018, 2019 Efraim Flashner +;;; Copyright © 2016, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2017 Alex Griffin ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -998,7 +998,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (define-public libreoffice (package (name "libreoffice") - (version "6.4.2.2") + (version "6.4.4.2") (source (origin (method url-fetch) @@ -1009,7 +1009,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (patches (search-patches "libreoffice-poppler-compat.patch")) (sha256 (base32 - "06acm41q9nda8r30b13cn9zafsw1gszjdphh6lx90s09d2sf7f23")))) + "0y6026h374787yy2f3as1q7clxmgywsfdrj62kw3577wvybqaf2l")))) (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) @@ -1205,7 +1205,6 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") ;; patching the build scripts to work with GCC5. Try enabling this ;; when our default compiler is >=GCC 6. "--disable-pdfium" - "--disable-gtk" ; disable use of GTK+ 2 "--without-doxygen" "--enable-build-opensymbol"))) (home-page "https://www.libreoffice.org/") -- cgit v1.2.3 From 5359b601cd19eab96205e8eabca902ec8a47db18 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jun 2020 14:44:11 +0200 Subject: gnu: toutenclic: Add missing input. * gnu/packages/education.scm (toutenclic)[native-inputs]: Add UNZIP. --- gnu/packages/education.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 550925d638..ab02d1b7af 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -386,7 +386,10 @@ to open the application in a web browser, for offline usage.") Type=Application~%" out))) #t)))))) - (inputs `(("python-pyqt" ,python-pyqt))) + (native-inputs + `(("unzip" ,unzip))) + (inputs + `(("python-pyqt" ,python-pyqt))) (synopsis "School tools for physically disabled children") (description "ToutEnClic is intended to facilitate the schooling of physically disabled children in ordinary schools. It is both -- cgit v1.2.3 From 37465b5be0324d9c953408fe88e2509ad0891712 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jun 2020 20:35:00 +0200 Subject: gnu: texlive-csquotes: Update source checksum. This package had not been adjusted for the TeX Live 2019 upgrade. Fixes . * gnu/packages/tex.scm (texlive-csquotes)[simple-texlive-package]: Update expected checksum. --- gnu/packages/tex.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 137e000bc5..6f6ea73ffc 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7306,7 +7306,7 @@ to what constitutes a good table in this context. The package offers (list "/doc/latex/csquotes/" "/tex/latex/csquotes/") (base32 - "15hgn37zg433skn7ijqs1kl2z56fhy29cjxn01b5pjrnrkdar4i4") + "088gvi60d7sdl6fgg68fbz30fnpqc3yrpkx80sfw7vwgar3wm3av") #:trivial? #t))) (package (inherit template) -- cgit v1.2.3 From 33430a455e3c6b01a6edb4afb5febdf7b9c689af Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 18:57:15 +0200 Subject: gnu: os-prober: Fix cross-compilation. * gnu/packages/bootloaders.scm (os-prober)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/bootloaders.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 5273412adf..ea80cf020e 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2016, 2017 David Craven ;;; Copyright © 2017, 2018 Efraim Flashner -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 nee ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Björn Höfling @@ -1017,7 +1017,8 @@ tools, and more.") (guix build utils) (ice-9 regex) ; for string-match (srfi srfi-26)) ; for cut - #:make-flags (list "CC=gcc") + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:tests? #f ; no tests #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 9b9bc1b061c5e1628d013bff917eaf040a035421 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:11:05 +0200 Subject: gnu: pigz: Fix cross-compilation. * gnu/packages/compression.scm (pigz)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/compression.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 568de1cfb2..a6b0273f76 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -875,7 +875,8 @@ extract such file systems.") (symlink "pigz" (string-append bin "/unpigz")) (install-file "pigz.1" man) #t)))) - #:make-flags (list "CC=gcc") + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:test-target "tests")) (inputs `(("zlib" ,zlib))) (home-page "https://zlib.net/pigz/") -- cgit v1.2.3 From cb3ca320529c7f5a307808ecaa6510e80d0ef85b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:11:15 +0200 Subject: gnu: lunzip: Fix cross-compilation. * gnu/packages/compression.scm (lunzip)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/compression.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index a6b0273f76..cd5f92e6b7 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1686,7 +1686,7 @@ of archives.") (build-system gnu-build-system) (arguments `(#:configure-flags - (list "CC=gcc"))) + (list ,(string-append "CC=" (cc-for-target))))) (home-page "https://www.nongnu.org/lzip/lunzip.html") (synopsis "Small, stand-alone lzip decompressor") (description -- cgit v1.2.3 From cb056c4019e4ccebb404b19ff4985415d57a9c63 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:11:44 +0200 Subject: gnu: clzip: Fix cross-compilation. * gnu/packages/compression.scm (clzip)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/compression.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index cd5f92e6b7..e7d74d808f 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1713,7 +1713,7 @@ Lunzip is intended to be fully compatible with the regular lzip package.") (build-system gnu-build-system) (arguments `(#:configure-flags - (list "CC=gcc"))) + (list ,(string-append "CC=" (cc-for-target))))) (home-page "https://www.nongnu.org/lzip/clzip.html") (synopsis "Small, stand-alone lzip compressor and decompressor") (description -- cgit v1.2.3 From e712b998aafef76b3f9fe00f8156fe4b725d6335 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:15:03 +0200 Subject: gnu: lolcat: Fix cross-compilation. * gnu/packages/games.scm (lolcat)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/games.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index bf68c34f5a..fc3569e9ea 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -626,8 +626,9 @@ tired of cows, a variety of other ASCII-art messengers are available.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;; no check target - #:make-flags (list "CC=gcc") + `(#:tests? #f ; no check target + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (delete 'bootstrap) -- cgit v1.2.3 From 2b9ce1007df59820d33c806d5feec04a38d59165 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:17:16 +0200 Subject: gnu: nvme-cli: Fix cross-compilation. * gnu/packages/linux.scm (nvme-cli)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0a154fd6cc..4acd50879e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3859,15 +3859,17 @@ Translation (@dfn{SAT}) are also supported.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "CC=gcc") + `(#:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases - (delete 'configure) ; No ./configure script + (delete 'configure) ; no ./configure script (replace 'install (lambda _ (invoke "make" "install-spec" "PREFIX=" (string-append "DESTDIR=" %output))))) - #:tests? #f)) ; The tests require sysfs, which is not accessible from - ; the build environment + ;; The tests require sysfs, which is not accessible from from the build + ;; environment + #:tests? #f)) (synopsis "NVM-Express user space tooling for Linux") (description "Nvme-cli is a utility to provide standards compliant tooling for NVM-Express drives. It was made specifically for Linux as it relies on the -- cgit v1.2.3 From 3a169fe30183011877b86d376a708e85b7a42671 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:24:36 +0200 Subject: gnu: clipnotify: Fix cross-compilation. * gnu/packages/xdisorg.scm (clipnotify)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/xdisorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 5941f63a26..86fbefbfb8 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2271,9 +2271,9 @@ configuring visual settings in different UI toolkits separately.") (install-file "clipnotify" bin) (install-file "README.md" doc) #t)))) - #:make-flags (list "CC=gcc") - ;; the package provides no test suite: - #:tests? #f)) + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) + #:tests? #f)) ; no test suite (inputs `(("libx11" ,libx11) ("libXfixes" ,libxfixes))) -- cgit v1.2.3 From 39f8ef2d16e413891bcd81a24011a01ecc9e07d8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:25:28 +0200 Subject: gnu: linenoise: Fix cross-compilation. * gnu/packages/shells.scm (linenoise)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/shells.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 74d08e02bc..562748da4a 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -600,8 +600,9 @@ operating system.") "1z16qwix8z6a40fskdgxsibkqgdrp4q6ncp4n6hnv4r9iihy2d8r")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;No tests are included - #:make-flags (list "CC=gcc") + `(#:tests? #f ; no tests are included + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From ebde5cfdf296e47673ab4b14136d0430fa544ec7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:27:11 +0200 Subject: gnu: iniparser: Fix cross-compilation. * gnu/packages/samba.scm (iniparser)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/samba.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index a502020121..b121b540f7 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -124,7 +124,7 @@ the Linux kernel CIFS client.") (build-system gnu-build-system) (arguments `(#:make-flags - (list "CC=gcc") + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (replace 'configure -- cgit v1.2.3 From ae05ac8fd2e7b464fb61a3c46e9e2baf88d2abdb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:52:29 +0200 Subject: gnu: iniparser: Edit synopsis & description. * gnu/packages/samba.scm (iniparser)[synopsis, description]: Flesh out. --- gnu/packages/samba.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index b121b540f7..0fa19e355c 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -159,11 +159,15 @@ the Linux kernel CIFS client.") '("AUTHORS" "INSTALL" "LICENSE" "README.md")) #t)))))) (home-page "https://github.com/ndevilla/iniparser") - (synopsis "Standalone ini file parsing library") + (synopsis "Simple @file{.ini} configuration file parsing library") (description - "iniparser is a free stand-alone @code{ini} file parsing library (Windows -configuration files). It is written in portable ANSI C and should compile -anywhere.") + "The iniParser C library reads and writes Windows-style @file{.ini} +configuration files. These are simple text files with a basic structure +composed of sections, properties, and values. While not expressive, they +are easy to read, write, and modify. + +The library is small, thread safe, and written in portable ANSI C with no +external dependencies.") (license x11))) (define-public samba -- cgit v1.2.3 From 907b9dc8cb87a2ef831627185b4cb08576b87622 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 20:29:12 +0200 Subject: gnu: memtester: Fix cross-compilation. * gnu/packages/hardware.scm (memtester)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/hardware.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 7ebe8f48eb..6a2e2c695b 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -43,7 +43,8 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages)) + #:use-module (guix packages) + #:use-module (guix utils)) ;; This is a module for packages related to physical hardware that don't (yet) ;; have a more specific home like gps.scm, security-token.scm, &c. @@ -203,7 +204,7 @@ Memtest86+ cannot currently be used on computers booted with UEFI.") (build-system gnu-build-system) (arguments `(#:make-flags - (list "CC=gcc") + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (replace 'configure -- cgit v1.2.3 From 24f4fc84313c07b91cee747ef43af56411b6bc9e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 04:24:21 +0200 Subject: gnu: ubridge: Fix cross-compilation. * gnu/packages/networking.scm (ubridge)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/networking.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ca7b36bb6a..8f650b1ce8 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2552,7 +2552,8 @@ SNMP v3 using both IPv4 and IPv6.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags '("CC=gcc") + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script -- cgit v1.2.3 From d9fda98049b7758c5af49aca83f9e29ae2cd64d5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 20:56:24 +0200 Subject: gnu: sct: Update to 0.5. * gnu/packages/xdisorg.scm (sct): Update to 0.5. --- gnu/packages/xdisorg.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 86fbefbfb8..60873637cf 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1911,7 +1911,7 @@ colors on all monitors attached to an XRandR-capable X11 display server.") (define-public sct (package (name "sct") - (version "0.4") + (version "0.5") (source (origin (method url-fetch) @@ -1919,8 +1919,7 @@ colors on all monitors attached to an XRandR-capable X11 display server.") (string-append "https://www.umaxx.net/dl/sct-" version ".tar.gz")) (sha256 - (base32 - "0r57z9ki8pvxhawfxys0v5h85z2x211sqxki0xvk1bga88ryldlv")))) + (base32 "0lrhx771iccbw04wrhj0ygids1pzmjfc4hvklm30m3p3flvhqf0m")))) (build-system gnu-build-system) (arguments '(#:make-flags (list "CC=gcc") -- cgit v1.2.3 From 395659d86d98afaba4d311ca5618f49a4548f6ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 20:56:43 +0200 Subject: gnu: sct: Prepare for cross-compilation. * gnu/packages/xdisorg.scm (sct)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/xdisorg.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 60873637cf..ee6b1a9ffd 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1922,8 +1922,9 @@ colors on all monitors attached to an XRandR-capable X11 display server.") (base32 "0lrhx771iccbw04wrhj0ygids1pzmjfc4hvklm30m3p3flvhqf0m")))) (build-system gnu-build-system) (arguments - '(#:make-flags (list "CC=gcc") - #:tests? #f ; No tests exist. + `(#:make-flags + (list ,(string-append "CC=" (cc-for-target))) + #:tests? #f ; no test suite #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From 9a46e0dd843a2f4c832f74e9a503e7200c934eb7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jun 2020 23:40:19 +0200 Subject: gnu: dbus: Fix CVE-2020-12049. * gnu/packages/patches/dbus-CVE-2020-12049.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/glib.scm (dbus/fixed): New variable. (dbus)[replacement]: New field. --- gnu/local.mk | 1 + gnu/packages/glib.scm | 10 +++++ gnu/packages/patches/dbus-CVE-2020-12049.patch | 58 ++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 gnu/packages/patches/dbus-CVE-2020-12049.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4a8a855502..babcb8f6ad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -855,6 +855,7 @@ dist_patch_DATA = \ %D%/packages/patches/datefudge-gettimeofday.patch \ %D%/packages/patches/dbacl-include-locale.h.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ + %D%/packages/patches/dbus-CVE-2020-12049.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ %D%/packages/patches/dconf-meson-0.52.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 12ba6e939b..94dc6adf6f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -88,6 +88,7 @@ (package (name "dbus") (version "1.12.16") + (replacement dbus/fixed) (source (origin (method url-fetch) (uri (string-append @@ -164,6 +165,15 @@ or through unencrypted TCP/IP suitable for use behind a firewall with shared NFS home directories.") (license license:gpl2+))) ; or Academic Free License 2.1 +;; Replacement package to fix CVE-2020-12049. +(define dbus/fixed + (package + (inherit dbus) + (source (origin + (inherit (package-source dbus)) + (patches (append (search-patches "dbus-CVE-2020-12049.patch") + (origin-patches (package-source dbus)))))))) + (define glib (package (name "glib") diff --git a/gnu/packages/patches/dbus-CVE-2020-12049.patch b/gnu/packages/patches/dbus-CVE-2020-12049.patch new file mode 100644 index 0000000000..71280144a1 --- /dev/null +++ b/gnu/packages/patches/dbus-CVE-2020-12049.patch @@ -0,0 +1,58 @@ +Fix CVE-2020-12049: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-12049 +https://lists.freedesktop.org/archives/ftp-release/2020-June/000753.html + +Taken from upstream: + +https://gitlab.freedesktop.org/dbus/dbus/-/commit/272d484283883fa9ff95b69d924fff6cd34842f5 + +diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c +--- a/dbus/dbus-sysdeps-unix.c ++++ b/dbus/dbus-sysdeps-unix.c +@@ -435,18 +435,6 @@ _dbus_read_socket_with_unix_fds (DBusSocket fd, + struct cmsghdr *cm; + dbus_bool_t found = FALSE; + +- if (m.msg_flags & MSG_CTRUNC) +- { +- /* Hmm, apparently the control data was truncated. The bad +- thing is that we might have completely lost a couple of fds +- without chance to recover them. Hence let's treat this as a +- serious error. */ +- +- errno = ENOSPC; +- _dbus_string_set_length (buffer, start); +- return -1; +- } +- + for (cm = CMSG_FIRSTHDR(&m); cm; cm = CMSG_NXTHDR(&m, cm)) + if (cm->cmsg_level == SOL_SOCKET && cm->cmsg_type == SCM_RIGHTS) + { +@@ -501,6 +489,26 @@ _dbus_read_socket_with_unix_fds (DBusSocket fd, + if (!found) + *n_fds = 0; + ++ if (m.msg_flags & MSG_CTRUNC) ++ { ++ unsigned int i; ++ ++ /* Hmm, apparently the control data was truncated. The bad ++ thing is that we might have completely lost a couple of fds ++ without chance to recover them. Hence let's treat this as a ++ serious error. */ ++ ++ /* We still need to close whatever fds we *did* receive, ++ * otherwise they'll never get closed. (CVE-2020-12049) */ ++ for (i = 0; i < *n_fds; i++) ++ close (fds[i]); ++ ++ *n_fds = 0; ++ errno = ENOSPC; ++ _dbus_string_set_length (buffer, start); ++ return -1; ++ } ++ + /* put length back (doesn't actually realloc) */ + _dbus_string_set_length (buffer, start + bytes_read); + -- cgit v1.2.3 From c45431a2838644bae90613690b023019b8bce456 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jun 2020 23:41:08 +0200 Subject: gnu: libabigail: Update to 1.7. * gnu/packages/elf.scm (libabigail): Update to 1.7. --- gnu/packages/elf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 098c0fc94a..3aabc6e927 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -112,14 +112,14 @@ object or archive file), @command{eu-strip} (for discarding symbols), (package (name "libabigail") (home-page "https://sourceware.org/libabigail/") - (version "1.6") + (version "1.7") (source (origin (method url-fetch) (uri (string-append "https://sourceware.org/pub/libabigail/" "libabigail-" version ".tar.gz")) (sha256 (base32 - "04j07lhvwbp6qp8pdwbf7iqnr7kgpabmqylsw4invpmzwnyp6g6g")))) + "0bf8w01l6wm7mm4clfg5rqi30m1ws11qqa4bp2vxghfwgi9ai8i7")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static" -- cgit v1.2.3 From 1f0e1c49aa83d5d180f4f5ee945085eeb2d62191 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:26:13 +0200 Subject: gnu: i2c-tools: Actually cross-compile. * gnu/packages/linux.scm (i2c-tools)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4acd50879e..1466165aa3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3595,10 +3595,10 @@ create a firmware image suitable for the Linux kernel, and more.") "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no 'check' target + `(#:tests? #f ; no 'check' target #:make-flags (list (string-append "prefix=" %output) - "CC=gcc") - ;; no configure script + ,(string-append "CC=" (cc-for-target))) + ;; No configure script. #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs `(("perl" ,perl))) -- cgit v1.2.3 From 15c8b1723a4819e3bac024690cde3fac275be2dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:28:17 +0200 Subject: gnu: earlyoom: Actually cross-compile. * gnu/packages/linux.scm (earlyoom)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1466165aa3..1a1821b5a7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3007,7 +3007,7 @@ from the module-init-tools project.") (install-file "contrib/notify_all_users.py" contrib) #t)))) #:make-flags (let* ((prefix (assoc-ref %outputs "out"))) - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) (string-append "VERSION=v" ,version) (string-append "PREFIX=" prefix) (string-append "SYSCONFDIR=" prefix "/etc"))) -- cgit v1.2.3 From e45f0c79fbad86a9a181b8674219f385c8ea5504 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:31:27 +0200 Subject: gnu: mbpfan: Fix cross-compilation. * gnu/packages/linux.scm (mbpfan)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1a1821b5a7..e60cc790e2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6490,10 +6490,10 @@ interface to this kernel feature.") (base32 "0aijyxrqh01x0s80yr4cgxgd001iiqqph65pxvby7f0wz8lnxnqj")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; tests ask to be run as root + `(#:tests? #f ; tests ask to be run as root #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "DESTDIR=" out) - "CC=gcc")) + ,(string-append "CC=" (cc-for-target)))) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths -- cgit v1.2.3 From 7dd57cc00e949dd414ed1c820d6452b2c9978184 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:38:11 +0200 Subject: gnu: hdparm: Fix cross-compilation. * gnu/packages/linux.scm (hdparm)[arguments]: Use CC-FOR-TARGET. Don't strip the binary during the build phase. --- gnu/packages/linux.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e60cc790e2..30420b013b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3821,10 +3821,13 @@ isolation or root privileges.") "03z1qm8zbgpxagk3994lvp24yqsshjibkwg05v9p3q1w7y48xrws")))) (build-system gnu-build-system) (arguments - `(#:make-flags (let ((out (assoc-ref %outputs "out"))) - (list (string-append "binprefix=" out) - (string-append "manprefix=" out) - "CC=gcc")) + `(#:make-flags + (let ((out (assoc-ref %outputs "out"))) + (list (string-append "binprefix=" out) + (string-append "manprefix=" out) + ,(string-append "CC=" (cc-for-target)) + ;; Let Guix strip the binaries and not break cross-compilation. + "STRIP=true")) #:phases (modify-phases %standard-phases (delete 'configure)) ; no configure script -- cgit v1.2.3 From 3dec317f1d54855705fb08c156f758b194c52d5c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:42:43 +0200 Subject: gnu: mdadm: Actually cross-compile. * gnu/packages/linux.scm (mdadm)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 30420b013b..197e5ea85a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4112,7 +4112,7 @@ MPEG-2 and audio over Linux IEEE 1394.") `(("udev" ,eudev))) (arguments `(#:make-flags (let ((out (assoc-ref %outputs "out"))) - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) "INSTALL=install" "CHECK_RUN_DIR=0" ;; TODO: tell it where to find 'sendmail' -- cgit v1.2.3 From ac68ab337cf09c99a71393002854f66ad495d2ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:47:22 +0200 Subject: gnu: blktrace: Prepare for cross-compilation. * gnu/packages/linux.scm (blktrace)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 197e5ea85a..1e1ba787e2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4331,12 +4331,13 @@ applications.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - '(#:make-flags - (list "CC=gcc" (string-append "prefix=" %output)) - #:tests? #f ; no tests + `(#:make-flags + (list ,(string-append "CC=" (cc-for-target)) + (string-append "prefix=" %output)) + #:tests? #f ; no tests #:phases (modify-phases %standard-phases - (delete 'configure) ; no configure script + (delete 'configure) ; no configure script (add-after 'unpack 'fix-gnuplot-path (lambda* (#:key inputs #:allow-other-keys) (let ((gnuplot (assoc-ref inputs "gnuplot"))) -- cgit v1.2.3 From 0792984459a692e21e2503c7e2818ed46783b633 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:50:22 +0200 Subject: gnu: acpica: Update to 20200528. * gnu/packages/admin.scm (acpica): Update to 20200528. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2bd1922fea..2490d76618 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1805,7 +1805,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (define-public acpica (package (name "acpica") - (version "20200430") + (version "20200528") (source (origin (method url-fetch) (uri (string-append @@ -1813,7 +1813,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") version ".tar.gz")) (sha256 (base32 - "1hiaz9lrmjzdbi5zl0ajfflja41cixzx2j76iyx02qbjlmy9cfjc")))) + "01ajxnz9dpnvdbib7yv20dw21a1yyfgwiw3whg0xi57cf4app2md")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) -- cgit v1.2.3 From 3b394f6a3ec070b34f91715b8a228e6edebe45aa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:51:19 +0200 Subject: gnu: inxi-minimal: Update to 3.1.01-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.1.01-1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2490d76618..bfbd533bcb 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3450,7 +3450,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.1.00-1") + (version "3.1.01-1") (source (origin (method git-fetch) @@ -3459,7 +3459,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "0md6yfd297l8695g0rsbs4mm74dc3k00rfjl4x2n4i33mkylp6qa")))) + (base32 "0r204w0r06ibdr4dck7yw2nmvj7xq68bjr7xwwiy7liqdml0n0yc")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit v1.2.3 From 6978cb2865ee26c2eb46bfe5a907d35b701a56c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 21:16:24 +0200 Subject: gnu: lemonbar: Fix cross-compilation. * gnu/packages/wm.scm (lemonbar)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/wm.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 2e975354c3..06d28e30c1 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1838,9 +1838,10 @@ between windows.") "1wwqbph392iwz8skaqxb0xpklb1l6yganqz80g4x1fhrnz7idmlh")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no test suite - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no test suite + #:make-flags + (list ,(string-append "CC=" (cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) -- cgit v1.2.3 From 898e8b528b6bde0a699cac81532181050344a548 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 21:31:11 +0200 Subject: gnu: net-tools: Fix cross-compilation. * gnu/packages/linux.scm (net-tools)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1e1ba787e2..12c37d8c51 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2150,7 +2150,7 @@ inadequately in modern network environments, and both should be deprecated.") (home-page "http://net-tools.sourceforge.net/") (build-system gnu-build-system) (arguments - '(#:modules ((guix build gnu-build-system) + `(#:modules ((guix build gnu-build-system) (guix build utils) (srfi srfi-1) (srfi srfi-26)) @@ -2190,7 +2190,7 @@ inadequately in modern network environments, and both should be deprecated.") #:tests? #f ; no test suite #:make-flags (let ((out (assoc-ref %outputs "out"))) - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) (string-append "BASEDIR=" out) (string-append "INSTALLNLSDIR=" out "/share/locale") (string-append "mandir=/share/man"))))) -- cgit v1.2.3 From 56a9ef22e3044134844f0093e2a3905f73dd830f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 21:41:32 +0200 Subject: gnu: iw: Use CC-FOR-TARGET. * gnu/packages/linux.scm (iw)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 12c37d8c51..0a935d529d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2414,12 +2414,11 @@ configuration and monitoring interfaces.") (arguments `(#:make-flags (let* ((target ,(%current-target-system)) - (gcc (if target (string-append target "-gcc") "gcc")) (pkg-config (if target (string-append target "-pkg-config") "pkg-config"))) (list - (string-append "CC=" gcc) + ,(string-append "CC=" (cc-for-target)) (string-append "PKG_CONFIG=" (assoc-ref %build-inputs "pkg-config") "/bin/" pkg-config) -- cgit v1.2.3 From d6af27375dce80772488642211ade6608fa60456 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:58:08 +0200 Subject: gnu: bs1770gain: Update to 0.7.0. * gnu/packages/audio.scm (bs1770gain): Update to 0.7.0. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 2d22dfc85a..ef1ff1ba5f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3373,14 +3373,14 @@ with support for HD extensions.") (define-public bs1770gain (package (name "bs1770gain") - (version "0.6.9") + (version "0.7.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/bs1770gain/bs1770gain/" version "/bs1770gain-" version ".tar.gz")) (sha256 - (base32 "1hcbff3q6xl9rj1pzy3fwy91y6fa99wwrhb31461j9kgc173ls7r")) + (base32 "0a2dcaxvxy5m3a5sb1lhplsymvz3ypaiidc5xn9qy01h53zvyvkp")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From f295c0834624e57e439cc4a1da021212bfff42f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 02:00:03 +0200 Subject: gnu: bs1770gain: Deduplicate home page URLs. * gnu/packages/audio.scm (bs1770gain)[source]: Re-use the HOME-PAGE field in the snippet. --- gnu/packages/audio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index ef1ff1ba5f..c8d15a3bb7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3374,6 +3374,7 @@ with support for HD extensions.") (package (name "bs1770gain") (version "0.7.0") + (home-page "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html") (source (origin (method url-fetch) @@ -3383,7 +3384,7 @@ with support for HD extensions.") (base32 "0a2dcaxvxy5m3a5sb1lhplsymvz3ypaiidc5xn9qy01h53zvyvkp")) (modules '((guix build utils))) (snippet - '(begin + `(begin ;; XXX (substitute* (find-files "." "\\.[ch]$") (("^ \\* N..o.*") "")) @@ -3395,12 +3396,11 @@ with support for HD extensions.") "configure.ac" "configure") (("https?://bs1770gain[^/]*/") - "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html")) + ,home-page)) #t)))) (build-system gnu-build-system) (inputs `(("ffmpeg" ,ffmpeg) ("sox" ,sox))) - (home-page "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html") (synopsis "Tool to adjust loudness of media files") (description "BS1770GAIN is a loudness scanner compliant with ITU-R BS.1770 and its -- cgit v1.2.3 From 9605af1acdc4af7ccfc5e9d10f4524d5db634230 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 02:20:57 +0200 Subject: gnu: qutebrowser: Update to 1.12.0. * gnu/packages/web-browsers.scm (qutebrowser): Update to 1.12.0. --- gnu/packages/web-browsers.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index b61ed7f3ca..c30a4ff3a2 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2016, 2019 Efraim Flashner ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017 Eric Bavier -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Rutger Helling ;;; Copyright © 2018 Timo Eisenmann ;;; Copyright © 2018 Pierre Neidhardt @@ -340,7 +340,7 @@ access.") (define-public qutebrowser (package (name "qutebrowser") - (version "1.11.0") + (version "1.12.0") (source (origin (method url-fetch) @@ -348,8 +348,7 @@ access.") "qutebrowser/releases/download/v" version "/" "qutebrowser-" version ".tar.gz")) (sha256 - (base32 - "0b0qlki9bp9mm41lrh6rc6qqvm4nsz8da63sby3a1f2xm9b9vvg2")))) + (base32 "0pywyhi4v6ymxpn85grrdr1agmcxsnm5jfqf3rlxqx5swbnxbfs1")))) (build-system python-build-system) (native-inputs `(("python-attrs" ,python-attrs))) ; for tests -- cgit v1.2.3 From 5c8a59e6b99e84e2f4b4989fc3529c702e096866 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 02:37:27 +0200 Subject: gnu: osinfo-db-tools: Update to 1.8.0. * gnu/packages/virtualization.scm (osinfo-db-tools): Update to 1.8.0. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 05ce96c974..9fa2887d48 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1440,7 +1440,7 @@ which is a hypervisor.") (define-public osinfo-db-tools (package (name "osinfo-db-tools") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-tools-" @@ -1448,7 +1448,7 @@ which is a hypervisor.") (sha256 (base32 - "08x8mrafphyll0d35xdc143rip3ahrz6bmzhc85nwhq7yk2vxpab")))) + "038q3gzdbkfkhpicj0755mw1q4gbvn57pslpw8n2dp3lds9im0g9")))) (build-system meson-build-system) (inputs `(("libsoup" ,libsoup) -- cgit v1.2.3 From 16cf7d471c848133d2bf9643860237a7b22ecc7d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 03:01:35 +0200 Subject: gnu: osinfo-db: Update to 20200529. * gnu/packages/virtualization.scm (osinfo-db): Update to 20200529. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 9fa2887d48..26c0bb54cb 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1474,14 +1474,14 @@ administrators and developers in managing the database.") (define-public osinfo-db (package (name "osinfo-db") - (version "20200203") + (version "20200529") (source (origin (method url-fetch) (uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-" version ".tar.xz")) (sha256 (base32 - "1zjq1dhlci00j17dij7s3l30hybzmaykpk5b6bd5xbllp745njn5")))) + "0mbrf9j5wmjhc6jixvhp4jqyxixh1717lqrmzmipdg99xnzba81n")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From a0cfa1e21a7792dba8e56c6b60148baf47282ad6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 05:33:02 +0200 Subject: gnu: intel-vaapi-driver: Update to 2.4.1. * gnu/packages/video.scm (intel-vaapi-driver): Update to 2.4.1. [source]: Use GIT-FETCH and GIT-FILE-NAME. [native-inputs]: Add autoconf, automake, and libtool. --- gnu/packages/video.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 261628d795..b2d359cac2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2888,18 +2888,22 @@ of modern, widely supported codecs.") (define-public intel-vaapi-driver (package (name "intel-vaapi-driver") - (version "2.4.0") + (version "2.4.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/intel/intel-vaapi-driver/" - "releases/download/" version "/intel-vaapi-driver-" - version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/intel/intel-vaapi-driver") + (commit version))) (sha256 - (base32 "12fhydgwpvyh97gxqlgv77wsf9yax321h46vi49j4sxghpcxvqki")))) + (base32 "1cidki3av9wnkgwi7fklxbg3bh6kysf8w3fk2qadjr05a92mx3zp")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) (inputs `(("libdrm" ,libdrm) ("libva" ,libva) -- cgit v1.2.3 From 9375555b555b16a54996d59321fe2dddeb5f2c50 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 05:43:17 +0200 Subject: gnu: nix: Update to 2.3.5. * gnu/packages/package-management.scm (nix): Update to 2.3.5. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 8ab0c9b746..edb09224c0 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -542,14 +542,14 @@ out) and returning a package that uses that as its 'source'." (define-public nix (package (name "nix") - (version "2.3.4") + (version "2.3.5") (source (origin (method url-fetch) (uri (string-append "http://nixos.org/releases/nix/nix-" version "/nix-" version ".tar.xz")) (sha256 (base32 - "03fhbb8088sgz3709zd9n9rydavar79w87l9n4q9iimcw06nlqhw")))) + "1hbqsrp1ii2sfq8x2mahjrl2182qck76n8blrl1jfz3xq99m6i15")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("boost" ,boost) -- cgit v1.2.3 From 0c58139c9a91953d089cb39b9b856409c4975a7b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 06:01:39 +0200 Subject: gnu: re2: Update to 2020-06-01. * gnu/packages/regex.scm (re2): Update to 2020-06-01. --- gnu/packages/regex.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index c90ab88db1..60203ba5ca 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016, 2020 Marius Bakke -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,7 +30,7 @@ (define-public re2 (package (name "re2") - (version "2020-05-01") + (version "2020-06-01") (home-page "https://github.com/google/re2") (source (origin (method git-fetch) @@ -38,7 +38,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0daav6ja99v5hdlwh1xzmja950y7767yw0phcbd0wpn42km39i20")) + "10jdgnp5dvkj3ay7grmdy539vv1srglnfxaqc5kb9v53cbql5hm8")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From e809c891dd05195c4390dd32540f5bf65418513a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 06:02:09 +0200 Subject: gnu: camlp5: Update to 7.12. * gnu/packages/ocaml.scm (camlp5): Update to 7.12. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 877e841b20..99f4518719 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -528,7 +528,7 @@ Git-friendly development workflow.") (define-public camlp5 (package (name "camlp5") - (version "7.11") + (version "7.12") (source (origin (method git-fetch) @@ -537,7 +537,7 @@ Git-friendly development workflow.") (commit (string-append "rel" (string-delete #\. version))))) (file-name (git-file-name name version)) (sha256 - (base32 "1s1f9i0r0czxlbnsaz4kvs2ahknmqxcm5ypl75g7scjcbl0an2x4")))) + (base32 "12ix5g15bys932hyf9gs637iz76m0ji9075d83jfdmx85q30llgf")))) (build-system gnu-build-system) (inputs `(("ocaml" ,ocaml))) -- cgit v1.2.3 From 523ddf348c6c24e1dddc86be0e136e7014fed7d0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 06:44:38 +0200 Subject: gnu: fmt: Update to 6.2.1. * gnu/packages/pretty-print.scm (fmt): Update to 6.2.1. --- gnu/packages/pretty-print.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index f7655c3535..c4bdbe9000 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Ludovic Courtès -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2020 Paul Garlick ;;; Copyright © 2020 Vincent Legoll @@ -168,14 +168,14 @@ different programming languages.") (define-public fmt (package (name "fmt") - (version "6.1.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/fmtlib/fmt/releases/download/" - version "/fmt-" version ".zip")) - (sha256 - (base32 - "1s1hxaby5byb07rgmrk4a0q11fxhz7b42khch7sp2qx974y0yrb3")))) + (version "6.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/fmtlib/fmt/releases/download/" + version "/fmt-" version ".zip")) + (sha256 + (base32 "06l8g59frbsbwj15kg6x2bbn6p8yidh6wzsigdhbdjncvm1agzll")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) -- cgit v1.2.3 From 9ab2790e2acf872c0f2cf41ec180de80d1eee3f3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 3 Jun 2020 10:08:44 +0200 Subject: gnu: emacs-auctex: Update to 12.2.3. * gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 12.2.3. --- gnu/packages/emacs-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ccb6614c74..0f547425a0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1804,14 +1804,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "12.2.2") + (version "12.2.3") (source (origin (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/auctex-" - version ".tar")) + (uri (string-append "https://elpa.gnu.org/packages/" + "auctex-" version ".tar")) (sha256 - (base32 "1map25xn7r28aldhcz9n8pbfk2l3gvnxx8hgih3ax8hyvnfi6brh")))) + (base32 "1rbn6pghkll5apjv1fyn82v523fch9l5ksi5lnh439nq460wx1yf")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). @@ -1829,8 +1829,8 @@ as a library for other Emacs packages.") (with-directory-excursion "doc" (setenv "HOME" (getenv "TMPDIR")) ; for mktextfm (invoke "pdftex" "tex-ref") - (install-file "tex-ref.pdf" (string-append etc-dir - "/refcards"))) + (install-file "tex-ref.pdf" + (string-append etc-dir "/refcards"))) #t)))))) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From 683910e9834f6e83fc3c291f129e8c9f72cf595a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 3 Jun 2020 12:43:04 +0300 Subject: gnu: global: Move vim plugins to correct directory. * gnu/packages/code.scm (global)[arguments]: Adjust 'post-install phase to install vim plugin files to the expected directory. --- gnu/packages/code.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index a50ac3506a..f6aaa63853 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2015, 2018 Ludovic Courtès ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2018 Ricardo Wurmus -;;; Copyright © 2016, 2017, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Andy Wingo @@ -146,12 +146,19 @@ highlighting your own code that seemed comprehensible when you wrote it.") (modify-phases %standard-phases (add-after 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) - ;; Install the Emacs Lisp file in the right place. + ;; Install the plugin files in the right place. (let* ((out (assoc-ref outputs "out")) (data (string-append out "/share/gtags")) + (vim (string-append out "/share/vim/vimfiles/plugin")) (lisp (string-append out "/share/emacs/site-lisp"))) - (install-file (string-append data "/gtags.el") lisp) - (delete-file (string-append data "/gtags.el")) + (mkdir-p lisp) + (mkdir-p vim) + (rename-file (string-append data "/gtags.el") + (string-append lisp "/gtags.el")) + (rename-file (string-append data "/gtags.vim") + (string-append vim "/gtags.vim")) + (rename-file (string-append data "/gtags-cscope.vim") + (string-append vim "/gtags-cscope.vim")) #t)))))) (home-page "https://www.gnu.org/software/global/") (synopsis "Cross-environment source code tag system") -- cgit v1.2.3 From ecd297a18c26e3d2c339371c9ee45901aa2bf731 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 3 Jun 2020 12:46:04 +0300 Subject: gnu: global: Don't build static libraries. * gnu/packages/code.scm (global)[arguments]: Add configure-flag to disable static libraries. --- gnu/packages/code.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index f6aaa63853..6334c97ef2 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -140,7 +140,8 @@ highlighting your own code that seemed comprehensible when you wrote it.") (list (string-append "--with-ncurses=" (assoc-ref %build-inputs "ncurses")) (string-append "--with-sqlite3=" - (assoc-ref %build-inputs "sqlite"))) + (assoc-ref %build-inputs "sqlite")) + "--disable-static") #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 7277baf50d348a11cd824379f1bb32beb83e7ffb Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 16:02:13 -0500 Subject: gnu: librdkafka: Update to 1.4.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (librdkafka): Update to 1.4.2. Signed-off-by: 宋文武 --- gnu/packages/networking.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 8f650b1ce8..df996d8b91 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -532,16 +532,16 @@ written in the C programming language.") (define-public librdkafka (package (name "librdkafka") - (version "0.9.1") + (version "1.4.2") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/edenhill/librdkafka/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/edenhill/librdkafka.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "10ldx7g7ymmg17snzx78vy4n8ma1rjx0agzi34g15j2fk867xmas")))) + "05mgrdzacn9kdpr68r5j0cvsvl54s52glnsc1ww9rcxx6p7hq1ly")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 08542026ea6312545d20f408f1743a811ae18f85 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 3 Jun 2020 14:05:43 +0200 Subject: gnu: python-pybedtools: Disable unreliable test. * gnu/packages/bioinformatics.scm (python-pybedtools)[arguments]: Disable test_intron_exon_reads test; run tests verbosely. test_intron_exon_reads --- gnu/packages/bioinformatics.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cfa0263e46..97ad0fc2fd 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -806,12 +806,13 @@ intended to behave exactly the same as the original BWK awk.") ;; See https://github.com/daler/pybedtools/issues/192 #:phases (modify-phases %standard-phases - ;; See https://github.com/daler/pybedtools/issues/261 (add-after 'unpack 'disable-broken-tests (lambda _ - ;; This test (pybedtools.test.test_scripts.test_venn_mpl) needs a - ;; graphical environment. (substitute* "pybedtools/test/test_scripts.py" + ;; This test freezes. + (("def test_intron_exon_reads") + "def _do_not_test_intron_exon_reads") + ;; This test fails in the Python 2 build. (("def test_venn_mpl") "def _do_not_test_venn_mpl")) (substitute* "pybedtools/test/test_helpers.py" @@ -868,7 +869,7 @@ intended to behave exactly the same as the original BWK awk.") (mkdir-p "/tmp/test") (copy-recursively "pybedtools/test" "/tmp/test") (with-directory-excursion "/tmp/test" - (invoke "pytest"))))))) + (invoke "pytest" "-v" "--doctest-modules"))))))) (propagated-inputs `(("bedtools" ,bedtools) ("samtools" ,samtools) -- cgit v1.2.3 From 6742a84c6344370afe4923b1e3e8c36b288d3afe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 3 Jun 2020 14:06:28 +0200 Subject: gnu: Remove bedtools-2.26. * gnu/packages/bioinformatics.scm (bedtools-2.26): Remove variable. --- gnu/packages/bioinformatics.scm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 97ad0fc2fd..7ef55a25a3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -475,20 +475,6 @@ BED, GFF/GTF, VCF.") (find-files "bin" ".*"))) #t))))))) -;; Needed for pybedtools. -(define-public bedtools-2.26 - (package (inherit bedtools) - (name "bedtools") - (version "2.26.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/arq5x/bedtools2/releases/" - "download/v" version "/" - "bedtools-" version ".tar.gz")) - (sha256 - (base32 - "0jhavwifnf7lmkb11h9y7dynr8d699h0rd2l52j1pfgircr2zwv5")))))) - (define-public pbbam (package (name "pbbam") -- cgit v1.2.3 From 2f49007dd076b14feb40d7c3331dee3e737265c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 3 Jun 2020 15:01:19 +0200 Subject: gnu: Add python-pairtools. * gnu/packages/bioinformatics.scm (python-pairtools): New variable. --- gnu/packages/bioinformatics.scm | 58 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7ef55a25a3..8d1adafd7e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -972,6 +972,64 @@ e.g. microbiome samples, genomes, metagenomes.") (("install_requires.append\\(\"pyqi\"\\)") "pass")) #t))))))))) +(define-public python-pairtools + (package + (name "python-pairtools") + (version "0.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirnylab/pairtools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gr8y13q7sd6yai6df4aavl2470n1f9s3cib6r473z4hr8hcbwmc")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-references + (lambda _ + (substitute* '("pairtools/pairtools_merge.py" + "pairtools/pairtools_sort.py") + (("/bin/bash") (which "bash"))) + #t)) + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (with-directory-excursion "/tmp" + (invoke "pytest" "-v"))))))) + (native-inputs + `(("python-cython" ,python-cython) + ("python-nose" ,python-nose) + ("python-pytest" ,python-pytest))) + (inputs + `(("python" ,python-wrapper))) + (propagated-inputs + `(("htslib" ,htslib) ; for bgzip, looked up in PATH + ("samtools" ,samtools) ; looked up in PATH + ("lz4" ,lz4) ; for lz4c + ("python-click" ,python-click) + ("python-numpy" ,python-numpy))) + (home-page "https://github.com/mirnylab/pairtools") + (synopsis "Process mapped Hi-C data") + (description "Pairtools is a simple and fast command-line framework to +process sequencing data from a Hi-C experiment. Process pair-end sequence +alignments and perform the following operations: + +@itemize +@item detect ligation junctions (a.k.a. Hi-C pairs) in aligned paired-end + sequences of Hi-C DNA molecules +@item sort @code{.pairs} files for downstream analyses +@item detect, tag and remove PCR/optical duplicates +@item generate extensive statistics of Hi-C datasets +@item select Hi-C pairs given flexibly defined criteria +@item restore @code{.sam} alignments from Hi-C pairs. +@end itemize +") + (license license:expat))) + (define-public bioperl-minimal (let* ((inputs `(("perl-module-build" ,perl-module-build) ("perl-data-stag" ,perl-data-stag) -- cgit v1.2.3 From 7c9be7b7cb71103d8a382a254e8c7a20ce7adce0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 1 Jun 2020 20:54:40 -0400 Subject: gnu: services: docker: Add a debug? parameter. * gnu/services/docker.scm (docker-configuration): Add a debug? field. (containerd-shepherd-service): Pass the "--log-level=debug" argument when DEBUG? is true. (docker-shepherd-service): Pass the "--debug" and "--log-level=debug" arguments when DEBUG? is true. * doc/guix.texi (Miscellaneous Services): Update doc. --- doc/guix.texi | 9 +++++++++ gnu/services/docker.scm | 20 ++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index beeda34ea2..de958c9cf1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26287,6 +26287,15 @@ The Docker package to use. @item @code{containerd} (default: @var{containerd}) The Containerd package to use. +@item @code{proxy} (default @var{docker-libnetwork-cmd-proxy}) +The Docker user-land networking proxy package to use. + +@item @code{enable-proxy?} (default @code{#f}) +Enable or disable the use of the Docker user-land networking proxy. + +@item @code{debug?} (default @code{#f}) +Enable or disable debug output. + @end table @end deftp diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index d6dc792821..937dff7bdb 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Danny Milosavljevic ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,7 +53,10 @@ loop-back communications.") (enable-proxy? (boolean #t) - "Enable or disable the user-land proxy (enabled by default).")) + "Enable or disable the user-land proxy (enabled by default).") + (debug? + (boolean #f) + "Enable or disable debug output.")) (define %docker-accounts (list (user-group (name "docker") (system? #t)))) @@ -71,19 +75,24 @@ loop-back communications.") (mkdir-p #$state-dir)))) (define (containerd-shepherd-service config) - (let* ((package (docker-configuration-containerd config))) + (let* ((package (docker-configuration-containerd config)) + (debug? (docker-configuration-debug? config))) (shepherd-service (documentation "containerd daemon.") (provision '(containerd)) (start #~(make-forkexec-constructor - (list (string-append #$package "/bin/containerd")) + (list (string-append #$package "/bin/containerd") + #$@(if debug? + '("--log-level=debug") + '())) #:log-file "/var/log/containerd.log")) (stop #~(make-kill-destructor))))) (define (docker-shepherd-service config) (let* ((docker (docker-configuration-docker config)) (enable-proxy? (docker-configuration-enable-proxy? config)) - (proxy (docker-configuration-proxy config))) + (proxy (docker-configuration-proxy config)) + (debug? (docker-configuration-debug? config))) (shepherd-service (documentation "Docker daemon.") (provision '(dockerd)) @@ -101,6 +110,9 @@ loop-back communications.") (start #~(make-forkexec-constructor (list (string-append #$docker "/bin/dockerd") "-p" "/var/run/docker.pid" + #$@(if debug? + '("--debug" "--log-level=debug") + '()) (if #$enable-proxy? "--userland-proxy" "") "--userland-proxy-path" (string-append #$proxy "/bin/proxy")) -- cgit v1.2.3 From 19b464fcb830b96e0d8c7bc93d3eb4dac851ff26 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 3 Jun 2020 11:08:16 -0400 Subject: gnu: python-can: Update to 3.3.3. This fixes the build of python-can, which is very exacting w.r.t. to its dependencies. * gnu/packages/python-xyz.scm (python-can): Update to 3.3.3. [phases]{relax-version-requirements}: New phase. [native-inputs]: Add python-coverage. [license]: Correct the license to lgpl3+. --- gnu/packages/python-xyz.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6aa666430a..2e9f0d5632 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1207,17 +1207,25 @@ class.") (define-public python-can (package (name "python-can") - (version "3.3.2") + (version "3.3.3") (source (origin (method url-fetch) (uri (pypi-uri "python-can" version)) (sha256 (base32 - "0bkbxi45sckzir6s0j3h01pkfn4vkz3ymih2zjp7zw77wz0vbvsz")))) + "123lz1bl6xf3d0fvxzr4bg4884yg4m9s21z6xd2m68zhnbv9rmpc")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'relax-version-requirements + (lambda _ + (substitute* "setup.py" + (("mock~=2\\.0") "mock") + (("coverage<5") "coverage") + (("pytest~=4\\.3") "pytest") + (("hypothesis~=4\\.56") "hypothesis")) + #t)) (add-after 'unpack 'fix-broken-tests ;; The tests try to run two scripts it expects should be ;; in PATH, but they aren't at this time (see: @@ -1232,6 +1240,7 @@ class.") ("python-wrapt" ,python-wrapt))) (native-inputs `(("python-codecov" ,python-codecov) + ("python-coverage" ,python-coverage) ("python-future" ,python-future) ("python-hypothesis" ,python-hypothesis) ("python-mock" ,python-mock) @@ -1246,7 +1255,7 @@ class.") controller area network (CAN) support for Python developers; providing common abstractions to different hardware devices, and a suite of utilities for sending and receiving messages on a CAN bus.") - (license license:gpl3+))) + (license license:lgpl3+))) (define-public python-diskcache (package -- cgit v1.2.3 From 3f9c62d1a8b345909adaeb22f454ad22554c55a1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 3 Jun 2020 14:51:38 +0200 Subject: gnu: shepherd: Update to 0.8.1. * gnu/packages/admin.scm (shepherd): Update to 0.8.1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index bfbd533bcb..77981e520a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -247,14 +247,14 @@ and provides a \"top-like\" mode (monitoring).") (define-public shepherd (package (name "shepherd") - (version "0.8.0") + (version "0.8.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/shepherd/shepherd-" version ".tar.gz")) (sha256 (base32 - "02lbc8z5gd8v8wfi4yh1zww8mk03w0zcwnmk4l4p3vpjlvlb63ll")))) + "0x9zr0x3xvk4qkb6jnda451d5iyrl06cz1bjzjsm0lxvjj3fabyk")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--localstatedir=/var"))) -- cgit v1.2.3 From b6c445931e85c07286a79bc9c80fdc956d58b1e2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 3 Jun 2020 17:22:43 +0200 Subject: doc: Mention Btrfs compression. Suggested by Pierre Neidhardt . * doc/guix.texi (Keyboard Layout and Networking and Partitioning): Mention Btrfs compression. --- doc/guix.texi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index de958c9cf1..056bf011f6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -2279,6 +2279,12 @@ types.}. For the ESP, if you have one and assuming it is mkfs.fat -F32 /dev/sda1 @end example +For the root file system, ext4 is the most widely used format. Other +file systems, such as Btrfs, support compression, which is reported to +nicely complement file deduplication that the daemon performs +independently of the file system (@pxref{Invoking guix-daemon, +deduplication}). + Preferably, assign file systems a label so that you can easily and reliably refer to them in @code{file-system} declarations (@pxref{File Systems}). This is typically done using the @code{-L} option of -- cgit v1.2.3 From d9ef5aeba757c6f86d2abafe6b62ef4c2516c2e6 Mon Sep 17 00:00:00 2001 From: Alexey Abramov Date: Sat, 30 May 2020 19:09:43 +0200 Subject: gnu: java-openjfx-build: Add helpful patch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/java.scm (java-openjfx-build)[source]: Use it. * gnu/packages/patches/java-openjfx-build-jdk_version.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Alexey Abramov Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/java.scm | 3 ++- .../patches/java-openjfx-build-jdk_version.patch | 27 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/java-openjfx-build-jdk_version.patch diff --git a/gnu/local.mk b/gnu/local.mk index babcb8f6ad..01ec893310 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1111,6 +1111,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch \ %D%/packages/patches/java-commons-collections-fix-java8.patch \ %D%/packages/patches/java-jeromq-fix-tests.patch \ + %D%/packages/patches/java-openjfx-build-jdk_version.patch \ %D%/packages/patches/java-powermock-fix-java-files.patch \ %D%/packages/patches/java-simple-xml-fix-tests.patch \ %D%/packages/patches/java-svg-salamander-Fix-non-det.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b12c3ca95c..d569ed57d6 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2499,7 +2499,8 @@ new Date();")) #t)) (sha256 (base32 - "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f")))) + "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f")) + (patches (search-patches "java-openjfx-build-jdk_version.patch")))) (build-system ant-build-system) (arguments `(#:jar-name "java-openjfx.jar" diff --git a/gnu/packages/patches/java-openjfx-build-jdk_version.patch b/gnu/packages/patches/java-openjfx-build-jdk_version.patch new file mode 100644 index 0000000000..7be954467a --- /dev/null +++ b/gnu/packages/patches/java-openjfx-build-jdk_version.patch @@ -0,0 +1,27 @@ +Subject: [PATCH] openjfx: Determine the version of Java in JDK_HOME + +Icedtea contains guix in its version, so build.gradle failes to run. Openjfx +packaging is not trivial, so you will probably need to try build it with +gradlew. + +--- + build.gradle | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/build.gradle b/build.gradle +index df82f63..2c626cd 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -742,9 +742,9 @@ try { + if (inStream.readLine() != null) { + String v = inStream.readLine(); + if (v != null) { +- int ib = v.indexOf(" (build "); ++ int ib = v.indexOf(" (guix build "); + if (ib != -1) { +- String ver = v.substring(ib + 8, v.size() - 1); ++ String ver = v.substring(ib + 13, v.size() - 1); + + defineProperty("jdkRuntimeVersion", ver) + defineProperty("jdkVersion", jdkRuntimeVersion.split("-")[0]) +2.24.1 -- cgit v1.2.3 From c19293ad091ae8bcb96373afd327bcb544879023 Mon Sep 17 00:00:00 2001 From: Alexey Abramov Date: Sat, 30 May 2020 19:09:44 +0200 Subject: gnu: java-openjfx-build: Fix indentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/java.scm (java-openjfx-build)[source]: Change the indentation of the uri dirictive. Signed-off-by: Alexey Abramov Signed-off-by: Ludovic Courtès --- gnu/packages/java.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d569ed57d6..43f0f37b91 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2486,10 +2486,10 @@ new Date();")) (source (origin (method hg-fetch) (uri (hg-reference - (url "http://hg.openjdk.java.net/openjfx/8u-dev/rt") - (changeset (string-append - (string-join (string-split version #\.) "u") - "-ga")))) + (url "http://hg.openjdk.java.net/openjfx/8u-dev/rt") + (changeset (string-append + (string-join (string-split version #\.) "u") + "-ga")))) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 56caf77e0d875a7f44e1f53508bfdd86331dff52 Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Fri, 29 May 2020 19:30:12 +0200 Subject: gnu: Add Polish hunspell dictionary. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libreoffice.scm (hunspell-dict-pl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/libreoffice.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 01d33dc03c..34579a776c 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2018 Jonathan Brielmaier ;;; Copyright © 2019 Chris Marusich +;;; Copyright © 2020 Marcin Karpezo ;;; ;;; This file is part of GNU Guix. ;;; @@ -920,6 +921,56 @@ library.") "toutesvariantes" (synopsis "Hunspell dictionary for all variants of French")) +(define-public hunspell-dict-pl + (package + (name "hunspell-dict-pl") + (version "20200327") + (source + (origin + (method url-fetch) + ;; Since creators of dictionary host only the latest daily release, + ;; we're using version mirrored by Arch Linux, which seems good + ;; enough. They're mirroring hunspell-pl releases since 2011. + (uri (string-append "https://sources.archlinux.org/other/community/" + "hunspell-pl/sjp-myspell-pl-" + version ".zip")) + (sha256 (base32 + "14mzf8glxkp2775dcqisb1zv6r8ncm3bvzl46q352rwyl2dg1c59")))) + + (build-system trivial-build-system) + (native-inputs `(("unzip" ,unzip))) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils) + (srfi srfi-26)) + + (let* ((out (assoc-ref %outputs "out")) + (hunspell (string-append out "/share/hunspell")) + (myspell (string-append out "/share/myspell")) + (doc (string-append out "/share/doc/" + ,name)) + (unzip (string-append (assoc-ref %build-inputs "unzip") + "/bin/unzip"))) + (invoke unzip "-j" "-o" (assoc-ref %build-inputs "source")) + (invoke unzip "-j" "-o" "pl_PL.zip") + (for-each (cut install-file <> hunspell) + (find-files "." + ,(string-append "pl_PL" + "\\.(dic|aff)$"))) + (mkdir-p myspell) + (symlink hunspell (string-append myspell "/dicts")) + (for-each (cut install-file <> doc) + (find-files "." "\\.(txt|org|md)$")) + #t)))) + (synopsis "Hunspell dictionary for Polish") + (description + "This package provides a dictionary for the Hunspell spell-checking +library.") + (home-page "https://sjp.pl/slownik/ort/") + (license + (list license:gpl2 license:mpl1.1 license:cc-by4.0 license:lgpl2.1 license:asl2.0)))) + (define-public hyphen (package (name "hyphen") -- cgit v1.2.3 From 639bcf205d55c7a0c6d0894b4e7a814a86d3b9a9 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 30 May 2020 19:10:30 +0200 Subject: gnu: Add mergerfs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/storage.scm (mergerfs): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/file-systems.scm | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 1f58917d0c..bb435d7ac0 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -682,3 +682,50 @@ APFS.") originally developed for Solaris and is now maintained by the OpenZFS community.") (license license:cddl1.0))) + +(define-public mergerfs + (package + (name "mergerfs") + (version "2.29.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/trapexit/mergerfs/releases/download/" + version "/mergerfs-" version ".tar.gz")) + (sha256 + (base32 + "17gizw4vgbqqjd2ykkfpp276942jb5qclp0lkiwkmq1yjgyjqfmk")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No tests exist. + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (setenv "CC" "gcc") + ;; These were copied from the package libfuse. + (substitute* '("libfuse/lib/mount_util.c" "libfuse/util/mount_util.c") + (("/bin/(u?)mount" _ maybe-u) + (string-append (assoc-ref inputs "util-linux") + "/bin/" maybe-u "mount"))) + (substitute* '("libfuse/util/mount.mergerfs.c") + (("/bin/sh") + (which "sh"))) + ;; The Makefile does not allow overriding PREFIX via make variables. + (substitute* '("Makefile" "libfuse/Makefile") + (("= /usr/local") (string-append "= " (assoc-ref outputs "out"))) + ;; cannot chown as build user + (("chown root:root") "true")) + #t))))) + ;; mergerfs bundles a heavily modified copy of libfuse. + (inputs `(("util-linux" ,util-linux))) + (home-page "https://github.com/trapexit/mergerfs") + (synopsis "Featureful union filesystem") + (description "mergerfs is a union filesystem geared towards simplifying +storage and management of files across numerous commodity storage devices. It +is similar to mhddfs, unionfs, and aufs.") + (license (list + license:isc ; mergerfs + license:gpl2 license:lgpl2.0 ; Imported libfuse code. + )))) -- cgit v1.2.3 From 4960a955f8f77cc4c35d0db749cd6f3de8787bff Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 30 May 2020 19:10:55 +0200 Subject: gnu: Add mergerfs-tools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/storage.scm (mergerfs-tools): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/file-systems.scm | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index bb435d7ac0..ca02a1e593 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -27,6 +27,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system linux-module) #:use-module (guix build-system trivial) @@ -53,7 +54,9 @@ #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages rsync) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) @@ -729,3 +732,53 @@ is similar to mhddfs, unionfs, and aufs.") license:isc ; mergerfs license:gpl2 license:lgpl2.0 ; Imported libfuse code. )))) + +(define-public mergerfs-tools + (let ((commit "c926779d87458d103f3b674603bf97801ae2486d") + (revision "1")) + (package + (name "mergerfs-tools") + ;; No released version exists. + (version (git-version "0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/trapexit/mergerfs-tools.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04hhwcib0xv4cf1mkj8zrp2aqpxkncml9iqg4m1mz6a5zhzsk0vm")))) + (build-system copy-build-system) + (inputs + `(("python" ,python) + ("python-xattr" ,python-xattr) + ("rsync" ,rsync))) + (arguments + '(#:install-plan + '(("src/" "bin/")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "src" "^mergerfs\\.") + (("'rsync'") + (string-append "'" (assoc-ref inputs "rsync") "/bin/rsync'")) + (("'rm'") + (string-append "'" (assoc-ref inputs "coreutils") "/bin/rm'"))) + (substitute* "src/mergerfs.mktrash" + (("xattr") + (string-append (assoc-ref inputs "python-xattr") "/bin/xattr")) + (("mkdir") + (string-append (assoc-ref inputs "coreutils") "/bin/mkdir"))) + #t))))) + (synopsis "Tools to help manage data in a mergerfs pool") + (description "mergerfs-tools is a suite of programs that can audit +permissions and ownership of files and directories on a mergerfs volume, +duplicates files and directories across branches in its pool, find and remove +duplicate files, balance pool drives, consolidate files in a single mergerfs +directory onto a single drive and create FreeDesktop.org Trash specification +compatible directories.") + (home-page "https://github.com/trapexit/mergerfs-tools") + (license license:isc)))) -- cgit v1.2.3 From 6aec7e2ec14dc86890c1e7ad142899a83736e10a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 19:56:37 +0200 Subject: gnu: hcxdumptool: Update to 6.0.6. * gnu/packages/networking.scm (hcxdumptool): Update to 6.0.6. [inputs]: Add openssl. --- gnu/packages/networking.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index df996d8b91..84535bda63 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2612,7 +2612,7 @@ packets from wireless devices for use with hashcat or John the Ripper.") (define-public hcxdumptool (package (name "hcxdumptool") - (version "5.2.0") + (version "6.0.6") (source (origin (method git-fetch) @@ -2620,7 +2620,7 @@ packets from wireless devices for use with hashcat or John the Ripper.") (url "https://github.com/ZerBea/hcxdumptool.git") (commit version))) (sha256 - (base32 "0pg1pvg029gm4rj0fj5kcsjb32hixgn4cxsgiir7spkmacf1qm4q")) + (base32 "1b4d543y64ib92w9gcmiyjn5hz2vyjqmxk3f3yr1zk04fhw16gmf")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -2631,6 +2631,8 @@ packets from wireless devices for use with hashcat or John the Ripper.") #:phases (modify-phases %standard-phases (delete 'configure)))) + (inputs + `(("openssl" ,openssl))) (home-page "https://github.com/ZerBea/hcxdumptool") (synopsis "Small tool to capture packets from wlan devices") (description -- cgit v1.2.3 From 39a598c686839d65a61ec1ebb982bd5896f3d7e4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 19:56:47 +0200 Subject: gnu: hcxdumptool: Fix cross-compilation. * gnu/packages/networking.scm (hcxdumptool)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 84535bda63..7dfdf8c0a1 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2625,7 +2625,7 @@ packets from wireless devices for use with hashcat or John the Ripper.") (build-system gnu-build-system) (arguments `(#:make-flags - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) (string-append "INSTALLDIR=" (assoc-ref %outputs "out") "/bin")) #:tests? #f ; no test suite #:phases -- cgit v1.2.3 From bb79af865a032f6a2477bfefe49a3e6125439893 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 19:59:50 +0200 Subject: gnu: ocaml-extlib: Update to 1.7.7. * gnu/packages/ocaml.scm (ocaml-extlib): Update to 1.7.7. [source]: Update TLD. --- gnu/packages/ocaml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 99f4518719..d9ba2aee2d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -267,14 +267,14 @@ for building OCaml library and programs.") (define-public ocaml-extlib (package (name "ocaml-extlib") - (version "1.7.6") + (version "1.7.7") (source (origin (method url-fetch) - (uri (string-append "https://ygrek.org.ua/p/release/ocaml-extlib/" + (uri (string-append "https://ygrek.org/p/release/ocaml-extlib/" "extlib-" version ".tar.gz")) (sha256 (base32 - "0wfs20v1yj5apdbj7214wdsr17ayh0qqq7ihidndvc8nmmwfa1dz")))) + "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1")))) (build-system ocaml-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6810e9fe842664e3e3dd0f63c6ab7af61d4631ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 20:00:03 +0200 Subject: gnu: perl-net-dns: Update to 1.24. * gnu/packages/networking.scm (perl-net-dns): Update to 1.24. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7dfdf8c0a1..3ad68ad070 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1286,7 +1286,7 @@ private (reserved).") (define-public perl-net-dns (package (name "perl-net-dns") - (version "1.21") + (version "1.24") (source (origin (method url-fetch) @@ -1297,7 +1297,7 @@ private (reserved).") (string-append "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-" version ".tar.gz"))) (sha256 - (base32 "0yknrsh0wqr9s43c0wf3dyzrsi2r7k0v75hay74gqkq850xy3vyx")))) + (base32 "0qyy5k4k0llqjjmkkfg96919gqybdc1z5fy9047n9imidjxc59hi")))) (build-system perl-build-system) (inputs `(("perl-digest-hmac" ,perl-digest-hmac))) -- cgit v1.2.3 From eb683ebb87faeebc0ac1ba7ab319b2fd0e9ba0be Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 20:05:26 +0200 Subject: gnu: lsp-plugins: Update to 1.1.22. * gnu/packages/music.scm (lsp-plugins): Update to 1.1.22. --- gnu/packages/music.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ac149a804c..24192f89c7 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4872,7 +4872,7 @@ and reverb.") (define-public lsp-plugins (package (name "lsp-plugins") - (version "1.1.21") + (version "1.1.22") (source (origin (method git-fetch) @@ -4881,8 +4881,7 @@ and reverb.") (commit (string-append "lsp-plugins-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1zw0iip6ki9k65kh8dp53x7l4va4mi5rj793n2yn4p9y84qzwrz9")))) + (base32 "0s0i0kf5nqxxywckg03fds1w7696ly60rnlljzqvp7qfgzps1r6c")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 5122961329906dd1cd721ad3d0659ce4038f6cc8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 20:05:52 +0200 Subject: gnu: ncdu: Update to 1.15. * gnu/packages/ncdu.scm (ncdu): Update to 1.15. --- gnu/packages/ncdu.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index 720b8a7858..e59e0334b7 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -28,14 +28,14 @@ (define-public ncdu (package (name "ncdu") - (version "1.14.2") + (version "1.15") (source (origin (method url-fetch) (uri (string-append "https://dev.yorhel.nl/download/ncdu-" version ".tar.gz")) (sha256 (base32 - "1cf6a9qw7ljaw09b0g7c5i252dl7wb2mnkrbwwwf7m0c3mf7yyll")))) + "1ywpa8yg74a5xa46f0qig92xw5z5s1lmspwzcslr497brk2ksnaa")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) (synopsis "Ncurses based disk usage analyzer") -- cgit v1.2.3 From b3ece3ba1691c358d98283bf23fa7ac7cf632fff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 20:44:47 +0200 Subject: gnu: mpg123: Update to 1.26.1. * gnu/packages/mp3.scm (mpg123): Update to 1.26.1. --- gnu/packages/mp3.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 60ef5560a1..2a4ca555dc 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -309,7 +309,7 @@ This package contains the binary.") (define-public mpg123 (package (name "mpg123") - (version "1.26.0") + (version "1.26.1") (source (origin (method url-fetch) @@ -319,7 +319,7 @@ This package contains the binary.") "https://www.mpg123.org/download/mpg123-" version ".tar.bz2"))) (sha256 - (base32 "0s62k45mz6264h0ljkrrs9vyagvl78q9pxhi7dnbk56pmgs0br74")))) + (base32 "0cp01wdy77ggzqzzasxd5jd9iypcly5m4c89idc9mpgknyd65mkl")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-default-audio=pulse"))) (native-inputs -- cgit v1.2.3 From 6b8ad47b2afb2b017a4f44471fc460795719d0d7 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:45:05 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.226. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.226. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0a935d529d..efd02b9902 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,10 +409,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.225") +(define-public linux-libre-4.4-version "4.4.226") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0pn66hf9yrjg15skq1inscr5m0slvgsd2qm8rg5id70llrb4jis9"))) + (hash (base32 "1dwvm81i62b06jsl38spfn719zrsbwq5z8viwckrpw4ma4w9k0j1"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From c77b62ca5cc02cef0ee4a324645e843a9c528e75 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:46:02 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.226. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.226. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index efd02b9902..23d58beb79 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -401,10 +401,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.225") +(define-public linux-libre-4.9-version "4.9.226") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1s63aymgsc4lsysy9d972ps9cyrf6bncyy5wcpv5a3wbaj678iz5"))) + (hash (base32 "1jj5ydz5cy87z7hrv54bkyl9739lpzja8580ngjhrip5iwb8q2j6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From f2a65479becef076584888d535bcc471a557f7aa Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:46:30 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.183. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.183. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 23d58beb79..bdc8ef9761 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -393,10 +393,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.182") +(define-public linux-libre-4.14-version "4.14.183") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "142v7qnfska86jqzilwq00kxdrq08iaaaw7f47xp9bnhb8fiy7b7"))) + (hash (base32 "11c0vd2pwplm8wafich4zg2mnp10vvnap987c5jh96w1avpsyra2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 644690b3e2d3bcb565ce796b096bb05d6944d690 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:47:09 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.126. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.126. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bdc8ef9761..e86baed959 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -385,10 +385,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.125") +(define-public linux-libre-4.19-version "4.19.126") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0zmxs6q2rgssvsh76xq9xgcax7bps19x2448d1q1fj9pzc7g8hwq"))) + (hash (base32 "129ziwvk3f4xh8jvnq2krajc0bnrl2zxffqsiz63j7p3vc57wakf"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From f52504a92c45545a754df7af5e952ba141e3b367 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:47:44 -0400 Subject: gnu: linux-libre@5.6: Update to 5.6.16. * gnu/packages/linux.scm (linux-libre-5.6-version): Update to 5.6.16. (linux-libre-5.6-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e86baed959..9beb764a39 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,10 +369,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) -(define-public linux-libre-5.6-version "5.6.15") +(define-public linux-libre-5.6-version "5.6.16") (define-public linux-libre-5.6-pristine-source (let ((version linux-libre-5.6-version) - (hash (base32 "0kh34f9vdfsi9g83fa1i1926djyzfi466w02c4y4d46ljf9pkav5"))) + (hash (base32 "1xvwk6yxi5nhiwhskpmr89a31286mw9hpm0y3l3i5ydswx6lnl15"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.6))) -- cgit v1.2.3 From 3daf7bc169561eadf986ca4477549c562c65b9ff Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:48:20 -0400 Subject: gnu: linux-libre: Update to 5.4.44. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.44. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9beb764a39..35b4d73b51 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -377,10 +377,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.6))) -(define-public linux-libre-5.4-version "5.4.43") +(define-public linux-libre-5.4-version "5.4.44") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0i07g72138xdf1l8x593jndq0waf3fx7plz3m6n5f9fl885bjrr6"))) + (hash (base32 "0fc4nsv1zwlknvfv1bzkjlq2vlx28wfl09hg2p7r8cn7a77bphlp"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 4c8700fd844d24f52c54966467765f14dca6510c Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Wed, 3 Jun 2020 21:21:34 +0200 Subject: gnu: sameboy: Update to 0.13.1 [security fix]. * gnu/packages/emulators.scm (sameboy): Update to 0.13.1. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 14c438337c..9798ac370e 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -470,7 +470,7 @@ and Game Boy Color games.") (define-public sameboy (package (name "sameboy") - (version "0.13") + (version "0.13.1") (source (origin (method git-fetch) @@ -479,7 +479,7 @@ and Game Boy Color games.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0cp126sd76h1c6pj7cmsgzn5kd471524ikhyspv7flcm8nmz9mq0")))) + (base32 "1il2bpbc3xyvvhbs2bgid64svjxcdl4dbqz6jy1azfmvzdp7jkrn")))) (build-system gnu-build-system) (native-inputs `(("rgbds" ,rgbds) -- cgit v1.2.3 From 026609453176f67d2f28871af114d3d6a9544c2a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Jun 2020 11:54:38 +0200 Subject: gnu: python-pypairix: Update to 0.3.7 and build programs. * gnu/packages/bioinformatics.scm (python-pypairix): Update to 0.3.7. [source]: Fetch from github. [arguments]: Add phases "build-programs" and "install-programs". --- gnu/packages/bioinformatics.scm | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8d1adafd7e..54cdb353c1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13788,18 +13788,31 @@ bound.") (define-public python-pypairix (package (name "python-pypairix") - (version "0.3.6") + (version "0.3.7") + ;; The tarball on pypi does not include the makefile to build the + ;; programs. (source (origin - (method url-fetch) - (uri (pypi-uri "pypairix" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/4dn-dcic/pairix.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0zs92b74s5v4xy2h16s15f3z6l4nnbw8x8zyif7xx5xpafjn0xss")))) + "1snr3lrmsld8sy77ng6ba6wcmd33xjccf1l2f3m6pi29xis9nd6p")))) (build-system python-build-system) - ;; FIXME: the tests fail because test.support cannot be loaded: - ;; ImportError: cannot import name 'support' - (arguments '(#:tests? #f)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'build-programs + (lambda _ (invoke "make"))) + (add-after 'install 'install-programs + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "bin" (string-append + (assoc-ref outputs "out") + "/bin")) + #t))))) (inputs `(("zlib" ,zlib))) (home-page "https://github.com/4dn-dcic/pairix") -- cgit v1.2.3 From 8b158e8b2cd0293eeebe73f5a71f0c513a89d606 Mon Sep 17 00:00:00 2001 From: Caleb Ristvedt Date: Tue, 2 Jun 2020 06:28:46 -0500 Subject: xorg: honor xorg-configuration-server in xorg-configuration->file Fixes . Previously the xorg-server package specified in the configuration was ignored entirely in xorg-configuration->file. This had the effect that while the X program of the configured package would be executed, the modules of the configured package would be ignored in favor of the default xorg-server package's modules. This fixes that. * gnu/services/xorg.scm (xorg-configuration->file): honor xorg-configuration-server. --- gnu/services/xorg.scm | 161 +++++++++++++++++++++++++------------------------- 1 file changed, 81 insertions(+), 80 deletions(-) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 2505bde97b..ca39994516 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -180,31 +180,32 @@ (define (xorg-configuration->file config) "Compute an Xorg configuration file corresponding to CONFIG, an record." - (define all-modules - ;; 'xorg-server' provides 'fbdevhw.so' etc. - (append (xorg-configuration-modules config) - (list xorg-server))) - - (define build - #~(begin - (use-modules (ice-9 match) - (srfi srfi-1) - (srfi srfi-26)) - - (call-with-output-file #$output - (lambda (port) - (define drivers - '#$(xorg-configuration-drivers config)) + (let ((xorg-server (xorg-configuration-server config))) + (define all-modules + ;; 'xorg-server' provides 'fbdevhw.so' etc. + (append (xorg-configuration-modules config) + (list xorg-server))) + + (define build + #~(begin + (use-modules (ice-9 match) + (srfi srfi-1) + (srfi srfi-26)) + + (call-with-output-file #$output + (lambda (port) + (define drivers + '#$(xorg-configuration-drivers config)) - (define (device-section driver) - (string-append " + (define (device-section driver) + (string-append " Section \"Device\" Identifier \"device-" driver "\" Driver \"" driver "\" EndSection")) - (define (screen-section driver resolutions) - (string-append " + (define (screen-section driver resolutions) + (string-append " Section \"Screen\" Identifier \"screen-" driver "\" Device \"device-" driver "\" @@ -218,8 +219,8 @@ Section \"Screen\" EndSubSection EndSection")) - (define (input-class-section layout variant model options) - (string-append " + (define (input-class-section layout variant model options) + (string-append " Section \"InputClass\" Identifier \"evdev keyboard catchall\" MatchIsKeyboard \"on\" @@ -243,69 +244,69 @@ Section \"InputClass\" Driver \"evdev\" EndSection\n")) - (define (expand modules) - ;; Append to MODULES the relevant /lib/xorg/modules - ;; sub-directories. - (append-map (lambda (module) - (filter-map (lambda (directory) - (let ((full (string-append module - directory))) - (and (file-exists? full) - full))) - '("/lib/xorg/modules/drivers" - "/lib/xorg/modules/input" - "/lib/xorg/modules/multimedia" - "/lib/xorg/modules/extensions"))) - modules)) - - (display "Section \"Files\"\n" port) - (for-each (lambda (font) - (format port " FontPath \"~a\"~%" font)) - '#$(xorg-configuration-fonts config)) - (for-each (lambda (module) - (format port - " ModulePath \"~a\"~%" - module)) - (append (expand '#$all-modules) - - ;; For fbdevhw.so and so on. - (list #$(file-append xorg-server - "/lib/xorg/modules")))) - (display "EndSection\n" port) - (display " + (define (expand modules) + ;; Append to MODULES the relevant /lib/xorg/modules + ;; sub-directories. + (append-map (lambda (module) + (filter-map (lambda (directory) + (let ((full (string-append module + directory))) + (and (file-exists? full) + full))) + '("/lib/xorg/modules/drivers" + "/lib/xorg/modules/input" + "/lib/xorg/modules/multimedia" + "/lib/xorg/modules/extensions"))) + modules)) + + (display "Section \"Files\"\n" port) + (for-each (lambda (font) + (format port " FontPath \"~a\"~%" font)) + '#$(xorg-configuration-fonts config)) + (for-each (lambda (module) + (format port + " ModulePath \"~a\"~%" + module)) + (append (expand '#$all-modules) + + ;; For fbdevhw.so and so on. + (list #$(file-append xorg-server + "/lib/xorg/modules")))) + (display "EndSection\n" port) + (display " Section \"ServerFlags\" Option \"AllowMouseOpenFail\" \"on\" EndSection\n" port) - (display (string-join (map device-section drivers) "\n") - port) - (newline port) - (display (string-join - (map (cut screen-section <> - '#$(xorg-configuration-resolutions config)) - drivers) - "\n") - port) - (newline port) - - (let ((layout #$(and=> (xorg-configuration-keyboard-layout config) - keyboard-layout-name)) - (variant #$(and=> (xorg-configuration-keyboard-layout config) - keyboard-layout-variant)) - (model #$(and=> (xorg-configuration-keyboard-layout config) - keyboard-layout-model)) - (options '#$(and=> (xorg-configuration-keyboard-layout config) - keyboard-layout-options))) - (when layout - (display (input-class-section layout variant model options) - port) - (newline port))) - - (for-each (lambda (config) - (display config port)) - '#$(xorg-configuration-extra-config config)))))) - - (computed-file "xserver.conf" build)) + (display (string-join (map device-section drivers) "\n") + port) + (newline port) + (display (string-join + (map (cut screen-section <> + '#$(xorg-configuration-resolutions config)) + drivers) + "\n") + port) + (newline port) + + (let ((layout #$(and=> (xorg-configuration-keyboard-layout config) + keyboard-layout-name)) + (variant #$(and=> (xorg-configuration-keyboard-layout config) + keyboard-layout-variant)) + (model #$(and=> (xorg-configuration-keyboard-layout config) + keyboard-layout-model)) + (options '#$(and=> (xorg-configuration-keyboard-layout config) + keyboard-layout-options))) + (when layout + (display (input-class-section layout variant model options) + port) + (newline port))) + + (for-each (lambda (config) + (display config port)) + '#$(xorg-configuration-extra-config config)))))) + + (computed-file "xserver.conf" build))) (define (xorg-configuration-directory modules) "Return a directory that contains the @code{.conf} files for X.org that -- cgit v1.2.3 From c987b72382e739bf887849b02c533eda317ea52b Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Wed, 3 Jun 2020 21:05:30 +0200 Subject: doc: cookbook: Add entry about getting substitutes through Tor. * doc/guix-cookbook.texi (Getting substitutes from Tor): New section. --- doc/guix-cookbook.texi | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 5574a60857..1342826c97 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -14,6 +14,7 @@ Copyright @copyright{} 2019 Pierre Neidhardt@* Copyright @copyright{} 2020 Oleg Pykhalov@* Copyright @copyright{} 2020 Matthew Brooks@* Copyright @copyright{} 2020 Marcin Karpezo@* +Copyright @copyright{} 2020 Brice Waegeneire@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -1326,6 +1327,7 @@ reference. * Connecting to Wireguard VPN:: Connecting to a Wireguard VPN. * Customizing a Window Manager:: Handle customization of a Window manager on Guix System. * Setting up a bind mount:: Setting up a bind mount in the file-systems definition. +* Getting substitutes from Tor:: Configuring Guix daemon to get substitutes through Tor. @end menu @node Customizing the Kernel @@ -1785,6 +1787,62 @@ mount itself. )) @end lisp +@node Getting substitutes from Tor +@section Getting substitutes from Tor + +Guix daemon can use a HTTP proxy to get substitutes, here we are +configuring it to get them via Tor. + +@quotation Warning +@emph{Not all} Guix daemon's traffic will go through Tor! Only +HTTP/HTTPS will get proxied; FTP, Git protocol, SSH, etc connections +will still go through the clearnet. Again, this configuration isn't +foolproof some of your traffic won't get routed by Tor at all. Use it +at your own risk. +@end quotation + +Guix's substitute server is available as a Onion service, if you want +to use it to get your substitutes from Tor configure your system as +follow: + +@lisp +(use-modules (gnu)) +(use-service-module base networking) + +(operating-system + … + (services + (cons + (service tor-service-type + (tor-configuration + (config-file (plain-file "tor-config" + "HTTPTunnelPort 127.0.0.1:9250")))) + (modify-services %base-services + (guix-service-type + config => (guix-configuration + (inherit config) + ;; ci.guix.gnu.org's Onion service + (substitute-urls "https://bp7o7ckwlewr4slm.onion") + (http-proxy "http://localhost:9250"))))))) +@end lisp + +This will keep a tor process running that provides a HTTP CONNECT tunnel +which will be used by @command{guix-daemon}. The daemon can use other +protocols than HTTP(S) to get remote resources, request using those +protocols won't go through Tor since we are only setting a HTTP tunnel +here. Note that @code{substitutes-urls} is using HTTPS and not HTTP or +it won't work, that's a limitation of Tor's tunnel; you may want to use +@command{privoxy} instead to avoid such limitations. + +If you don't want to always get substitutes through Tor but using it just +some of the times, then skip the @code{guix-configuration}. When you +want to get a substitute from the Tor tunnel run: + +@example +sudo herd set-http-proxy guix-daemon http://localhost:9250 +guix build --substitute-urls=https://bp7o7ckwlewr4slm.onion … +@end example + @c ********************************************************************* @node Advanced package management @chapter Advanced package management -- cgit v1.2.3 From 4a6a6f1a2a121687303bf02de2db2714f8467abd Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Thu, 4 Jun 2020 14:55:19 +0200 Subject: gnu: Add emacs-glsl-mode. * gnu/packages/emacs-xyz.scm (emacs-glsl-mode): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0f547425a0..dfdc40bcc6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22693,6 +22693,32 @@ sense in the @samp{To} and @samp{Cc} headers). When in the message body, this executes a different function (default: @code{indent-relative}).") (license license:gpl2+)))) +(define-public emacs-glsl-mode + ;; No tag, version grabbed from source .el file. + (let ((commit "b07112016436d9634cd4ef747f9af6b01366d136") + (revision "0")) + (package + (name "emacs-glsl-mode") + (version (git-version "2.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jimhourihan/glsl-mode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bav9ipfm0vy26n74ngsmjzc7fsyqz6xmriadzx55s44h8p5dn1s")))) + (build-system emacs-build-system) + (home-page "https://github.com/jimhourihan/glsl-mode") + (synopsis "Major mode for Open GLSL shader files") + (description + "This package provides a major mode for editing OpenGLSL grammar files, +usually files ending with @file{.vert}, @file{.frag}, @file{.glsl} or +@file{.geom}. It is based on C mode plus some features and pre-specified +fontifications.") + (license license:gpl3+)))) + (define-public emacs-gnus-harvest (let ((commit "feda071a87b799bd5d23cacde3ee71f0b166e75d") (revision "0")) -- cgit v1.2.3 From f0dab65663651a879882f975d5dd6824e8795e7d Mon Sep 17 00:00:00 2001 From: Simon South Date: Wed, 3 Jun 2020 21:22:21 -0400 Subject: gnu: emacs-nov-el: Update to 0.3.0. * gnu/packages/emacs-xyz.scm (emacs-nov-el): Update to 0.3.0. [home-page, source]: Use new upstream URIs. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dfdc40bcc6..bf89f8455e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12428,16 +12428,16 @@ the format.") (define-public emacs-nov-el (package (name "emacs-nov-el") - (version "0.2.9") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wasamasa/nov.el.git") - (commit version))) + (url "https://depp.brause.cc/nov.el.git") + (commit "ea0c835c1b5e6e70293f4bd64e9c89bdc42f8596"))) (file-name (git-file-name name version)) (sha256 (base32 - "0v01l1p35mcigixs6j4c5bpc7n7bd51kxa0p3l1xl0gr92774yq3")))) + "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz")))) (build-system emacs-build-system) (arguments `(#:phases @@ -12453,7 +12453,7 @@ the format.") ("emacs-esxml" ,emacs-esxml))) (inputs `(("unzip" ,unzip))) - (home-page "https://github.com/wasamasa/nov.el/") + (home-page "https://depp.brause.cc/nov.el/") (synopsis "Major mode for reading EPUBs in Emacs") (description "@code{nov.el} provides a major mode for reading EPUB documents. -- cgit v1.2.3 From 398ec3c1e265a3f89ed07987f33b264db82e4080 Mon Sep 17 00:00:00 2001 From: Simon South Date: Wed, 3 Jun 2020 21:48:41 -0400 Subject: gnu: emacs-elpher: Update to 2.7.9. * gnu/packages/emacs-xyz.scm (emacs-elpher): Update to 2.7.9. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bf89f8455e..8b06ead381 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20866,7 +20866,7 @@ it forcibly (define-public emacs-elpher (package (name "emacs-elpher") - (version "2.7.8") + (version "2.7.9") (source (origin (method git-fetch) @@ -20876,7 +20876,7 @@ it forcibly (file-name (git-file-name name version)) (sha256 (base32 - "1x86c2lmqpmi5my356iz7lbygwpmp956dc50ng762ld0savzxff0")))) + "1vikzia87z5x3wx2qjihv0r2f29b7s9xkm6i1j0y646dwnzn6wzr")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) -- cgit v1.2.3 From 3d8496705d5c4aa3c7253750dbc93ec513e94ffe Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jun 2020 15:31:59 +0200 Subject: gnu: emacs-nov-el: Add comment about upstream not tagging releases. * gnu/packages/emacs-xyz.scm (emacs-nov-el): Add a comment. Fix indentation. --- gnu/packages/emacs-xyz.scm | 65 ++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8b06ead381..1f509a37a9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12426,36 +12426,39 @@ the format.") (license license:gpl3+))) (define-public emacs-nov-el - (package - (name "emacs-nov-el") - (version "0.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://depp.brause.cc/nov.el.git") - (commit "ea0c835c1b5e6e70293f4bd64e9c89bdc42f8596"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz")))) - (build-system emacs-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'embed-path-to-unzip - (lambda _ - (substitute* "nov.el" - (("\\(executable-find \"unzip\"\\)") - (string-append "\"" (which "unzip") "\""))) - #t))))) - (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-esxml" ,emacs-esxml))) - (inputs - `(("unzip" ,unzip))) - (home-page "https://depp.brause.cc/nov.el/") - (synopsis "Major mode for reading EPUBs in Emacs") - (description "@code{nov.el} provides a major mode for reading EPUB + ;; Upstream does not tag releases. Specify raw commit hash matching the + ;; release. + (let ((commit "ea0c835c1b5e6e70293f4bd64e9c89bdc42f8596")) + (package + (name "emacs-nov-el") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://depp.brause.cc/nov.el.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'embed-path-to-unzip + (lambda _ + (substitute* "nov.el" + (("\\(executable-find \"unzip\"\\)") + (string-append "\"" (which "unzip") "\""))) + #t))))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-esxml" ,emacs-esxml))) + (inputs + `(("unzip" ,unzip))) + (home-page "https://depp.brause.cc/nov.el/") + (synopsis "Major mode for reading EPUBs in Emacs") + (description "@code{nov.el} provides a major mode for reading EPUB documents. Features: @@ -12472,7 +12475,7 @@ Features: @item Image rescaling @end itemize ") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public epipe (package -- cgit v1.2.3 From 415b90f24ee83059102f5fb0ce74a2bc0954fe58 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Tue, 2 Jun 2020 21:32:32 +0200 Subject: gnu: network-manager-applet: Propagate 'libnma'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/gnome.scm (network-manager-applet)[inputs]: Move 'libnma' to … [propagated-inputs]: … here. Signed-off-by: Efraim Flashner --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2be117d21b..7335dc1cd6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6807,10 +6807,11 @@ Cisco's AnyConnect SSL VPN.") ;; libnm-gtk.pc refers to all these. `(("dbus-glib" ,dbus-glib) ("gtk+" ,gtk+) - ("network-manager" ,network-manager))) + ("network-manager" ,network-manager) + ;; nm-applet need by org.gnome.nm-applet.gschema.xml + ("libnma" ,libnma))) (inputs `(("gcr" ,gcr) - ("libnma" ,libnma) ("libgudev" ,libgudev) ("libnotify" ,libnotify) ("libsecret" ,libsecret) -- cgit v1.2.3 From 55cdcf5f5582efb91242e7c1495ff1a2f8614a27 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 4 Jun 2020 10:30:05 -0500 Subject: gnu: emacs-slack: Update to a6d9f49. * gnu/packages/emacs-xyz.scm (emacs-slack): Update to a6d9f49. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1f509a37a9..d7975707d3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11899,8 +11899,8 @@ through them using @key{C-c C-SPC}.") (license license:gpl3+))) (define-public emacs-slack - (let ((commit "b7b9eada0bf62d40dfe764b00f55913a2d3d742e") - (revision "7")) + (let ((commit "a6d9f49bc6161f12c594d25254e77eedf4a67666") + (revision "8")) (package (name "emacs-slack") (version (git-version "0.0.2" revision commit)) @@ -11912,7 +11912,7 @@ through them using @key{C-c C-SPC}.") (file-name (git-file-name name commit)) (sha256 (base32 - "0cqr7jnfxzb0z2wy79pdwpv9cvmawjif1kin3zbp8q7zhwrq09v0")))) + "0crjjankqi4bqjk5pdz4r2ixf56n1nnq8ab1gz3sbl3v6as6262w")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 2ca87aecd106afcf26c130d27b37583bfcc3e095 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 4 Jun 2020 10:45:44 -0500 Subject: gnu: emacs-treemacs: Update to 2.8. * gnu/packages/emacs-xyz.scm (emacs-treemacs): Update to 2.8. [arguments]: Do not prepare dependencies before testing. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d7975707d3..87797aabcc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19047,7 +19047,7 @@ processes for Emacs") (define-public emacs-treemacs (package (name "emacs-treemacs") - (version "2.6") + (version "2.8") (source (origin (method git-fetch) (uri (git-reference @@ -19056,7 +19056,7 @@ processes for Emacs") (file-name (git-file-name name version)) (sha256 (base32 - "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1")))) + "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) @@ -19078,7 +19078,9 @@ processes for Emacs") (add-after 'unpack 'fix-makefile (lambda _ (substitute* "Makefile" - (("@\\$\\(CASK\\) exec ") "")) + (("@\\$\\(CASK\\) exec ") "") + ;; Guix does not need to prepare dependencies before testing. + (("test: prepare") "test:")) #t)) (add-after 'fix-makefile 'chdir-elisp ;; Elisp directory is not in root of the source. -- cgit v1.2.3 From 790ada9168e0689c1c4607c61cdc1d2dbc327abf Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sat, 30 May 2020 14:49:45 +0200 Subject: gnu: autorandr: Fix typo. * gnu/packages/xdisorg.scm (autorandr)[arguments]: Fix typo in bash completion directory. --- gnu/packages/xdisorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index ee6b1a9ffd..d4acd90154 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -201,7 +201,7 @@ program.") (invoke "make" (string-append "DESTDIR=" (assoc-ref outputs "out")) "PREFIX=" - "BASH_COMPLETIONS_DIR=etc/bash_completiond.d" + "BASH_COMPLETIONS_DIR=etc/bash_completion.d" "install" "TARGETS=autorandr launcher manpage bash_completion")))))) (synopsis "Auto-detect connected displays and load appropriate setup") -- cgit v1.2.3 From 80cd90ef30e78e3b483ee1d00993c9a9a4a096ac Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Thu, 4 Jun 2020 12:42:30 -0700 Subject: gnu: Add emacs-meson-mode. * gnu/packages/emacs-xyz.scm (emacs-meson-mode): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 87797aabcc..188ecf45b6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22671,6 +22671,28 @@ two user-defined directories, as well as using more descriptive names for files and subdirectories when appropriate.") (license license:gpl3+))) +(define-public emacs-meson-mode + (package + (name "emacs-meson-mode") + (version "0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wentasah/meson-mode.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1720b3hpfqd989zrgcns51jbjrv4vzl9di9mccl55vkmkbqzfin0")))) + (build-system emacs-build-system) + (home-page "https://github.com/wentasah/meson-mode") + (synopsis "Major mode for Meson build system files") + (description + "This is an Emacs major mode for Meson build system files. Syntax +highlighting works reliably. Indentation works too, but there are probably +cases where it breaks.") + (license license:gpl3+))) + (define-public emacs-message-x ;; Use the latest commit, as there are no tagged releases. (let ((commit "5524de7bbfdd8749c110f48de5afb024d9f83133") -- cgit v1.2.3 From 20a9d2f2804fef79afbcfb46ea793a8362e6b92b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jun 2020 23:23:38 +0200 Subject: gnu: emacs-modus-vivendi-theme: Update to 0.9.0. * gnu/packages/emacs-xyz.scm (emacs-modus-vivendi-theme): Update to 0.9.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 188ecf45b6..d5c3896c05 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21468,14 +21468,14 @@ standard. This is the highest standard of its kind.") (define-public emacs-modus-vivendi-theme (package (name "emacs-modus-vivendi-theme") - (version "0.8.1") + (version "0.9.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "modus-vivendi-theme-" version ".el")) (sha256 - (base32 "121nlr5w58j4q47rh9xjjf9wzb97yl2m1n2l6g58ck4vnarwndl1")))) + (base32 "0f6cd93q9vrxfmgg6ff85ixcmq6acvrirb3kwgkf7qv16w3ipcir")))) (build-system emacs-build-system) (home-page "https://gitlab.com/protesilaos/modus-themes") (synopsis "Accessible dark theme (WCAG AAA)") -- cgit v1.2.3 From e6d9e055ec7e211f462c76642ed1b96bb8a70e81 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jun 2020 23:24:06 +0200 Subject: gnu: emacs-modus-operandi-theme: Update to 0.9.0. * gnu/packages/emacs-xyz.scm (emacs-modus-operandi-theme): Update to 0.9.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d5c3896c05..a111cbb99b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21447,14 +21447,14 @@ Emacs that integrate with major modes like Org-mode.") (define-public emacs-modus-operandi-theme (package (name "emacs-modus-operandi-theme") - (version "0.8.1") + (version "0.9.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "modus-operandi-theme-" version ".el")) (sha256 - (base32 "0i8s6blkhx53m1jk1bblqs7fwlbn57xkxxhsp9famcj5m0xyfimb")))) + (base32 "0wzwhzpw5g719xxz58v5bjqb8gdz1xzqwxslgm9cng4y3hwy3igh")))) (build-system emacs-build-system) (home-page "https://gitlab.com/protesilaos/modus-themes") (synopsis "Accessible light theme (WCAG AAA)") -- cgit v1.2.3 From b7bb381ba3740d33652c2a8e7772c17b93b259cc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 4 Jun 2020 17:32:23 +0200 Subject: bash completion: Complete file names after '-p' and '-C'. * etc/completion/bash/guix (_guix_is_dash_C, _guix_is_dash_p): New functions. (_guix_complete): Honor them for "install", "remove", "upgrade", "pull", and "time-machine". --- etc/completion/bash/guix | 53 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix index 0333bfc8a2..650cf1d1ce 100644 --- a/etc/completion/bash/guix +++ b/etc/completion/bash/guix @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +# Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès # # This file is part of GNU Guix. # @@ -115,6 +115,24 @@ _guix_is_dash_m () esac } } +_guix_is_dash_C () +{ + [ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-C" ] \ + || { case "${COMP_WORDS[$COMP_CWORD]}" in + --channels=*) true;; + *) false;; + esac } +} + +_guix_is_dash_p () +{ + [ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-p" ] \ + || { case "${COMP_WORDS[$COMP_CWORD]}" in + --profile=*) true;; + *) false;; + esac } +} + _guix_complete_file () { # Let Readline complete file names. @@ -169,13 +187,28 @@ _guix_complete () fi elif _guix_is_command "install" then - _guix_complete_available_package "$word_at_point" + if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p + then + _guix_complete_file + else + _guix_complete_available_package "$word_at_point" + fi elif _guix_is_command "remove" then - _guix_complete_installed_package "$word_at_point" + if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p + then + _guix_complete_file + else + _guix_complete_installed_package "$word_at_point" + fi elif _guix_is_command "upgrade" then - _guix_complete_installed_package "$word_at_point" + if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p + then + _guix_complete_file + else + _guix_complete_installed_package "$word_at_point" + fi elif _guix_is_command "build" then if _guix_is_dash_L || _guix_is_dash_m @@ -193,6 +226,18 @@ _guix_complete () 2) _guix_complete_subcommand;; *) _guix_complete_file;; # TODO: restrict to *.scm esac + elif _guix_is_command "pull" + then + if _guix_is_dash_C || _guix_is_dash_p + then + _guix_complete_file + fi + elif _guix_is_command "time-machine" + then + if _guix_is_dash_C + then + _guix_complete_file + fi elif _guix_is_command "container" then case $COMP_CWORD in -- cgit v1.2.3 From 538ca8dd65f0075cc65bcca18ed87f66a789290a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 4 Jun 2020 18:09:11 +0200 Subject: bash completion: Complete sub-commands after 'guix time-machine'. * etc/completion/bash/guix (_guix_complete_subcommand): New function. (_guix_complete): Use it. For "time-machine", call '_guix_complete_subcommand' by default. --- etc/completion/bash/guix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix index 650cf1d1ce..df35919eb2 100644 --- a/etc/completion/bash/guix +++ b/etc/completion/bash/guix @@ -148,6 +148,17 @@ _guix_complete_pid () declare _guix_subcommands +_guix_complete_subcommand () +{ + if [ -z "$_guix_subcommands" ] + then + # Cache the list of subcommands to speed things up. + _guix_subcommands="$(guix --help 2> /dev/null \ + | grep '^ ' | cut -c 2-)" + fi + COMPREPLY=($(compgen -W "$_guix_subcommands" -- "$word_at_point")) +} + _guix_complete () { local word_count=${#COMP_WORDS[*]} @@ -165,13 +176,7 @@ _guix_complete () case $COMP_CWORD in 1) - if [ -z "$_guix_subcommands" ] - then - # Cache the list of subcommands to speed things up. - _guix_subcommands="$(guix --help 2> /dev/null \ - | grep '^ ' | cut -c 2-)" - fi - COMPREPLY=($(compgen -W "$_guix_subcommands" -- "$word_at_point")) + _guix_complete_subcommand ;; *) if _guix_is_command "package" @@ -237,6 +242,8 @@ _guix_complete () if _guix_is_dash_C then _guix_complete_file + else + _guix_complete_subcommand fi elif _guix_is_command "container" then -- cgit v1.2.3 From b54a1b504ea44a6fa6bc708d5198b0b6f34df15c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 4 Jun 2020 23:25:54 +0200 Subject: gnu: guile-rsvg: Use 'git-fetch' instead of a generated archive. * gnu/packages/gtk.scm (guile-rsvg)[source]: Switch to GIT-FETCH. --- gnu/packages/gtk.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 24089668d2..eb1984fb20 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -943,13 +943,13 @@ exceptions, macros, and a dynamic programming environment.") (version (string-append "2.18.1-" revision "." (string-take commit 7))) (source (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/wingo/guile-rsvg/" - "repository/archive.tar.gz?ref=" - commit)) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/wingo/guile-rsvg/") + (commit commit))) (sha256 (base32 - "0vdzjx8l5nc4y2xjqs0g1rqn1zrwfsm30brh5gz00r1x41a2pvv2")) + "0cnbl40df2sbhpc32cma6j6w312rfvcgbxxqaixgf0ymim3fb248")) (patches (search-patches "guile-rsvg-pkgconfig.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 0713929685d2fd1970df1b1ce238ee7bd6e892f8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jun 2020 23:59:12 +0200 Subject: gnu: rosegarden: Update to 20.06. * gnu/packages/music.scm (rosegarden): Update to 20.06. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 24192f89c7..a26c4fc250 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4132,14 +4132,14 @@ specification and header.") (define-public rosegarden (package (name "rosegarden") - (version "19.12") + (version "20.06") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/rosegarden/rosegarden/" version "/rosegarden-" version ".tar.bz2")) (sha256 - (base32 "1qcaxc6hdzva7kwxxhgl95437fagjbxzv4mihsgpr7y9qk08ppw1")))) + (base32 "1i9x9rkqwwdrk77xl5ra8i48cjirbc7fbisnj0nnclccwaq0wk6r")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release") -- cgit v1.2.3 From 7730f41afd90a9c3c83a56adfee09069da66a8e5 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 4 Jun 2020 14:56:37 +0200 Subject: installer: final: Add some extra logging. * gnu/installer/final.scm (kill-cow-users): Log the killed process name, (umount-cow-store): inform that we are umounting the cow-store. --- gnu/installer/final.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index 4c2da484c9..ece1aff95c 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -128,7 +128,7 @@ USERS." (match (string-tokenize (read-string port) %not-nul) ((argv0 _ ...) (unless (member (pk (basename argv0)) spare) - (syslog "Killing process ~a~%" pid) + (syslog "Killing process ~a (~a)~%" pid argv0) (kill pid SIGKILL))) (_ #f)))))) pids))) @@ -146,6 +146,8 @@ be much appreciated." (catch #t (lambda () (let ((tmp-dir "/remove")) + (syslog "Unmounting cow-store.~%") + (mkdir-p tmp-dir) (mount (%store-directory) tmp-dir "" MS_MOVE) -- cgit v1.2.3 From 66294d7cfee011b80f13dfc87a69710d3460db07 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jun 2020 09:10:34 +0200 Subject: gnu: guix: Update to 7730f41afd. * gnu/packages/package-management.scm (guix): Update to 1.1.0-5.7730f41. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index edb09224c0..5c192156c3 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "bdc801e1cfa8e436890da5bd755dd7759cb0f748") - (revision 4)) + (commit "7730f41afd90a9c3c83a56adfee09069da66a8e5") + (revision 5)) (package (name "guix") @@ -135,7 +135,7 @@ (commit commit))) (sha256 (base32 - "1wf30g45kh4nmcapd4vrcl6m2wjzly7v7dv8z0r584770i2yh836")) + "008ihwvcsj8y5wz4i9l28nv5gzi01v8j16zxv46gaxc736kinhxq")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 3a7fcfb34ef8cefb64c93d48e2d665a08fe3b8a1 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 5 Jun 2020 14:08:20 +0200 Subject: gnu: txr: Update to 239. * gnu/packages/lisp.scm (txr): Update to 239. [arguments]: Use cc-for-target. --- gnu/packages/lisp.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 498eee9526..a2e0f0724d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -800,7 +800,7 @@ enough to play the original mainframe Zork all the way through.") (define-public txr (package (name "txr") - (version "238") + (version "239") (source (origin (method git-fetch) @@ -809,15 +809,12 @@ enough to play the original mainframe Zork all the way through.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0asdq4n828xb1m31s7f47mqcbjqkzxz11bwnw8v3f2249m93ync4")))) + (base32 "1jldpkd5f855m3z4zjpd1ha64f405pcdwwrnr8jnk66v22dsvdwx")))) (build-system gnu-build-system) (arguments `(#:configure-flags - (let ((target ,(%current-target-system))) - (list (string-append "cc=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "--prefix=" (assoc-ref %outputs "out")))) + (list ,(string-append "cc=" (cc-for-target)) + (string-append "--prefix=" (assoc-ref %outputs "out"))) #:test-target "tests" #:phases (modify-phases %standard-phases -- cgit v1.2.3 From b2eae0e1427502b171347fb173bab2547560a707 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Mon, 1 Jun 2020 17:41:40 -0500 Subject: gnu: Add quantile-estimator. * gnu/packages/lisp-xyz.scm (sbcl-quantile-estimator, ecl-quantile-estimator, cl-quantile-estimator): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b78eec7f4d..df0424ef55 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11555,3 +11555,37 @@ accompaniment to the standard ANSI facilities.") (define-public cl-osicat (sbcl-package->cl-source-package sbcl-osicat)) + +(define-public sbcl-quantile-estimator + (package + (name "sbcl-quantile-estimator") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/deadtrickster/quantile-estimator.cl") + (commit "84d0ea405d793f5e808c68c4ddaf25417b0ff8e5"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rlswkf0siaabsvvch3dgxmg45fw5w8pd9b7ri2w7a298aya52z9")))) + (build-system asdf-build-system/sbcl) + (arguments + '(#:asd-system-name "quantile-estimator")) + (inputs + `(("alexandria" ,sbcl-alexandria))) + (home-page "https://github.com/deadtrickster/quantile-estimator.cl") + (synopsis + "Effective computation of biased quantiles over data streams") + (description + "Common Lisp implementation of Graham Cormode and S. +Muthukrishnan's Effective Computation of Biased Quantiles over Data +Streams in ICDE’05.") + (license license:expat))) + +(define-public cl-quantile-estimator + (sbcl-package->cl-source-package sbcl-quantile-estimator)) + +(define-public ecl-quantile-estimator + (sbcl-package->ecl-package sbcl-quantile-estimator)) -- cgit v1.2.3 From 4c7c3077904cb7ce790bee4b463133b02133f335 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 5 Jun 2020 14:38:19 +0200 Subject: gnu: Add cl-prometheus. * gnu/packages/lisp-xyz.scm (sbcl-prometheus, cl-prometheus, ecl-prometheus): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index df0424ef55..cfc699d0d0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11589,3 +11589,35 @@ Streams in ICDE’05.") (define-public ecl-quantile-estimator (sbcl-package->ecl-package sbcl-quantile-estimator)) + +(define-public sbcl-prometheus + (package + (name "sbcl-prometheus") + (version "0.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/deadtrickster/prometheus.cl.git") + (commit "7352b92296996ff383503e19bdd3bcea30409a15"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fzczls2kfgdx18pja4lqxjrz72i583185d8nq0pb3s331hhzh0z")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("bordeaux-threads" ,sbcl-bordeaux-threads) + ("cl-ppcre" ,sbcl-cl-ppcre) + ("local-time" ,sbcl-local-time) + ("quantile-estimator" ,sbcl-quantile-estimator))) + (home-page "https://github.com/deadtrickster/prometheus.cl") + (synopsis "Prometheus.io Common Lisp client") + (description "Prometheus.io Common Lisp client.") + (license license:expat))) + +(define-public cl-prometheus + (sbcl-package->cl-source-package sbcl-prometheus)) + +(define-public ecl-prometheus + (sbcl-package->ecl-package sbcl-prometheus)) -- cgit v1.2.3 From 4e21f5bcabafc4e1f3375f5f91059bed67b5a8e3 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 5 Jun 2020 14:44:18 +0200 Subject: gnu: Add cl-prometheus.collectors.sbcl. * gnu/packages/lisp-xyz.scm (sbcl-prometheus.collectors.sbcl, cl-prometheus.collectors.sbcl): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index cfc699d0d0..ceab76990d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11621,3 +11621,14 @@ Streams in ICDE’05.") (define-public ecl-prometheus (sbcl-package->ecl-package sbcl-prometheus)) + +(define-public sbcl-prometheus.collectors.sbcl + (package + (inherit sbcl-prometheus) + (name "sbcl-prometheus.collectors.sbcl") + (inputs `(("prometheus" ,sbcl-prometheus))) + (synopsis "Prometheus collector for SBCL metrics") + (description "Prometheus collector for SBCL metrics."))) + +(define-public cl-prometheus.collectors.sbcl + (sbcl-package->cl-source-package sbcl-prometheus.collectors.sbcl)) -- cgit v1.2.3 From b4ece1a291bbeb04c185a995df699fde022bd482 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 5 Jun 2020 14:49:51 +0200 Subject: gnu: Add cl-prometheus.collectors.process. * gnu/packages/lisp-xyz.scm (sbcl-prometheus.collectors.process, cl-prometheus.collectors.process, ecl-prometheus.collectors.process): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ceab76990d..96de71b4f0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11632,3 +11632,22 @@ Streams in ICDE’05.") (define-public cl-prometheus.collectors.sbcl (sbcl-package->cl-source-package sbcl-prometheus.collectors.sbcl)) + +(define-public sbcl-prometheus.collectors.process + (package + (inherit sbcl-prometheus) + (name "sbcl-prometheus.collectors.process") + (inputs + `(("cffi" ,sbcl-cffi) + ("cffi-grovel" ,sbcl-cffi-grovel) + ("cl-fad" ,sbcl-cl-fad) + ("prometheus" ,sbcl-prometheus) + ("split-sequence" ,sbcl-split-sequence))) + (synopsis "Prometheus collector for process metrics") + (description "Prometheus collector for process metrics."))) + +(define-public cl-prometheus.collectors.process + (sbcl-package->cl-source-package sbcl-prometheus.collectors.process)) + +(define-public ecl-prometheus.collectors.process + (sbcl-package->ecl-package sbcl-prometheus.collectors.process)) -- cgit v1.2.3 From 78d1aa9eef788654ce3c8440a86927a219b3c4fa Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 5 Jun 2020 14:55:17 +0200 Subject: gnu: Add cl-prometheus.formats.text. * gnu/packages/lisp-xyz.scm (sbcl-prometheus.formats.text, cl-prometheus.formats.text, ecl-prometheus.formats.text): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 96de71b4f0..9af4b851fa 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11651,3 +11651,19 @@ Streams in ICDE’05.") (define-public ecl-prometheus.collectors.process (sbcl-package->ecl-package sbcl-prometheus.collectors.process)) + +(define-public sbcl-prometheus.formats.text + (package + (inherit sbcl-prometheus) + (name "sbcl-prometheus.formats.text") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("prometheus" ,sbcl-prometheus))) + (synopsis "Prometheus client text format") + (description "Prometheus client text format."))) + +(define-public cl-prometheus.formats.text + (sbcl-package->cl-source-package sbcl-prometheus.formats.text)) + +(define-public ecl-prometheus.formats.text + (sbcl-package->ecl-package sbcl-prometheus.formats.text)) -- cgit v1.2.3 From 019ff3c3c74048a133263ccacac3db87e52bc00a Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 5 Jun 2020 14:59:19 +0200 Subject: gnu: Add cl-prometheus.exposers.hunchentoot. * gnu/packages/lisp-xyz.scm (sbcl-prometheus.exposers.hunchentoot, cl-prometheus.exposers.hunchentoot): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9af4b851fa..3156bc9de2 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11667,3 +11667,19 @@ Streams in ICDE’05.") (define-public ecl-prometheus.formats.text (sbcl-package->ecl-package sbcl-prometheus.formats.text)) + +(define-public sbcl-prometheus.exposers.hunchentoot + (package + (inherit sbcl-prometheus) + (name "sbcl-prometheus.exposers.hunchentoot") + (inputs + `(("hunchentoot" ,sbcl-hunchentoot) + ("prometheus" ,sbcl-prometheus) + ("prometheus.formats.text" ,sbcl-prometheus.formats.text) + ("salza2" ,sbcl-salza2) + ("trivial-utf-8" ,sbcl-trivial-utf-8))) + (synopsis "Prometheus collector for Hunchentoot metrics") + (description "Prometheus collector for Hunchentoot metrics"))) + +(define-public cl-prometheus.exposers.hunchentoot + (sbcl-package->cl-source-package sbcl-prometheus.exposers.hunchentoot)) -- cgit v1.2.3 From 9e20646bf5210c8068150c9f75983badb6fd249c Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 5 Jun 2020 15:03:59 +0200 Subject: gnu: Add cl-prometheus.pushgateway. * gnu/packages/lisp-xyz.scm (sbcl-prometheus.pushgateway, cl-prometheus.pushgateway, ecl-prometheus.pushgateway): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3156bc9de2..591615f4d1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11683,3 +11683,20 @@ Streams in ICDE’05.") (define-public cl-prometheus.exposers.hunchentoot (sbcl-package->cl-source-package sbcl-prometheus.exposers.hunchentoot)) + +(define-public sbcl-prometheus.pushgateway + (package + (inherit sbcl-prometheus) + (name "sbcl-prometheus.pushgateway") + (inputs + `(("drakma" ,sbcl-drakma) + ("prometheus" ,sbcl-prometheus) + ("prometheus.formats.text" ,sbcl-prometheus.formats.text))) + (synopsis "Prometheus Pushgateway client") + (description "Prometheus Pushgateway client."))) + +(define-public cl-prometheus.pushgateway + (sbcl-package->cl-source-package sbcl-prometheus.pushgateway)) + +(define-public ecl-prometheus.pushgateway + (sbcl-package->ecl-package sbcl-prometheus.pushgateway)) -- cgit v1.2.3 From 59dda9709af2f969865b6edb5e1505b934a90e5f Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 12:30:04 -0500 Subject: gnu: Add cl-uuid. * gnu/packages/lisp-xyz.scm (sbcl-uuid, cl-uuid, ecl-uuid): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 591615f4d1..13faa6ccb7 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11700,3 +11700,35 @@ Streams in ICDE’05.") (define-public ecl-prometheus.pushgateway (sbcl-package->ecl-package sbcl-prometheus.pushgateway)) + +(define-public sbcl-uuid + (let ((commit "e7d6680c3138385c0708f7aaf0c96622eeb140e8")) + (package + (name "sbcl-uuid") + (version (git-version "2012.12.26" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dardoria/uuid.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jnyp2kibcf5cwi60l6grjrj8wws9chasjvsw7xzwyym2lyid46f")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("ironclad" ,sbcl-ironclad) + ("trivial-utf-8" ,sbcl-trivial-utf-8))) + (home-page "https://github.com/dardoria/uuid") + (synopsis + "Common Lisp implementation of UUIDs according to RFC4122") + (description + "Common Lisp implementation of UUIDs according to RFC4122.") + (license license:llgpl)))) + +(define-public cl-uuid + (sbcl-package->cl-source-package sbcl-uuid)) + +(define-public ecl-uuid + (sbcl-package->ecl-package sbcl-uuid)) -- cgit v1.2.3 From adf70454caef289fc263263c2373d648922a7a05 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 12:36:35 -0500 Subject: gnu: Add cl-dissect. * gnu/packages/lisp-xyz.scm (sbcl-dissect, cl-dissect, ecl-dissect): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 13faa6ccb7..24d961fadf 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11732,3 +11732,35 @@ Streams in ICDE’05.") (define-public ecl-uuid (sbcl-package->ecl-package sbcl-uuid)) + +(define-public sbcl-dissect + (let ((commit "cffd38479f0e64e805f167bbdb240b783ecc8d45")) + (package + (name "sbcl-dissect") + (version (git-version "1.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/dissect.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rmsjkgjl90gl6ssvgd60hb0d5diyhsiyypvw9hbc0ripvbmk5r5")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-ppcre" ,sbcl-cl-ppcre))) + (home-page "https://shinmera.github.io/dissect/") + (synopsis + "Introspection library for the call stack and restarts") + (description + "Dissect is a small Common Lisp library for introspecting the call stack +and active restarts.") + (license license:zlib)))) + +(define-public cl-dissect + (sbcl-package->cl-source-package sbcl-dissect)) + +(define-public ecl-dissect + (sbcl-package->ecl-package sbcl-dissect)) -- cgit v1.2.3 From 38d738e92bfc634f4d515247a5ac2719653e2735 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 12:39:18 -0500 Subject: gnu: Add cl-rove. * gnu/packages/lisp-xyz.scm (sbcl-rove, cl-rove, ecl-rove): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 24d961fadf..f6f523daf9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11764,3 +11764,39 @@ and active restarts.") (define-public ecl-dissect (sbcl-package->ecl-package sbcl-dissect)) + +;; TODO: Uses ASDF's package-inferred-system which is not supported by +;; asdf-build-system/sbcl as of 2020-05-21. We should fix +;; asdf-build-system/sbcl. +(define-public sbcl-rove + (package + (name "sbcl-rove") + (version "0.9.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fukamachi/rove.git") + (commit "f3695db08203bf26f3b861dc22ac0f4257d3ec21"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07ala4l2fncxf540fzxj3h5mhi9i4wqllhj0rqk8m2ljl5zbz89q")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("dissect" ,sbcl-dissect) + ("trivial-gray-streams" ,sbcl-trivial-gray-streams))) + (home-page "https://github.com/fukamachi/rove") + (synopsis + "Yet another common lisp testing library") + (description + "Rove is a unit testing framework for Common Lisp applications. +This is intended to be a successor of Prove.") + (license license:bsd-3))) + +(define-public cl-rove + (sbcl-package->cl-source-package sbcl-rove)) + +(define-public ecl-rove + (sbcl-package->ecl-package sbcl-rove)) -- cgit v1.2.3 From aae3df1817ebb98891ce5866c908b3a9a009835a Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 12:47:09 -0500 Subject: gnu: Add cl-exponential-backoff. * gnu/packages/lisp-xyz.scm (sbcl-exponential-backoff, cl-exponential-backoff, ecl-exponential-backoff): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f6f523daf9..62977f5e8b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11800,3 +11800,33 @@ This is intended to be a successor of Prove.") (define-public ecl-rove (sbcl-package->ecl-package sbcl-rove)) + +(define-public sbcl-exponential-backoff + (let ((commit "8d9e8444d8b3184a524c12ce3449f91613ab714f")) + (package + (name "sbcl-exponential-backoff") + (version (git-version "0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/death/exponential-backoff.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1389hm9hxv85s0125ja4js1bvh8ay4dsy9q1gaynjv27ynik6gmv")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/death/exponential-backoff") + (synopsis "Exponential backoff algorithm in Common Lisp") + (description + "An implementation of the exponential backoff algorithm in Common Lisp. +Inspired by the implementation found in Chromium. Read the header file to +learn about each of the parameters.") + (license license:expat)))) + +(define-public cl-exponential-backoff + (sbcl-package->cl-source-package sbcl-exponential-backoff)) + +(define-public ecl-exponential-backoff + (sbcl-package->ecl-package sbcl-exponential-backoff)) -- cgit v1.2.3 From 3e7362181c697babe9c3a1f6952cf16b3ad7fbce Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 12:52:20 -0500 Subject: gnu: Add cl-sxql. * gnu/packages/lisp-xyz.scm (sbcl-sxql, cl-sxql, ecl-sxql): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 62977f5e8b..e33f3b203a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11830,3 +11830,42 @@ learn about each of the parameters.") (define-public ecl-exponential-backoff (sbcl-package->ecl-package sbcl-exponential-backoff)) + +(define-public sbcl-sxql + (let ((commit "5aa8b739492c5829e8623432b5d46482263990e8")) + (package + (name "sbcl-sxql") + (version (git-version "0.1.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fukamachi/sxql.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0k25p6w2ld9cn8q8s20lda6yjfyp4q89219sviayfgixnj27avnj")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:test-asd-file "sxql-test.asd")) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-syntax-annot" ,sbcl-cl-syntax-annot) + ("iterate" ,sbcl-iterate) + ("optima" ,sbcl-optima) + ("split-sequence" ,sbcl-split-sequence) + ("trivial-types" ,sbcl-trivial-types))) + (native-inputs + `(("prove" ,sbcl-prove) + ("prove-asdf" ,sbcl-prove-asdf))) + (home-page "https://github.com/fukamachi/sxql") + (synopsis "SQL generator for Common Lisp") + (description "SQL generator for Common Lisp.") + (license license:bsd-3)))) + +(define-public cl-sxql + (sbcl-package->cl-source-package sbcl-sxql)) + +(define-public ecl-sxql + (sbcl-package->ecl-package sbcl-sxql)) -- cgit v1.2.3 From 1f9999df4a104558454d36d4aab821c9d5c631fd Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 12:55:36 -0500 Subject: gnu: Add cl-1am. * gnu/packages/lisp-xyz.scm (sbcl-1am, cl-1am, ecl-1am): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e33f3b203a..1bb6c4b55c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11869,3 +11869,32 @@ learn about each of the parameters.") (define-public ecl-sxql (sbcl-package->ecl-package sbcl-sxql)) + +(define-public sbcl-1am + (let ((commit "8b1da94eca4613fd8a20bdf63f0e609e379b0ba5")) + (package + (name "sbcl-1am") + (version (git-version "0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lmj/1am.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05ss4nz1jb9kb796295482b62w5cj29msfj8zis33sp2rw2vmv2g")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:asd-system-name "1am")) + (home-page "https://github.com/lmj/1am") + (synopsis "Minimal testing framework for Common Lisp") + (description "A minimal testing framework for Common Lisp.") + (license license:expat)))) + +(define-public cl-1am + (sbcl-package->cl-source-package sbcl-1am)) + +(define-public ecl-1am + (sbcl-package->ecl-package sbcl-1am)) -- cgit v1.2.3 From ea924134f819eef072ba7df9080d39de97fd73e6 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jun 2020 12:28:12 +0200 Subject: tests: syscall: Support file-systems without extended attributes. * tests/syscalls.scm (setxattr): Catch ENOTSUP that can be raised if the file-system does not support extended user attributes. --- tests/syscalls.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/syscalls.scm b/tests/syscalls.scm index 6098a09437..6acaa0b131 100644 --- a/tests/syscalls.scm +++ b/tests/syscalls.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015 David Thompson ;;; Copyright © 2020 Simon South +;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -276,8 +277,14 @@ (let ((key "user.translator") (value "/hurd/pfinet\0") (file (open-file temp-file "w0"))) - (setxattr temp-file key value) - (string=? (getxattr temp-file key) value))) + (catch 'system-error + (lambda () + (setxattr temp-file key value) + (string=? (getxattr temp-file key) value)) + (lambda args + ;; Accept ENOTSUP, if the file-system does not support extended user + ;; attributes. + (memv (system-error-errno args) (list ENOTSUP)))))) (false-if-exception (delete-file temp-file)) (test-equal "fcntl-flock wait" -- cgit v1.2.3 From 6f07472ab2ded3effd98565330b1f8b21d721961 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jun 2020 19:23:27 +0200 Subject: gnu: guix: Update to ea924134f8. Update Guix to include ea924134f819eef072ba7df9080d39de97fd73e6, that fixes a test failure that can occur when running from a file-system without user_xattr support. * gnu/packages/package-management.scm (guix): Update to 1.1.0-6.ea92413. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 5c192156c3..ecaebac291 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "7730f41afd90a9c3c83a56adfee09069da66a8e5") - (revision 5)) + (commit "ea924134f819eef072ba7df9080d39de97fd73e6") + (revision 6)) (package (name "guix") @@ -135,7 +135,7 @@ (commit commit))) (sha256 (base32 - "008ihwvcsj8y5wz4i9l28nv5gzi01v8j16zxv46gaxc736kinhxq")) + "08likdidf3k1zqf8821h6a84dsrvgbdhridhkzpjymc2c884j0w4")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 2d84d653164ea932540bd27e518a2ed6f8658f96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 21:43:49 +0200 Subject: gnu: synapse: Update to 1.14.0. * gnu/packages/matrix.scm (synapse): Update to 1.14.0. --- gnu/packages/matrix.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 7bbdc09688..002c1b530d 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Alex ter Weele +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,15 +60,15 @@ an LDAP server.") (define-public synapse (package (name "synapse") - (version "1.11.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (pypi-uri "matrix-synapse" version)) (sha256 (base32 - "0cqbwcz0fi4w413s1kcxvf696qi4n46n1k4ggnygqri5yq26qlfy")))) + "09drdqcjvpk9s3hq5rx9yxsxq0wak5fg5gfaiqfnbnxav2c2v7kq")))) (build-system python-build-system) - ;; TODO I think there are custom tests + ;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’. (propagated-inputs `(("python-simplejson" ,python-simplejson) ; not attested but required ;; requirements (synapse/python_dependencies.py) @@ -100,6 +101,7 @@ an LDAP server.") ("python-bleach" ,python-bleach) ("python-typing-extensions" ,python-typing-extensions) ;; conditional requirements (synapse/python_dependencies.py) + ;;("python-hiredis" ,python-hiredis) ("python-matrix-synapse-ldap3" ,python-matrix-synapse-ldap3) ("python-psycopg2" ,python-psycopg2) ("python-jinja2" ,python-jinja2) -- cgit v1.2.3 From d57eae24a4f8d936b3603526dbc03b7af253838f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 21:51:35 +0200 Subject: gnu: fetchmail: Update to 6.4.6. * gnu/packages/mail.scm (fetchmail): Update to 6.4.6. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a408c84dfb..67ed8c4b68 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -347,7 +347,7 @@ to run without any changes.") (define-public fetchmail (package (name "fetchmail") - (version "6.4.5") + (version "6.4.6") (source (origin (method url-fetch) @@ -355,7 +355,7 @@ to run without any changes.") (version-major+minor version) "/" "fetchmail-" version ".tar.xz")) (sha256 - (base32 "073bjh8qbvww7f5gbd6pq640qspi7dc6cjndvm0h2jcl0a90c3yk")))) + (base32 "04b0sq1xad6gs1bfhkbmhsn1kq6y4gsx9l9ywjvd5d0rc15yrvqn")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl))) -- cgit v1.2.3 From 9cd1b802fb000583cefafb9ccd35b87949fbb888 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Jun 2020 01:29:14 +0200 Subject: gnu: man-db: Update to 2.9.2. * gnu/packages/man.scm (man-db): Update to 2.9.2. --- gnu/packages/man.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 4dfac4f87b..779781f822 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -62,14 +62,14 @@ a flexible and convenient way.") (define-public man-db (package (name "man-db") - (version "2.9.1") + (version "2.9.2") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/man-db/man-db-" version ".tar.xz")) (sha256 (base32 - "0ky7aq8313xa1y0zdwdbz5yvjfjb3xy0xymbimd2d9q9bky8lgds")))) + "0z04kwv5ymmd0pzadpaag696jfckg6rbz8x4jrgj09bmqqk3yf3v")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From f0bebc570614dbe052edca956f7bab2c593379ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Jun 2020 19:05:51 +0200 Subject: gnu: iproute2: Update to 5.7.0. * gnu/packages/linux.scm (iproute): Update to 5.7.0. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 35b4d73b51..f61ce864af 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2072,7 +2072,7 @@ that the Ethernet protocol is much simpler than the IP protocol.") (define-public iproute (package (name "iproute2") - (version "5.5.0") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append @@ -2080,7 +2080,7 @@ that the Ethernet protocol is much simpler than the IP protocol.") version ".tar.xz")) (sha256 (base32 - "0ywg70f98wgfai35jl47xzpjp45a6n7crja4vc8ql85cbi1l7ids")))) + "088gs56iqhdlpw1iqjwrss4zxd4zbl2wl8s2implrrdajjxcfpbj")))) (build-system gnu-build-system) (arguments `( ;; There is a test suite, but it wants network namespaces and sudo. -- cgit v1.2.3 From 28d6b57c38abf8843ef02d85178755790db824a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Jun 2020 17:02:03 +0200 Subject: gnu: singular: Update to 4.1.3p1. * gnu/packages/algebra.scm (singular): Update to 4.1.3p1. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 4df2e96ecd..1008d24cd3 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -609,7 +609,7 @@ matrices, and polynomials over the integers and over finite fields.") (define-public singular (package (name "singular") - (version "4.1.2p1") + (version "4.1.3p1") (source (origin (method url-fetch) @@ -623,7 +623,7 @@ matrices, and polynomials over the integers and over finite fields.") #\.) "-") "/singular-" version ".tar.gz")) (sha256 (base32 - "0kvd55353fiqyq1msmi0kka66n5h0aqs7m3km60r01b1w2f8085m")))) + "1f02mrjwh7pd3pydfvjxsw5rph2qmkg1idwqrdsax924sa77sljw")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From 53428597a690b409cdb66070ca4397ed76015e20 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Jun 2020 18:02:03 +0200 Subject: gnu: strace: Update to 5.7. * gnu/packages/linux.scm (strace): Update to 5.7. [arguments]: Disable three failing tests. --- gnu/packages/linux.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f61ce864af..745370b8f8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1788,7 +1788,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.") (define-public strace (package (name "strace") - (version "5.5") + (version "5.7") (home-page "https://strace.io") (source (origin (method url-fetch) @@ -1796,7 +1796,7 @@ Zerofree requires the file system to be unmounted or mounted read-only.") "/strace-" version ".tar.xz")) (sha256 (base32 - "1zrhpzjlgfwfl8dd53llswmmharm5rbi0zch7lln5sjris69an4z")))) + "1n6cfz3i2krkyvxpdp3kmxhf7sy5xp0danzaiirbk5fdkfgvb15j")))) (build-system gnu-build-system) (arguments '(#:phases @@ -1805,6 +1805,12 @@ Zerofree requires the file system to be unmounted or mounted read-only.") (lambda _ (substitute* "strace.c" (("/bin/sh") (which "sh"))) + #t)) + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; XXX These hang forever even if the test time-out is extended. + (substitute* "tests/Makefile.in" + (("^\tstrace-DD?D?\\.test \\\\.*") "")) #t))) ;; Don't fail if the architecture doesn't support different personalities. #:configure-flags '("--enable-mpers=check") -- cgit v1.2.3 From 1860b4152360a18ac562690c1f541e53537bf262 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Jun 2020 18:45:11 +0200 Subject: gnu: websocketpp: Update to 0.8.2. * gnu/packages/web.scm (websocketpp): Update to 0.8.2. [source]: Replace patch. * gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch: Delete file. * gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 2 +- .../patches/websocketpp-fix-for-boost-1.70.patch | 103 --------------------- .../patches/websocketpp-fix-for-cmake-3.15.patch | 17 ++++ gnu/packages/web.scm | 6 +- 4 files changed, 21 insertions(+), 107 deletions(-) delete mode 100644 gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch create mode 100644 gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch diff --git a/gnu/local.mk b/gnu/local.mk index 01ec893310..5dc0909efd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1588,7 +1588,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/weasyprint-library-paths.patch \ %D%/packages/patches/webkitgtk-share-store.patch \ - %D%/packages/patches/websocketpp-fix-for-boost-1.70.patch \ + %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ %D%/packages/patches/wicd-urwid-1.3.patch \ diff --git a/gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch b/gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch deleted file mode 100644 index ece414a1cb..0000000000 --- a/gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch +++ /dev/null @@ -1,103 +0,0 @@ -This patch for Boost >= 1.70 was made by merging two patches that -are in the 'develop' branch (c769c92 and f810ca2). - -diff -u b/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp ---- b/websocketpp/transport/asio/connection.hpp -+++ b/websocketpp/transport/asio/connection.hpp -@@ -311,9 +311,10 @@ - * needed. - */ - timer_ptr set_timer(long duration, timer_handler callback) { -- timer_ptr new_timer = lib::make_shared( -- lib::ref(*m_io_service), -- lib::asio::milliseconds(duration) -+ timer_ptr new_timer( -+ new lib::asio::steady_timer( -+ *m_io_service, -+ lib::asio::milliseconds(duration)) - ); - - if (config::enable_multithreading) { -@@ -461,8 +462,7 @@ - m_io_service = io_service; - - if (config::enable_multithreading) { -- m_strand = lib::make_shared( -- lib::ref(*io_service)); -+ m_strand.reset(new lib::asio::io_service::strand(*io_service)); - } - - lib::error_code ec = socket_con_type::init_asio(io_service, m_strand, -diff -u b/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp ---- b/websocketpp/transport/asio/endpoint.hpp -+++ b/websocketpp/transport/asio/endpoint.hpp -@@ -195,8 +195,7 @@ - - m_io_service = ptr; - m_external_io_service = true; -- m_acceptor = lib::make_shared( -- lib::ref(*m_io_service)); -+ m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service)); - - m_state = READY; - ec = lib::error_code(); -@@ -688,9 +687,7 @@ - * @since 0.3.0 - */ - void start_perpetual() { -- m_work = lib::make_shared( -- lib::ref(*m_io_service) -- ); -+ m_work.reset(new lib::asio::io_service::work(*m_io_service)); - } - - /// Clears the endpoint's perpetual flag, allowing it to exit when empty -@@ -854,8 +851,7 @@ - - // Create a resolver - if (!m_resolver) { -- m_resolver = lib::make_shared( -- lib::ref(*m_io_service)); -+ m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service)); - } - - tcon->set_uri(u); -unchanged: ---- a/websocketpp/transport/asio/security/none.hpp -+++ b/websocketpp/transport/asio/security/none.hpp -@@ -168,8 +168,7 @@ protected: - return socket::make_error_code(socket::error::invalid_state); - } - -- m_socket = lib::make_shared( -- lib::ref(*service)); -+ m_socket.reset(new lib::asio::ip::tcp::socket(*service)); - - if (m_socket_init_handler) { - m_socket_init_handler(m_hdl, *m_socket); -unchanged: ---- a/websocketpp/transport/asio/security/tls.hpp -+++ b/websocketpp/transport/asio/security/tls.hpp -@@ -193,8 +193,7 @@ protected: - if (!m_context) { - return socket::make_error_code(socket::error::invalid_tls_context); - } -- m_socket = lib::make_shared( -- _WEBSOCKETPP_REF(*service),lib::ref(*m_context)); -+ m_socket.reset(new socket_type(*service, *m_context)); - - if (m_socket_init_handler) { - m_socket_init_handler(m_hdl, get_socket()); -only in patch2: -unchanged: ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -202,7 +202,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) - endif () - - if (NOT Boost_USE_STATIC_LIBS) -- add_definitions (/DBOOST_TEST_DYN_LINK) -+ add_definitions (-DBOOST_TEST_DYN_LINK) - endif () - - set (Boost_FIND_REQUIRED TRUE) diff --git a/gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch b/gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch new file mode 100644 index 0000000000..ea759d022b --- /dev/null +++ b/gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch @@ -0,0 +1,17 @@ +From: Tobias Geerinckx-Rice +Date: Fri, 05 Jun 2020 18:37:51 +0200 +Subject: [PATCH] gnu: websocketpp: Fix build with CMake >= 3.15. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57ed01e78..43c772d78 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -215,7 +215,7 @@ + set (Boost_USE_MULTITHREADED TRUE) + set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these! + +- find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}") ++ find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS}) + + if (Boost_FOUND) + # Boost is a project wide global dependency. diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bd46ac9c2c..30ef341fa3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1178,7 +1178,7 @@ other systems that want to manipulate WebAssembly files.") (define-public websocketpp (package (name "websocketpp") - (version "0.8.1") + (version "0.8.2") (source (origin (method git-fetch) @@ -1187,8 +1187,8 @@ other systems that want to manipulate WebAssembly files.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "12ffczcrryh74c1xssww35ic6yiy2l2xgdd30lshiq9wnzl2brgy")) - (patches (search-patches "websocketpp-fix-for-boost-1.70.patch")))) + (base32 "1ww4fhl8qf12hkv6jaild8zzsygdspxm1gqpk2f63gv1xfi31wpm")) + (patches (search-patches "websocketpp-fix-for-cmake-3.15.patch")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) ("openssl" ,openssl))) -- cgit v1.2.3 From 98a76dd8f3f0f367ac4f1513d36b95caa3159c46 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Jun 2020 18:47:00 +0200 Subject: gnu: docker, docker-cli: Update to 19.03.9. * gnu/packages/docker.scm (%docker-version): Update to 19.03.9. (docker, docker-cli): Update hashes. --- gnu/packages/docker.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index bf009a792b..aeb43a6393 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Thompson ;;; Copyright © 2018 Efraim Flashner -;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2020 Michael Rohleder ;;; @@ -47,7 +47,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization)) -(define %docker-version "19.03.7") +(define %docker-version "19.03.9") (define-public python-docker-py (package @@ -314,7 +314,7 @@ built-in registry server of Docker.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1sik109lxmiwgrsnvfip1nnal1xkh8z1mlvys6aknjyh29ll1iq8")) + (base32 "1a9hkprkix5d7lqi88r8svvfpzh1qbzw9nrkp11lxrcf9wdan4hg")) (patches (search-patches "docker-fix-tests.patch")))) (build-system gnu-build-system) @@ -592,7 +592,7 @@ provisioning etc.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "164l33npy8acdbbrz8vcyiwx18vi55wwwikkasg0w43b5bdhz8sx")))) + (base32 "1599ff7699p3m925rdyfg7gl3cga6gy0lli7qh2ybyiw2kwf4gj9")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" -- cgit v1.2.3 From a0e5111eb14faf92d1241614486aa5bee1e8e41e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Jun 2020 18:58:02 +0200 Subject: gnu: diffoscope: Remove redundant let binding. * gnu/packages/diffoscope.scm (diffoscope): Unbind VERSION. --- gnu/packages/diffoscope.scm | 315 ++++++++++++++++++++++---------------------- 1 file changed, 157 insertions(+), 158 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 0c780932eb..99922ab5a4 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -70,163 +70,162 @@ #:use-module (ice-9 match)) (define-public diffoscope - (let ((version "145")) - (package - (name "diffoscope") - (version version) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "01n7q3q0hib4bd8gcq0yjghy5zhp0fh0bq1jxrn2ww8zyd4knmc3")))) - (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - ;; setup.py mistakenly requires python-magic from PyPi, even - ;; though the Python bindings of `file` are sufficient. - ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844 - (add-after 'unpack 'dependency-on-python-magic - (lambda _ - (substitute* "setup.py" - (("'python-magic',") "")))) - ;; Patch in support for known tools - (add-after 'unpack 'add-known-tools - (lambda _ - (substitute* "diffoscope/external_tools.py" - (("'debian': 'openssl'") - "'debian': 'openssl', 'guix': 'openssl'")))) - ;; This test is broken because our `file` package has a - ;; bug in berkeley-db file type detection. - (add-after 'unpack 'remove-berkeley-test - (lambda _ - (delete-file "tests/comparators/test_berkeley_db.py") - #t)) - ;; Test is dynamically generated and may have false - ;; negatives with different ocaml versions. Further - ;; background in: https://bugs.debian.org/939386 - (add-after 'unpack 'remove-ocaml-test - (lambda _ - (substitute* "tests/comparators/test_ocaml.py" - (("def test_diff.differences.:") - "def skip_test_diff(differences):")) - #t)) - (add-after 'unpack 'skip-elf-tests - ;; FIXME: libmix_differences test added in 125, and is - ;; failing, need to explore why... - (lambda _ - (substitute* "tests/comparators/test_elf.py" - (("def test_libmix_differences.libmix_differences.:") - "def skip_test_libmix_differences(libmix_differences):")) - #t)) - (add-after 'unpack 'embed-tool-references - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "diffoscope/comparators/utils/compare.py" - (("\\['xxd',") - (string-append "['" (which "xxd") "',"))) - (substitute* "diffoscope/comparators/elf.py" - (("@tool_required\\('readelf'\\)") "") - (("get_tool_name\\('readelf'\\)") - (string-append "'" (which "readelf") "'"))) - (substitute* "diffoscope/comparators/directory.py" - (("@tool_required\\('stat'\\)") "") - (("@tool_required\\('getfacl'\\)") "") - (("\\['stat',") - (string-append "['" (which "stat") "',")) - (("\\['getfacl',") - (string-append "['" (which "getfacl") "',"))) - #t)) - (add-before 'check 'writable-test-data - (lambda _ - ;; tests may need needs write access to tests - ;; directory - (for-each make-file-writable (find-files "tests")) - #t)) - (add-before 'check 'delete-failing-test - (lambda _ - ;; this requires /sbin to be on the path - (delete-file "tests/test_tools.py") - #t))))) - (inputs `(("rpm" ,rpm) ;for rpm-python - ("python-file" ,python-file) - ("python-debian" ,python-debian) - ("python-libarchive-c" ,python-libarchive-c) - ("python-tlsh" ,python-tlsh) - ("acl" ,acl) ;for getfacl - ("colordiff" ,colordiff) - ("xxd" ,xxd))) - ;; Below are modules used for tests. - (native-inputs `(("python-pytest" ,python-pytest) - ("python-chardet" ,python-chardet) - ("python-binwalk" ,python-binwalk) - ("python-h5py" ,python-h5py) - ("python-pypdf2" ,python-pypdf2) - ("python-progressbar33" ,python-progressbar33) - ;; test suite skips tests when tool is missing - ,@(match (%current-system) - ;; ghc is only available on x86 currently. - ((or "x86_64-linux" "i686-linux") - `(("ghc" ,ghc))) - (_ - `())) - ,@(match (%current-system) - ;; openjdk and dependent packages are only - ;; available on x86_64 currently. - ((or "x86_64-linux") - `(("enjarify" ,enjarify) - ;; no unversioned openjdk available - ("openjdk:jdk" ,openjdk12 "jdk") - )) - (_ - `())) - ("abootimg" ,abootimg) - ("bdb" ,bdb) - ("binutils" ,binutils) - ("bzip2" ,bzip2) - ("cdrtools" ,cdrtools) - ("colord" ,colord) - ("cpio" ,cpio) - ("docx2txt" ,docx2txt) - ("dtc" ,dtc) - ("e2fsprogs" ,e2fsprogs) - ("ffmpeg" ,ffmpeg) - ("gettext" ,gettext-minimal) - ("ghostscript" ,ghostscript) - ("giflib:bin" ,giflib "bin") - ("gnumeric" ,gnumeric) - ("gnupg" ,gnupg) - ("hdf5" ,hdf5) - ("imagemagick" ,imagemagick) - ("libarchive" ,libarchive) - ("llvm" ,llvm) - ("lz4" ,lz4) - ("mono" ,mono) - ("ocaml" ,ocaml) - ("odt2txt" ,odt2txt) - ("openssh" ,openssh) - ("openssl" ,openssl) - ("pgpdump" ,pgpdump) - ("poppler" ,poppler) - ("python-jsbeautifier" ,python-jsbeautifier) - ("r-minimal" ,r-minimal) - ("rpm" ,rpm) - ("sng" ,sng) - ("sqlite" ,sqlite) - ("squashfs-tools" ,squashfs-tools) - ("tcpdump" ,tcpdump) - ("unzip" ,unzip) - ("wabt" ,wabt) - ("xxd" ,xxd) - ("xz" ,xz) - ("zip" ,zip) - ("zstd" ,zstd))) - (home-page "https://diffoscope.org/") - (synopsis "Compare files, archives, and directories in depth") - (description - "Diffoscope tries to get to the bottom of what makes files or directories + (package + (name "diffoscope") + (version "145") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01n7q3q0hib4bd8gcq0yjghy5zhp0fh0bq1jxrn2ww8zyd4knmc3")))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + ;; setup.py mistakenly requires python-magic from PyPi, even + ;; though the Python bindings of `file` are sufficient. + ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844 + (add-after 'unpack 'dependency-on-python-magic + (lambda _ + (substitute* "setup.py" + (("'python-magic',") "")))) + ;; Patch in support for known tools + (add-after 'unpack 'add-known-tools + (lambda _ + (substitute* "diffoscope/external_tools.py" + (("'debian': 'openssl'") + "'debian': 'openssl', 'guix': 'openssl'")))) + ;; This test is broken because our `file` package has a + ;; bug in berkeley-db file type detection. + (add-after 'unpack 'remove-berkeley-test + (lambda _ + (delete-file "tests/comparators/test_berkeley_db.py") + #t)) + ;; Test is dynamically generated and may have false + ;; negatives with different ocaml versions. Further + ;; background in: https://bugs.debian.org/939386 + (add-after 'unpack 'remove-ocaml-test + (lambda _ + (substitute* "tests/comparators/test_ocaml.py" + (("def test_diff.differences.:") + "def skip_test_diff(differences):")) + #t)) + (add-after 'unpack 'skip-elf-tests + ;; FIXME: libmix_differences test added in 125, and is + ;; failing, need to explore why... + (lambda _ + (substitute* "tests/comparators/test_elf.py" + (("def test_libmix_differences.libmix_differences.:") + "def skip_test_libmix_differences(libmix_differences):")) + #t)) + (add-after 'unpack 'embed-tool-references + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "diffoscope/comparators/utils/compare.py" + (("\\['xxd',") + (string-append "['" (which "xxd") "',"))) + (substitute* "diffoscope/comparators/elf.py" + (("@tool_required\\('readelf'\\)") "") + (("get_tool_name\\('readelf'\\)") + (string-append "'" (which "readelf") "'"))) + (substitute* "diffoscope/comparators/directory.py" + (("@tool_required\\('stat'\\)") "") + (("@tool_required\\('getfacl'\\)") "") + (("\\['stat',") + (string-append "['" (which "stat") "',")) + (("\\['getfacl',") + (string-append "['" (which "getfacl") "',"))) + #t)) + (add-before 'check 'writable-test-data + (lambda _ + ;; tests may need needs write access to tests + ;; directory + (for-each make-file-writable (find-files "tests")) + #t)) + (add-before 'check 'delete-failing-test + (lambda _ + ;; this requires /sbin to be on the path + (delete-file "tests/test_tools.py") + #t))))) + (inputs `(("rpm" ,rpm) ;for rpm-python + ("python-file" ,python-file) + ("python-debian" ,python-debian) + ("python-libarchive-c" ,python-libarchive-c) + ("python-tlsh" ,python-tlsh) + ("acl" ,acl) ;for getfacl + ("colordiff" ,colordiff) + ("xxd" ,xxd))) + ;; Below are modules used for tests. + (native-inputs `(("python-pytest" ,python-pytest) + ("python-chardet" ,python-chardet) + ("python-binwalk" ,python-binwalk) + ("python-h5py" ,python-h5py) + ("python-pypdf2" ,python-pypdf2) + ("python-progressbar33" ,python-progressbar33) + ;; test suite skips tests when tool is missing + ,@(match (%current-system) + ;; ghc is only available on x86 currently. + ((or "x86_64-linux" "i686-linux") + `(("ghc" ,ghc))) + (_ + `())) + ,@(match (%current-system) + ;; openjdk and dependent packages are only + ;; available on x86_64 currently. + ((or "x86_64-linux") + `(("enjarify" ,enjarify) + ;; no unversioned openjdk available + ("openjdk:jdk" ,openjdk12 "jdk") + )) + (_ + `())) + ("abootimg" ,abootimg) + ("bdb" ,bdb) + ("binutils" ,binutils) + ("bzip2" ,bzip2) + ("cdrtools" ,cdrtools) + ("colord" ,colord) + ("cpio" ,cpio) + ("docx2txt" ,docx2txt) + ("dtc" ,dtc) + ("e2fsprogs" ,e2fsprogs) + ("ffmpeg" ,ffmpeg) + ("gettext" ,gettext-minimal) + ("ghostscript" ,ghostscript) + ("giflib:bin" ,giflib "bin") + ("gnumeric" ,gnumeric) + ("gnupg" ,gnupg) + ("hdf5" ,hdf5) + ("imagemagick" ,imagemagick) + ("libarchive" ,libarchive) + ("llvm" ,llvm) + ("lz4" ,lz4) + ("mono" ,mono) + ("ocaml" ,ocaml) + ("odt2txt" ,odt2txt) + ("openssh" ,openssh) + ("openssl" ,openssl) + ("pgpdump" ,pgpdump) + ("poppler" ,poppler) + ("python-jsbeautifier" ,python-jsbeautifier) + ("r-minimal" ,r-minimal) + ("rpm" ,rpm) + ("sng" ,sng) + ("sqlite" ,sqlite) + ("squashfs-tools" ,squashfs-tools) + ("tcpdump" ,tcpdump) + ("unzip" ,unzip) + ("wabt" ,wabt) + ("xxd" ,xxd) + ("xz" ,xz) + ("zip" ,zip) + ("zstd" ,zstd))) + (home-page "https://diffoscope.org/") + (synopsis "Compare files, archives, and directories in depth") + (description + "Diffoscope tries to get to the bottom of what makes files or directories different. It recursively unpacks archives of many kinds and transforms various binary formats into more human readable forms to compare them. It can compare two tarballs, ISO images, or PDFs just as easily. @@ -234,7 +233,7 @@ compare two tarballs, ISO images, or PDFs just as easily. Diffoscope has many optional dependencies; @code{diffoscope --list-missing-tools guix} will display optional packages to install.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public reprotest (package -- cgit v1.2.3 From ba6d3612550f5d978c4b5b1df122444f8fb29377 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Jun 2020 19:06:11 +0200 Subject: gnu: diffoscope: Update to 146. * gnu/packages/diffoscope.scm (diffoscope): Update to 146. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 99922ab5a4..f6f402b315 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "145") + (version "146") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "01n7q3q0hib4bd8gcq0yjghy5zhp0fh0bq1jxrn2ww8zyd4knmc3")))) + "07kd3vshf4wlm0mv3mp6ljbxjq80mcg52w5ks6si1gnpzfbfz07p")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From ecab53c320b1584a08f811b17a92bd9a50a50ff3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Jun 2020 21:30:56 +0200 Subject: gnu: boost-signals2: Update hash. Reported by pkill9 on #guix. * gnu/packages/boost.scm (boost-signals2)[source]: Fix the hash. --- gnu/packages/boost.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index d28c58d663..9e7c40cd99 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -322,7 +322,7 @@ Boost.Thread.") (file-name (git-file-name name version)) (sha256 (base32 - "1nayaqshhzr1n6jj43bpvvay36d5gn075h0b95psii5x8ingszdk")))) + "13i5j43nggb46i6qpaf7gk53i7zp7pimphl7sydyfqz2m9yx5cdy")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 41f443c90af57f9537eccb1a1a45c6e11b377a32 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Jun 2020 17:48:11 +0200 Subject: Add (guix git-authenticate). * build-aux/git-authenticate.scm (commit-signing-key) (read-authorizations, commit-authorized-keys, authenticate-commit) (load-keyring-from-blob, load-keyring-from-reference) (authenticate-commits, authenticated-commit-cache-file) (previously-authenticated-commits, cache-authenticated-commit): Remove. * build-aux/git-authenticate.scm (git-authenticate): Pass #:default-authorizations to 'authenticate-commits'. * guix/git-authenticate.scm: New file, with code taken from 'build-aux/git-authenticate.scm'. Remove references to '%historical-authorized-signing-keys' and add #:default-authorizations parameter instead. * Makefile.am (MODULES): Add it. (authenticate): Depend on guix/git-authenticate.go. --- Makefile.am | 3 +- build-aux/git-authenticate.scm | 203 ++-------------------------------- guix/git-authenticate.scm | 244 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 253 insertions(+), 197 deletions(-) create mode 100644 guix/git-authenticate.scm diff --git a/Makefile.am b/Makefile.am index 5b64386b53..db30004b1b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,6 +104,7 @@ MODULES = \ guix/lint.scm \ guix/glob.scm \ guix/git.scm \ + guix/git-authenticate.scm \ guix/graph.scm \ guix/cache.scm \ guix/cve.scm \ @@ -632,7 +633,7 @@ commit_v1_0_1 = d68de958b60426798ed62797ff7c96c327a672ac # Authenticate the current Git checkout by checking signatures on every commit # starting from $(commit_v1_0_1). -authenticate: guix/openpgp.go guix/git.go +authenticate: guix/openpgp.go guix/git-authenticate.go guix/git.go $(AM_V_at)echo "Authenticating Git checkout..." ; \ "$(top_builddir)/pre-inst-env" $(GUILE) \ --no-auto-compile -e git-authenticate \ diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index 8e679fd5e5..5e1fdaaa24 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -22,21 +22,16 @@ ;;; (use-modules (git) - (guix git) - (guix openpgp) (guix base16) - ((guix utils) - #:select (cache-directory with-atomic-file-output)) - ((guix build utils) #:select (mkdir-p)) + (guix git) + (guix git-authenticate) (guix i18n) + ((guix openpgp) + #:select (openpgp-public-key-fingerprint + openpgp-format-fingerprint)) (guix progress) (srfi srfi-1) - (srfi srfi-11) (srfi srfi-26) - (srfi srfi-34) - (srfi srfi-35) - (rnrs bytevectors) - (rnrs io ports) (ice-9 match) (ice-9 format) (ice-9 pretty-print)) @@ -231,195 +226,9 @@ ;; Commits lacking a signature. '()) -(define (commit-signing-key repo commit-id keyring) - "Return the OpenPGP key that signed COMMIT-ID (an OID). Raise an exception -if the commit is unsigned, has an invalid signature, or if its signing key is -not in KEYRING." - (let-values (((signature signed-data) - (catch 'git-error - (lambda () - (commit-extract-signature repo commit-id)) - (lambda _ - (values #f #f))))) - (unless signature - (raise (condition - (&message - (message (format #f (G_ "commit ~a lacks a signature") - commit-id)))))) - - (let ((signature (string->openpgp-packet signature))) - (with-fluids ((%default-port-encoding "UTF-8")) - (let-values (((status data) - (verify-openpgp-signature signature keyring - (open-input-string signed-data)))) - (match status - ('bad-signature - ;; There's a signature but it's invalid. - (raise (condition - (&message - (message (format #f (G_ "signature verification failed \ -for commit ~a") - (oid->string commit-id))))))) - ('missing-key - (raise (condition - (&message - (message (format #f (G_ "could not authenticate \ -commit ~a: key ~a is missing") - (oid->string commit-id) - data)))))) - ('good-signature data))))))) - -(define (read-authorizations port) - "Read authorizations in the '.guix-authorizations' format from PORT, and -return a list of authorized fingerprints." - (match (read port) - (('authorizations ('version 0) - (((? string? fingerprints) _ ...) ...) - _ ...) - (map (lambda (fingerprint) - (base16-string->bytevector - (string-downcase (string-filter char-set:graphic fingerprint)))) - fingerprints)))) - -(define* (commit-authorized-keys repository commit - #:optional (default-authorizations '())) - "Return the list of OpenPGP fingerprints authorized to sign COMMIT, based on -authorizations listed in its parent commits. If one of the parent commits -does not specify anything, fall back to DEFAULT-AUTHORIZATIONS." - (define (commit-authorizations commit) - (catch 'git-error - (lambda () - (let* ((tree (commit-tree commit)) - (entry (tree-entry-bypath tree ".guix-authorizations")) - (blob (blob-lookup repository (tree-entry-id entry)))) - (read-authorizations - (open-bytevector-input-port (blob-content blob))))) - (lambda (key error) - (if (= (git-error-code error) GIT_ENOTFOUND) - default-authorizations - (throw key error))))) - - (apply lset-intersection bytevector=? - (map commit-authorizations (commit-parents commit)))) - -(define (authenticate-commit repository commit keyring) - "Authenticate COMMIT from REPOSITORY and return the signing key fingerprint. -Raise an error when authentication fails." - (define id - (commit-id commit)) - - (define signing-key - (commit-signing-key repository id keyring)) - - (unless (member (openpgp-public-key-fingerprint signing-key) - (commit-authorized-keys repository commit - %historical-authorized-signing-keys)) - (raise (condition - (&message - (message (format #f (G_ "commit ~a not signed by an authorized \ -key: ~a") - (oid->string id) - (openpgp-format-fingerprint - (openpgp-public-key-fingerprint - signing-key)))))))) - - signing-key) - -(define (load-keyring-from-blob repository oid keyring) - "Augment KEYRING with the keyring available in the blob at OID, which may or -may not be ASCII-armored." - (let* ((blob (blob-lookup repository oid)) - (port (open-bytevector-input-port (blob-content blob)))) - (get-openpgp-keyring (if (port-ascii-armored? port) - (open-bytevector-input-port (read-radix-64 port)) - port) - keyring))) - -(define (load-keyring-from-reference repository reference) - "Load the '.key' files from the tree at REFERENCE in REPOSITORY and return -an OpenPGP keyring." - (let* ((reference (branch-lookup repository - (string-append "origin/" reference) - BRANCH-REMOTE)) - (target (reference-target reference)) - (commit (commit-lookup repository target)) - (tree (commit-tree commit))) - (fold (lambda (name keyring) - (if (string-suffix? ".key" name) - (let ((entry (tree-entry-bypath tree name))) - (load-keyring-from-blob repository - (tree-entry-id entry) - keyring)) - keyring)) - %empty-keyring - (tree-list tree)))) - -(define* (authenticate-commits repository commits - #:key - (keyring-reference "keyring") - (report-progress (const #t))) - "Authenticate COMMITS, a list of commit objects, calling REPORT-PROGRESS for -each of them. Return an alist showing the number of occurrences of each key. -The OpenPGP keyring is loaded from KEYRING-REFERENCE in REPOSITORY." - (define keyring - (load-keyring-from-reference repository keyring-reference)) - - (fold (lambda (commit stats) - (report-progress) - (let ((signer (authenticate-commit repository commit keyring))) - (match (assq signer stats) - (#f (cons `(,signer . 1) stats)) - ((_ . count) (cons `(,signer . ,(+ count 1)) - (alist-delete signer stats)))))) - '() - commits)) - (define commit-short-id (compose (cut string-take <> 7) oid->string commit-id)) - -;;; -;;; Caching. -;;; - -(define (authenticated-commit-cache-file) - "Return the name of the file that contains the cache of -previously-authenticated commits." - (string-append (cache-directory) "/authentication/channels/guix")) - -(define (previously-authenticated-commits) - "Return the previously-authenticated commits as a list of commit IDs (hex -strings)." - (catch 'system-error - (lambda () - (call-with-input-file (authenticated-commit-cache-file) - read)) - (lambda args - (if (= ENOENT (system-error-errno args)) - '() - (apply throw args))))) - -(define (cache-authenticated-commit commit-id) - "Record in ~/.cache COMMIT-ID and its closure as authenticated (only -COMMIT-ID is written to cache, though)." - (define %max-cache-length - ;; Maximum number of commits in cache. - 200) - - (let ((lst (delete-duplicates - (cons commit-id (previously-authenticated-commits)))) - (file (authenticated-commit-cache-file))) - (mkdir-p (dirname file)) - (with-atomic-file-output file - (lambda (port) - (let ((lst (if (> (length lst) %max-cache-length) - (take lst %max-cache-length) ;truncate - lst))) - (chmod port #o600) - (display ";; List of previously-authenticated commits.\n\n" - port) - (pretty-print lst port)))))) - ;;; ;;; Entry point. @@ -462,6 +271,8 @@ COMMIT-ID is written to cache, though)." (let ((stats (call-with-progress-reporter reporter (lambda (report) (authenticate-commits repository commits + #:default-authorizations + %historical-authorized-signing-keys #:report-progress report))))) (cache-authenticated-commit (oid->string (commit-id end-commit))) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm new file mode 100644 index 0000000000..4df56fab59 --- /dev/null +++ b/guix/git-authenticate.scm @@ -0,0 +1,244 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019, 2020 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix git-authenticate) + #:use-module (git) + #:use-module (guix base16) + #:use-module (guix i18n) + #:use-module (guix openpgp) + #:use-module ((guix utils) + #:select (cache-directory with-atomic-file-output)) + #:use-module ((guix build utils) + #:select (mkdir-p)) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-11) + #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) + #:use-module (rnrs bytevectors) + #:use-module (rnrs io ports) + #:use-module (ice-9 match) + #:autoload (ice-9 pretty-print) (pretty-print) + #:export (read-authorizations + commit-signing-key + commit-authorized-keys + authenticate-commit + authenticate-commits + load-keyring-from-reference + previously-authenticated-commits + cache-authenticated-commit)) + +;;; Commentary: +;;; +;;; This module provides tools to authenticate a range of Git commits. A +;;; commit is considered "authentic" if and only if it is signed by an +;;; authorized party. Parties authorized to sign a commit are listed in the +;;; '.guix-authorizations' file of the parent commit. +;;; +;;; Code: + +(define (commit-signing-key repo commit-id keyring) + "Return the OpenPGP key that signed COMMIT-ID (an OID). Raise an exception +if the commit is unsigned, has an invalid signature, or if its signing key is +not in KEYRING." + (let-values (((signature signed-data) + (catch 'git-error + (lambda () + (commit-extract-signature repo commit-id)) + (lambda _ + (values #f #f))))) + (unless signature + (raise (condition + (&message + (message (format #f (G_ "commit ~a lacks a signature") + commit-id)))))) + + (let ((signature (string->openpgp-packet signature))) + (with-fluids ((%default-port-encoding "UTF-8")) + (let-values (((status data) + (verify-openpgp-signature signature keyring + (open-input-string signed-data)))) + (match status + ('bad-signature + ;; There's a signature but it's invalid. + (raise (condition + (&message + (message (format #f (G_ "signature verification failed \ +for commit ~a") + (oid->string commit-id))))))) + ('missing-key + (raise (condition + (&message + (message (format #f (G_ "could not authenticate \ +commit ~a: key ~a is missing") + (oid->string commit-id) + data)))))) + ('good-signature data))))))) + +(define (read-authorizations port) + "Read authorizations in the '.guix-authorizations' format from PORT, and +return a list of authorized fingerprints." + (match (read port) + (('authorizations ('version 0) + (((? string? fingerprints) _ ...) ...) + _ ...) + (map (lambda (fingerprint) + (base16-string->bytevector + (string-downcase (string-filter char-set:graphic fingerprint)))) + fingerprints)))) + +(define* (commit-authorized-keys repository commit + #:optional (default-authorizations '())) + "Return the list of OpenPGP fingerprints authorized to sign COMMIT, based on +authorizations listed in its parent commits. If one of the parent commits +does not specify anything, fall back to DEFAULT-AUTHORIZATIONS." + (define (commit-authorizations commit) + (catch 'git-error + (lambda () + (let* ((tree (commit-tree commit)) + (entry (tree-entry-bypath tree ".guix-authorizations")) + (blob (blob-lookup repository (tree-entry-id entry)))) + (read-authorizations + (open-bytevector-input-port (blob-content blob))))) + (lambda (key error) + (if (= (git-error-code error) GIT_ENOTFOUND) + default-authorizations + (throw key error))))) + + (apply lset-intersection bytevector=? + (map commit-authorizations (commit-parents commit)))) + +(define* (authenticate-commit repository commit keyring + #:key (default-authorizations '())) + "Authenticate COMMIT from REPOSITORY and return the signing key fingerprint. +Raise an error when authentication fails. If one of the parent commits does +not specify anything, fall back to DEFAULT-AUTHORIZATIONS." + (define id + (commit-id commit)) + + (define signing-key + (commit-signing-key repository id keyring)) + + (unless (member (openpgp-public-key-fingerprint signing-key) + (commit-authorized-keys repository commit + default-authorizations)) + (raise (condition + (&message + (message (format #f (G_ "commit ~a not signed by an authorized \ +key: ~a") + (oid->string id) + (openpgp-format-fingerprint + (openpgp-public-key-fingerprint + signing-key)))))))) + + signing-key) + +(define (load-keyring-from-blob repository oid keyring) + "Augment KEYRING with the keyring available in the blob at OID, which may or +may not be ASCII-armored." + (let* ((blob (blob-lookup repository oid)) + (port (open-bytevector-input-port (blob-content blob)))) + (get-openpgp-keyring (if (port-ascii-armored? port) + (open-bytevector-input-port (read-radix-64 port)) + port) + keyring))) + +(define (load-keyring-from-reference repository reference) + "Load the '.key' files from the tree at REFERENCE in REPOSITORY and return +an OpenPGP keyring." + (let* ((reference (branch-lookup repository + (string-append "origin/" reference) + BRANCH-REMOTE)) + (target (reference-target reference)) + (commit (commit-lookup repository target)) + (tree (commit-tree commit))) + (fold (lambda (name keyring) + (if (string-suffix? ".key" name) + (let ((entry (tree-entry-bypath tree name))) + (load-keyring-from-blob repository + (tree-entry-id entry) + keyring)) + keyring)) + %empty-keyring + (tree-list tree)))) + +(define* (authenticate-commits repository commits + #:key + (default-authorizations '()) + (keyring-reference "keyring") + (report-progress (const #t))) + "Authenticate COMMITS, a list of commit objects, calling REPORT-PROGRESS for +each of them. Return an alist showing the number of occurrences of each key. +The OpenPGP keyring is loaded from KEYRING-REFERENCE in REPOSITORY." + (define keyring + (load-keyring-from-reference repository keyring-reference)) + + (fold (lambda (commit stats) + (report-progress) + (let ((signer (authenticate-commit repository commit keyring + #:default-authorizations + default-authorizations))) + (match (assq signer stats) + (#f (cons `(,signer . 1) stats)) + ((_ . count) (cons `(,signer . ,(+ count 1)) + (alist-delete signer stats)))))) + '() + commits)) + + +;;; +;;; Caching. +;;; + +(define (authenticated-commit-cache-file) + "Return the name of the file that contains the cache of +previously-authenticated commits." + (string-append (cache-directory) "/authentication/channels/guix")) + +(define (previously-authenticated-commits) + "Return the previously-authenticated commits as a list of commit IDs (hex +strings)." + (catch 'system-error + (lambda () + (call-with-input-file (authenticated-commit-cache-file) + read)) + (lambda args + (if (= ENOENT (system-error-errno args)) + '() + (apply throw args))))) + +(define (cache-authenticated-commit commit-id) + "Record in ~/.cache COMMIT-ID and its closure as authenticated (only +COMMIT-ID is written to cache, though)." + (define %max-cache-length + ;; Maximum number of commits in cache. + 200) + + (let ((lst (delete-duplicates + (cons commit-id (previously-authenticated-commits)))) + (file (authenticated-commit-cache-file))) + (mkdir-p (dirname file)) + (with-atomic-file-output file + (lambda (port) + (let ((lst (if (> (length lst) %max-cache-length) + (take lst %max-cache-length) ;truncate + lst))) + (chmod port #o600) + (display ";; List of previously-authenticated commits.\n\n" + port) + (pretty-print lst port)))))) -- cgit v1.2.3 From 512b9e2da26968ebafdd47f701edd8fc3936d3e8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Jun 2020 22:52:03 +0200 Subject: git-authenticate: Don't hard-code "origin/" for keyring reference. * guix/git-authenticate.scm (load-keyring-from-reference): Remove hard-coded "origin/". Use BRANCH-ALL instead of BRANCH-REMOTE. --- guix/git-authenticate.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index 4df56fab59..4217ab6d27 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -161,9 +161,7 @@ may not be ASCII-armored." (define (load-keyring-from-reference repository reference) "Load the '.key' files from the tree at REFERENCE in REPOSITORY and return an OpenPGP keyring." - (let* ((reference (branch-lookup repository - (string-append "origin/" reference) - BRANCH-REMOTE)) + (let* ((reference (branch-lookup repository reference BRANCH-ALL)) (target (reference-target reference)) (commit (commit-lookup repository target)) (tree (commit-tree commit))) -- cgit v1.2.3 From f8213f1bca912ec41be61bc5e166c702968fcf89 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Jun 2020 22:53:06 +0200 Subject: git-authenticate: Raise proper SRFI-35 conditions. * guix/git-authenticate.scm (&git-authentication-error) (&unsigned-commit-error, &unauthorized-commit-error) (&signature-verification-error, &missing-key-error): New condition types. (commit-signing-key, authenticate-commit): Raise them. --- guix/git-authenticate.scm | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index 4217ab6d27..b73f957105 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -41,7 +41,18 @@ authenticate-commits load-keyring-from-reference previously-authenticated-commits - cache-authenticated-commit)) + cache-authenticated-commit + + git-authentication-error? + git-authentication-error-commit + unsigned-commit-error? + unauthorized-commit-error? + unauthorized-commit-error-signing-key + signature-verification-error? + signature-verification-error-keyring + signature-verification-error-signature + missing-key-error? + missing-key-error-signature)) ;;; Commentary: ;;; @@ -52,6 +63,27 @@ ;;; ;;; Code: +(define-condition-type &git-authentication-error &error + git-authentication-error? + (commit git-authentication-error-commit)) + +(define-condition-type &unsigned-commit-error &git-authentication-error + unsigned-commit-error?) + +(define-condition-type &unauthorized-commit-error &git-authentication-error + unauthorized-commit-error? + (signing-key unauthorized-commit-error-signing-key)) + +(define-condition-type &signature-verification-error &git-authentication-error + signature-verification-error? + (signature signature-verification-error-signature) + (keyring signature-verification-error-keyring)) + +(define-condition-type &missing-key-error &git-authentication-error + missing-key-error? + (signature missing-key-error-signature)) + + (define (commit-signing-key repo commit-id keyring) "Return the OpenPGP key that signed COMMIT-ID (an OID). Raise an exception if the commit is unsigned, has an invalid signature, or if its signing key is @@ -64,9 +96,10 @@ not in KEYRING." (values #f #f))))) (unless signature (raise (condition + (&unsigned-commit-error (commit commit-id)) (&message (message (format #f (G_ "commit ~a lacks a signature") - commit-id)))))) + (oid->string commit-id))))))) (let ((signature (string->openpgp-packet signature))) (with-fluids ((%default-port-encoding "UTF-8")) @@ -77,12 +110,17 @@ not in KEYRING." ('bad-signature ;; There's a signature but it's invalid. (raise (condition + (&signature-verification-error (commit commit-id) + (signature signature) + (keyring keyring)) (&message (message (format #f (G_ "signature verification failed \ for commit ~a") (oid->string commit-id))))))) ('missing-key (raise (condition + (&missing-key-error (commit commit-id) + (signature signature)) (&message (message (format #f (G_ "could not authenticate \ commit ~a: key ~a is missing") @@ -138,6 +176,8 @@ not specify anything, fall back to DEFAULT-AUTHORIZATIONS." (commit-authorized-keys repository commit default-authorizations)) (raise (condition + (&unauthorized-commit-error (commit id) + (signing-key signing-key)) (&message (message (format #f (G_ "commit ~a not signed by an authorized \ key: ~a") -- cgit v1.2.3 From c83eedba2361c3831d3efb5ad63d5077d636fb28 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Jun 2020 23:20:06 +0200 Subject: git-authenticate: Add tests. * guix/tests/git.scm (call-with-environment-variables) (with-environment-variables): Remove. * guix/tests/git.scm (populate-git-repository): Add clauses for signed commits and signed merges. * guix/tests/gnupg.scm: New file. * tests/git-authenticate.scm: New file. * tests/ed25519bis.key, tests/ed25519bis.sec: New files. * Makefile.am (dist_noinst_DATA): Add 'guix/tests/gnupg.scm'. (SCM_TESTS): Add 'tests/git-authenticate.scm'. (EXTRA_DIST): Add tests/ed25519bis.{key,sec}. --- .dir-locals.el | 2 + Makefile.am | 6 +- guix/tests/git.scm | 26 ++--- guix/tests/gnupg.scm | 72 ++++++++++++ tests/ed25519bis.key | 10 ++ tests/ed25519bis.sec | 10 ++ tests/git-authenticate.scm | 286 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 393 insertions(+), 19 deletions(-) create mode 100644 guix/tests/gnupg.scm create mode 100644 tests/ed25519bis.key create mode 100644 tests/ed25519bis.sec create mode 100644 tests/git-authenticate.scm diff --git a/.dir-locals.el b/.dir-locals.el index fcde914e60..e34ddc5a85 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -96,6 +96,8 @@ (eval . (put 'call-with-progress-reporter 'scheme-indent-function 1)) (eval . (put 'with-temporary-git-repository 'scheme-indent-function 2)) + (eval . (put 'with-environment-variables 'scheme-indent-function 1)) + (eval . (put 'with-fresh-gnupg-setup 'scheme-indent-function 1)) ;; This notably allows '(' in Paredit to not insert a space when the ;; preceding symbol is one of these. diff --git a/Makefile.am b/Makefile.am index db30004b1b..f3985f9572 100644 --- a/Makefile.am +++ b/Makefile.am @@ -319,7 +319,8 @@ MODULES += $(STORE_MODULES) dist_noinst_DATA = \ guix/tests.scm \ guix/tests/http.scm \ - guix/tests/git.scm + guix/tests/git.scm \ + guix/tests/gnupg.scm # Auxiliary files for packages. AUX_FILES = \ @@ -404,6 +405,7 @@ SCM_TESTS = \ tests/gem.scm \ tests/gexp.scm \ tests/git.scm \ + tests/git-authenticate.scm \ tests/glob.scm \ tests/gnu-maintenance.scm \ tests/grafts.scm \ @@ -576,6 +578,8 @@ EXTRA_DIST += \ tests/dsa.key \ tests/ed25519.key \ tests/ed25519.sec \ + tests/ed25519bis.key \ + tests/ed25519bis.sec \ build-aux/config.rpath \ bootstrap \ doc/build.scm \ diff --git a/guix/tests/git.scm b/guix/tests/git.scm index 566660e85e..c77c544e03 100644 --- a/guix/tests/git.scm +++ b/guix/tests/git.scm @@ -21,6 +21,7 @@ #:use-module ((guix git) #:select (with-repository)) #:use-module (guix utils) #:use-module (guix build utils) + #:use-module ((guix tests gnupg) #:select (with-environment-variables)) #:use-module (ice-9 match) #:use-module (ice-9 control) #:export (git-command @@ -30,24 +31,6 @@ (define git-command (make-parameter "git")) -(define (call-with-environment-variables variables thunk) - "Call THUNK with the environment VARIABLES set." - (let ((environment (environ))) - (dynamic-wind - (lambda () - (for-each (match-lambda - ((variable value) - (setenv variable value))) - variables)) - thunk - (lambda () - (environ environment))))) - -(define-syntax-rule (with-environment-variables variables exp ...) - "Evaluate EXP with the given environment VARIABLES set." - (call-with-environment-variables variables - (lambda () exp ...))) - (define (populate-git-repository directory directives) "Initialize a new Git checkout and repository in DIRECTORY and apply DIRECTIVES. Each element of DIRECTIVES is an sexp like: @@ -97,6 +80,9 @@ Return DIRECTORY on success." ((('commit text) rest ...) (git "commit" "-m" text) (loop rest)) + ((('commit text ('signer fingerprint)) rest ...) + (git "commit" "-m" text (string-append "--gpg-sign=" fingerprint)) + (loop rest)) ((('tag name) rest ...) (git "tag" name) (loop rest)) @@ -108,6 +94,10 @@ Return DIRECTORY on success." (loop rest)) ((('merge branch message) rest ...) (git "merge" branch "-m" message) + (loop rest)) + ((('merge branch message ('signer fingerprint)) rest ...) + (git "merge" branch "-m" message + (string-append "--gpg-sign=" fingerprint)) (loop rest))))) (define (call-with-temporary-git-repository directives proc) diff --git a/guix/tests/gnupg.scm b/guix/tests/gnupg.scm new file mode 100644 index 0000000000..6e7fdbcf65 --- /dev/null +++ b/guix/tests/gnupg.scm @@ -0,0 +1,72 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix tests gnupg) + #:use-module (guix utils) + #:use-module (guix build utils) + #:use-module (ice-9 match) + #:export (gpg-command + gpgconf-command + with-fresh-gnupg-setup + + with-environment-variables)) + +(define (call-with-environment-variables variables thunk) + "Call THUNK with the environment VARIABLES set." + (let ((environment (environ))) + (dynamic-wind + (lambda () + (for-each (match-lambda + ((variable value) + (setenv variable value))) + variables)) + thunk + (lambda () + (environ environment))))) + +(define-syntax-rule (with-environment-variables variables exp ...) + "Evaluate EXP with the given environment VARIABLES set." + (call-with-environment-variables variables + (lambda () exp ...))) + +(define gpg-command + (make-parameter "gpg")) + +(define gpgconf-command + (make-parameter "gpgconf")) + +(define (call-with-fresh-gnupg-setup imported thunk) + (call-with-temporary-directory + (lambda (home) + (with-environment-variables `(("GNUPGHOME" ,home)) + (dynamic-wind + (lambda () + (for-each (lambda (file) + (invoke (gpg-command) "--import" file)) + imported)) + thunk + (lambda () + ;; Terminate 'gpg-agent' & co. + (invoke (gpgconf-command) "--kill" "all"))))))) + +(define-syntax-rule (with-fresh-gnupg-setup imported exp ...) + "Evaluate EXP in the context of a fresh GnuPG setup where all the files +listed in IMPORTED, and only them, have been imported. This sets 'GNUPGHOME' +such that the user's real GnuPG files are left untouched. The 'gpg-agent' +process is terminated afterwards." + (call-with-fresh-gnupg-setup imported (lambda () exp ...))) diff --git a/tests/ed25519bis.key b/tests/ed25519bis.key new file mode 100644 index 0000000000..f5329105d5 --- /dev/null +++ b/tests/ed25519bis.key @@ -0,0 +1,10 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEXtVsNhYJKwYBBAHaRw8BAQdAnLsYdh3BpeK1xDguJE80XW2/MSmqeeP6pbQw +8jAw0OG0IkNoYXJsaWUgR3VpeCA8Y2hhcmxpZUBleGFtcGxlLm9yZz6IlgQTFggA +PhYhBKBDaY1jer75FlruS4IkDtyrgNqDBQJe1Ww2AhsDBQkDwmcABQsJCAcCBhUK +CQgLAgQWAgMBAh4BAheAAAoJEIIkDtyrgNqDM6cA/idDdoxo9SU+witdTXt24APH +yRzHbX9Iyh4dZNIek9JwAP9E0BwSvDHB4LY9z4RWf2hJp3dm/yZ/jEpK+w4BGN4J +Ag== +=JIU0 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/tests/ed25519bis.sec b/tests/ed25519bis.sec new file mode 100644 index 0000000000..059765f557 --- /dev/null +++ b/tests/ed25519bis.sec @@ -0,0 +1,10 @@ +-----BEGIN PGP PRIVATE KEY BLOCK----- + +lFgEXtVsNhYJKwYBBAHaRw8BAQdAnLsYdh3BpeK1xDguJE80XW2/MSmqeeP6pbQw +8jAw0OEAAP9lsLf3tk0OH1X4By4flYSz4PBFo40EwS4t6xx76poUphCEtCJDaGFy +bGllIEd1aXggPGNoYXJsaWVAZXhhbXBsZS5vcmc+iJYEExYIAD4WIQSgQ2mNY3q+ ++RZa7kuCJA7cq4DagwUCXtVsNgIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIe +AQIXgAAKCRCCJA7cq4DagzOnAP4nQ3aMaPUlPsIrXU17duADx8kcx21/SMoeHWTS +HpPScAD/RNAcErwxweC2Pc+EVn9oSad3Zv8mf4xKSvsOARjeCQI= +=gUik +-----END PGP PRIVATE KEY BLOCK----- diff --git a/tests/git-authenticate.scm b/tests/git-authenticate.scm new file mode 100644 index 0000000000..5937c37ee6 --- /dev/null +++ b/tests/git-authenticate.scm @@ -0,0 +1,286 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (test-git-authenticate) + #:use-module (git) + #:use-module (guix git) + #:use-module (guix git-authenticate) + #:use-module (guix openpgp) + #:use-module (guix tests git) + #:use-module (guix tests gnupg) + #:use-module (guix build utils) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-64) + #:use-module (rnrs bytevectors) + #:use-module (rnrs io ports)) + +;; Test the (guix git-authenticate) tools. + +(define %ed25519-public-key-file + (search-path %load-path "tests/ed25519.key")) +(define %ed25519-secret-key-file + (search-path %load-path "tests/ed25519.sec")) +(define %ed25519bis-public-key-file + (search-path %load-path "tests/ed25519bis.key")) +(define %ed25519bis-secret-key-file + (search-path %load-path "tests/ed25519bis.sec")) + +(define (read-openpgp-packet file) + (get-openpgp-packet + (open-bytevector-input-port + (call-with-input-file file read-radix-64)))) + +(define key-fingerprint + (compose openpgp-format-fingerprint + openpgp-public-key-fingerprint + read-openpgp-packet)) + +(define (key-id file) + (define id + (openpgp-public-key-id (read-openpgp-packet))) + + (string-pad (number->string id 16) 16 #\0)) + +(define (gpg+git-available?) + (and (which (git-command)) + (which (gpg-command)) (which (gpgconf-command)))) + + +(test-begin "git-authenticate") + +(unless (which (git-command)) (test-skip 1)) +(test-assert "unsigned commits" + (with-temporary-git-repository directory + '((add "a.txt" "A") + (commit "first commit") + (add "b.txt" "B") + (commit "second commit")) + (with-repository directory repository + (let ((commit1 (find-commit repository "first")) + (commit2 (find-commit repository "second"))) + (guard (c ((unsigned-commit-error? c) + (oid=? (git-authentication-error-commit c) + (commit-id commit1)))) + (authenticate-commits repository (list commit1 commit2) + #:keyring-reference "master") + 'failed))))) + +(unless (gpg+git-available?) (test-skip 1)) +(test-assert "signed commits, default authorizations" + (with-fresh-gnupg-setup (list %ed25519-public-key-file + %ed25519-secret-key-file) + (with-temporary-git-repository directory + `((add "signer.key" ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (commit "zeroth commit") + (add "a.txt" "A") + (commit "first commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (add "b.txt" "B") + (commit "second commit" + (signer ,(key-fingerprint %ed25519-public-key-file)))) + (with-repository directory repository + (let ((commit1 (find-commit repository "first")) + (commit2 (find-commit repository "second"))) + (authenticate-commits repository (list commit1 commit2) + #:default-authorizations + (list (openpgp-public-key-fingerprint + (read-openpgp-packet + %ed25519-public-key-file))) + #:keyring-reference "master")))))) + +(unless (gpg+git-available?) (test-skip 1)) +(test-assert "signed commits, .guix-authorizations" + (with-fresh-gnupg-setup (list %ed25519-public-key-file + %ed25519-secret-key-file) + (with-temporary-git-repository directory + `((add "signer.key" ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (add ".guix-authorizations" + ,(object->string + `(authorizations (version 0) + ((,(key-fingerprint + %ed25519-public-key-file) + (name "Charlie")))))) + (commit "zeroth commit") + (add "a.txt" "A") + (commit "first commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (add ".guix-authorizations" + ,(object->string `(authorizations (version 0) ()))) ;empty + (commit "second commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (add "b.txt" "B") + (commit "third commit" + (signer ,(key-fingerprint %ed25519-public-key-file)))) + (with-repository directory repository + (let ((commit1 (find-commit repository "first")) + (commit2 (find-commit repository "second")) + (commit3 (find-commit repository "third"))) + ;; COMMIT1 and COMMIT2 are fine. + (and (authenticate-commits repository (list commit1 commit2) + #:keyring-reference "master") + + ;; COMMIT3 is signed by an unauthorized key according to its + ;; parent's '.guix-authorizations' file. + (guard (c ((unauthorized-commit-error? c) + (and (oid=? (git-authentication-error-commit c) + (commit-id commit3)) + (bytevector=? + (openpgp-public-key-fingerprint + (unauthorized-commit-error-signing-key c)) + (openpgp-public-key-fingerprint + (read-openpgp-packet + %ed25519-public-key-file)))))) + (authenticate-commits repository + (list commit1 commit2 commit3) + #:keyring-reference "master") + 'failed))))))) + +(unless (gpg+git-available?) (test-skip 1)) +(test-assert "signed commits, .guix-authorizations, unauthorized merge" + (with-fresh-gnupg-setup (list %ed25519-public-key-file + %ed25519-secret-key-file + %ed25519bis-public-key-file + %ed25519bis-secret-key-file) + (with-temporary-git-repository directory + `((add "signer1.key" + ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (add "signer2.key" + ,(call-with-input-file %ed25519bis-public-key-file + get-string-all)) + (add ".guix-authorizations" + ,(object->string + `(authorizations (version 0) + ((,(key-fingerprint + %ed25519-public-key-file) + (name "Alice")))))) + (commit "zeroth commit") + (add "a.txt" "A") + (commit "first commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (branch "devel") + (checkout "devel") + (add "devel/1.txt" "1") + (commit "first devel commit" + (signer ,(key-fingerprint %ed25519bis-public-key-file))) + (checkout "master") + (add "b.txt" "B") + (commit "second commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (merge "devel" "merge" + (signer ,(key-fingerprint %ed25519-public-key-file)))) + (with-repository directory repository + (let ((master1 (find-commit repository "first commit")) + (master2 (find-commit repository "second commit")) + (devel1 (find-commit repository "first devel commit")) + (merge (find-commit repository "merge"))) + (define (correct? c commit) + (and (oid=? (git-authentication-error-commit c) + (commit-id commit)) + (bytevector=? + (openpgp-public-key-fingerprint + (unauthorized-commit-error-signing-key c)) + (openpgp-public-key-fingerprint + (read-openpgp-packet %ed25519bis-public-key-file))))) + + (and (authenticate-commits repository (list master1 master2) + #:keyring-reference "master") + + ;; DEVEL1 is signed by an unauthorized key according to its + ;; parent's '.guix-authorizations' file. + (guard (c ((unauthorized-commit-error? c) + (correct? c devel1))) + (authenticate-commits repository + (list master1 devel1) + #:keyring-reference "master") + #f) + + ;; MERGE is authorized but one of its ancestors is not. + (guard (c ((unauthorized-commit-error? c) + (correct? c devel1))) + (authenticate-commits repository + (list master1 master2 + devel1 merge) + #:keyring-reference "master") + #f))))))) + +(unless (gpg+git-available?) (test-skip 1)) +(test-assert "signed commits, .guix-authorizations, authorized merge" + (with-fresh-gnupg-setup (list %ed25519-public-key-file + %ed25519-secret-key-file + %ed25519bis-public-key-file + %ed25519bis-secret-key-file) + (with-temporary-git-repository directory + `((add "signer1.key" + ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (add "signer2.key" + ,(call-with-input-file %ed25519bis-public-key-file + get-string-all)) + (add ".guix-authorizations" + ,(object->string + `(authorizations (version 0) + ((,(key-fingerprint + %ed25519-public-key-file) + (name "Alice")))))) + (commit "zeroth commit") + (add "a.txt" "A") + (commit "first commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (branch "devel") + (checkout "devel") + (add ".guix-authorizations" + ,(object->string ;add the second signer + `(authorizations (version 0) + ((,(key-fingerprint + %ed25519-public-key-file) + (name "Alice")) + (,(key-fingerprint + %ed25519bis-public-key-file)))))) + (commit "first devel commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (add "devel/2.txt" "2") + (commit "second devel commit" + (signer ,(key-fingerprint %ed25519bis-public-key-file))) + (checkout "master") + (add "b.txt" "B") + (commit "second commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (merge "devel" "merge" + (signer ,(key-fingerprint %ed25519-public-key-file))) + ;; After the merge, the second signer is authorized. + (add "c.txt" "C") + (commit "third commit" + (signer ,(key-fingerprint %ed25519bis-public-key-file)))) + (with-repository directory repository + (let ((master1 (find-commit repository "first commit")) + (master2 (find-commit repository "second commit")) + (devel1 (find-commit repository "first devel commit")) + (devel2 (find-commit repository "second devel commit")) + (merge (find-commit repository "merge")) + (master3 (find-commit repository "third commit"))) + (authenticate-commits repository + (list master1 master2 devel1 devel2 + merge master3) + #:keyring-reference "master")))))) + +(test-end "git-authenticate") + -- cgit v1.2.3 From 831c1a32301c45bade7d932629bf6f35befca343 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 00:11:22 +0200 Subject: gnu: emacs-general: Update to a0b17d2. Fixes . Reported by bdju . * gnu/packages/emacs-xyz.scm (emacs-general): Update to a0b17d2. [arguments]: Remove unnecessary phase. Update #:test-command. --- gnu/packages/emacs-xyz.scm | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a111cbb99b..6110374281 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18216,20 +18216,20 @@ advice to be recorded and displayed.") (license license:gpl3+)))) (define-public emacs-general - (let ((commit "f38fb2294bd29261374b772f765730f2fa168b3e") - (revision "3")) + (let ((commit "a0b17d207badf462311b2eef7c065b884462cb7c") + (revision "4")) (package (name "emacs-general") (version (git-version "0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/noctuid/general.el.git") - (commit commit))) - (sha256 - (base32 - "1aqi5axkwfng6rm52sblf738c7rffp10sqs69dvkh2fv3ps8q28i")) - (file-name (git-file-name name version)))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/noctuid/general.el.git") + (commit commit))) + (sha256 + (base32 "0wn5rk3gkimdklip392mnjrmkymgrb7q9skifi03cbpjam1anzvv")) + (file-name (git-file-name name version)))) (build-system emacs-build-system) (native-inputs `(("emacs-buttercup" ,emacs-buttercup) @@ -18237,15 +18237,8 @@ advice to be recorded and displayed.") ("emacs-which-key" ,emacs-which-key) ("emacs-use-package" ,emacs-use-package))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'fix-makefile - (lambda _ - (substitute* "Makefile" - (("cask exec ") "")) - #t))) - #:tests? #t - #:test-command '("make" "test"))) + `(#:tests? #t + #:test-command '("buttercup" "-L" "test/test-general.el"))) (home-page "https://github.com/noctuid/general.el") (synopsis "More convenient key definitions in emacs") (description "@code{general.el} provides a more convenient method for -- cgit v1.2.3 From f9bffb564ac720cb63d233cca048dfec75aa714d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 08:17:55 +0200 Subject: gnu: python-backports-csv: Update to 1.0.7. * gnu/packages/python-xyz.scm (python-backports-csv): Update to 1.0.7. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2e9f0d5632..bf0584326b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7336,14 +7336,13 @@ It is written entirely in Python.") (define-public python-backports-csv (package (name "python-backports-csv") - (version "1.0.5") + (version "1.0.7") (source (origin (method url-fetch) (uri (pypi-uri "backports.csv" version)) (sha256 - (base32 - "1imzbrradkfn8s2m1qcimyn74dn1mz2p3j381jljn166rf2i6hlc")))) + (base32 "0vdx5jlhs91iizc8j8l8811nqprwvdx39pgkdc82w2qkfgzxyxqj")))) (build-system python-build-system) (home-page "https://github.com/ryanhiebert/backports.csv") (synopsis "Backport of Python 3's csv module for Python 2") -- cgit v1.2.3 From 6b490fff21b9c87f5ad5a0eda0e6eada32ccc681 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 02:51:39 +0200 Subject: gnu: fortune-mod: Update to 2.28.0. * gnu/packages/games.scm (fortune-mod): Update to 2.28.0. --- gnu/packages/games.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index fc3569e9ea..8a2ac9fcc5 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6380,7 +6380,7 @@ original.") (define-public fortune-mod (package (name "fortune-mod") - (version "2.22.0") + (version "2.28.0") (source (origin (method git-fetch) @@ -6389,8 +6389,7 @@ original.") (commit (string-append "fortune-mod-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "17h2g35j8nzljsqaqhrsx75jakbmlqnsa150g2xw414fcbnjbyps")))) + (base32 "1ppzgnffgdcmq6fq4gmdq2ig10ip2bnfgklkb3i8nc6bdxm7pb89")))) (build-system cmake-build-system) (arguments `(#:test-target "check" -- cgit v1.2.3 From 893aca0993b93a8156b32cf76d9b57a097c13622 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 05:15:15 +0200 Subject: gnu: gpxsee: Update to 7.30. * gnu/packages/gps.scm (gpxsee): Update to 7.30. --- gnu/packages/gps.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index bb3ec345ba..38fa6bea47 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Vincent Legoll @@ -182,7 +182,7 @@ coordinates as well as partial support for adjustments in global coordinate syst (define-public gpxsee (package (name "gpxsee") - (version "7.25") + (version "7.30") (source (origin (method git-fetch) (uri (git-reference @@ -191,7 +191,7 @@ coordinates as well as partial support for adjustments in global coordinate syst (file-name (git-file-name name version)) (sha256 (base32 - "0lml3hz2zxljl9j5wnh7bn9bj8k9v3wf6bk3g77x9nnarsmw0fcx")))) + "09gajwqc30r9a2sn972qdx3gx0gki9n0zafq986hn6zsr3z43mfs")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 996b3f71594724392ee530e9d8b201b905f22726 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:04:21 +0200 Subject: gnu: mtpaint: Fix version numbering. * gnu/packages/image.scm (mtpaint): Remove let binding. [version]: Don't use GIT-VERSION. [source]: Specify the matching COMMIT directly. --- gnu/packages/image.scm | 90 +++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 48 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 94e6abe19f..36386537c3 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2075,54 +2075,48 @@ AOM, including with alpha.") license:expat)))) ; cJSON in the test suite (define-public mtpaint - (let ((commit "03b1b0938067b88d86d9f1b1088730f1934d411e") - (revision "1")) - (package - (name "mtpaint") - ;; The author neither releases tarballs nor uses git version tags. - ;; Instead, author puts version in git commit title. - (version (git-version "3.49.25" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/wjaguar/mtPaint/") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0izm2wvj26566fd8mqvypr7bmv7jnq8qhp4760m7z2wrc4y8pjn1")))) - (build-system gnu-build-system) - (native-inputs - `(("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("which" ,which))) - (inputs - `(("imlib2" ,imlib2) - ("libtiff" ,libtiff) - ("libpng" ,libpng) - ("libungif", libungif) - ("libjpeg", libjpeg-turbo) - ("libwebp" ,libwebp) - ("openjpeg" ,openjpeg) - ("lcms" ,lcms) - ("zlib", zlib) - ("glib" ,glib) - ;; support for gtk3 is in testing stage - ("gtk+" ,gtk+-2))) - (arguments - `(#:configure-flags - (list - ;; internationalized version - "intl" - ;; install man page - "man") - ;; no check target - #:tests? #f)) - (home-page "http://mtpaint.sourceforge.net/") - (synopsis "Create pixel art and manipulate digital images") - (description - "Mtpaint is a graphic editing program which uses the GTK+ toolkit. + (package + (name "mtpaint") + ;; The author neither releases tarballs nor uses git version tags. + ;; Instead, author puts version in git commit title. + (version "3.49.25") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wjaguar/mtPaint") + (commit "03b1b0938067b88d86d9f1b1088730f1934d411e"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0izm2wvj26566fd8mqvypr7bmv7jnq8qhp4760m7z2wrc4y8pjn1")))) + (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ("which" ,which))) + (inputs + `(("imlib2" ,imlib2) + ("libtiff" ,libtiff) + ("libpng" ,libpng) + ("libungif", libungif) + ("libjpeg", libjpeg-turbo) + ("libwebp" ,libwebp) + ("openjpeg" ,openjpeg) + ("lcms" ,lcms) + ("zlib", zlib) + ("glib" ,glib) + ;; Support for gtk3 is in the testing stage. + ("gtk+" ,gtk+-2))) + (arguments + `(#:configure-flags + (list "intl" ; build internationalized version + "man") ; build the man page + #:tests? #f)) ; no test suite + (home-page "http://mtpaint.sourceforge.net/") + (synopsis "Create pixel art and manipulate digital images") + (description + "Mtpaint is a graphic editing program which uses the GTK+ toolkit. It can create and edit indexed palette or 24bit RGB images, offers basic painting and palette manipulation tools. It also handles JPEG, JPEG2000, GIF, TIFF, WEBP, BMP, PNG, XPM formats.") - (license license:gpl3+)))) + (license license:gpl3+))) -- cgit v1.2.3 From 6e13b0efce7e77d033a6585019f5821a577672ca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:14:47 +0200 Subject: gnu: mtpaint: Update to 3.49.27. * gnu/packages/image.scm (mtpaint): Update to 3.49.27. --- gnu/packages/image.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 36386537c3..495780246f 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2079,16 +2079,16 @@ AOM, including with alpha.") (name "mtpaint") ;; The author neither releases tarballs nor uses git version tags. ;; Instead, author puts version in git commit title. - (version "3.49.25") + (version "3.49.27") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/wjaguar/mtPaint") - (commit "03b1b0938067b88d86d9f1b1088730f1934d411e"))) + (commit "26751cd0336414e2f16cbe25c9fe2702f34e7b5c"))) (file-name (git-file-name name version)) (sha256 - (base32 "0izm2wvj26566fd8mqvypr7bmv7jnq8qhp4760m7z2wrc4y8pjn1")))) + (base32 "12mzai9pqvyb342m21rjz0jxiy75q24sjw6ax147pzy8frzkgd54")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 6f64a05ec920ed46a845ad399546170988d2e05d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:16:36 +0200 Subject: gnu: evince: Update to 3.36.1. * gnu/packages/gnome.scm (evince): Update to 3.36.1. --- gnu/packages/gnome.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7335dc1cd6..6bcc36dec5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1668,7 +1668,7 @@ forgotten when the session ends.") (define-public evince (package (name "evince") - (version "3.34.2") + (version "3.36.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/evince/" @@ -1676,7 +1676,7 @@ forgotten when the session ends.") "evince-" version ".tar.xz")) (sha256 (base32 - "05q6v9lssd21623mnj2p49clj9v9csw9kay7n4nklki025grbh1w")))) + "1msbb66lasikpfjpkwsvi7h22hqmk275850ilpdqwbd0b39vzf4c")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-nautilus" "--enable-introspection") @@ -1726,8 +1726,7 @@ forgotten when the session ends.") ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("xmllint" ,libxml2))) - (home-page - "https://www.gnome.org/projects/evince/") + (home-page "https://www.gnome.org/projects/evince/") (synopsis "GNOME's document viewer") (description "Evince is a document viewer for multiple document formats. It -- cgit v1.2.3 From 2bf0a5cbae96adfe97de5903f620d441a3106c07 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:17:40 +0200 Subject: gnu: geoclue: Update to 2.5.6. * gnu/packages/gnome.scm (geoclue): Update to 2.5.6. --- gnu/packages/gnome.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6bcc36dec5..592cab0b49 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4124,7 +4124,7 @@ output devices.") (define-public geoclue (package (name "geoclue") - (version "2.5.5") + (version "2.5.6") (source (origin (method url-fetch) @@ -4132,8 +4132,7 @@ output devices.") (string-append "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/" version "/geoclue-" version ".tar.bz2")) (sha256 - (base32 - "1b7jqrsn4x7mxjxj8hvb2dl2cmhrpb9vibs4rvkkanky5nsx3sai")) + (base32 "0a833x5apzabxj80ywvsh8crd635vni2i9v9c1p095f6hvmfc45k")) (patches (search-patches "geoclue-config.patch")))) (build-system meson-build-system) (arguments -- cgit v1.2.3 From df305cea48d769cc35e01a4d6d68f22d885520f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:24:00 +0200 Subject: gnu: mcelog: Fix unversioned DOCDIR. * gnu/packages/linux.scm (mcelog)[arguments]: VERSION DOCDIR. --- gnu/packages/linux.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 745370b8f8..9cc23609f1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5496,7 +5496,8 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.") #:make-flags (let ((out (assoc-ref %outputs "out"))) (list "CC=gcc" (string-append "prefix=" out) - (string-append "DOCDIR=" out "/share/doc/mcelog") + (string-append "DOCDIR=" out "/share/doc/" + ,name "-" ,version) "etcprefix=$(DOCDIR)/examples")) ;; The tests will only run as root on certain supported CPU models. #:tests? #f)) -- cgit v1.2.3 From ed139ee733db52c6f364d07bb4dc72385cfe8818 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:26:04 +0200 Subject: gnu: mcelog: Update to 170. * gnu/packages/linux.scm (mcelog): Update to 170. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9cc23609f1..a9a281858e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5472,14 +5472,14 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.") (define-public mcelog (package (name "mcelog") - (version "168") + (version "170") (source (origin (method url-fetch) (uri (string-append "https://git.kernel.org/cgit/utils/cpu/mce/" "mcelog.git/snapshot/v" version ".tar.gz")) (sha256 (base32 - "1c4faayg1gcm3002b2fdrfnv76z92mvfzccvx8w9crjp0d17sp24")) + "1m11v1y7cvpm7hwsghj23z77ps1w5jzn8000iwiyxpb939h2km5l")) (file-name (string-append name "-" version ".tar.gz")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From de3825286ff91529c66a4d3847518e5d7cd45295 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:29:42 +0200 Subject: gnu: mcelog: Update description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I believe that nowadays rasdaemon is a/the recommended alternative. * gnu/packages/linux.scm (mcelog)[description]: Remove ‘required’. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a9a281858e..db03160085 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5505,10 +5505,10 @@ the default @code{nsswitch} and the experimental @code{umich_ldap}.") (home-page "https://mcelog.org/") (synopsis "Machine check monitor for x86 Linux systems") (description - "The mcelog daemon is required by the Linux kernel to log memory, I/O, CPU, -and other hardware errors on x86 systems. It can also perform user-defined -tasks, such as bringing bad pages off-line, when configurable error thresholds -are exceeded.") + "The mcelog daemon logs memory, I/O, CPU, and other hardware errors on x86 +systems running the kernel Linux. It can also perform user-defined tasks, such +as bringing bad pages off-line, when configurable error thresholds are +exceeded.") (license license:gpl2))) (define-public mtd-utils -- cgit v1.2.3 From b613842238af7c0164ae0df58190423a8b466f63 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 00:07:13 +0200 Subject: gnu: libqmi: Update to 1.24.12. * gnu/packages/freedesktop.scm (libqmi): Update to 1.24.12. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 90154cbba9..9e84f30b5c 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1084,7 +1084,7 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol.") (define-public libqmi (package (name "libqmi") - (version "1.24.4") + (version "1.24.12") (source (origin (method url-fetch) (uri (string-append @@ -1092,7 +1092,7 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol.") "libqmi-" version ".tar.xz")) (sha256 (base32 - "12licfsszr6qxpg9b2b04qm2glk8d42fcy32zr8jzwrgr7gbl5h3")))) + "0scb8a2kh0vnzx6kxanfy2s2slnfppvrwg202rxv30m8p2i92frd")))) (build-system gnu-build-system) (inputs `(("libgudev" ,libgudev))) -- cgit v1.2.3 From 51b25847b7bab85fde2a87d1a4eaf9fb08f1234f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:37:37 +0200 Subject: gnu: libavif: Mark up description. * gnu/packages/image.scm (libavif)[description]: Use @acronym{}. --- gnu/packages/image.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 495780246f..393ee7e08b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2067,9 +2067,9 @@ This package can be used to create @code{favicon.ico} files for web sites.") `(("libaom" ,libaom) ("dav1d" ,dav1d))) (synopsis "Encode and decode AVIF files") - (description "Libavif is a C implementation of the AV1 Image File Format -(AVIF). It can encode and decode all YUV formats and bit depths supported by -AOM, including with alpha.") + (description "Libavif is a C implementation of @acronym{AVIF, the AV1 Image +File Format}. It can encode and decode all YUV formats and bit depths supported +by AOM, including with alpha.") (home-page "https://github.com/AOMediaCodec/libavif") (license (list license:bsd-2 ; libavif itself license:expat)))) ; cJSON in the test suite -- cgit v1.2.3 From 35f9af5f7d0d8d4252ebf46d4cec8ea75e821bda Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 12:19:55 +0200 Subject: gnu: emacs-websocket: Update to 1.12. * gnu/packages/emacs-xyz.scm (emacs-websocket): Update to 1.12. [source]: Use ELPA repository instead of GitHub. --- gnu/packages/emacs-xyz.scm | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6110374281..be7044de0f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11791,31 +11791,22 @@ database of references on life sciences.") (define-public emacs-websocket (package (name "emacs-websocket") - (version "1.10") + (version "1.12") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ahyatt/emacs-websocket.git") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "websocket-" version ".tar")) (sha256 - (base32 - "1dgrf7na6r6mmkknphzshlbd5fnzisg0qn0j7vfpa38wgsymaq52")))) + (base32 "0ap4z80c6pzpb69wrx0hsvwzignxmd2b9xy974by9gf5xm2wpa8w")))) (build-system emacs-build-system) - (arguments - `(#:tests? #t - ;; TODO: also enable websocket-functional-test.el - #:test-command '("emacs" "--batch" - "-l" "websocket-test.el" - "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://elpa.gnu.org/packages/websocket.html") (synopsis "Emacs WebSocket client and server") - (description "This is an Elisp library for WebSocket clients to talk to -WebSocket servers, and for WebSocket servers to accept connections from -WebSocket clients. This library is designed to be used by other library -writers, to write applications that use WebSockets, and is not useful by -itself.") + (description + "This is an Elisp library for WebSocket clients to talk to WebSocket +servers, and for WebSocket servers to accept connections from WebSocket +clients. This library is designed to be used by other library writers, to +write applications that use WebSockets, and is not useful by itself.") (license license:gpl3+))) (define-public emacs-oauth2 -- cgit v1.2.3 From 8f21ddad41dcdc5356b5b4af0928e3f51fb6ec36 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 12:23:00 +0200 Subject: gnu: emacs-undo-tree: Update to 0.7.4. * gnu/packages/emacs-xyz.scm (emacs-undo-tree): Update to 0.7.4. [source]: Use GNU ELPA repository. --- gnu/packages/emacs-xyz.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index be7044de0f..34e4babc27 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2675,20 +2675,19 @@ in the center.") (define-public emacs-undo-tree (package (name "emacs-undo-tree") - (version "0.7.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "http://dr-qubit.org/git/undo-tree.git") - (commit (string-append "release/" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1nr0149y2nvrxj56gc12jqnfl01g6z9ypfsgl6pfg85cw73hnggk")))) + (version "0.7.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "undo-tree-" version ".el")) + (sha256 + (base32 "018ixl802f076sfyf4gkacpgrdpybin88jd8vq9zgyvc6x2dalfa")))) (build-system emacs-build-system) (home-page "http://www.dr-qubit.org/emacs.php") (synopsis "Treat undo history as a tree") - (description "Tree-like interface to Emacs undo system, providing + (description + "Tree-like interface to Emacs undo system, providing graphical tree presentation of all previous states of buffer that allows easily move between them.") (license license:gpl3+))) -- cgit v1.2.3 From 96f0a465daa0402f87836e13c34980f8fd0d99e4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:03:21 +0200 Subject: gnu: emacs-php-mode: Update to 1.23.0. * gnu/packages/emacs-xyz.scm (emacs-php-mode): Update to 1.23.0. --- gnu/packages/emacs-xyz.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 34e4babc27..02a4417417 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10236,25 +10236,25 @@ configuration of Chinese fonts.") (define-public emacs-php-mode (package (name "emacs-php-mode") - (version "1.22.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ejmr/php-mode.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1r4bpyavlndd4c78cv5cc97bc0gkd4cggiyz4kd2vg6zlyc1nld3")))) + (version "1.23.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ejmr/php-mode.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wnkcxg6djy4jvxhshiy1iw6b5cf79pjwjhfd1a060cavhfm4v5c")))) (build-system emacs-build-system) (home-page "https://github.com/ejmr/php-mode") (synopsis "Major mode for editing PHP code") - (description "@code{php-mode} is a major mode for editing PHP source -code. It's an extension of C mode; thus it inherits all C mode's navigation -functionality. But it colors according to the PHP grammar and indents -according to the PEAR coding guidelines. It also includes a couple handy -IDE-type features such as documentation search and a source and class -browser.") + (description + "PHP mode is a major mode for editing PHP source code. It's an extension +of C mode; thus it inherits all C mode's navigation functionality. But it +colors according to the PHP grammar and indents according to the PEAR coding +guidelines. It also includes a couple handy IDE-type features such as +documentation search and a source and class browser.") (license license:gpl3+))) (define-public emacs-pos-tip -- cgit v1.2.3 From 0d582c68eec944c12991a79f288a13c4d753f319 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:08:11 +0200 Subject: gnu: emacs-clojure-mode: Update to 5.11.0. * gnu/packages/emacs-xyz.scm (emacs-clojure-mode): Update to 5.11.0. [native-inputs]: Add emacs-buttercup, remove emacs-ert-runner. [arguments]: Update test command. [description]: Small typographic fixes. --- gnu/packages/emacs-xyz.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 02a4417417..0d912e7b70 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6570,7 +6570,7 @@ allowing unprefixed keys to insert their respective characters as expected.") (define-public emacs-clojure-mode (package (name "emacs-clojure-mode") - (version "5.6.1") + (version "5.11.0") (source (origin (method git-fetch) @@ -6579,21 +6579,21 @@ allowing unprefixed keys to insert their respective characters as expected.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1qadymqzs5fn1sb347xzfw8lqq6s85vvkh4kzm35m61g5i2lm86y")))) + (base32 "1x1yszp6waa778ki6sw66w1pzcz389wd01gkcldfxxnd7z89ad5d")))) (build-system emacs-build-system) (native-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-s" ,emacs-s) - ("ert-runner" ,emacs-ert-runner))) + `(("emacs-buttercup" ,emacs-buttercup) + ("emacs-dash" ,emacs-dash) + ("emacs-s" ,emacs-s))) (arguments `(#:tests? #t - #:test-command '("ert-runner"))) + #:test-command '("buttercup"))) (home-page "https://github.com/clojure-emacs/clojure-mode") (synopsis "Major mode for Clojure code") (description "This Emacs package provides font-lock, indentation, navigation and basic refactoring for the @uref{http://clojure.org, Clojure programming language}. -It is recommended to use @code{clojure-mode} with paredit or smartparens.") +It is recommended to use @code{clojure-mode} with Paredit or Smartparens.") (license license:gpl3+))) (define-public emacs-epl -- cgit v1.2.3 From 22ba47551b62c080bb574a572e10dd607bb6f011 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:11:33 +0200 Subject: gnu: emacs-magit-popup: Update to 2.13.2. * gnu/packages/emacs-xyz.scm (emacs-magit-popup): Update to 2.13.2. --- gnu/packages/emacs-xyz.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0d912e7b70..3ad529de10 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -510,16 +510,16 @@ support for Git-SVN.") (define-public emacs-magit-popup (package (name "emacs-magit-popup") - (version "2.12.5") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/magit-popup.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "13riknyqr6vxqll80sfhvz165flvdz367rbd0pr5slb01bnfsi2i")))) + (version "2.13.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/magit-popup.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ifhph1mj7wjar62d65fjx45qsjwsyslbj7liih3v0r4by5gyxmw")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From c160e5571c00edb8cb1748359cf958496557bc74 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:14:05 +0200 Subject: gnu: emacs-beginend: Update to 2.1.0. * gnu/packages/emacs-xyz.scm (emacs-beginend): Update to 2.1.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3ad529de10..dbecb51c6d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14400,7 +14400,7 @@ until the top-level form is no longer a macro call.") (define-public emacs-beginend (package (name "emacs-beginend") - (version "2.0.0") + (version "2.1.0") (source (origin (method git-fetch) @@ -14409,7 +14409,7 @@ until the top-level form is no longer a macro call.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl")))) + (base32 "1ic5z3qb5sc3mjrjdlg0rqm2l59a43gwnakagns4cilln2a3xdg8")))) ;; TODO: Run tests. (build-system emacs-build-system) (inputs -- cgit v1.2.3 From 90eb9381cbeee58bd0251be9ab833d92573c656b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:15:52 +0200 Subject: gnu: emacs-cider: Update to 0.25.0. * gnu/packages/emacs-xyz.scm (emacs-cider): Update to 0.25.0. [propagated-inputs]: Reorder entries. Remove emacs-seq, built-in. --- gnu/packages/emacs-xyz.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dbecb51c6d..adadc99982 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8012,7 +8012,7 @@ target will call @code{compile} on it.") (define-public emacs-cider (package (name "emacs-cider") - (version "0.23.0") + (version "0.25.0") (source (origin (method git-fetch) @@ -8021,20 +8021,18 @@ target will call @code{compile} on it.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "05yjkqc6d4grq9z5pxmv3anqh4zlhfg4v46jlccp6ynh030g7axs")))) + (base32 "1sdd7vzw948q01kc8im1asiq1j06q0mnn2s8kj83f8sbdnfy0qbk")))) (build-system emacs-build-system) (arguments - '(#:exclude ; Don't exclude 'cider-test.el'. + '(#:exclude ;don't exclude 'cider-test.el' '("^\\.dir-locals\\.el$" "^test/"))) (propagated-inputs `(("emacs-clojure-mode" ,emacs-clojure-mode) - ("emacs-sesman" ,emacs-sesman) - ("emacs-seq" ,emacs-seq) - ("emacs-spinner" ,emacs-spinner) ("emacs-parseedn" ,emacs-parseedn) ("emacs-pkg-info" ,emacs-pkg-info) - ("emacs-queue" ,emacs-queue))) + ("emacs-queue" ,emacs-queue) + ("emacs-sesman" ,emacs-sesman) + ("emacs-spinner" ,emacs-spinner))) (home-page "https://cider.mx/") (synopsis "Clojure development environment for Emacs") (description -- cgit v1.2.3 From bed1d64ca46f9e5363ff0eebe4b525ca944cd8b2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:17:43 +0200 Subject: gnu: emacs-darkroom: Update to 0.3. * gnu/packages/emacs-xyz.scm (emacs-darkroom): Update to 0.3. --- gnu/packages/emacs-xyz.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index adadc99982..d5735c8111 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15206,14 +15206,14 @@ It s customizable: it's easy to add or redefine what exactly consitutes a (define-public emacs-darkroom (package (name "emacs-darkroom") - (version "0.2") - (source (origin - (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/darkroom-" - version ".el")) - (sha256 - (base32 - "1a528brhz4vckhp77n2c1phkyqdliykpj9kzk3f834f4rwnb5mp0")))) + (version "0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "darkroom-" version ".el")) + (sha256 + (base32 "0l1xg5kqmjw22k78qnsln0ifx2dx74xxqj0qp8xxcpqvzzx0xh86")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/darkroom.html") (synopsis "Remove visual distractions and focus on writing") -- cgit v1.2.3 From 3c47d838fa62a25c1f5a757431e4d608dd028fd1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:19:01 +0200 Subject: gnu: emacs-oauth2: Update to 0.13. * gnu/packages/emacs-xyz.scm (emacs-oauth2): Update to 0.13. --- gnu/packages/emacs-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d5735c8111..b8bbd1be96 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11809,15 +11809,14 @@ write applications that use WebSockets, and is not useful by itself.") (define-public emacs-oauth2 (package (name "emacs-oauth2") - (version "0.11") + (version "0.13") (source (origin (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/oauth2-" - version ".el")) + (uri (string-append "https://elpa.gnu.org/packages/" + "oauth2-" version ".el")) (sha256 - (base32 - "0ydkc9jazsnbbvfhd47mql52y7k06n3z7r0naqxkwb99j9blqsmp")))) + (base32 "0y5nbdwxz2hfr09xgsqgyv60vgx0rsaisibcpkz00klvgg26w33r")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/oauth2.html") (synopsis "OAuth 2.0 authorization protocol implementation") -- cgit v1.2.3 From 73a148f325c4029dfe10f1d430a62250e8d14daa Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:22:51 +0200 Subject: gnu: emacs-ghub: Update to 3.3.0. * gnu/packages/emacs-xyz.scm (emacs-ghub): Update to 3.3.0. --- gnu/packages/emacs-xyz.scm | 63 ++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b8bbd1be96..2726ac06dc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -650,42 +650,39 @@ deliver data to mobile and web apps.") (license license:gpl3+))) (define-public emacs-ghub - ;; We need a newer commit to avoid problems in emacs-forge. - (let ((commit "e19cd86ca4768a6d89285123933baa3f1460d696") - (revision "2")) - (package - (name "emacs-ghub") - (version (git-version "3.2.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/ghub") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1d6f8sxlsl0fpkzwbpnaw77d1a5pkg63zfvf6a2fxir357lbdizx")))) - (build-system emacs-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'make-info - (lambda _ - (invoke "make" "info")))))) - (native-inputs - `(("texinfo" ,texinfo))) - (propagated-inputs - `(("dash" ,emacs-dash) - ("emacs-let-alist" ,emacs-let-alist) - ("treepy" ,emacs-treepy))) - (home-page "https://github.com/magit/ghub") - (synopsis "Emacs client libraries for the APIs of various Git forges") - (description - "Ghub provides basic support for using the APIs of various Git forges from + (package + (name "emacs-ghub") + (version "3.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/ghub") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1229g0d9f4ywwjndx32x4z5jdr0kzyi44hjxmy0sifwfmg9nn251")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'make-info + (lambda _ + (invoke "make" "info")))))) + (native-inputs + `(("texinfo" ,texinfo))) + (propagated-inputs + `(("dash" ,emacs-dash) + ("emacs-let-alist" ,emacs-let-alist) + ("treepy" ,emacs-treepy))) + (home-page "https://github.com/magit/ghub") + (synopsis "Emacs client libraries for the APIs of various Git forges") + (description + "Ghub provides basic support for using the APIs of various Git forges from Emacs packages. It supports the REST APIs of Github, Github GraphQL, Gitlab, Gitea, Gogs and Bitbucket. It abstracts access to API resources using only a handful of functions that are not resource-specific.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-typit ;; Last release is from 2017. -- cgit v1.2.3 From ae08e0f963051d4b632ad0379091f1468f5ec6ed Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:23:54 +0200 Subject: gnu: emacs-jsonrpc: Update to 1.0.12. * gnu/packages/emacs-xyz.scm (emacs-jsonrpc): Update to 1.0.12. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2726ac06dc..63cbff5ee0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11037,14 +11037,14 @@ highlighting.") (define-public emacs-jsonrpc (package (name "emacs-jsonrpc") - (version "1.0.11") + (version "1.0.12") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "jsonrpc-" version ".el")) (sha256 - (base32 "04cy1mqd6y8k5lcpg076szjk9av9345mmsnzzh6vgbcw3dcgbr23")))) + (base32 "0cqp05awikbrn88ifld3vwnv6cxgmr83wlnsvxw8bqb96djz70ad")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/jsonrpc.html") (synopsis "JSON-RPC library") -- cgit v1.2.3 From 0e96514e7b2ad11c201fa06f57457c8e33054120 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:44:05 +0200 Subject: gnu: emacs-haskell-mode: Update to 17.1. * gnu/packages/emacs-xyz.scm (emacs-haskell-mode): Update to 17.1. [arguments]: Add phase to skip failing tests. * gnu/packages/patches/haskell-mode-make-check.patch: * gnu/packages/patches/haskell-mode-unused-variables.patch: Delete files. * gnu/local.mk: Apply files removal. --- gnu/local.mk | 2 - gnu/packages/emacs-xyz.scm | 51 ++++++++++------------ gnu/packages/patches/haskell-mode-make-check.patch | 35 --------------- .../patches/haskell-mode-unused-variables.patch | 44 ------------------- 4 files changed, 23 insertions(+), 109 deletions(-) delete mode 100644 gnu/packages/patches/haskell-mode-make-check.patch delete mode 100644 gnu/packages/patches/haskell-mode-unused-variables.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5dc0909efd..5016d16d7a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1069,8 +1069,6 @@ dist_patch_DATA = \ %D%/packages/patches/gtksourceview-2-add-default-directory.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ %D%/packages/patches/gzdoom-find-system-libgme.patch \ - %D%/packages/patches/haskell-mode-unused-variables.patch \ - %D%/packages/patches/haskell-mode-make-check.patch \ %D%/packages/patches/hdf4-architectures.patch \ %D%/packages/patches/hdf4-reproducibility.patch \ %D%/packages/patches/hdf4-shared-fortran.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 63cbff5ee0..3964891c7e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -822,26 +822,22 @@ replacement.") (define-public emacs-haskell-mode (package (name "emacs-haskell-mode") - (version "16.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/haskell/haskell-mode") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1qk36y0v9fzass6785il65c6wb5cfj4ihhwkvgnzmbafpa8p4dvq")) - (patches - (search-patches ; backport test failure fixes - "haskell-mode-unused-variables.patch" - "haskell-mode-make-check.patch")))) - (inputs - `(("emacs-el-search" ,emacs-el-search) ; for tests - ("emacs-stream" ,emacs-stream))) ; for tests + (version "17.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/haskell/haskell-mode") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0izcasi2v02zh08c863h43m8mmsldzy8pck43cllrfn0zf24v2qn")))) (propagated-inputs `(("emacs-dash" ,emacs-dash))) (native-inputs `(("emacs" ,emacs-minimal) + ("emacs-el-search" ,emacs-el-search) + ("emacs-stream" ,emacs-stream) ("texinfo" ,texinfo))) (build-system gnu-build-system) (arguments @@ -854,8 +850,7 @@ replacement.") #:phases (modify-phases %standard-phases (delete 'configure) - (add-before - 'build 'pre-build + (add-before 'build 'pre-build (lambda* (#:key inputs #:allow-other-keys) (define (el-dir store-dir) (match (find-files store-dir "\\.el$") @@ -874,14 +869,17 @@ replacement.") (_ "")) inputs))) (substitute* (find-files "." "\\.el") (("/bin/sh") sh)) - ;; embed filename to fix test failure - (let ((file "tests/haskell-cabal-tests.el")) - (substitute* file - (("\\(buffer-file-name\\)") - (format #f "(or (buffer-file-name) ~s)" file)))) #t))) - (replace - 'install + (add-before 'check 'delete-failing-tests + ;; XXX: these tests require GHC executable, which would be a big + ;; native input. + (lambda _ + (with-directory-excursion "tests" + (for-each delete-file + '("haskell-customize-tests.el" + "inferior-haskell-tests.el"))) + #t)) + (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (el-dir (string-append out "/share/emacs/site-lisp")) @@ -898,9 +896,6 @@ replacement.") (install-file "haskell-mode.info" info)) (copy-to-dir doc '("CONTRIBUTING.md" "NEWS" "README.md")) (copy-to-dir el-dir (find-files "." "\\.elc?")) - ;; These are part of other packages. - (with-directory-excursion el-dir - (for-each delete-file '("dash.el" "ert.el"))) #t)))))) (home-page "https://github.com/haskell/haskell-mode") (synopsis "Haskell mode for Emacs") diff --git a/gnu/packages/patches/haskell-mode-make-check.patch b/gnu/packages/patches/haskell-mode-make-check.patch deleted file mode 100644 index a4d4d525f2..0000000000 --- a/gnu/packages/patches/haskell-mode-make-check.patch +++ /dev/null @@ -1,35 +0,0 @@ -Copied from upstream repository. -Hunk #2 is removed since it cannot be applied and it is not needed. - -From 7cead7137bf54851c1b7df5a3854351296d21276 Mon Sep 17 00:00:00 2001 -From: Vasantha Ganesh K -Date: Thu, 22 Jun 2017 23:38:40 +0530 -Subject: [PATCH] removed `check-conventions' from make - ---- - Makefile | 7 +- - tests/haskell-code-conventions.el | 165 ------------------------------ - 2 files changed, 1 insertion(+), 171 deletions(-) - delete mode 100644 tests/haskell-code-conventions.el - -diff --git a/Makefile b/Makefile -index b2c89d6..aa907c5 100644 ---- a/Makefile -+++ b/Makefile -@@ -79,12 +79,7 @@ build-$(EMACS_VERSION)/build-flag : build-$(EMACS_VERSION) $(patsubst %.el,build - check-%: tests/%-tests.el - $(BATCH) -l "$<" -f ert-run-tests-batch-and-exit; - --check: compile $(AUTOLOADS) check-ert check-conventions -- --check-conventions : -- $(BATCH) -l tests/haskell-code-conventions.el \ -- -f haskell-check-conventions-batch-and-exit -- @echo "conventions are okay" -+check: compile $(AUTOLOADS) check-ert - - check-ert: $(ELCHECKS) - $(BATCH) --eval "(when (= emacs-major-version 24) \ --- -2.18.0 - diff --git a/gnu/packages/patches/haskell-mode-unused-variables.patch b/gnu/packages/patches/haskell-mode-unused-variables.patch deleted file mode 100644 index b175fae28c..0000000000 --- a/gnu/packages/patches/haskell-mode-unused-variables.patch +++ /dev/null @@ -1,44 +0,0 @@ -Copied verbatim from upstream repository. - -From cee22450ee30e79952f594796721dc6b17798ee6 Mon Sep 17 00:00:00 2001 -From: Sascha Wilde -Date: Fri, 23 Sep 2016 15:35:59 +0200 -Subject: [PATCH] Removed unused lexical variables. - ---- - haskell-lexeme.el | 3 +-- - haskell-process.el | 4 +--- - 2 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/haskell-lexeme.el b/haskell-lexeme.el -index 4256a79..b832560 100644 ---- a/haskell-lexeme.el -+++ b/haskell-lexeme.el -@@ -138,8 +138,7 @@ When match is successful, match-data will contain: - (match-text 2) - whole qualified identifier - (match-text 3) - unqualified part of identifier - (match-text 4) - closing backtick" -- (let ((begin (point)) -- (match-data-old (match-data)) -+ (let ((match-data-old (match-data)) - first-backtick-start - last-backtick-start - qid-start -diff --git a/haskell-process.el b/haskell-process.el -index b4efba2..4f3f859 100644 ---- a/haskell-process.el -+++ b/haskell-process.el -@@ -160,9 +160,7 @@ HPTYPE is the result of calling `'haskell-process-type`' function." - (defun haskell-process-log (msg) - "Effective append MSG to the process log (if enabled)." - (when haskell-process-log -- (let* ((append-to (get-buffer-create "*haskell-process-log*")) -- (windows (get-buffer-window-list append-to t t)) -- move-point-in-windows) -+ (let* ((append-to (get-buffer-create "*haskell-process-log*"))) - (with-current-buffer append-to - ;; point should follow insertion so that it stays at the end - ;; of the buffer --- -2.18.0 - -- cgit v1.2.3 From d7c606818b0a9e79a70789b036f03c559f84e09f Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 6 Jun 2020 14:16:30 +0200 Subject: gnu: Add cl-ascii-table. * gnu/packages/lisp-xyz.scm (sbcl-cl-ascii-table, cl-ascii-table, ecl-cl-ascii-table): New variables. --- gnu/packages/lisp-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 1bb6c4b55c..e92fd0ba1d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11898,3 +11898,32 @@ learn about each of the parameters.") (define-public ecl-1am (sbcl-package->ecl-package sbcl-1am)) + +(define-public sbcl-cl-ascii-table + (let ((commit "d9f5e774a56fad1b416e4dadb8f8a5b0e84094e2") + (revision "1")) + (package + (name "sbcl-cl-ascii-table") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/telephil/cl-ascii-table.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "125fdif9sgl7k0ngjhxv0wjas2q27d075025hvj2rx1b1x948z4s")))) + (build-system asdf-build-system/sbcl) + (synopsis "Library to make ascii-art tables") + (description + "This is a Common Lisp library to present tabular data in ascii-art +tables.") + (home-page "https://github.com/telephil/cl-ascii-table") + (license license:expat)))) + +(define-public cl-ascii-table + (sbcl-package->cl-source-package sbcl-cl-ascii-table)) + +(define-public ecl-cl-ascii-table + (sbcl-package->ecl-package sbcl-cl-ascii-table)) -- cgit v1.2.3 From a531168f5da6feb762c51c2f2ff88b0a5ee5cdc8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 14:53:38 +0200 Subject: gnu: emacs-edit-server: Update to 1.15. * gnu/packages/emacs-xyz.scm (emacs-edit-server): Update to 1.15. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3964891c7e..0d6e7d0843 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14107,7 +14107,7 @@ confused by comments or @code{foo-bar} matching @code{foo}.") (define-public emacs-edit-server (package (name "emacs-edit-server") - (version "1.13") + (version "1.15") (source (origin (method git-fetch) @@ -14116,7 +14116,7 @@ confused by comments or @code{foo-bar} matching @code{foo}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "12dp1xj09jrp0kxp9xb6cak9dn6zkyis1wfn4fnhzmxxnrd8c5rn")))) + (base32 "0xxby3ghs38i1l7kag12rnzlzcg9297pm8k6kqq3aqzsg9d2950y")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 8312d6f0bc1854cbb4c88c90591b994e1c5aab91 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:00:15 +0200 Subject: gnu: emacs-multi-term: Update to 1.5.0.017c77c. * gnu/packages/emacs-xyz.scm (emacs-multi-term): Update to 1.5.0.017c77c. --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0d6e7d0843..95d47046c1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20809,21 +20809,24 @@ acting like notes that are made @emph{in} the document.") (license license:gpl3+)))) (define-public emacs-multi-term - (let ((commit "0804b11e52b960c80f5cd0712ee1e53ae70d83a4")) + ;; No upstream release. Extract version from main file. + (let ((commit "017c77c550115936860e2ea71b88e585371475d5") + (revision "0")) (package (name "emacs-multi-term") - (version "1.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/manateelazycat/multi-term.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0apvidmvb7rv05qjnjhax42ma8wrimik5vxx620dlbv17svz7iyf")))) + (version (git-version "1.5" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/manateelazycat/multi-term.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "043dqd8i8h6hbcg11rzprxin2yq5lb902zlrb7mxah44vyp8wrdi")))) (build-system emacs-build-system) - (inputs `(("zsh" ,zsh))) + (inputs + `(("zsh" ,zsh))) (home-page "https://github.com/manateelazycat/multi-term") (synopsis "Manage multiple terminal buffers in Emacs") (description -- cgit v1.2.3 From dc81932ee5883c7c90e1bfd0f57b0321f4f183f9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:06:19 +0200 Subject: gnu: emacs-highlight-escape-sequences: Fix version number. * gnu/packages/emacs-xyz.scm (emacs-highlight-escape-sequences): Extract appropriate version number from main file. --- gnu/packages/emacs-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 95d47046c1..4ccbc14a23 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15637,12 +15637,12 @@ the previously visible buffer part after each scroll.") (license license:gpl3+))) (define-public emacs-highlight-escape-sequences + ;; No release upstream. Extract version from main file. (let ((commit "08d846a7aa748209d65fecead2b6a766c3e5cb41") - (revision "1")) + (revision "0")) (package (name "emacs-highlight-escape-sequences") - (version (string-append "0.0.1" "-" revision "." - (string-take commit 7))) + (version (git-version "0.4" revision commit)) (source (origin (method git-fetch) @@ -15651,8 +15651,7 @@ the previously visible buffer part after each scroll.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 - "05mc3w1f8ykf80914a1yddw6j8cmh0h57llm07xh89s53821v2is")))) + (base32 "05mc3w1f8ykf80914a1yddw6j8cmh0h57llm07xh89s53821v2is")))) (build-system emacs-build-system) (home-page "https://github.com/dgutov/highlight-escape-sequences") (synopsis "Highlight escape sequences in Emacs") -- cgit v1.2.3 From 7b32e7bfafe40f0ef9158f823a73e33173291ab8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:10:45 +0200 Subject: gnu: emacs-posframe: Update to 0.7.0. * gnu/packages/emacs-xyz.scm (emacs-posframe): Update to 0.7.0. [source]: Use GNU Elpa repository instead of GitHub. --- gnu/packages/emacs-xyz.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4ccbc14a23..f207cebb71 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10322,20 +10322,18 @@ and cangjie.") (define-public emacs-posframe (package (name "emacs-posframe") - (version "0.5.0") + (version "0.7.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tumashu/posframe") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "posframe-" version ".el")) (sha256 - (base32 - "1fhjxj7gi2pj5rdnmf0gddiwd8iifgjgjp01c01npz1gwwixyqh3")))) + (base32 "1kwl83jb5k1hnx0s2qw972v0gjqbbvk4sdcdb1qbdxsyw36sylc9")))) (build-system emacs-build-system) - ;; emacs-minimal does not include the function font-info - (arguments `(#:emacs ,emacs)) + ;; emacs-minimal does not include the function font-info. + (arguments + `(#:emacs ,emacs)) (home-page "https://github.com/tumashu/posframe") (synopsis "Pop a posframe (a child frame) at point") (description "@code{emacs-posframe} can pop a posframe at point. A -- cgit v1.2.3 From 678248f5ea3d3d19bc2a5a41d90bb30e63e667e1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:14:25 +0200 Subject: gnu: emacs-stream: Update to 2.2.5. * gnu/packages/emacs-xyz.scm (emacs-stream): Update to 2.2.5. [source]: Use GNU ELPA repository instead of GitHub. [arguments]: Skip tests, which do not exist on ELPA. --- gnu/packages/emacs-xyz.scm | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f207cebb71..94d2620056 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9139,31 +9139,23 @@ editing nginx config files.") (license license:gpl2+))) (define-public emacs-stream - (let ((commit "a3f3da155a49c133e2692bd8789b35492bfdc4f7") - (revision "1")) - (package - (name "emacs-stream") - (version (git-version "2.2.4" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Emacsmirror/stream.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0aig0yjb9z752ijh0mzildjmh44j051inchga8qll01dr8wf7332")))) - (build-system emacs-build-system) - (arguments - `(#:tests? #t - #:test-command '("emacs" "--batch" - "-l" "tests/stream-tests.el" - "-f" "ert-run-tests-batch-and-exit"))) - (home-page "https://github.com/Emacsmirror/stream") - (synopsis "Implementation of streams for Emacs") - (description "This library provides an implementation of streams for Emacs. + (package + (name "emacs-stream") + (version "2.2.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "stream-" version ".tar")) + (file-name (git-file-name name version)) + (sha256 + (base32 "00c3n4gyxzv7vczqms0d62kl8zsmjfyxa92mwxn2snyx857a9jfw")))) + (build-system emacs-build-system) + (home-page "http://elpa.gnu.org/packages/stream.html") + (synopsis "Implementation of streams for Emacs") + (description "This library provides an implementation of streams for Emacs. Streams are implemented as delayed evaluation of cons cells.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-cl-print (let ((commit "1a70c553dfb04352afb5b8696fe0cef8acc8f991") -- cgit v1.2.3 From b68bf28c8fc896a0a388f8eeaf7c78bcd64557b8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:17:22 +0200 Subject: gnu: emacs-rainbow-mode: Update to 1.0.4. * gnu/packages/emacs-xyz.scm (emacs-rainbow-mode): Update to 1.0.4. --- gnu/packages/emacs-xyz.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 94d2620056..35827c056e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7512,20 +7512,20 @@ of its name.") (define-public emacs-rainbow-mode (package (name "emacs-rainbow-mode") - (version "1.0.2") - (source (origin - (method url-fetch) - (uri (string-append - "https://elpa.gnu.org/packages/rainbow-mode-" version ".el")) - (sha256 - (base32 - "1zfqj63sr07pdlwy7caz4fxsjhmbhh939n81z6jxq9xggm8ajxkd")))) + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "rainbow-mode-" version ".el")) + (sha256 + (base32 "0rp76gix1ph1wrmdax6y2m3i9y1dmgv7ikjz8xsl5lizkygsy9cg")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/rainbow-mode.html") (synopsis "Colorize color names in buffers") (description "This minor mode sets background color to strings that match color -names, e.g. #0000ff is displayed in white with a blue background.") +names, e.g., @samp{#0000ff} is displayed in white with a blue background.") (license license:gpl3+))) (define-public emacs-ryo-modal -- cgit v1.2.3 From c08a784c58bca8df048bc98276aa4fcf0d61d8b3 Mon Sep 17 00:00:00 2001 From: Steve Sprang Date: Fri, 5 Jun 2020 11:05:06 -0700 Subject: gnu: openscad: Add patch to fix build. * gnu/packages/patches/openscad-parser-boost-1.72.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/engineering.scm (openscad)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/engineering.scm | 4 +++- .../patches/openscad-parser-boost-1.72.patch | 26 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/openscad-parser-boost-1.72.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5016d16d7a..92a2255893 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1326,6 +1326,7 @@ dist_patch_DATA = \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openssh-hurd.patch \ %D%/packages/patches/openresolv-restartcmd-guix.patch \ + %D%/packages/patches/openscad-parser-boost-1.72.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 2102f8d295..9d9c67b861 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2263,7 +2263,9 @@ specification can be downloaded at @url{http://3mf.io/specification/}.") ".src.tar.gz")) (sha256 (base32 - "0nbgk5q5pgnw53la0kccdcpz2f4xf6d6076rkn0q08z57hkc85ha")))) + "0nbgk5q5pgnw53la0kccdcpz2f4xf6d6076rkn0q08z57hkc85ha")) + (patches (search-patches + "openscad-parser-boost-1.72.patch")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) diff --git a/gnu/packages/patches/openscad-parser-boost-1.72.patch b/gnu/packages/patches/openscad-parser-boost-1.72.patch new file mode 100644 index 0000000000..35311e6173 --- /dev/null +++ b/gnu/packages/patches/openscad-parser-boost-1.72.patch @@ -0,0 +1,26 @@ +https://github.com/openscad/openscad/commit/b6c170cc5d.patch + +From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Fri, 25 Oct 2019 15:10:26 +0000 +Subject: [PATCH] Add missing header bootlegged by Boost < 1.72 + +src/parser.y:76:6: error: no template named 'stack' in namespace 'std' +std::stack scope_stack; +~~~~~^ +--- + src/parser.y | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/parser.y b/src/parser.y +index 7f4fd56ca7..4c77c989ea 100644 +--- a/src/parser.y ++++ b/src/parser.y +@@ -46,6 +46,7 @@ + #include "printutils.h" + #include "memory.h" + #include ++#include + #include + #include "boost-utils.h" + #include "feature.h" -- cgit v1.2.3 From 0bcf20e9491ae122942e8b210469ff4cd772a134 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:23:10 +0200 Subject: gnu: emacs-web-server: Update to 0.1.2. * gnu/packages/emacs-xyz.scm (emacs-web-server): Update to 0.1.2. [source]: Use GNU ELPA repository instead of GitHub. [native-inputs]: Remove unnecessary native inputs. [arguments]: Do not run tests, which do not exist in ELPA. --- gnu/packages/emacs-xyz.scm | 48 +++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 35827c056e..00cefb984f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19854,40 +19854,22 @@ invoked.") (license license:gpl3+)))) (define-public emacs-web-server - (let ((commit "cafa5b7582c57252a0884b2c33da9b18fb678713") - (revision "1")) - (package - (name "emacs-web-server") - (version (git-version "0.1.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/eschulte/emacs-web-server/") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1c0lfqmbs5hvz3fh3c8wgp6ipwmxrwx9xj264bjpj3phixd5419y")))) - (build-system emacs-build-system) - (native-inputs - `(("curl" ,curl))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-shell - ;; Setting the SHELL environment variable is required for the tests - ;; to find sh. - (lambda _ - (setenv "SHELL" (which "sh")) - #t))) - #:tests? #t - #:test-command '("make" "check"))) - (home-page "https://github.com/eschulte/emacs-web-server/") - (synopsis "Web server with handlers in Emacs Lisp") - (description "This package supports HTTP GET and POST requests with + (package + (name "emacs-web-server") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "web-server-" version ".tar")) + (sha256 + (base32 "10lcsl4dg2yr9zjd99gq9jz150wvvh6r5y9pd88l8y9vz16f2lim")))) + (build-system emacs-build-system) + (home-page "https://github.com/eschulte/emacs-web-server/") + (synopsis "Web server with handlers in Emacs Lisp") + (description "This package supports HTTP GET and POST requests with url-encoded parameters, as well as web sockets.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-markdown-preview-mode (package -- cgit v1.2.3 From 5c5bd76f314924402c8a6d9323936cd187e20de5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 15:21:54 +0200 Subject: gnu: openconnect: Add a comment about the gnutls version. * gnu/packages/vpn.scm (openconnect): Add said comment. * gnu/packages/tls.scm (gnutls): Add backlink to optimise SEO. --- gnu/packages/tls.scm | 1 + gnu/packages/vpn.scm | 2 ++ 2 files changed, 3 insertions(+) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index ec81b7bf07..8a644a3ef2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -165,6 +165,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") + ;; XXX Unversion openconnect's "gnutls" input when ungrafting. (replacement gnutls-3.6.13) (version "3.6.12") (source (origin diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 0f0157806c..5c38ac71e8 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -259,6 +259,8 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer (build-system gnu-build-system) (propagated-inputs `(("libxml2" ,libxml2) + ;; XXX ‘DTLS is insecure in GnuTLS v3.6.3 through v3.6.12.’ + ;; See . ("gnutls" ,gnutls-3.6.13) ("zlib" ,zlib))) (inputs -- cgit v1.2.3 From 2a56b2cf867c49429a594b10bf39e71565d59326 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:29:02 +0200 Subject: gnu: emacs-exwm: Update to 0.24. * gnu/packages/emacs-xyz.scm (emacs-exwm): Update to 0.24. --- gnu/packages/emacs-xyz.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 00cefb984f..df5f47a495 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10448,15 +10448,15 @@ It should enable you to implement low-level X11 applications.") (define-public emacs-exwm (package (name "emacs-exwm") - (version "0.23") + (version "0.24") (synopsis "Emacs X window manager") - (source (origin - (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/exwm-" - version ".tar")) - (sha256 - (base32 - "05w1v3wrp1lzz20zd9lcvr5nhk809kgy6svvkbs15xhnr6x55ad5")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "exwm-" version ".tar")) + (sha256 + (base32 "0lj1a3cmbpf4h6x8k6x8cdm1qb51ca6filydnvi5zcda8zpl060s")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xelb" ,emacs-xelb))) @@ -10508,8 +10508,9 @@ It should enable you to implement low-level X11 applications.") (chmod exwm-executable #o555) #t)))))) (home-page "https://github.com/ch11ng/exwm") - (description "EXWM is a full-featured tiling X window manager for Emacs -built on top of XELB.") + (description + "EXWM is a full-featured tiling X window manager for Emacs built on top +of XELB.") (license license:gpl3+))) (define-public emacs-switch-window -- cgit v1.2.3 From fa7bd13e5b143d6a6741a9672748782e0e6d0ee6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 4 Jun 2020 17:54:15 +0200 Subject: gnu: rcas-web: Use guile2.2 version of Guile-Redis. * gnu/packages/bioinformatics.scm (rcas-web)[inputs]: Change from GUILE-REDIS to GUILE2.2-REDIS. While at it, rename the GUILE input to "guile" instead of "guile-next". --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 54cdb353c1..550c0387e9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8747,9 +8747,9 @@ library implementing most of the pipeline's features.") (inputs `(("r-minimal" ,r-minimal) ("r-rcas" ,r-rcas) - ("guile-next" ,guile-2.2) + ("guile" ,guile-2.2) ("guile-json" ,guile-json-1) - ("guile-redis" ,guile-redis))) + ("guile-redis" ,guile2.2-redis))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://github.com/BIMSBbioinfo/rcas-web") -- cgit v1.2.3 From 8951b9496b5c390adb3b3292d234bb8ab9936c40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jun 2020 15:00:42 +0200 Subject: gnu: GnuTLS: Update replacement to 3.6.14 [fixes CVE-2020-13777]. * gnu/packages/tls.scm (gnutls-3.6.13): Rename to ... (gnutls-3.6.14): ... this. Update to 3.6.14. (gnutls)[replacement]: Adjust accordingly. * gnu/packages/package-management.scm (guix)[propagated-inputs]: Likewise. * gnu/packages/vpn.scm (openconnect)[propagated-inputs]: Likewise. --- gnu/packages/package-management.scm | 2 +- gnu/packages/tls.scm | 10 +++++----- gnu/packages/vpn.scm | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index ecaebac291..cc3a40cb93 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -371,7 +371,7 @@ $(prefix)/etc/init.d\n"))) ("glibc-utf8-locales" ,glibc-utf8-locales))) (propagated-inputs - `(("gnutls" ,(if (%current-target-system) gnutls-3.6.13 guile3.0-gnutls)) + `(("gnutls" ,(if (%current-target-system) gnutls-3.6.14 guile3.0-gnutls)) ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-4) ("guile-sqlite3" ,guile-sqlite3) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 8a644a3ef2..ec401416ce 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -166,7 +166,7 @@ living in the same process.") (package (name "gnutls") ;; XXX Unversion openconnect's "gnutls" input when ungrafting. - (replacement gnutls-3.6.13) + (replacement gnutls-3.6.14) (version "3.6.12") (source (origin (method url-fetch) @@ -254,20 +254,20 @@ required structures.") (properties '((ftp-server . "ftp.gnutls.org") (ftp-directory . "/gcrypt/gnutls"))))) -(define-public gnutls-3.6.13 +(define-public gnutls-3.6.14 (package (inherit gnutls) - (version "3.6.13") + (version "3.6.14") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnutls/v" (version-major+minor version) - "/gnutls-3.6.13.tar.xz")) + "/gnutls-" version ".tar.xz")) (patches (search-patches "gnutls-skip-trust-store-test.patch" "gnutls-cross.patch")) (sha256 (base32 - "0f1gnm0756qms5cpx6yn6xb8d3imc2gkqmygf12n9x6r8zs1s11j")))) + "0qwxsfizynly0ns537vnhnlm5lh03la4vbsmz675n0n7vqd7ac2n")))) (native-inputs `(,@(if (%current-target-system) ;for cross-build `(("guile" ,guile-3.0)) ;to create .go files diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 5c38ac71e8..e16ac81961 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -261,7 +261,7 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer `(("libxml2" ,libxml2) ;; XXX ‘DTLS is insecure in GnuTLS v3.6.3 through v3.6.12.’ ;; See . - ("gnutls" ,gnutls-3.6.13) + ("gnutls" ,gnutls-3.6.14) ("zlib" ,zlib))) (inputs `(("lz4" ,lz4) -- cgit v1.2.3 From c125119204a0084c52b78fe902a6f0fb75869c7e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:47:57 +0200 Subject: gnu: emacs-ebdb: Update to 0.6.18. * gnu/packages/emacs-xyz.scm (emacs-ebdb): Update to 0.6.18. [source]: Use GNU ELPA repository instead of GitHub. --- gnu/packages/emacs-xyz.scm | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index df5f47a495..79dcddc60b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21033,30 +21033,25 @@ time.") federated microblogging social network.") (license license:gpl3+))) -;; The last release tarball is for version 0.6. We pick a commit close to -;; version 0.6.10, which doesn't have a release tarball. (define-public emacs-ebdb - (let ((commit "2a87f5ed2a53e3a4e91e8c88ba5afc49f5e945df") - (revision "0")) - (package - (name "emacs-ebdb") - (version (git-version "0.6.10" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/girzel/ebdb.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0fidy7z0c86dpqiss97sg5s92fd3fj4bdl8pqqdgg2m00jx4mrjz")))) - (build-system emacs-build-system) - (home-page "https://github.com/girzel/ebdb") - (synopsis "EIEIO port of BBDB, Emacs's contact-management package") - (description "EBDB is a contact management/addressbook package for -Emacs. It's a re-write of the Insidious Big Brother Database (BBDB) using -Emacs Lisp's (relatively new) EIEIO object oriented libraries.") - (license license:gpl3+)))) + (package + (name "emacs-ebdb") + (version "0.6.18") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "ebdb-" version ".tar")) + (sha256 + (base32 "0znbv3c7wdgak1f1zb051vg4r29fksqh53k1j77jfmqcvwkpz2mw")))) + (build-system emacs-build-system) + (home-page "https://github.com/girzel/ebdb") + (synopsis "EIEIO port of BBDB, Emacs's contact-management package") + (description + "EBDB is a contact management/addressbook package for Emacs. It's +a re-write of the Insidious Big Brother Database (BBDB) using Emacs +Lisp's (relatively new) EIEIO object oriented libraries.") + (license license:gpl3+))) (define-public emacs-refactor (package -- cgit v1.2.3 From 7239b05494686d8d407545b57b7d1f662c2215f1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:54:51 +0200 Subject: gnu: emacs-frog-menu: Update to 0.2.11. * gnu/packages/emacs-xyz.scm (emacs-frog-menu): Update to 0.2.11. [source]: Use GNU ELPA repository instead of GitHub. --- gnu/packages/emacs-xyz.scm | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 79dcddc60b..eb7b90bedf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12564,31 +12564,26 @@ the same values you get in a terminal.") (license license:gpl3+))) (define-public emacs-frog-menu - (let ((commit "740bbc88b8535d31f783f3b2043a2a6683afbf31") - (revision "1")) - (package - (name "emacs-frog-menu") - (version (git-version "0.2.9" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/clemera/frog-menu") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1g77424jwq62qj06rvld44s5hp0dw8rw2pwmmag6gd536zf65xrj")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-posframe" ,emacs-posframe) - ("emacs-avy" ,emacs-avy))) - (home-page "https://github.com/clemera/frog-menu") - (synopsis "Quickly pick items from ad hoc menus") - (description - "This package provides a popup offering a preview of a list of -candidates on which user-defined dispatch actions can act.") - (license license:gpl3+)))) + (package + (name "emacs-frog-menu") + (version "0.2.11") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "frog-menu-" version ".el")) + (sha256 + (base32 "06iw11z61fd0g4w3562k3smcmzaq3nivvvc6gzm8y8k5pcrqzdff")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-avy" ,emacs-avy) + ("emacs-posframe" ,emacs-posframe))) + (home-page "https://github.com/clemera/frog-menu") + (synopsis "Quickly pick items from ad hoc menus") + (description + "This package provides a popup offering a preview of a list of candidates +on which user-defined dispatch actions can act.") + (license license:gpl3+))) (define-public emacs-frog-jump-buffer (let ((commit "2d7b342785ae27d45f5d252272df6eb773c78e20") -- cgit v1.2.3 From 36b5cfdf0269b0b73aba8b7190e297e327ea6ead Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:59:04 +0200 Subject: gnu: emacs-howm: Update to 1.4.6. * gnu/packages/emacs-xyz.scm (emacs-howm): Update to 1.4.6. --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index eb7b90bedf..9509bfd0b4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1864,14 +1864,14 @@ a set of simplified face specifications and a user-supplied color palette") (define-public emacs-howm (package (name "emacs-howm") - (version "1.4.5") + (version "1.4.6") (source (origin (method url-fetch) - (uri (string-append "https://howm.sourceforge.jp/a/howm-" - version ".tar.gz")) + (uri (string-append "https://howm.sourceforge.jp/a/" + "howm-" version ".tar.gz")) (sha256 - (base32 "1kvr5pxpc9rwhkza9025mdi0wvh0f0rpawl21rzirjk1x10903yi")))) + (base32 "17ihch1zbk08ih7gc232jlmbw7hax8ldb9glxp8d75k4asa98qh5")))) (build-system gnu-build-system) (native-inputs `(("emacs" ,emacs-minimal))) -- cgit v1.2.3 From 49b4a062f960b8299cd611e2fa6e922691405502 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 16:07:14 +0200 Subject: gnu: emacs-zones: Update to 2019.7.13. * gnu/packages/emacs-xyz.scm (emacs-zones): Update to 2019.7.13. [source]: Use GNU ELPA repository instead of GitHub. Remove unnecessary patch. * gnu/packages/patches/emacs-zones-called-interactively.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Apply file deletion. --- gnu/local.mk | 1 - gnu/packages/emacs-xyz.scm | 47 +++++++++------------- .../patches/emacs-zones-called-interactively.patch | 43 -------------------- 3 files changed, 20 insertions(+), 71 deletions(-) delete mode 100644 gnu/packages/patches/emacs-zones-called-interactively.patch diff --git a/gnu/local.mk b/gnu/local.mk index 92a2255893..ae8a2275f7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -895,7 +895,6 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-telega-test-env.patch \ %D%/packages/patches/emacs-undohist-ignored.patch \ %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ - %D%/packages/patches/emacs-zones-called-interactively.patch \ %D%/packages/patches/enjarify-setup-py.patch \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \ %D%/packages/patches/erlang-man-path.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9509bfd0b4..0871a14c64 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9311,33 +9311,26 @@ customizable by the user.") (license license:gpl2+))) (define-public emacs-zones - (let ((commit "3169815c323966ff8e252b44e3558d6d045243fe") - (revision "2")) - (package - (name "emacs-zones") - (version (git-version "0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacsmirror/zones.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "039msns5596rz0my7fxpanpxwg1lkhpiibm9ppnlzaajx1hszbzl")) - (patches - (search-patches - "emacs-zones-called-interactively.patch")))) - (build-system emacs-build-system) - (home-page "https://www.emacswiki.org/emacs/Zones") - (synopsis "Define and act on multiple zones of buffer text") - (description "Library @file{zones.el} lets you easily define and -subsequently act on multiple zones of buffer text. You can think of this as -enlarging the notion of region. In effect, it can remove the requirement of -target text being a contiguous sequence of characters. A set of buffer zones -is, in effect, a (typically) noncontiguous set of text.") - (license license:gpl3+)))) + (package + (name "emacs-zones") + (version "2019.7.13") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "zones-" version ".el")) + (sha256 + (base32 "0qp1ba2pkqx9d35g7z8hf8qs2k455krf2a92l4rka3ipsbnmq5k1")))) + (build-system emacs-build-system) + (home-page "https://www.emacswiki.org/emacs/Zones") + (synopsis "Define and act on multiple zones of buffer text") + (description + "Library @file{zones.el} lets you easily define and subsequently act on +multiple zones of buffer text. You can think of this as enlarging the notion +of region. In effect, it can remove the requirement of target text being +a contiguous sequence of characters. A set of buffer zones is, in effect, +a (typically) noncontiguous set of text.") + (license license:gpl3+))) (define-public emacs-mu4e-alert (package diff --git a/gnu/packages/patches/emacs-zones-called-interactively.patch b/gnu/packages/patches/emacs-zones-called-interactively.patch deleted file mode 100644 index eefcfdd12e..0000000000 --- a/gnu/packages/patches/emacs-zones-called-interactively.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 81603e53ebaae0f0b23c4c52c7dab83e808964ec Mon Sep 17 00:00:00 2001 -From: Brian Leung -Date: Sun, 17 Mar 2019 01:32:04 +0100 -Subject: [PATCH] This patch silences the byte-compiler. - ---- - zones.el | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/zones.el b/zones.el -index ca88d48..594ea36 100644 ---- a/zones.el -+++ b/zones.el -@@ -1075,7 +1075,7 @@ You can use `C-x n x' to widen to a previous buffer restriction. - - This is a destructive operation. The list structure of the variable - value can be modified." -- (zz-narrow-advice (interactive-p))) -+ (zz-narrow-advice (called-interactively-p 'interactive))) - - (defadvice narrow-to-defun (after zz-add-zone--defun activate) - "Push the defun limits to the current `zz-izones-var'. -@@ -1083,7 +1083,7 @@ You can use `C-x n x' to widen to a previous buffer restriction. - - This is a destructive operation. The list structure of the variable - value can be modified." -- (zz-narrow-advice (interactive-p))) -+ (zz-narrow-advice (called-interactively-p 'interactive))) - - ;; Call `zz-add-zone' if interactive or `zz-add-zone-anyway-p'. - ;; -@@ -1093,7 +1093,7 @@ You can use `C-x n x' to widen to a previous buffer restriction. - - This is a destructive operation. The list structure of the variable - value can be modified." -- (zz-narrow-advice (interactive-p))) -+ (zz-narrow-advice (called-interactively-p 'interactive))) - - ;;(@* "General Commands") - --- -2.22.0 - -- cgit v1.2.3 From ba209becc617d23c308359d15b1c05c76ea3a103 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 16:17:04 +0200 Subject: gnu: emacs-mmm-mode: Update to 0.5.8. * gnu/packages/emacs-xyz.scm (emacs-mmm-mode): Update to 0.5.8. [source]: Use GNU ELPA repository instead of GitHub. [build-system]: Switch to emacs-build-system. [native-inputs]: Remove. --- gnu/packages/emacs-xyz.scm | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0871a14c64..7fa1ca5b49 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2247,28 +2247,20 @@ window).") (define-public emacs-mmm-mode (package (name "emacs-mmm-mode") - (version "0.5.7") + (version "0.5.8") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/purcell/mmm-mode.git") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "mmm-mode-" version ".tar")) (sha256 - (base32 - "0lxd55yhz0ag7v1ydff55bg4h8snq5lbk8cjwxqpyq6gh4v7md1h")))) - (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("emacs" ,emacs-minimal) - ("texinfo" ,texinfo-5))) ;fails to build with Texinfo 6.7 + (base32 "05ckf4zapdpvnd3sqpw6kxaa567zh536a36m9qzx3sqyjbyn5fb4")))) + (build-system emacs-build-system) (home-page "https://github.com/purcell/mmm-mode") (synopsis "Allow multiple major modes in an Emacs buffer") (description - "MMM Mode is a minor mode that allows multiple major modes to coexist in a -single buffer.") + "MMM Mode is a minor mode that allows multiple major modes to coexist in +a single buffer.") (license license:gpl3+))) (define-public emacs-mmt -- cgit v1.2.3 From 8ad05ef697bd239fd9115d9b5e6e69661dcfdca3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 16:21:26 +0200 Subject: gnu: emacs-nhexl-mode: Update to 1.5. * gnu/packages/emacs-xyz.scm (emacs-nhexl-mode): Update to 1.5. [description]: Remove trailing newline character. --- gnu/packages/emacs-xyz.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7fa1ca5b49..378fd20bf5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20427,15 +20427,14 @@ as: (define-public emacs-nhexl-mode (package (name "emacs-nhexl-mode") - (version "1.4") + (version "1.5") (source (origin (method url-fetch) - (uri (string-append - "https://elpa.gnu.org/packages/nhexl-mode-" - version ".el")) + (uri (string-append "https://elpa.gnu.org/packages/" + "nhexl-mode-" version ".el")) (sha256 - (base32 "1c2q4w6hkvc7z4026hiqdcsm2scd6q35x7b0dk80h8qicsbi14c8")))) + (base32 "0qvxfg7sv4iqyjxzaim6b4v9k5hav36qd4vkf9jwzw6p5fri8w8d")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/nhexl-mode.html") (synopsis "Minor mode to edit files via hex-dump format") @@ -20459,7 +20458,7 @@ moving text. In this minor mode, not only self-inserting keys overwrite existing text, but commands like `yank' and @command{kill-region} as well. @item It overrides @code{C-u} to use hexadecimal, so you can do @code{C-u a 4 C-f} to advance by #xa4 characters. -@end itemize\n") +@end itemize") (license license:gpl3+))) (define-public emacs-helm-wikipedia -- cgit v1.2.3 From a2ebb515dbd6e363ddf8cd0f42afa7233d7036f5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 20:03:10 +0200 Subject: gnu: emacs-with-editor: Update to 2.9.2. * gnu/packages/emacs-xyz.scm (emacs-with-editor): Update to 2.9.2. --- gnu/packages/emacs-xyz.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 378fd20bf5..23876932ac 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -297,16 +297,16 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.") (define-public emacs-with-editor (package (name "emacs-with-editor") - (version "2.9.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/with-editor.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1sjb3qqrn1rhmpkrn14l8rya6c3gwxwmgw74n779s54kvl9gn7a9")))) + (version "2.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/with-editor.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1m8bm8q5zakfjdkd0662gbkvzmcrlkxy1856xns2nfiflrkpw88b")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash))) -- cgit v1.2.3 From 50580fd44db2a89a37608994a491db4aef4f9538 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 5 Jun 2020 19:35:40 +0300 Subject: gnu: rust-rpassword-4: Update to 4.0.5. * gnu/packages/crates-io.scm (rust-rpassword-4): Update to 4.0.5. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 20f0567c51..788ec02654 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18967,14 +18967,14 @@ rust.") (define-public rust-rpassword-4 (package (name "rust-rpassword") - (version "4.0.3") + (version "4.0.5") (source (origin (method url-fetch) (uri (crate-uri "rpassword" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0jnl8wzmdazkpzqs0vsw0n0vm0v4b8chqifd6s84nl9w2ybhx7ym")))) + (base32 "17z99xazhhbaczw0ib1vnnq450j0zacdn8b2zcbdir68sdbicdwr")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 75c5d360d9b285433f22bb8b826622ecb236bc11 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jun 2020 23:35:27 +0200 Subject: gnu: grantlee: Correct license. * gnu/packages/qt.scm (grantlee)[license]: Set to LGPL2.1+. --- gnu/packages/qt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c312efa1f9..cd5b38d74c 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -142,7 +142,7 @@ (description "Grantlee Templates can be used for theming and generation of other text such as code. The syntax uses the syntax of the Django template system, and the core design of Django is reused in Grantlee.") - (license license:lgpl2.0+))) + (license license:lgpl2.1+))) (define-public qt-4 (package -- cgit v1.2.3 From 6ecdb8dc5ea0dffcf4e42d034368536c368ead04 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jun 2020 15:47:39 +0200 Subject: gnu: akonadi-search: Enable tests. * gnu/packages/kde-pim.scm (akonadi-search)[native-inputs]: Add DBUS. [arguments]: Add #:phases. --- gnu/packages/kde-pim.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index cb24f0efbf..0d6ab36c15 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2019, 2020 Hartmut Goebel +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -308,7 +309,10 @@ wrapping notes into KMime::Message objects.") (base32 "16qzs2cs4nxwrpwcdgwry95qn6wmg8s1p4w3qajx1ahkgwmsh11s")))) (build-system qt-build-system) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules))) + `(("extra-cmake-modules" ,extra-cmake-modules) + + ;; For tests. + ("dbus" ,dbus))) (inputs `(("akonadi" ,akonadi) ("akonadi-mime" ,akonadi-mime) @@ -327,7 +331,19 @@ wrapping notes into KMime::Message objects.") ("qtbase" ,qtbase) ("xapian" ,xapian))) (arguments - `(#:tests? #f)) ;; TODO: needs dbus + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; FIXME: This test fails because it fails to establish + ;; a socket connection, seemingly due to failure during + ;; DBus communication. + (substitute* "agent/autotests/CMakeLists.txt" + ((".*schedulertest\\.cpp.*") + "")) + #t)) + (replace 'check + (lambda _ + (invoke "dbus-launch" "ctest")))))) (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/akonadi/html/") (synopsis "Akonadi search library") (description "This package provides a library used to search in the -- cgit v1.2.3 From 32a4c032be404168157824adf13e312f8dff4a6c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jun 2020 16:12:16 +0200 Subject: gnu: kdevelop: Update to 5.5.2. * gnu/packages/kde.scm (kdevelop): Update to 5.5.2. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index c52feb5725..c978504793 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -209,7 +209,7 @@ projects.") (define-public kdevelop (package (name "kdevelop") - (version "5.5.1") + (version "5.5.2") (source (origin (method url-fetch) @@ -217,7 +217,7 @@ projects.") "/" version "/src/kdevelop-" version ".tar.xz")) (sha256 - (base32 "18hxwkdbfw0qs3p19jv6d8wwwdzb9m087891i8w2bzkn21fd5pmy")))) + (base32 "1nkl3z1n1l7ly2zvmbx2sdhx5q72wcvpwhzsz3qgw1474qd9i3i2")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From 9c0fd3d34cab839411ba47312eba6b659d5213ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jun 2020 20:56:54 +0200 Subject: gnu: KContacts: Propagate required inputs. * gnu/packages/kde-frameworks.scm (kcontacts)[inputs]: Move KCODECS, KCOREADDONS, KCONFIG, and KI18N ... [propagated-inputs]: ... here. New field. --- gnu/packages/kde-frameworks.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 0c31709329..d8a1e5262c 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1561,11 +1561,13 @@ integrated it into your application's other widgets.") `(("extra-cmake-modules" ,extra-cmake-modules) ("xorg-server" ,xorg-server))) ; for the tests (inputs - `(("kcodecs" ,kcodecs) + `(("qtbase" ,qtbase))) + (propagated-inputs + `(;; As required by KF5ContactsConfig.cmake. + ("kcodecs" ,kcodecs) ("kconfig" ,kconfig) ("kcoreaddons" ,kcoreaddons) - ("ki18n" ,ki18n) - ("qtbase" ,qtbase))) + ("ki18n" ,ki18n))) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From b69ca4d234db8fe2750e9b0d6b6139a5a89a4da6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jun 2020 20:57:50 +0200 Subject: gnu: Add kpeoplevcard. * gnu/packages/kde-pim.scm (kpeoplevcard): New public variable. --- gnu/packages/kde-pim.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 0d6ab36c15..569ac43d91 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1595,6 +1595,37 @@ and exchanging calendar data, vCalendar and iCalendar.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) +(define-public kpeoplevcard + (package + (name "kpeoplevcard") + (version "0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://download.kde.org/stable/kpeoplevcard/" + version "/kpeoplevcard-" version ".tar.xz")) + (sha256 + (base32 + "1hv3fq5k0pps1wdvq9r1zjnr0nxf8qc3vwsnzh9jpvdy79ddzrcd")))) + (build-system qt-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check-setup + (lambda _ + (setenv "HOME" "/tmp") + #t))))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kcontacts" ,kcontacts) + ("kpeople" ,kpeople) + ("qtbase" ,qtbase))) + (home-page "https://invent.kde.org/pim/kpeoplevcard") + (synopsis "Expose vCard contacts to KPeople") + (description + "This plugins adds support for vCard (also known as @acronym{VCF, +Virtual Contact File}) files to the KPeople contact management library.") + (license license:lgpl2.1+))) + (define-public kpimcommon (package (name "kpimcommon") -- cgit v1.2.3 From 7cfa1f5e78a2e2a4f0b068e67b0362ac12993005 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jun 2020 21:28:07 +0200 Subject: gnu: Remove nss/fixed. The merge preceding this commit ignored the nss replacement added in commit 7bc396bf353c5550c49b3f8791b34072ba417d90. This commit removes the remaining bits, because the fix is already present in nss@3.52.1. * gnu/packages/patches/nss-CVE-2020-12399.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/nss.scm (nss/fixed): Remove variable. --- gnu/local.mk | 1 - gnu/packages/nss.scm | 8 -- gnu/packages/patches/nss-CVE-2020-12399.patch | 138 -------------------------- 3 files changed, 147 deletions(-) delete mode 100644 gnu/packages/patches/nss-CVE-2020-12399.patch diff --git a/gnu/local.mk b/gnu/local.mk index 120d68c0ac..1685710f77 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1295,7 +1295,6 @@ dist_patch_DATA = \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/network-manager-plugin-path.patch \ %D%/packages/patches/nsis-env-passthru.patch \ - %D%/packages/patches/nss-CVE-2020-12399.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-pkgconfig.patch \ %D%/packages/patches/ntfs-3g-CVE-2019-9755.patch \ diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 9b9baf33c1..b19ad7e1e9 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -191,11 +191,3 @@ applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards.") (license license:mpl2.0))) - -(define nss/fixed - (package - (inherit nss) - (source (origin - (inherit (package-source nss)) - (patches (append (search-patches "nss-CVE-2020-12399.patch") - (origin-patches (package-source nss)))))))) diff --git a/gnu/packages/patches/nss-CVE-2020-12399.patch b/gnu/packages/patches/nss-CVE-2020-12399.patch deleted file mode 100644 index 0d91b655e2..0000000000 --- a/gnu/packages/patches/nss-CVE-2020-12399.patch +++ /dev/null @@ -1,138 +0,0 @@ -Fix CVE-2020-12399 (Timing attack on DSA signature generation: NSS has -shown timing differences when performing DSA signatures, which was -exploitable and could eventually leak private keys.) - -Copied from upstream: - -but with "nss/" inserted into the file name to patch. - -# HG changeset patch -# User Robert Relyea -# Date 1589907685 0 -# Node ID daa823a4a29bcef0fec33a379ec83857429aea2e -# Parent d2cfb4ccdf167e5ea06d2bb5bc39c50f789929c8 -Bug 1631576 - Force a fixed length for DSA exponentiation r=pereida,bbrumley - -Differential Revision: https://phabricator.services.mozilla.com/D72011 - -diff --git a/nss/lib/freebl/dsa.c b/nss/lib/freebl/dsa.c ---- a/nss/lib/freebl/dsa.c -+++ b/nss/lib/freebl/dsa.c -@@ -308,23 +308,24 @@ DSA_NewKeyFromSeed(const PQGParams *para - SECItem seedItem; - seedItem.data = (unsigned char *)seed; - seedItem.len = PQG_GetLength(¶ms->subPrime); - return dsa_NewKeyExtended(params, &seedItem, privKey); - } - - static SECStatus - dsa_SignDigest(DSAPrivateKey *key, SECItem *signature, const SECItem *digest, -- const unsigned char *kb) -+ const unsigned char *kbytes) - { - mp_int p, q, g; /* PQG parameters */ - mp_int x, k; /* private key & pseudo-random integer */ - mp_int r, s; /* tuple (r, s) is signature) */ - mp_int t; /* holding tmp values */ - mp_int ar; /* holding blinding values */ -+ mp_digit fuzz; /* blinding multiplier for q */ - mp_err err = MP_OKAY; - SECStatus rv = SECSuccess; - unsigned int dsa_subprime_len, dsa_signature_len, offset; - SECItem localDigest; - unsigned char localDigestData[DSA_MAX_SUBPRIME_LEN]; - SECItem t2 = { siBuffer, NULL, 0 }; - - /* FIPS-compliance dictates that digest is a SHA hash. */ -@@ -368,31 +369,46 @@ dsa_SignDigest(DSAPrivateKey *key, SECIt - CHECK_MPI_OK(mp_init(&q)); - CHECK_MPI_OK(mp_init(&g)); - CHECK_MPI_OK(mp_init(&x)); - CHECK_MPI_OK(mp_init(&k)); - CHECK_MPI_OK(mp_init(&r)); - CHECK_MPI_OK(mp_init(&s)); - CHECK_MPI_OK(mp_init(&t)); - CHECK_MPI_OK(mp_init(&ar)); -+ - /* - ** Convert stored PQG and private key into MPI integers. - */ - SECITEM_TO_MPINT(key->params.prime, &p); - SECITEM_TO_MPINT(key->params.subPrime, &q); - SECITEM_TO_MPINT(key->params.base, &g); - SECITEM_TO_MPINT(key->privateValue, &x); -- OCTETS_TO_MPINT(kb, &k, dsa_subprime_len); -+ OCTETS_TO_MPINT(kbytes, &k, dsa_subprime_len); -+ -+ /* k blinding create a single value that has the high bit set in -+ * the mp_digit*/ -+ if (RNG_GenerateGlobalRandomBytes(&fuzz, sizeof(mp_digit)) != SECSuccess) { -+ PORT_SetError(SEC_ERROR_NEED_RANDOM); -+ rv = SECFailure; -+ goto cleanup; -+ } -+ fuzz |= 1ULL << ((sizeof(mp_digit) * PR_BITS_PER_BYTE - 1)); - /* - ** FIPS 186-1, Section 5, Step 1 - ** - ** r = (g**k mod p) mod q - */ -- CHECK_MPI_OK(mp_exptmod(&g, &k, &p, &r)); /* r = g**k mod p */ -- CHECK_MPI_OK(mp_mod(&r, &q, &r)); /* r = r mod q */ -+ CHECK_MPI_OK(mp_mul_d(&q, fuzz, &t)); /* t = q*fuzz */ -+ CHECK_MPI_OK(mp_add(&k, &t, &t)); /* t = k+q*fuzz */ -+ /* length of t is now fixed, bits in k have been blinded */ -+ CHECK_MPI_OK(mp_exptmod(&g, &t, &p, &r)); /* r = g**t mod p */ -+ /* r is now g**(k+q*fuzz) == g**k mod p */ -+ CHECK_MPI_OK(mp_mod(&r, &q, &r)); /* r = r mod q */ -+ - /* - ** FIPS 186-1, Section 5, Step 2 - ** - ** s = (k**-1 * (HASH(M) + x*r)) mod q - */ - if (DSA_NewRandom(NULL, &key->params.subPrime, &t2) != SECSuccess) { - PORT_SetError(SEC_ERROR_NEED_RANDOM); - rv = SECFailure; -@@ -406,25 +422,34 @@ dsa_SignDigest(DSAPrivateKey *key, SECIt - goto cleanup; - } - SECITEM_TO_MPINT(t2, &ar); /* ar <-$ Zq */ - SECITEM_FreeItem(&t2, PR_FALSE); - - /* Using mp_invmod on k directly would leak bits from k. */ - CHECK_MPI_OK(mp_mul(&k, &ar, &k)); /* k = k * ar */ - CHECK_MPI_OK(mp_mulmod(&k, &t, &q, &k)); /* k = k * t mod q */ -- CHECK_MPI_OK(mp_invmod(&k, &q, &k)); /* k = k**-1 mod q */ -+ /* k is now k*t*ar */ -+ CHECK_MPI_OK(mp_invmod(&k, &q, &k)); /* k = k**-1 mod q */ -+ /* k is now (k*t*ar)**-1 */ - CHECK_MPI_OK(mp_mulmod(&k, &t, &q, &k)); /* k = k * t mod q */ -- SECITEM_TO_MPINT(localDigest, &s); /* s = HASH(M) */ -+ /* k is now (k*ar)**-1 */ -+ SECITEM_TO_MPINT(localDigest, &s); /* s = HASH(M) */ - /* To avoid leaking secret bits here the addition is blinded. */ -- CHECK_MPI_OK(mp_mul(&x, &ar, &x)); /* x = x * ar */ -- CHECK_MPI_OK(mp_mulmod(&x, &r, &q, &x)); /* x = x * r mod q */ -+ CHECK_MPI_OK(mp_mul(&x, &ar, &x)); /* x = x * ar */ -+ /* x is now x*ar */ -+ CHECK_MPI_OK(mp_mulmod(&x, &r, &q, &x)); /* x = x * r mod q */ -+ /* x is now x*r*ar */ - CHECK_MPI_OK(mp_mulmod(&s, &ar, &q, &t)); /* t = s * ar mod q */ -- CHECK_MPI_OK(mp_add(&t, &x, &s)); /* s = t + x */ -- CHECK_MPI_OK(mp_mulmod(&s, &k, &q, &s)); /* s = s * k mod q */ -+ /* t is now hash(M)*ar */ -+ CHECK_MPI_OK(mp_add(&t, &x, &s)); /* s = t + x */ -+ /* s is now (HASH(M)+x*r)*ar */ -+ CHECK_MPI_OK(mp_mulmod(&s, &k, &q, &s)); /* s = s * k mod q */ -+ /* s is now (HASH(M)+x*r)*ar*(k*ar)**-1 = (k**-1)*(HASH(M)+x*r) */ -+ - /* - ** verify r != 0 and s != 0 - ** mentioned as optional in FIPS 186-1. - */ - if (mp_cmp_z(&r) == 0 || mp_cmp_z(&s) == 0) { - PORT_SetError(SEC_ERROR_NEED_RANDOM); - rv = SECFailure; - goto cleanup; - -- cgit v1.2.3 From 0ec1622cb26a351c7662f32877b5a8368f8f0584 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jun 2020 23:36:27 +0200 Subject: gnu: grantlee: Update to 5.2.0. * gnu/packages/qt.scm (grantlee): Update to 5.2.0. [inputs]: Add QTDECLARATIVE. [arguments]: Remove #:configure-flags. Remove obsolete phase. --- gnu/packages/qt.scm | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index bb5ed59ac9..ba12760b1a 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -101,7 +101,7 @@ (define-public grantlee (package (name "grantlee") - (version "5.1.0") + (version "5.2.0") (source (origin (method git-fetch) @@ -110,30 +110,18 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dmah2gd6zd4fgz2f4ir11dazqg067hjz8xshhywhfsmavchi626")))) + (base32 "02dyqxjyxiqxrlz5g7v9ly8f095vs3iha39l75q6s8axs36y01lq")))) (native-inputs ;; Optional: lcov and cccc, both are for code coverage `(("doxygen" ,doxygen))) (inputs `(("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) ("qtscript" ,qtscript))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DCMAKE_CXX_STANDARD=11") - #:phases + `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'delete-broken-tests - (lambda _ - ;; TODO: Two date tests (for date01 and date02) fail for unknown - ;; reasons. - ;; Actual (result): "" - ;; Expected (output): "01" - ;; Actual (result): "" - ;; Expected (output): "Jan. 1, 2008" - (delete-file "templates/tests/testfilters.cpp") - (substitute* "templates/tests/CMakeLists.txt" - (("testfilters") "")) - #t)) (add-before 'check 'check-setup (lambda _ ;; make Qt render "offscreen", required for tests -- cgit v1.2.3 From faa2f1b2df31bd26b033eb738dc07b31d52112b0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 May 2020 19:15:02 +0200 Subject: gnu: KDE Plasma: Update to 5.18.5. * gnu/packages/kde-plasma.scm (kdecoration, kscreenlocker, libksysguard, libkscreen): Update to 5.18.5. --- gnu/packages/kde-plasma.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index a04b2f0279..ce6abb3a65 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -38,14 +38,14 @@ (define-public kdecoration (package (name "kdecoration") - (version "5.17.0") + (version "5.18.5") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kdecoration-" version ".tar.xz")) (sha256 (base32 - "0rljpywpaqmar13jijphkpc9k1crma476j9my0d00hfrjil5xlnn")))) + "1j59axgpdbj7nlg06h5gb0pix3s3nll32k6s2f88vc1cbwj5d67h")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -62,14 +62,14 @@ manager which re-parents a Client window to a window decoration frame.") (define-public kscreenlocker (package (name "kscreenlocker") - (version "5.17.0") + (version "5.18.5") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kscreenlocker-" version ".tar.xz")) (sha256 (base32 - "1jzkq5m0hvcpsl7clai33ndiil8gls7ndir3mfcc5l8gv7df2ir0")))) + "1lhq9rxafbbxwpwzq8m25xi9hgcdfdfwl8hafqhygzp14z89q9ml")))) (build-system cmake-build-system) (arguments `(#:phases @@ -125,14 +125,14 @@ manager which re-parents a Client window to a window decoration frame.") (define-public libkscreen (package (name "libkscreen") - (version "5.17.0") + (version "5.18.5") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "0znxfqqyyij6i4dp95gf5g4vrhg4jsshgh2k13ldy294kby2mxw0")))) + (base32 "0z18djlfrj510dz3r2n8qx6fswdbp2qmhg5y3bn00hij02832qm9")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -155,7 +155,7 @@ basic needs and easy to configure for those who want special setups.") (define-public libksysguard (package (name "libksysguard") - (version "5.17.0") + (version "5.18.5") (source (origin (method url-fetch) @@ -163,7 +163,7 @@ basic needs and easy to configure for those who want special setups.") "/libksysguard-" version ".tar.xz")) (sha256 (base32 - "1b79qxg6j9lqgyq8i677f00f7cbplqak1r9riyc9wj5s2r60ydw7")))) + "02s40ahqp4r9amjshdf0dhw9hdggvica2jl426i4d9b950507myl")))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 6701d2323688d752cdf6e368499dd21f32fb9656 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jun 2020 16:06:58 +0200 Subject: gnu: KDE: Update to 20.04.1. * gnu/packages/patches/akonadi-paths.patch: Adjust for upstream changes. * gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/kde-internet.scm (kget, kopete, krdc, libgravatar): Update to 20.04.1. [source](uri): Adjust for new upstream location. * gnu/packages/kde-multimedia.scm (audiocd-kio, dragon, ffmpegthumbs, juk, k3b, kamoso, kmix, kwave, libkcddb, libkcompactdisc): Likewise. * gnu/packages/kde-systemtools.scm (dolphin, dolphin-plugins, khelpcenter, konsole, krfb, ksystemlog): Update to 20.04.1. [source](uri): Adjust for new upstream location. * gnu/packages/kde-utils.scm (kate, kmag, kmousetool, kmouth, sweeper): Update to 20.04.1. [source](uri): Adjust for new upstream location. * gnu/packages/kde.scm (baloo-widgets, libkomparediff2, kqtquickcharts, grantleetheme, kcachegrind, libkdegames, zeroconf-ioslave): Update to 20.04.1. [source](uri): Adjust for new upstream location. (grantleetheme)[inputs]: Add KGUIADDONS. * gnu/packages/kde-pim.scm (akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, akonadi-search, kincidenceeditor, kaddressbook, kalarmcal, kblog, kcalendarsupport, kcalutils, kdav, kdepim-apps-libs, kdepim-runtime, keventviews, kgpg, kidentitymanagement, kimap, kldap, kleopatra, kmail, kmailcommon, kmailimporter, kmailtransport, kmbox, kmessagelib, kmime, knotes, kontactinterface, korganizer, kpimcommon, kpimtextedit, ksmtp, ktnef, libkdepim, libkgapi, libkleo, libksieve): Update to 20.04.1. [source](uri): Adjust to current. (akonadi)[inputs]: Remove KDBUSADDONS and KDESIGNERPLUGIN. (akonadi-calendar)[inputs]: Remove KDBUSADDONS. (kdepim-runtime)[source](patches): Remove. [arguments]: Add phase 'extend-CPLUS_INCLUDE_PATH'. [inputs]: Remove KDBUSADDONS and KICONTHEMES. (kmessagelib)[arguments]: Add phase 'extend-CPLUS_INCLUDE_PATH. [inputs]: Add QCA. (kdepim-apps-libs)[inputs]: Remove KDBUSADDONS and KICONTHEMES. (knotes)[inputs]: Remove KDBUSADDONS. (kpimcommon)[inputs]: Remove KDBUSADDONS and KCOMPLETION. (libksieve)[arguments]: Disable one more test. (korganizer)[arguments]: Disable one test. --- gnu/local.mk | 1 - gnu/packages/kde-internet.scm | 24 +- gnu/packages/kde-multimedia.scm | 60 ++--- gnu/packages/kde-pim.scm | 288 +++++++++++---------- gnu/packages/kde-systemtools.scm | 36 +-- gnu/packages/kde-utils.scm | 30 +-- gnu/packages/kde.scm | 45 ++-- gnu/packages/patches/akonadi-paths.patch | 53 ++-- ...kdepim-runtime-Fix-missing-link-libraries.patch | 42 --- 9 files changed, 280 insertions(+), 299 deletions(-) delete mode 100644 gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1685710f77..9bf7e78492 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1122,7 +1122,6 @@ dist_patch_DATA = \ %D%/packages/patches/libvirt-create-machine-cgroup.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ - %D%/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch \ %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ %D%/packages/patches/kiki-level-selection-crash.patch \ %D%/packages/patches/kiki-makefile.patch \ diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 5eb90cfb7c..f9cd29e9b8 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -116,14 +116,14 @@ Other notable features include: (define-public kget (package (name "kget") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kget-" version ".tar.xz")) (sha256 - (base32 "004qqq93iqidh2m9q2p2cwlbc2kfrz0g8a2mgd712c9p66l7s42s")))) + (base32 "1swx58wcig8zq8ibhczhcw7l8mqjm7pq8zca9gmny9kda5q04f5m")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -249,14 +249,14 @@ Features are: (define-public kopete (package (name "kopete") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kopete-" version ".tar.xz")) (sha256 - (base32 "088jya4v04l7r38pph1hxkr6ln4023s3ji3y8ipzdkalcx8hgr6l")))) + (base32 "149gi9hkyl825kf046iqkam3gkzfwdc2sihbf8gs6njachzvb81y")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -327,14 +327,14 @@ This package is part of the KDE networking module.") (define-public krdc (package (name "krdc") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/krdc-" version ".tar.xz")) (sha256 - (base32 "1p6g994whzjz9aarzrblh70xzs3jvygd1898qxgfymndlfxaxjyl")))) + (base32 "1hp23k3nsrcxpv2qiynjgm71zn3l6ds00cpd4frc68szgiblrw9r")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -429,14 +429,14 @@ a full-featured client for BitTorrent.") (define-public libgravatar (package (name "libgravatar") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/libgravatar-" version ".tar.xz")) (sha256 - (base32 "1yzq9d0hzqh1hdfpnh7fp44fyjk169gvm4pqgwg24ra00z8j2d3z")))) + (base32 "0981ci2kr20v4fk11h57rqya0brgslfazpgq1yk5yqiwyqqm49r2")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 639d74d894..938251a532 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -46,14 +46,14 @@ (define-public audiocd-kio (package (name "audiocd-kio") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/audiocd-kio-" version ".tar.xz")) (sha256 - (base32 "1924w7li16qkmqsvbgfihjd7id6mb00m9k3acfwkkf32yzg3dn4q")))) + (base32 "0qlnxxbayqhz25jbvzis27jw2zbw1pmacp8rv7v5wa7zfqn3kmyk")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -86,14 +86,14 @@ This package is part of the KDE multimedia module.") (define-public dragon (package (name "dragon") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/dragon-" version ".tar.xz")) (sha256 - (base32 "02l16k4sgrxbczxp8rlnxbylb5fmjh4zhl4xw55qxkvmvxnjy5zr")))) + (base32 "1sssg20a1vpwk816lp5jgwahilaswb9f3hgfqvc73il4g11ky1xj")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -201,14 +201,14 @@ its own database. You can build and play your own playlist.") (define-public ffmpegthumbs (package (name "ffmpegthumbs") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/ffmpegthumbs-" version ".tar.xz")) (sha256 - (base32 "1w6070ng40nf99wpl6p5s8nx0icfx2c26vvnz4f9fx7l7pldh6n9")))) + (base32 "17l50z33a1h5zkrrfkb261yi2hms66qj36l1mndq7mvs97y2ggmc")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -232,14 +232,14 @@ This package is part of the KDE multimedia module.") (define-public juk (package (name "juk") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/juk-" version ".tar.xz")) (sha256 - (base32 "0c1hrd1n4ah7qm8xr7bfswgbcmbvnnhai4bfawx6v6ab3frl7wvf")))) + (base32 "06vsh7knyhcbcbf632jhldbqpzfkdyils2l8dbcdw5nj5hhgzzmr")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -287,14 +287,14 @@ This package is part of the KDE multimedia module.") (define-public k3b (package (name "k3b") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/k3b-" version ".tar.xz")) (sha256 - (base32 "08rbiy1hz650srdksr7ciq8dpcz20wczs22613pghrpgm5zsczhr")))) + (base32 "0r01ninrrmqk7pl5jg0g51fcky1ammw0yyq572wyhibw7q8y7ly7")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -400,14 +400,14 @@ autoloading of subtitle files for use while playing video.") (define-public kamoso (package (name "kamoso") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kamoso-" version ".tar.xz")) (sha256 - (base32 "0j0lr2gwaxwchgfp54dashm1b39gsaw4ly9p8ybavwwzhjkdqza3")))) + (base32 "0c47j315kjfikd3b6x18786k3gqymicjjslpm0a58zdxl3wpqfay")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -447,14 +447,14 @@ camera. Use it to take pictures and make videos to share.") (define-public kmix (package (name "kmix") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmix-" version ".tar.xz")) (sha256 - (base32 "1g42hlmpdf0rrgqapps6v47z9cnwpkfzpwgavaq26m5k3bpanwfg")))) + (base32 "1na52ypp57wqrc6pl1khinx9i6fidv1k97nnxcy8zb4l7d5sh1nd")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -560,14 +560,14 @@ Some features: (define-public kwave (package (name "kwave") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kwave-" version ".tar.xz")) (sha256 - (base32 "1vv3m3h9mvjr9sxajccqnvcgvz901n3qxhki0g7vsljvh31x5s5x")))) + (base32 "0ysa873pc2gip95cxr8yv7ifd9qql5zg6h67i9n9q3iqa6v58iyw")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -637,14 +637,14 @@ Its features include: (define-public libkcddb (package (name "libkcddb") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkcddb-" version ".tar.xz")) (sha256 - (base32 "1rla9sfzpdfiki0p265ga6d1axqpq37825maaw85hm84mg7hkzjn")))) + (base32 "1fwryaj8ldmsqhl5qxjda8by9i7xlb97r8p9rqzckw697hkfhs0h")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -668,14 +668,14 @@ Its features include: (define-public libkcompactdisc (package (name "libkcompactdisc") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkcompactdisc-" version ".tar.xz")) (sha256 - (base32 "09gl2dww5i50rpj92ryw4vq5ryy96cv9kflg6yqgdbznmmdqhawi")))) + (base32 "0iy4i0hxqsrnndd4iqkww7v1rqry7kvi5paxdw5qjfffwn8kcsbx")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 569ac43d91..b7b779c7d5 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -43,14 +43,14 @@ (define-public akonadi (package (name "akonadi") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-" version ".tar.xz")) (sha256 - (base32 "0v7f1049wjnqxhwxr1443wc2cfbdqmf15xcwjz3j1m0vgdva9pyg")) + (base32 "0kkn7lh3akkk9cdi8qdk9kqzs1cgv916mkl440x4ykqd1v8brzqb")) (patches (search-patches "akonadi-paths.patch" "akonadi-timestamps.patch" @@ -66,8 +66,6 @@ ("kconfigwidgets" ,kconfigwidgets) ("kcoreaddons" ,kcoreaddons) ("kcrash" ,kcrash) - ("kdbusaddons" ,kdbusaddons) - ("kdesignerplugin" ,kdesignerplugin) ("ki18n" ,ki18n) ("kiconthemes" ,kiconthemes) ("kio" ,kio) @@ -122,14 +120,14 @@ programs.") (define-public akonadi-calendar (package (name "akonadi-calendar") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-calendar-" version ".tar.xz")) (sha256 - (base32 "1550h08i8rjnbd9yrnhd9v3v68ingrag2bdxrbid62qvam0n5ihy")))) + (base32 "1mq76qyd3jcngb2yfanpn7qvklzllza399fxwii0mqppp1vmnb2b")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -142,7 +140,6 @@ programs.") ("kcalutils" ,kcalutils) ("kcodecs" ,kcodecs) ("kcontacts" ,kcontacts) - ("kdbusaddons" ,kdbusaddons) ("ki18n" ,ki18n) ("kiconthemes" ,kiconthemes) ("kidentitymanagement" ,kidentitymanagement) @@ -166,14 +163,14 @@ collection and item views.") (define-public akonadi-contacts (package (name "akonadi-contacts") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-contacts-" version ".tar.xz")) (sha256 - (base32 "1pw1s8c6dlcb103cw46p1ikvas3y8cwiwnfdny2jd3hr3rig4px9")))) + (base32 "0igggarnl99s5pl73dgrpha4lf7vnr000iy69vcwmqs5lxb7cyli")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -217,14 +214,14 @@ to list and filter contacts.") (define-public akonadi-mime (package (name "akonadi-mime") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-mime-" version ".tar.xz")) (sha256 - (base32 "03q3dnhzcgmgcqvijnwi4ikg0m1zad2l679bqnp051v27fvs4yg7")))) + (base32 "1wd776ia3z22a79biq04y4m83n8xpvfmyg8bcsslr7lmc3avdg8w")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -270,14 +267,14 @@ with emails through Akonadi easier.") (define-public akonadi-notes (package (name "akonadi-notes") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-notes-" version ".tar.xz")) (sha256 - (base32 "0r8vh11bfjzhspb5kp2d0kcgwqd2m5qpxpamiajzjq910f51sw3w")))) + (base32 "04y293kjrmjjcbb7fkjl7hl4vrks4cjjxnvc6ibzyv81rn6cdhh2")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -299,14 +296,14 @@ wrapping notes into KMime::Message objects.") (define-public akonadi-search (package (name "akonadi-search") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-search-" version ".tar.xz")) (sha256 - (base32 "16qzs2cs4nxwrpwcdgwry95qn6wmg8s1p4w3qajx1ahkgwmsh11s")))) + (base32 "1h5p44y244gzf7ndzw7afrvq9c76ybp8ddvg82p3lzjh02rrvd50")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -336,7 +333,7 @@ wrapping notes into KMime::Message objects.") (lambda _ ;; FIXME: This test fails because it fails to establish ;; a socket connection, seemingly due to failure during - ;; DBus communication. + ;; DBus communication. See also 'korganizer'. (substitute* "agent/autotests/CMakeLists.txt" ((".*schedulertest\\.cpp.*") "")) @@ -354,14 +351,14 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.") (define-public kincidenceeditor (package (name "kincidenceeditor") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/incidenceeditor-" version ".tar.xz")) (sha256 - (base32 "0v962v2ihawndg39ypkfawa449vpbdyg00ib7avb19a153y3wxg6")))) + (base32 "1xpp5lw60mvpjsjsxmicfa5y2d68wnb9vm4yb1krwkihm852ziny")))) (properties `((upstream-name . "incidenceeditor"))) (build-system qt-build-system) (native-inputs @@ -403,14 +400,14 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.") (define-public kaddressbook (package (name "kaddressbook") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kaddressbook-" version ".tar.xz")) (sha256 - (base32 "1bpl9cqjv7s6pnsaa266jqmny2s6ldkylxviri162jxg51v1hhz3")))) + (base32 "1vpdhdj87ai2sxjn2jk3mh6bzfr1n3yzydnkgv7nc8v1m2fdawap")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -460,14 +457,14 @@ CalDAV server.") (define-public kalarmcal (package (name "kalarmcal") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kalarmcal-" version ".tar.xz")) (sha256 - (base32 "0w9qsx2gqwny2v4fsj4awn814s9b7yrxvqrawlick3r2kp4x1sgn")))) + (base32 "0g0bm4zzzcpl2pqqf609349zagwrgj6a4ibxpgg4zf21aacdq8bi")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -501,14 +498,14 @@ calendar data.") (define-public kblog (package (name "kblog") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kblog-" version ".tar.xz")) (sha256 - (base32 "0r3ik3df444kzg2mnzckkh4kk6v08zil1f26dwmxsslsqw9hl0vv")))) + (base32 "0pi3axs58wsz5vq6vyisz73s24q739zplwrblyvkcm16nll4mvhk")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -535,14 +532,14 @@ one of the APIs mentioned above.") (define-public kcalendarsupport (package (name "kcalendarsupport") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/calendarsupport-" version ".tar.xz")) (sha256 - (base32 "1hwfh5njq4614ypwdilna33hdcn11kshpwg6n27cag1qhwrxs1i4")))) + (base32 "1yv3hs7qw481cxw4kzbx5l8vv18bgzm1b0vj3zrlqqxwl5ac6xvy")))) (properties `((upstream-name . "calendarsupport"))) (build-system qt-build-system) (native-inputs @@ -581,14 +578,14 @@ calendaring applications.") (define-public kcalutils (package (name "kcalutils") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kcalutils-" version ".tar.xz")) (sha256 - (base32 "1nlkik4qiciyh1slgpis3n5h9pks2ygdba9yq4s16nnmip4l45w2")))) + (base32 "0v268w8vhgqxq1nwv9b9cy4h7zqgjrv19r44g3zc9w5j76ivix86")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -620,14 +617,14 @@ functions for accessing calendar data using the kcalcore API.") (define-public kdav (package (name "kdav") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kdav-" version ".tar.xz")) (sha256 - (base32 "1w59n17lridglphnm4mnmmzq1ijpbp269qxfmz01vk6wry6hlnp8")))) + (base32 "10syhwdlx36yip07yylzir8ig8arm1i868f2j6xpkwhxblrprlxk")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -648,14 +645,14 @@ supported using GroupDAV or CardDAV.") (define-public kdepim-apps-libs (package (name "kdepim-apps-libs") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kdepim-apps-libs-" version ".tar.xz")) (sha256 - (base32 "10xbzvp9cm5fpy4nxp38qm4vf0bycpq94bm4z2j4lw7ll1aq8irw")))) + (base32 "0m9qrfjs97anh9h6ibggx23ddlm1zkxjap2iyf3gf672ip01fvci")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -670,9 +667,7 @@ supported using GroupDAV or CardDAV.") ("kconfigwidgets" ,kconfigwidgets) ("kcontacts" ,kcontacts) ("kcoreaddons" ,kcoreaddons) - ("kdbusaddons" ,kdbusaddons) ("ki18n" ,ki18n) - ("kiconthemes" ,kiconthemes) ("kimap" ,kimap) ("kio" ,kio) ("kitemmodels" ,kitemmodels) @@ -694,16 +689,14 @@ for KDE PIM.") (define-public kdepim-runtime (package (name "kdepim-runtime") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kdepim-runtime-" version ".tar.xz")) (sha256 - (base32 "1skid9v6viw379mwhmb4xjh6bylv8wg7cy56kkbcpsmpars9cwr6")) - (patches (search-patches - "kdepim-runtime-Fix-missing-link-libraries.patch")))) + (base32 "1in4x4wvgclkni72cfkw9jx35d0qd0jmfwybm3ksx5qx5sbki9gg")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -727,9 +720,7 @@ for KDE PIM.") ("kconfigwidgets" ,kconfigwidgets) ("kcontacts" ,kcontacts) ("kdav" ,kdav) - ("kdbusaddons" ,kdbusaddons) ("kholidays" ,kholidays) - ("kiconthemes" ,kiconthemes) ("kidentitymanagement" ,kidentitymanagement) ("kimap" ,kimap) ("kio" ,kio) @@ -758,7 +749,18 @@ for KDE PIM.") (arguments ;; TODO: 5/45 tests fail for quite different reasons, even with ;; "offscreen" and dbus - `(#:tests? #f)) + `(#:tests? #f + #:phases (modify-phases %standard-phases + (add-after 'set-paths 'extend-CPLUS_INCLUDE_PATH + (lambda* (#:key inputs #:allow-other-keys) + ;; FIXME: is not + ;; found during one of the compilation steps without + ;; this hack. + (setenv "CPLUS_INCLUDE_PATH" + (string-append (assoc-ref inputs "akonadi-mime") + "/include/KF5:" + (or (getenv "CPLUS_INCLUDE_PATH") ""))) + #t))))) (home-page "https://cgit.kde.org/kdepim-runtime.git") (synopsis "Runtime components for Akonadi KDE") (description "This package contains Akonadi agents written using KDE @@ -773,14 +775,14 @@ package.") (define-public keventviews (package (name "keventviews") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/eventviews-" version ".tar.xz")) (sha256 - (base32 "190vx074ligzysc9w5pf2b51dfy0i4v9mc53m9jdcw8y02shy49w")))) + (base32 "0si9p95rgp7mgkzhzwyy10zrwzy1kipbhm1y96yjlc9rxi3jrc73")))) (properties `((upstream-name . "eventviews"))) (build-system qt-build-system) (native-inputs @@ -823,14 +825,14 @@ package.") (define-public kgpg (package (name "kgpg") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kgpg-" version ".tar.xz")) (sha256 - (base32 "1dis7zv51a4lhx5l3wlwnhym8f79h8sibhhk97fkn8d7szdrmfw5")))) + (base32 "03d3gsbara7ga2cyrhafkw11qq9cj804h9vpvxl4wd2a9c90snkh")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -871,14 +873,14 @@ cryptography to the contents of the clipboard.") (define-public kidentitymanagement (package (name "kidentitymanagement") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kidentitymanagement-" version ".tar.xz")) (sha256 - (base32 "0dqz49sp5hq44590rrxav8688aqlzsww4q4n55ksfy13nk9i5mbf")))) + (base32 "0flp9p9hlr1zfgvsy5i1nq55p7bvnhqxkxbif1lyw0cq6iblxhgr")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -910,14 +912,14 @@ cryptography to the contents of the clipboard.") (define-public kimap (package (name "kimap") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kimap-" version ".tar.xz")) (sha256 - (base32 "0l8hb2z82jzbwr12lw5fismwk1a3ca4dk966p1fxg4bibck8vjj6")))) + (base32 "1x22wfzqp92mn1fy2xl89k9yjfk2vgcva0fd30i9rrqj4aw2rsma")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -941,14 +943,14 @@ easier to do so.") (define-public kldap (package (name "kldap") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kldap-" version ".tar.xz")) (sha256 - (base32 "1blbnj8av6h168g14gyphyd9sz87af773b1qglmbkv5pzbzaanxn")))) + (base32 "0whlp586ycsx0qf0nr81avwscpq62w5js46z7vayy0dxkhrhfayr")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -971,14 +973,14 @@ protocol for querying and modifying directory services running over TCP/IP. ") (define-public kleopatra (package (name "kleopatra") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kleopatra-" version ".tar.xz")) (sha256 - (base32 "1bqwxdl91s2nai871vvhkmcc3simbnvr2i5m6dnl327bplzqgfa4")))) + (base32 "1m50nzb2m27fkb8z3k34cv4zi2akr0fx8zn7lk5swhg49sgrip6n")))) (build-system qt-build-system) (native-inputs `(("dbus" ,dbus) @@ -1027,14 +1029,14 @@ and retrieving certificates from LDAP servers.") (define-public kmail (package (name "kmail") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmail-" version ".tar.xz")) (sha256 - (base32 "0gsdpv9pf4h031zcawc4qv78a5kl9hxp2amd0spjhs7wc7nl17fk")) + (base32 "06qfxzi5pasm6p5ck44sjca96dz8xzd1nndq5lqcyvcxmmnvvz3p")) (patches (search-patches "kmail-Fix-missing-link-libraries.patch")))) (build-system qt-build-system) (native-inputs @@ -1121,14 +1123,14 @@ manager from KDE.") (define-public kmailcommon (package (name "kmailcommon") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/mailcommon-" version ".tar.xz")) (sha256 - (base32 "1gsj89kgq4457mnfjlys4wiixpzwlbwhj4zpd7r4fdhbyihz3k2m")))) + (base32 "0q1k57zx1l7bnzrk1hadjxjn6r4yzz833mgsvaai9sd8qg022x2l")))) (properties `((upstream-name . "mailcommon"))) (build-system qt-build-system) (native-inputs @@ -1188,14 +1190,14 @@ dealing with email.") (define-public kmailimporter (package (name "kmailimporter") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/mailimporter-" version ".tar.xz")) (sha256 - (base32 "0vmrgjz47f96crrbv0bhaz0abh2am4whhb294rfz02mvjghbzpzv")))) + (base32 "1929pw0shdzi0yvjnqhak680hjjibg8f8hqy3svyxxhiqbhfjm26")))) (properties `((upstream-name . "mailimporter"))) (build-system qt-build-system) (native-inputs @@ -1227,14 +1229,14 @@ e-mail client programs into KMail and KDE PIM.") (define-public kmailtransport (package (name "kmailtransport") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmailtransport-" version ".tar.xz")) (sha256 - (base32 "04jdnqxbp4382vjxh06rrvsigbrygqfkw0fvbbjnjymp585mgkr4")))) + (base32 "1swqlgzxzlqffm119sbhszy9lr93m8lzwygr0q4raa660b6yiavm")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1269,14 +1271,14 @@ mail transport.") (define-public kmbox (package (name "kmbox") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmbox-" version ".tar.xz")) (sha256 - (base32 "13b5v1nx46k5ais3cms7yxrfi8p6xbljpkpg3f7v1asb6kshv7g2")))) + (base32 "03cny38v4y1lmcrs6d34hbj9assqgf51rqryf5rdzkiaq79c1krc")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1293,14 +1295,14 @@ using a Qt/KMime C++ API.") (define-public kmessagelib (package (name "kmessagelib") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/messagelib-" version ".tar.xz")) (sha256 - (base32 "0a378aqkdjzyzlxxha2qxa6vzrj92l1fplzb6fajz4l7ipj4hbnv")))) + (base32 "03vq4962bhps2j9c9i52majlbkmvg2gmr197igv8xamja1vs8hk1")))) (properties `((upstream-name . "messagelib"))) (build-system qt-build-system) (native-inputs @@ -1351,6 +1353,7 @@ using a Qt/KMime C++ API.") ("libgravatar" ,libgravatar) ("libkdepim" ,libkdepim) ("libkleo" ,libkleo) + ("qca" ,qca) ("qgpgme" ,qgpgme) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) @@ -1359,7 +1362,17 @@ using a Qt/KMime C++ API.") ("qtwebkit" ,qtwebkit) ("sonnet" ,sonnet))) (arguments - `(#:tests? #f)) ;; TODO many test fail for quite different reasons + `(#:tests? #f ;TODO many test fail for quite different reasons + #:phases (modify-phases %standard-phases + (add-after 'set-paths 'extend-CPLUS_INCLUDE_PATH + (lambda* (#:key inputs #:allow-other-keys) + ;; FIXME: One of the compilation steps fail to find + ;; without this hack. + (setenv "CPLUS_INCLUDE_PATH" + (string-append (assoc-ref inputs "libkdepim") + "/include/KF5:" + (or (getenv "CPLUS_INCLUDE_PATH") ""))) + #t))))) (home-page "https://cgit.kde.org/messagelib.git") (synopsis "KDE PIM messaging libraries") (description "This package provides several libraries for messages, @@ -1371,14 +1384,14 @@ kwebengineviewer.") (define-public kmime (package (name "kmime") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmime-" version ".tar.xz")) (sha256 - (base32 "1pc00pwwrngsyr7ppvqwfgvcgy2wiqdbqxhv9xidn4dw9way2ng6")))) + (base32 "1dkdxfr1ry10qyql5sp1ai4li11f0ncf9hipg27j59y70mlyrl2r")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1409,14 +1422,14 @@ information in non-ASCII character sets.") (define-public knotes (package (name "knotes") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/knotes-" version ".tar.xz")) (sha256 - (base32 "128qpfqjn5zwl5550srmbjyxns242q6a3b0jy70jjx2yixy3rb87")))) + (base32 "13h4n7fb5p6g1f5kmw6pblpd76j904psm30s3a5d3kykni57dijx")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1439,7 +1452,6 @@ information in non-ASCII character sets.") ("kcontacts" ,kcontacts) ("kcoreaddons" ,kcoreaddons) ("kcrash" ,kcrash) - ("kdbusaddons" ,kdbusaddons) ("kdnssd" ,kdnssd) ("kdoctools" ,kdoctools) ("kglobalaccel" ,kglobalaccel) @@ -1483,14 +1495,14 @@ Features: (define-public kontactinterface (package (name "kontactinterface") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kontactinterface-" version ".tar.xz")) (sha256 - (base32 "1p0iw9i8cxh3jn7094wvxhlpc2sw52q8csfdgch1lf3dwhkpp0k7")))) + (base32 "0s1qm1wjkvbb1film94r7g88d8vgh26bm0hm6gpyqv5bazw5qx3j")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1511,14 +1523,14 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).") (define-public korganizer (package (name "korganizer") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/korganizer-" version ".tar.xz")) (sha256 - (base32 "1ixdmmczccvwr7a6vvzv0kyjay0mjnbwcwkq6yym32m2lb3vcxdn")))) + (base32 "04lz3ldrr0lpy9zpsg9ja1i9gxzlcjpqcwn3g7l4jjdky4frcr2r")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1576,6 +1588,15 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; FIXME: This test started failing after the 20.04 update + ;; seemingly due to DBus communication issues. + ;; See also 'akonadi-search' for a similar test failure. + (substitute* "src/autotests/CMakeLists.txt" + ((".*test_advanced\\(koeventpopupmenutest\\.cpp.*") + "")) + #t)) (replace 'check (lambda _ (invoke "dbus-launch" "ctest" ".") @@ -1629,14 +1650,14 @@ Virtual Contact File}) files to the KPeople contact management library.") (define-public kpimcommon (package (name "kpimcommon") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/pimcommon-" version ".tar.xz")) (sha256 - (base32 "1jl40ymq46yjn9va78hklgg91ikrfahf3w4jl5ziiqbivcl7r9kn")))) + (base32 "15lfqv5w4iwyjlvf4idykpkjgppl0ic59r4dw95qkbbjkps0nr7j")))) (properties `((upstream-name . "pimcommon"))) (build-system qt-build-system) (native-inputs @@ -1651,12 +1672,10 @@ Virtual Contact File}) files to the KPeople contact management library.") ("grantlee" ,grantlee) ;; TODO: ("kaccounts" ,kaccounts) ("kcodecs" ,kcodecs) - ("kcompletion" ,kcompletion) ("kconfig" ,kconfig) ("kconfigwidgets" ,kconfigwidgets) ("kcontacts" ,kcontacts) ("kcoreaddons" ,kcoreaddons) - ("kdbusaddons" ,kdbusaddons) ("kdesignerplugin" ,kdesignerplugin) ("ki18n" ,ki18n) ("kiconthemes" ,kiconthemes) @@ -1691,14 +1710,14 @@ Virtual Contact File}) files to the KPeople contact management library.") (define-public kpimtextedit (package (name "kpimtextedit") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kpimtextedit-" version ".tar.xz")) (sha256 - (base32 "1as48j5qfpj9pqjck1615nlpk4a850m7xxcyl41gx8biww027zvm")))) + (base32 "0j6d4sv405c3x0ww75qsww94apidsb8aaqf59akhv96zmv0vx5wy")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1733,14 +1752,14 @@ text in the text edit to all kinds of markup, like HTML or BBCODE.") (define-public ksmtp (package (name "ksmtp") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/ksmtp-" version ".tar.xz")) (sha256 - (base32 "1pd8mma3xbq83jkn76gqinn6xh9imaji0jrg3qzysf5rvjl8kcqn")))) + (base32 "1xyaahibm0dc3qdwiak5yqa66szxaxnylvqxi6k21ayvzn2vxbhx")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1773,14 +1792,14 @@ standard protocols for e-mail transmission.") (define-public ktnef (package (name "ktnef") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/ktnef-" version ".tar.xz")) (sha256 - (base32 "0kgfhh46130hg1xq8km5gjzxa3b620j1zdrg54qivxa782smgbl6")))) + (base32 "0cn5p32w2kas56yyc15c22kll4hd02lvvxz2n6cz1wda8alspj19")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1805,14 +1824,14 @@ and allows one to view/extract message formatted text in Rich Text Format.") (define-public libkdepim (package (name "libkdepim") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkdepim-" version ".tar.xz")) (sha256 - (base32 "0ndh97w1bfii4snx9yc0qazqk5jhx22s810kj656967xd1w4bj9n")))) + (base32 "0bask561laxgkgm3rxfpyxqs6jx1l9xjk058lhycq0pik6vwhdha")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1853,14 +1872,14 @@ and allows one to view/extract message formatted text in Rich Text Format.") (define-public libkgapi (package (name "libkgapi") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkgapi-" version ".tar.xz")) (sha256 - (base32 "0z76b745n4hhjndrhv1w5acibia8x1frh78jx7bvxa72d8wphn08")))) + (base32 "0nvd5fqrvyb7c3g7rf1lxbbv38q9sqnhd6irgx7awwgw92inxky4")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1889,14 +1908,14 @@ various Google services.") (define-public libkleo (package (name "libkleo") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkleo-" version ".tar.xz")) (sha256 - (base32 "0vjp07j102mi20c4q2fdvkjc0skb9q7msxp64n76wy3cciv346jz")))) + (base32 "0rijpmqyx4mrr7csik3vkfcra7kfywk6yz548fmq3ha8wa9ax8fv")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1927,14 +1946,14 @@ KDE using certificate-based crypto.") (define-public libksieve (package (name "libksieve") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/libksieve-" version ".tar.xz")) (sha256 - (base32 "0q6f6lc4yvlq0vsfml10lz844z6zxxf7yivk7l3vglap58ci20x1")) + (base32 "04k2nkwg5vlgbr5wpvsq02wi54ljsy4ka7y3ns5x3d2gb06wp03c")) (patches (search-patches "libksieve-Fix-missing-link-libraries.patch")))) (build-system qt-build-system) (native-inputs @@ -1974,6 +1993,11 @@ KDE using certificate-based crypto.") "src/ksieveui/editor/webengine/autotests/CMakeLists.txt" (("^\\s*(add_test|ecm_mark_as_test)\\W" line) (string-append "# " line))) + ;; FIXME: This test fails due to time zone problems. + (substitute* + "src/ksieveui/autocreatescripts/autotests/CMakeLists.txt" + ((".*sieveeditorgraphicalmodewidgettest\\.cpp.*") + "")) #t))))) (home-page "https://cgit.kde.org/libksieve.git") (synopsis "KDE Sieve library") diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index d51566341d..0fbf6e3373 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -38,14 +38,14 @@ (define-public dolphin (package (name "dolphin") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/dolphin-" version ".tar.xz")) (sha256 - (base32 "0klxyvcj1bmzpsyahj9kq3smvwzww30pjk5c90j6jpf14hizawfy")))) + (base32 "0xr5s0s40i2bsfjfapvpa7dxh9s4604cxirg97xcaacd6fdvhpds")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -97,14 +97,14 @@ The main features of Dolphin are: (define-public dolphin-plugins (package (name "dolphin-plugins") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/dolphin-plugins-" version ".tar.xz")) (sha256 - (base32 "0m9sl5fybk60h7r91a5qfxvwzksg2kxn1bc2ygrr8klm2pv0x1l2")))) + (base32 "12g44s6g7ma6avp15l45l42qyzbglswvahm2wji79zdls5vjnz7r")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -125,14 +125,14 @@ Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.") (define-public khelpcenter (package (name "khelpcenter") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/khelpcenter-" version ".tar.xz")) (sha256 - (base32 "0ympq1qm5h14mw18wry7l02ndg1f5kddwkf5bliip6vk2vxiff50")))) + (base32 "0wxzjragvjcfc7c4qja8wzpshhaywficj7f7wkmppzybcsxwn9qb")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -175,14 +175,14 @@ document meta data file.") (define-public konsole (package (name "konsole") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/konsole-" version ".tar.xz")) (sha256 - (base32 "09bhgqjnqlpxkkgdpn35pvj747ab7waz10zalvpwdpgqkw811iic")))) + (base32 "0ckr7bjkyaw0gr5kx569jfnhkhwmlk4lqk41ng61qwxlb4bsdbdm")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -230,14 +230,14 @@ This package is part of the KDE base applications module.") (define-public krfb (package (name "krfb") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/krfb-" version ".tar.xz")) (sha256 - (base32 "079f4jlmd69a5nppmn7khsxrnswlfbdzjni0cbixwlcij05y2267")))) + (base32 "092ijn88jpmgk2zwz37vzf35jisl234mc3krc9jl7bd955akx51k")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -282,14 +282,14 @@ This package is part of the KDE networking module.") (define-public ksystemlog (package (name "ksystemlog") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/ksystemlog-" version ".tar.xz")) (sha256 - (base32 "079r2xnj168y9kz37rhxr3rcwh6fksljsj1ihmi7f7a8wmdabz4p")))) + (base32 "1826h89ynvlxdwzyqil2d79cvynglww6fax7qp41wxasgarxhsni")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 38bdfbfaba..f97c03cc61 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -33,14 +33,14 @@ (define-public kate (package (name "kate") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kate-" version ".tar.xz")) (sha256 - (base32 "0wgcw10c4grkmsyp79ashwgpy59lgrinwdib4mjclpw2grp0g7xb")))) + (base32 "0nrby307syrqlxrf9lwdzc9c15ifw47418qwszqwg345ma2pww7i")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -100,14 +100,14 @@ Kate's features include: (define-public kmag (package (name "kmag") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmag-" version ".tar.xz")) (sha256 - (base32 "0l69mgnh2mmkxawwibqdx9n7myl6qqnr2fd3mpsg2bzpcfvmsvi1")))) + (base32 "18lk8i2r90gvw8q5j179xgpniih92mwk06krk7w4jv98yinqf6m5")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -131,14 +131,14 @@ artists to web-designers to people with low vision.") (define-public kmousetool (package (name "kmousetool") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmousetool-" version ".tar.xz")) (sha256 - (base32 "169kk20mkm29nycg2vs1k5cs22gzchqs9hbfd661cy2l7n4d8d04")))) + (base32 "01j6bx8zihns4ip8maj0gb3w3bhx1ha2ljhfmsm6lcyay531ay98")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -170,14 +170,14 @@ whom pressing buttons hurts.") (define-public kmouth (package (name "kmouth") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmouth-" version ".tar.xz")) (sha256 - (base32 "1agjxf1jfi967hj1iz788n6cna6fr7qg80zsx6s119hg7b0xwqmr")))) + (base32 "1afgxlys9mvmc3rd33g7gchfb0ylx83x3x0a0qf3dra6cpgsgcg7")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -475,14 +475,14 @@ Features: (define-public sweeper (package (name "sweeper") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/sweeper-" version ".tar.xz")) (sha256 - (base32 "1gn87yxmhi7rs82jq7y89bvlx33xbl9wq8kr96pcz423khqvjl84")))) + (base32 "1az3c2khnh51bbmqpamj4p26d3a0ff4l5rd3vcrylg94mk7wgh59")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index c978504793..5cf614d9c9 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -70,14 +70,14 @@ (define-public baloo-widgets (package (name "baloo-widgets") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/baloo-widgets-" version ".tar.xz")) (sha256 - (base32 "0bba8dgxd7rcjji809kwnw78hl1nb5ssh2ir4k4b0wvx395jifgd")))) + (base32 "1x4v79vhvc5ixkbsf3jyjz5ig1lf78rfw3r7g3llpb4j1kcp3wh0")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -103,14 +103,14 @@ This package contains GUI widgets for baloo.") (define-public grantleetheme (package (name "grantleetheme") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/grantleetheme-" version ".tar.xz")) (sha256 - (base32 "0j77q1yyfmggzgkqgcw2xr0v9xg3h5cdhh8jry8h2llw75ahy6xb")) + (base32 "0gabc5cb0sf00s7m5v2jnq55qsrdbrq6nqd15y1i15p788zifsjx")) (patches (search-patches "grantlee-merge-theme-dirs.patch")))) (build-system qt-build-system) (native-inputs @@ -118,6 +118,7 @@ This package contains GUI widgets for baloo.") ("libxml2" ,libxml2))) ;; xmllint required for tests (inputs `(("grantlee" ,grantlee) + ("kguiaddons" ,kguiaddons) ("ki18n" ,ki18n) ("kiconthemes" ,kiconthemes) ("knewstuff" ,knewstuff) @@ -126,7 +127,7 @@ This package contains GUI widgets for baloo.") (synopsis "Library providing Grantlee theme support") (description "This library provides Grantlee theme support.") (license ;; LGPL for libraries, FDL for documentation - (list license:lgpl2.0+ license:fdl1.2+)))) + (list license:lgpl2.1+ license:fdl1.2+)))) (define-public kdenlive (let ((version "18.08.1")) @@ -449,14 +450,14 @@ features include brush stabilizers, brush engines and wrap-around mode.") (define-public libkomparediff2 (package (name "libkomparediff2") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkomparediff2-" version ".tar.xz")) (sha256 - (base32 "0p8j24d0lzylv5crdzak87016ppgph5hiyxkvapda1m8zlb5dfm1")))) + (base32 "0m8m7sgpf2f4nxpaaymyvihlk0pcyblyd99mcbibrnyr5kzkzzdc")))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) @@ -620,15 +621,15 @@ communicate with each other. Here's a few things KDE Connect can do: (define-public kqtquickcharts (package (name "kqtquickcharts") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kqtquickcharts-" version ".tar.xz")) (sha256 (base32 - "0kwrqm7aa74plqkkyigi6b2hic6dzrygkgb6hsgj35ycrfn4rigi")))) + "1wxp35mf9zlpgzi4msdl86b2krdq2ipqw371gyx23r7j84vdyxi3")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -645,14 +646,14 @@ charts.") (define-public kcachegrind (package (name "kcachegrind") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/kcachegrind-" version ".tar.xz")) (sha256 (base32 - "0sm3085vd79svfql6nqjyrwlknnmdyyvi0yjnmyb09mq7djf1icg")))) + "0fx17s6fj1pxl1mgfrqhchk8sihkbji1x8y3nhb1r0971wzd1nsc")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -687,14 +688,14 @@ Python, PHP, and Perl.") (define-public libkdegames (package (name "libkdegames") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkdegames-" version ".tar.xz")) (sha256 - (base32 "12dvkmjgbi8dp9y55zmx1pw3zr2i374c4vn3mfn9r31bf06dr701")))) + (base32 "1xsrrvhwjwi5aajcaxydmzc69i4yx6shs8ly8vr85njc188ycg13")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -733,14 +734,14 @@ Python, PHP, and Perl.") (define-public zeroconf-ioslave (package (name "zeroconf-ioslave") - (version "19.08.3") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" version + (uri (string-append "mirror://kde/stable/release-service/" version "/src/zeroconf-ioslave-" version ".tar.xz")) (sha256 - (base32 "1vbi4kpyrk530q2dj8ql2i0gxjybdbmkqpl8vkhrihl7r7f0xc5p")))) + (base32 "1qck5jyc4psslpibhki8sz8aj0hsnx8z791vzyn10lmdzn71vx8c")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) diff --git a/gnu/packages/patches/akonadi-paths.patch b/gnu/packages/patches/akonadi-paths.patch index da250ee9e8..ac08ec5448 100644 --- a/gnu/packages/patches/akonadi-paths.patch +++ b/gnu/packages/patches/akonadi-paths.patch @@ -1,31 +1,31 @@ This is based on the respectve patch from NixPkgs, but with the parts pinning mysql and postgresql executables removed. The our package definition on why. - -Index: akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp -=================================================================== ---- akonadi-19.08.0.orig/src/akonadicontrol/agentmanager.cpp -+++ akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp -@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose, - mStorageController = new Akonadi::ProcessControl; - mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld - connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); -- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); -+ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); +diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp +--- a/src/akonadicontrol/agentmanager.cpp ++++ b/src/akonadicontrol/agentmanager.cpp +@@ -61,7 +61,7 @@ public: + []() { + QCoreApplication::instance()->exit(255); + }); +- start(QStringLiteral("akonadiserver"), args, RestartOnCrash); ++ start(QLatin1String(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash); + } - if (mAgentServerEnabled) { - mAgentServer = new Akonadi::ProcessControl; - connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure); -- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); -+ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); + ~StorageProcessControl() override +@@ -84,7 +84,7 @@ public: + []() { + qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!"; + }); +- start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash); ++ start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash); } - } -Index: akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp -=================================================================== ---- akonadi-19.08.0.orig/src/akonadicontrol/agentprocessinstance.cpp -+++ akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp -@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A + ~AgentServerProcessControl() override +diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp +--- a/src/akonadicontrol/agentprocessinstance.cpp ++++ b/src/akonadicontrol/agentprocessinstance.cpp +@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo) } else { Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); const QStringList arguments = QStringList() << executable << identifier(); @@ -34,11 +34,10 @@ Index: akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp mController->start(agentLauncherExec, arguments); } return true; -Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp -=================================================================== ---- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp -+++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp -@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer( +diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp +--- a/src/server/storage/dbconfigmysql.cpp ++++ b/src/server/storage/dbconfigmysql.cpp +@@ -209,7 +209,7 @@ bool DbConfigMysql::startInternalServer() #endif // generate config file diff --git a/gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch b/gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch deleted file mode 100644 index 13345c0038..0000000000 --- a/gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b84c4ba97cecf7304e99cafdd8a9c5866ce27050 Mon Sep 17 00:00:00 2001 -From: Hartmut Goebel -Date: Tue, 21 Jan 2020 23:33:50 +0100 -Subject: [PATCH] Fix missing link libraries. - -See - -These are only actually missing if the libraries reside in different -prefixes, as it is the case in Guix or Nix. ---- - resources/ews/test/CMakeLists.txt | 1 + - resources/facebook/CMakeLists.txt | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/resources/ews/test/CMakeLists.txt b/resources/ews/test/CMakeLists.txt -index b20eddcb8..6355eb994 100644 ---- a/resources/ews/test/CMakeLists.txt -+++ b/resources/ews/test/CMakeLists.txt -@@ -35,6 +35,7 @@ qt5_add_resources(isolatestestcommon_RSRCS isolatedtestcommon.qrc) - add_library(isolatedtestcommon STATIC ${isolatestestcommon_SRCS}) - target_link_libraries(isolatedtestcommon - KF5::AkonadiCore -+ KF5::AkonadiMime - Qt5::Core - Qt5::Network - Qt5::Test -diff --git a/resources/facebook/CMakeLists.txt b/resources/facebook/CMakeLists.txt -index bdd5eeaa7..27a9c83c1 100644 ---- a/resources/facebook/CMakeLists.txt -+++ b/resources/facebook/CMakeLists.txt -@@ -21,7 +21,8 @@ add_library(facebookresourcelib STATIC ${fbresource_SRCS}) - - target_link_libraries(facebookresourcelib - KF5::KIOWidgets -+ KF5::AkonadiCore - KF5::IconThemes - KF5::I18n - KF5::ConfigGui - KF5::CalendarCore --- -2.21.1 - -- cgit v1.2.3 From a5d465e25b43b52dcb94a4facac351cbe9b80f01 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jun 2020 20:25:59 +0200 Subject: gnu: Add pulseaudio-qt. * gnu/packages/kde-frameworks.scm (pulseaudio-qt): New public variable. --- gnu/packages/kde-frameworks.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 7aa7205a0a..a1abd7d46c 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -66,6 +66,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) @@ -1293,6 +1294,37 @@ which are used in DBus communication.") provides uniform access to generation of barcodes with data.") (license license:lgpl2.1+))) +(define-public pulseaudio-qt + (package + (name "pulseaudio-qt") + (version "1.2") + (source (origin + (method url-fetch) + (uri (string-append "https://download.kde.org/stable/pulseaudio-qt" + "/pulseaudio-qt-" version ".tar.xz")) + (sha256 + (base32 + "1i0ql68kxv9jxs24rsd3s7jhjid3f2fq56fj4wbp16zb4wd14099")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config))) + (inputs + `(("glib" ,glib) + ("pulseaudio" ,pulseaudio) + ("qtdeclarative" ,qtdeclarative) + ("qtbase" ,qtbase))) + (home-page "https://invent.kde.org/libraries/pulseaudio-qt/") + (synopsis "Qt bindings for PulseAudio") + (description + "pulseaudio-qt is a Qt-style wrapper for libpulse. It allows querying +and manipulation of various PulseAudio objects such as @code{Sinks}, +@code{Sources} and @code{Streams}. It does not wrap the full feature set of +libpulse.") + ;; User can choose between LGPL version 2.1 or 3.0; or + ;; "any later version accepted by the membership of KDE e.V". + (license (list license:lgpl2.1 license:lgpl3)))) + (define-public qqc2-desktop-style (package (name "qqc2-desktop-style") -- cgit v1.2.3 From 9141cec489676c4d2dd919bebdc10dd44136adde Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jun 2020 21:01:09 +0200 Subject: gnu: kdeconnect: Update to 1.4. * gnu/packages/kde.scm (kdeconnect): Update to 1.4. [arguments]: Add #:phases. [inputs]: Add KIRIGAMI, KPEOPLE, KPEOPLEVCARD, PULSEAUDIO-QT, and QTMULTIMEDIA. --- gnu/packages/kde.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 5cf614d9c9..fb14a64988 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2018, 2019 Hartmut Goebel ;;; Copyright © 2019, 2020 Ludovic Courtès +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,6 +50,7 @@ #:use-module (gnu packages graphics) #:use-module (gnu packages image) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages kde-pim) #:use-module (gnu packages kde-plasma) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) @@ -565,7 +567,7 @@ different notification systems.") (define-public kdeconnect (package (name "kdeconnect") - (version "1.3.5") + (version "1.4") (source (origin (method url-fetch) @@ -574,11 +576,22 @@ different notification systems.") version ".tar.xz")) (sha256 (base32 - "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5")))) + "06i6spspqpl79x6z2bfvbgd08b3h1pyx5j1xjhd8ifyrm52pkvna")))) (build-system qt-build-system) (arguments `(#:configure-flags '("-DBUILD_TESTING=ON" "-DLIBEXEC_INSTALL_DIR=libexec") + #:phases (modify-phases %standard-phases + (add-after 'set-paths 'extend-CPLUS_INCLUDE_PATH + (lambda* (#:key inputs #:allow-other-keys) + ;; FIXME: is not found during one + ;; of the compilation steps without this hack. + (setenv "CPLUS_INCLUDE_PATH" + (string-append (assoc-ref inputs "kcmutils") + "/include/KF5:" + (or (getenv "CPLUS_INCLUDE_PATH") + ""))) + #t))) #:tests? #f)) ; tests fail hard in our build environment (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -593,12 +606,17 @@ different notification systems.") ("ki18n" ,ki18n) ("kiconthemes" ,kiconthemes) ("kio" ,kio) + ("kirigami" ,kirigami) ("knotifications" ,knotifications) + ("kpeople" ,kpeople) + ("kpeoplevcard" ,kpeoplevcard) ("kwayland" ,kwayland) ("libfakekey" ,libfakekey) + ("pulseaudio-qt" ,pulseaudio-qt) ("qca" ,qca) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) + ("qtmultimedia" ,qtmultimedia) ("qtx11extras" ,qtx11extras))) (home-page "https://community.kde.org/KDEConnect") (synopsis "Enable your devices to communicate with each other") -- cgit v1.2.3 From cfec1af96a19be3fef26e13900937773355ee580 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 17:17:07 +0200 Subject: gnu: di: Update to 4.48. * gnu/packages/admin.scm (di): Update to 4.48. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 77981e520a..2e1c4d1ada 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2743,13 +2743,13 @@ a new command using the matched rule, and runs it.") (define-public di (package (name "di") - (version "4.47.3") + (version "4.48") (source (origin (method url-fetch) (uri (string-append "https://gentoo.com/di/di-" version ".tar.gz")) (sha256 - (base32 "0m4npba50sf5s61g5z3xd2r7937zwja941f2h3f081xi24c2hfck")))) + (base32 "0crvvfsxh8ryc0j19a2x52i9zacvggm8zi6j3kzygkcwnpz4km8r")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; obscure test failures -- cgit v1.2.3 From aba98be5406eaeaf70dbd6b9b30e16d254ede9d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 17:23:32 +0200 Subject: gnu: di: Cross-compile. * gnu/packages/admin.scm (di)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2e1c4d1ada..bb93f7efb1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2758,7 +2758,7 @@ a new command using the matched rule, and runs it.") (delete 'configure) ; no configure script (add-before 'build 'setup-environment (lambda* (#:key outputs #:allow-other-keys) - (setenv "CC" "gcc") + (setenv "CC" ,(cc-for-target)) (setenv "prefix" (assoc-ref outputs "out")) #t))) #:make-flags (list "--environment-overrides"))) -- cgit v1.2.3 From 6aa25ab3b332deb070e6d4c6ca2786e4dead69b9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 20:26:33 +0200 Subject: gnu: burp: Update to 2.3.28. * gnu/packages/backup.scm (burp): Update to 2.3.28. --- gnu/packages/backup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 49db612eb9..950dbc55ff 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1066,14 +1066,14 @@ interractive mode.") (define-public burp (package (name "burp") - (version "2.3.26") + (version "2.3.28") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/burp/burp-" version "/burp-" version ".tar.bz2")) (sha256 (base32 - "1kwm8wwmzla02cqacgpmac6n5466dqd5czx83lkbp97rmg9017h8")))) + "18f8cjsb87skabvz4cl5pdln35qmim7x686js1xzpld6wyl9kv2k")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 58eea2eb26647ef24f486d65551ccd6452adec0f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 20:37:18 +0200 Subject: gnu: klavaro: Update to 3.10. * gnu/packages/education.scm (klavaro): Update to 3.10. --- gnu/packages/education.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index ab02d1b7af..2ccda4b7a0 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -648,15 +648,14 @@ hours.") (define-public klavaro (package (name "klavaro") - (version "3.09") + (version "3.10") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/klavaro/klavaro-" version ".tar.bz2")) (sha256 - (base32 - "12gml7h45b1w9s318h0d5wxw92h7pgajn2kh57j0ak9saq0yb0wr")))) + (base32 "0jnzdrndiq6m0bwgid977z5ghp4q61clwdlzfpx4fd2ml5x3iq95")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 22fdca91a9edaca2ed0a714d2309470646c73c97 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 21:53:36 +0200 Subject: gnu: libqmi: Update to 1.24.14. * gnu/packages/freedesktop.scm (libqmi): Update to 1.24.14. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 9e84f30b5c..b823a693f7 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1084,7 +1084,7 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol.") (define-public libqmi (package (name "libqmi") - (version "1.24.12") + (version "1.24.14") (source (origin (method url-fetch) (uri (string-append @@ -1092,7 +1092,7 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol.") "libqmi-" version ".tar.xz")) (sha256 (base32 - "0scb8a2kh0vnzx6kxanfy2s2slnfppvrwg202rxv30m8p2i92frd")))) + "0zshxqbm9ldybgrzh7pjmwmfjvvvfd0xh8qhgl8xiqdb9ply73r0")))) (build-system gnu-build-system) (inputs `(("libgudev" ,libgudev))) -- cgit v1.2.3 From 58bb833365db4e8934a386497d5b00a063cfd27d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 6 Jun 2020 18:46:49 +0200 Subject: grafts: Improve performance for derivations with many inputs. Partly fixes . Reported by Lars-Dominik Braun . Previously we'd potentially traverse the same sub-graph of DEPS several times. With this patch, command: guix environment --ad-hoc r-learnr --search-paths goes from 11.3s to 4.6s. * guix/grafts.scm (reference-origin): Rename to... (reference-origins): ... this. Change 'item' parameter to 'items'. [lookup-derivers]: New procedure. (cumulative-grafts)[dependency-grafts]: Change 'item' to 'items' and use 'reference-origins'. Remove 'mapm' around 'dependency-grafts' call. --- guix/grafts.scm | 85 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 33 deletions(-) diff --git a/guix/grafts.scm b/guix/grafts.scm index 69d6fe4469..910dcadc8a 100644 --- a/guix/grafts.scm +++ b/guix/grafts.scm @@ -20,10 +20,12 @@ #:use-module (guix store) #:use-module (guix monads) #:use-module (guix records) + #:use-module (guix combinators) #:use-module (guix derivations) #:use-module ((guix utils) #:select (%current-system)) #:use-module (guix sets) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-11) #:use-module (srfi srfi-9 gnu) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) @@ -183,32 +185,47 @@ references." (set-current-state (vhash-cons key result cache)) (return result))))))) -(define (reference-origin drv item) - "Return the derivation/output pair among the inputs of DRV, recursively, -that produces ITEM. Return #f if ITEM is not produced by a derivation (i.e., -it's a content-addressed \"source\"), or if it's not produced by a dependency -of DRV." +(define (reference-origins drv items) + "Return the derivation/output pairs among the inputs of DRV, recursively, +that produce ITEMS. Elements of ITEMS not produced by a derivation (i.e., +it's a content-addressed \"source\"), or not produced by a dependency of DRV, +have no corresponding element in the resulting list." + (define (lookup-derivers drv result items) + ;; Return RESULT augmented by all the drv/output pairs producing one of + ;; ITEMS, and ITEMS stripped of matching items. + (fold2 (match-lambda* + (((output . file) result items) + (if (member file items) + (values (alist-cons drv output result) + (delete file items)) + (values result items)))) + result items + (derivation->output-paths drv))) + ;; Perform a breadth-first traversal of the dependency graph of DRV in - ;; search of the derivation that produces ITEM. + ;; search of the derivations that produce ITEMS. (let loop ((drv (list drv)) + (items items) + (result '()) (visited (setq))) (match drv (() - #f) + result) ((drv . rest) - (if (set-contains? visited drv) - (loop rest visited) - (let ((inputs (derivation-inputs drv))) - (or (any (lambda (input) - (let ((drv (derivation-input-derivation input))) - (any (match-lambda - ((output . file) - (and (string=? file item) - (cons drv output)))) - (derivation->output-paths drv)))) - inputs) - (loop (append rest (map derivation-input-derivation inputs)) - (set-insert drv visited))))))))) + (cond ((null? items) + result) + ((set-contains? visited drv) + (loop rest items result visited)) + (else + (let*-values (((inputs) + (map derivation-input-derivation + (derivation-inputs drv))) + ((result items) + (fold2 lookup-derivers + result items inputs))) + (loop (append rest inputs) + items result + (set-insert drv visited))))))))) (define* (cumulative-grafts store drv grafts #:key @@ -233,25 +250,27 @@ derivations to the corresponding set of grafts." (_ #f))) - (define (dependency-grafts item) - (match (reference-origin drv item) - ((drv . output) - ;; If GRAFTS already contains a graft from DRV, do not override it. - (if (find (cut graft-origin? drv <>) grafts) - (state-return grafts) - (cumulative-grafts store drv grafts - #:outputs (list output) - #:guile guile - #:system system))) - (#f - (state-return grafts)))) + (define (dependency-grafts items) + (mapm %store-monad + (lambda (drv+output) + (match drv+output + ((drv . output) + ;; If GRAFTS already contains a graft from DRV, do not + ;; override it. + (if (find (cut graft-origin? drv <>) grafts) + (state-return grafts) + (cumulative-grafts store drv grafts + #:outputs (list output) + #:guile guile + #:system system))))) + (reference-origins drv items))) (with-cache (cons (derivation-file-name drv) outputs) (match (non-self-references store drv outputs) (() ;no dependencies (return grafts)) (deps ;one or more dependencies - (mlet %state-monad ((grafts (mapm %state-monad dependency-grafts deps))) + (mlet %state-monad ((grafts (dependency-grafts deps))) (let ((grafts (delete-duplicates (concatenate grafts) equal?))) (match (filter (lambda (graft) (member (graft-origin-file-name graft) deps)) -- cgit v1.2.3 From b49caaa2b7f624c3395c8e872638282bcc420502 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 6 Jun 2020 21:37:47 +0200 Subject: packages: Make 'bag-grafts' insensitive to '%current-target-system'. Fixes . Reported by Mathieu Othacehe. * guix/packages.scm (bag-grafts): Wrap 'fold-bag-dependencies' calls in 'parameterize'. * tests/packages.scm ("package->bag, sensitivity to %current-target-system"): New test. --- guix/packages.scm | 30 +++++++++++++++++------------- tests/packages.scm | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 13 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 3d9988d836..0ccd31a7a9 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1277,23 +1277,27 @@ to (see 'graft-derivation'.)" (define native-grafts (let ((->graft (input-graft store system))) - (fold-bag-dependencies (lambda (package grafts) - (match (->graft package) - (#f grafts) - (graft (cons graft grafts)))) - '() - bag))) + (parameterize ((%current-system system) + (%current-target-system #f)) + (fold-bag-dependencies (lambda (package grafts) + (match (->graft package) + (#f grafts) + (graft (cons graft grafts)))) + '() + bag)))) (define target-grafts (if target (let ((->graft (input-cross-graft store target system))) - (fold-bag-dependencies (lambda (package grafts) - (match (->graft package) - (#f grafts) - (graft (cons graft grafts)))) - '() - bag - #:native? #f)) + (parameterize ((%current-system system) + (%current-target-system target)) + (fold-bag-dependencies (lambda (package grafts) + (match (->graft package) + (#f grafts) + (graft (cons graft grafts)))) + '() + bag + #:native? #f))) '())) ;; We can end up with several identical grafts if we stumble upon packages diff --git a/tests/packages.scm b/tests/packages.scm index d8f0d677a3..72e87dbfb7 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -1006,6 +1006,39 @@ (assoc-ref (bag-build-inputs bag) "libc") (assoc-ref (bag-build-inputs bag) "coreutils")))) +(test-assert "package->bag, sensitivity to %current-target-system" + ;; https://bugs.gnu.org/41713 + (let* ((lower (lambda* (name #:key system target inputs native-inputs + #:allow-other-keys) + (and (not target) + (bag (name name) (system system) (target target) + (build-inputs native-inputs) + (host-inputs inputs) + (build (lambda* (store name inputs + #:key system target + #:allow-other-keys) + (build-expression->derivation + store "foo" '(mkdir %output)))))))) + (bs (build-system + (name 'build-system-without-cross-compilation) + (description "Does not support cross compilation.") + (lower lower))) + (dep (dummy-package "dep" (build-system bs))) + (pkg (dummy-package "example" + (native-inputs `(("dep" ,dep))))) + (do-not-build (lambda (continue store lst . _) lst))) + (equal? (with-build-handler do-not-build + (parameterize ((%current-target-system "powerpc64le-linux-gnu") + (%graft? #t)) + (package-cross-derivation %store pkg + (%current-target-system) + #:graft? #t))) + (with-build-handler do-not-build + (package-cross-derivation %store + (package (inherit pkg)) + "powerpc64le-linux-gnu" + #:graft? #t))))) + (test-equal "package->bag, cross-compilation" `(,(%current-system) "foo86-hurd" (,(package-source gnu-make)) -- cgit v1.2.3 From 0c053a3973fbd8a62961998ca1b75152e8741229 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 27 May 2020 17:40:14 +0200 Subject: system: 'system-linux-image-file-name' takes an optional parameter. * gnu/system.scm (system-linux-image-file-name): Make 'target' an optional parameter. --- gnu/system.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index ac8bbd1d16..61cbaef280 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -466,15 +466,15 @@ from the initrd." "Return the list of swap services for OS." (map swap-service (operating-system-swap-devices os))) -(define* (system-linux-image-file-name) - "Return the basename of the kernel image file for SYSTEM." - ;; FIXME: Evaluate the conditional based on the actual current system. - (let ((target (or (%current-target-system) (%current-system)))) - (cond - ((string-prefix? "arm" target) "zImage") - ((string-prefix? "mips" target) "vmlinuz") - ((string-prefix? "aarch64" target) "Image") - (else "bzImage")))) +(define* (system-linux-image-file-name #:optional + (target (or (%current-target-system) + (%current-system)))) + "Return the basename of the kernel image file for TARGET." + (cond + ((string-prefix? "arm" target) "zImage") + ((string-prefix? "mips" target) "vmlinuz") + ((string-prefix? "aarch64" target) "Image") + (else "bzImage"))) (define (operating-system-kernel-file os) "Return an object representing the absolute file name of the kernel image of -- cgit v1.2.3 From b3477234455a555917365b6b4961004e2361c57f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 27 May 2020 23:04:48 +0200 Subject: vm: 'expression->derivation-in-linux-vm' always returns a native build. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Remove #:target. [builder]: Use #+. Don't pass #:target-arm32? and #:target-aarch64? to 'load-in-linux-vm'. Pass #:target #f to 'gexp->derivation'. (qemu-image): Adjust accordingly. * gnu/build/vm.scm (load-in-linux-vm): Remove #:target-aarch64? and #:target-arm32?. Define them as local variables. --- gnu/build/vm.scm | 11 ++++++++--- gnu/system/vm.scm | 16 +++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 433b5a7e8d..0f0ceae18f 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -84,8 +84,6 @@ linux initrd make-disk-image? single-file-output? - target-arm32? - target-aarch64? (disk-image-size (* 100 (expt 2 20))) (disk-image-format "qcow2") (references-graphs '())) @@ -101,7 +99,14 @@ access it via /dev/hda. REFERENCES-GRAPHS can specify a list of reference-graph files as produced by the #:references-graphs parameter of 'derivation'." - (define target-arm? (or target-arm32? target-aarch64?)) + (define target-arm32? + (string-prefix? "arm-" %host-type)) + + (define target-aarch64? + (string-prefix? "aarch64-" %host-type)) + + (define target-arm? + (or target-arm32? target-aarch64?)) (define arch-specific-flags `(;; On ARM, a machine has to be specified. Use "virt" machine to avoid diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 3e483fd86c..d737a5e4ec 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -141,7 +141,7 @@ (define* (expression->derivation-in-linux-vm name exp #:key - (system (%current-system)) target + (system (%current-system)) (linux linux-libre) initrd (qemu qemu-minimal) @@ -226,10 +226,11 @@ substitutable." (let* ((native-inputs '#+(list qemu (canonical-package coreutils))) - (linux (string-append #$linux "/" - #$(system-linux-image-file-name))) - (initrd #$initrd) - (loader #$loader) + (linux (string-append + #+linux "/" + #+(system-linux-image-file-name system))) + (initrd #+initrd) + (loader #+loader) (graphs '#$(match references-graphs (((graph-files . _) ...) graph-files) (_ #f))) @@ -249,8 +250,6 @@ substitutable." #:memory-size #$memory-size #:make-disk-image? #$make-disk-image? #:single-file-output? #$single-file-output? - #:target-arm32? #$(check target-arm32?) - #:target-aarch64? #$(check target-aarch64?) #:disk-image-format #$disk-image-format #:disk-image-size size #:references-graphs graphs)))))) @@ -258,7 +257,7 @@ substitutable." (gexp->derivation name builder ;; TODO: Require the "kvm" feature. #:system system - #:target target + #:target #f ;EXP is always executed natively #:env-vars env-vars #:guile-for-build guile-for-build #:references-graphs references-graphs @@ -430,7 +429,6 @@ system that is passed to 'populate-root-file-system'." #:bootloader-installer #$(bootloader-installer bootloader))))))) #:system system - #:target target #:make-disk-image? #t #:disk-image-size disk-image-size #:disk-image-format disk-image-format -- cgit v1.2.3 From 96cb3f8a29a96c0b72784fa88d2a34249ebb1437 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 27 May 2020 23:08:15 +0200 Subject: vm: 'qemu-image' uses the native partitioning tools and bootloader. * gnu/system/vm.scm (qemu-image): Use #+ for Parted, the bootloader, etc. --- gnu/system/vm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index d737a5e4ec..c7767db9df 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -345,7 +345,7 @@ system that is passed to 'populate-root-file-system'." (setlocale LC_ALL "en_US.utf8") (let ((inputs - '#$(append (list parted e2fsprogs dosfstools) + '#+(append (list parted e2fsprogs dosfstools) (map canonical-package (list sed grep coreutils findutils gawk)))) @@ -422,12 +422,12 @@ system that is passed to 'populate-root-file-system'." #:partitions partitions #:grub-efi grub-efi #:bootloader-package - #$(bootloader-package bootloader) + #+(bootloader-package bootloader) #:bootcfg #$bootcfg-drv #:bootcfg-location #$(bootloader-configuration-file bootloader) #:bootloader-installer - #$(bootloader-installer bootloader))))))) + #+(bootloader-installer bootloader))))))) #:system system #:make-disk-image? #t #:disk-image-size disk-image-size -- cgit v1.2.3 From 52c1b90a5a0c36d618b159233dcf7ba2a56737ba Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 28 May 2020 00:37:33 +0200 Subject: vm: 'qemu-image' preserves the cross-compilation target of the OS. * gnu/system/vm.scm (qemu-image)[preserve-target, inputs*]: New variables. In gexp, use INPUTS* instead of INPUTS. Wrap OS and BOOTCFG-DRV in 'preserve-target'. Pass INPUTS* instead of INPUTS as the #:references-graphs. --- gnu/system/vm.scm | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index c7767db9df..991ea2d837 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -317,6 +317,21 @@ system that is passed to 'populate-root-file-system'." (local-file (search-path %load-path "guix/store/schema.sql")))) + (define preserve-target + (if target + (lambda (obj) + (with-parameters ((%current-target-system target)) + obj)) + identity)) + + (define inputs* + (map (match-lambda + ((name thing) + `(,name ,(preserve-target thing))) + ((name thing output) + `(,name ,(preserve-target thing) ,output))) + inputs)) + (expression->derivation-in-linux-vm name (with-extensions gcrypt-sqlite3&co @@ -355,7 +370,7 @@ system that is passed to 'populate-root-file-system'." '#$(map (match-lambda ((name thing) thing) ((name thing output) `(,thing ,output))) - inputs))) + inputs*))) (set-path-environment-variable "PATH" '("bin" "sbin") inputs) @@ -367,7 +382,7 @@ system that is passed to 'populate-root-file-system'." #:closures graphs #:copy-closures? #$copy-inputs? #:register-closures? #$register-closures? - #:system-directory #$os + #:system-directory #$(preserve-target os) #:make-device-nodes #$(match device-nodes @@ -423,7 +438,7 @@ system that is passed to 'populate-root-file-system'." #:grub-efi grub-efi #:bootloader-package #+(bootloader-package bootloader) - #:bootcfg #$bootcfg-drv + #:bootcfg #$(preserve-target bootcfg-drv) #:bootcfg-location #$(bootloader-configuration-file bootloader) #:bootloader-installer @@ -432,7 +447,7 @@ system that is passed to 'populate-root-file-system'." #:make-disk-image? #t #:disk-image-size disk-image-size #:disk-image-format disk-image-format - #:references-graphs inputs + #:references-graphs inputs* #:substitutable? substitutable?)) (define* (system-docker-image os -- cgit v1.2.3 From 60f759f06d3a33f9284233200a2c732ed8716ef7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 27 May 2020 23:09:49 +0200 Subject: vm: compiler honors system and target. * gnu/system/vm.scm (system-qemu-image/shared-store): Add #:system and #:target. Pass it down. (system-qemu-image/shared-store-script): Likewise. (virtual-machine-compiler): Likewise. --- gnu/system/vm.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 991ea2d837..05f3986aca 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -764,6 +764,8 @@ environment with the store shared with the host. MAPPINGS is a list of (define* (system-qemu-image/shared-store os #:key + (system (%current-system)) + (target (%current-target-system)) full-boot? (disk-image-size (* (if full-boot? 500 30) (expt 2 20)))) "Return a derivation that builds a QEMU image of OS that shares its store @@ -784,6 +786,8 @@ bootloader refers to: OS kernel, initrd, bootloader data, etc." ;; This is more than needed (we only need the kernel, initrd, GRUB for its ;; font, and the background image), but it's hard to filter that. (qemu-image #:os os + #:system system + #:target target #:bootcfg-drv bootcfg #:bootloader (bootloader-configuration-bootloader (operating-system-bootloader os)) @@ -824,6 +828,8 @@ with '-virtfs' options for the host file systems listed in SHARED-FS." (define* (system-qemu-image/shared-store-script os #:key + (system (%current-system)) + (target (%current-target-system)) (qemu qemu) (graphic? #t) (memory-size 256) @@ -847,6 +853,8 @@ it is mostly useful when FULL-BOOT? is true." (mlet* %store-monad ((os -> (virtualized-operating-system os mappings full-boot?)) (image (system-qemu-image/shared-store os + #:system system + #:target target #:full-boot? full-boot? #:disk-image-size disk-image-size))) (define kernel-arguments @@ -920,10 +928,11 @@ FORWARDINGS is a list of host-port/guest-port pairs." (define-gexp-compiler (virtual-machine-compiler (vm ) system target) - ;; XXX: SYSTEM and TARGET are ignored. (match vm (($ os qemu graphic? memory-size disk-image-size ()) (system-qemu-image/shared-store-script os + #:system system + #:target target #:qemu qemu #:graphic? graphic? #:memory-size memory-size @@ -936,6 +945,8 @@ FORWARDINGS is a list of host-port/guest-port pairs." "user,model=virtio-net-pci," (port-forwardings->qemu-options forwardings))))) (system-qemu-image/shared-store-script os + #:system system + #:target target #:qemu qemu #:graphic? graphic? #:memory-size memory-size -- cgit v1.2.3 From e768e4e97fff4615da01245437ee91f27adb0c9c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 27 May 2020 23:11:14 +0200 Subject: vm: Shared-store script runs the native QEMU and Bash. * gnu/system/vm.scm (system-qemu-image/shared-store-script): Use #+ for QEMU and BASH. --- gnu/system/vm.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 05f3986aca..038cce19b6 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -862,7 +862,8 @@ it is mostly useful when FULL-BOOT? is true." #+@(operating-system-kernel-arguments os "/dev/vda1"))) (define qemu-exec - #~(list (string-append #$qemu "/bin/" #$(qemu-command (%current-system))) + #~(list #+(file-append qemu "/bin/" + (qemu-command (or target system))) #$@(if full-boot? #~() #~("-kernel" #$(operating-system-kernel-file os) @@ -879,7 +880,7 @@ it is mostly useful when FULL-BOOT? is true." #~(call-with-output-file #$output (lambda (port) (format port "#!~a~% exec ~a \"$@\"~%" - #$(file-append bash "/bin/sh") + #+(file-append bash "/bin/sh") (string-join #$qemu-exec " ")) (chmod port #o555)))) -- cgit v1.2.3 From b2ee53d5aead4e2c49f526c8ddcf5a279e879236 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 27 May 2020 23:57:41 +0200 Subject: gnu: guile-static: Disable JIT on ARMv7. * gnu/packages/make-bootstrap.scm (make-guile-static): Pass "--disable-jit" when 'target-arm32?' is true. --- gnu/packages/make-bootstrap.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index fe86f810bf..b2d3e2a326 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -706,7 +706,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; When `configure' checks for ltdl availability, it ;; doesn't try to link using libtool, and thus fails ;; because of a missing -ldl. Work around that. - ''("LDFLAGS=-ldl")) + + ;; XXX: On ARMv7, disable JIT: it causes crashes with 3.0.2, + ;; possibly related to . + (if (target-arm32?) + ''("LDFLAGS=-ldl" "--disable-jit") + ''("LDFLAGS=-ldl"))) ((#:phases phases '%standard-phases) `(modify-phases ,phases -- cgit v1.2.3 From d67a88196607b57ce1209464b03b79d2a74bf5cd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 6 Jun 2020 23:00:05 +0200 Subject: utils: Add 'with-environment-variables'. * guix/tests/gnupg.scm (call-with-environment-variables) (with-environment-variables): Move to... * guix/utils.scm: ... here. * guix/tests/git.scm: Adjust accordingly. --- guix/tests/git.scm | 1 - guix/tests/gnupg.scm | 22 +--------------------- guix/utils.scm | 50 ++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 41 insertions(+), 32 deletions(-) diff --git a/guix/tests/git.scm b/guix/tests/git.scm index c77c544e03..5d7056bb53 100644 --- a/guix/tests/git.scm +++ b/guix/tests/git.scm @@ -21,7 +21,6 @@ #:use-module ((guix git) #:select (with-repository)) #:use-module (guix utils) #:use-module (guix build utils) - #:use-module ((guix tests gnupg) #:select (with-environment-variables)) #:use-module (ice-9 match) #:use-module (ice-9 control) #:export (git-command diff --git a/guix/tests/gnupg.scm b/guix/tests/gnupg.scm index 6e7fdbcf65..47c858d232 100644 --- a/guix/tests/gnupg.scm +++ b/guix/tests/gnupg.scm @@ -22,27 +22,7 @@ #:use-module (ice-9 match) #:export (gpg-command gpgconf-command - with-fresh-gnupg-setup - - with-environment-variables)) - -(define (call-with-environment-variables variables thunk) - "Call THUNK with the environment VARIABLES set." - (let ((environment (environ))) - (dynamic-wind - (lambda () - (for-each (match-lambda - ((variable value) - (setenv variable value))) - variables)) - thunk - (lambda () - (environ environment))))) - -(define-syntax-rule (with-environment-variables variables exp ...) - "Evaluate EXP with the given environment VARIABLES set." - (call-with-environment-variables variables - (lambda () exp ...))) + with-fresh-gnupg-setup)) (define gpg-command (make-parameter "gpg")) diff --git a/guix/utils.scm b/guix/utils.scm index 69e3f0a934..17a96370f1 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -89,7 +89,6 @@ guile-version>? version-prefix? string-replace-substring - arguments-from-environment-variable file-extension file-sans-extension tarball-sans-extension @@ -99,6 +98,9 @@ call-with-temporary-directory with-atomic-file-output + with-environment-variables + arguments-from-environment-variable + config-directory cache-directory @@ -113,6 +115,38 @@ call-with-compressed-output-port canonical-newline-port)) + +;;; +;;; Environment variables. +;;; + +(define (call-with-environment-variables variables thunk) + "Call THUNK with the environment VARIABLES set." + (let ((environment (environ))) + (dynamic-wind + (lambda () + (for-each (match-lambda + ((variable value) + (setenv variable value))) + variables)) + thunk + (lambda () + (environ environment))))) + +(define-syntax-rule (with-environment-variables variables exp ...) + "Evaluate EXP with the given environment VARIABLES set." + (call-with-environment-variables variables + (lambda () exp ...))) + +(define (arguments-from-environment-variable variable) + "Retrieve value of environment variable denoted by string VARIABLE in the +form of a list of strings (`char-set:graphic' tokens) suitable for consumption +by `args-fold', if VARIABLE is defined, otherwise return an empty list." + (let ((env (getenv variable))) + (if env + (string-tokenize env char-set:graphic) + '()))) + ;;; ;;; Filtering & pipes. @@ -582,6 +616,11 @@ minor version numbers from version-string." (list-prefix? (string-tokenize v1 not-dot) (string-tokenize v2 not-dot))))) + +;;; +;;; Files. +;;; + (define (file-extension file) "Return the extension of FILE or #f if there is none." (let ((dot (string-rindex file #\.))) @@ -634,15 +673,6 @@ REPLACEMENT." (substring str start index) pieces)))))))) -(define (arguments-from-environment-variable variable) - "Retrieve value of environment variable denoted by string VARIABLE in the -form of a list of strings (`char-set:graphic' tokens) suitable for consumption -by `args-fold', if VARIABLE is defined, otherwise return an empty list." - (let ((env (getenv variable))) - (if env - (string-tokenize env char-set:graphic) - '()))) - (define (call-with-temporary-output-file proc) "Call PROC with a name of a temporary file and open output port to that file; close the file and delete it when leaving the dynamic extent of this -- cgit v1.2.3 From c39693d76099c159df856ffb5b2c43765fd6f2dd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 6 Jun 2020 23:17:02 +0200 Subject: ui: 'display-search-results' automatically invokes the pager. * guix/ui.scm (call-with-paginated-output-port): New procedure. (with-paginated-output-port): New macro. (display-search-results): Use it instead of displaying a hint. --- .dir-locals.el | 2 ++ guix/ui.scm | 57 +++++++++++++++++++++++++++++++++------------------------ 2 files changed, 35 insertions(+), 24 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index e34ddc5a85..dc8bc0e437 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -99,6 +99,8 @@ (eval . (put 'with-environment-variables 'scheme-indent-function 1)) (eval . (put 'with-fresh-gnupg-setup 'scheme-indent-function 1)) + (eval . (put 'with-paginated-output-port 'scheme-indent-function 1)) + ;; This notably allows '(' in Paredit to not insert a space when the ;; preceding symbol is one of these. (eval . (modify-syntax-entry ?~ "'")) diff --git a/guix/ui.scm b/guix/ui.scm index ea5f460865..98b30445c8 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -69,6 +69,7 @@ #:use-module (ice-9 match) #:use-module (ice-9 format) #:use-module (ice-9 regex) + #:autoload (ice-9 popen) (open-pipe* close-pipe) #:autoload (system base compile) (compile-file) #:autoload (system repl repl) (start-repl) #:autoload (system repl debug) (make-debug stack->vector) @@ -1557,6 +1558,27 @@ score, the more relevant OBJ is to REGEXPS." zero means that PACKAGE does not match any of REGEXPS." (relevance package regexps %package-metrics)) +(define (call-with-paginated-output-port proc) + (if (isatty?* (current-output-port)) + ;; Set 'LESS' so that 'less' exits if everything fits on the screen (F), + ;; lets ANSI escapes through (r), does not send the termcap + ;; initialization string (X). + (let ((pager (with-environment-variables `(("LESS" + ,(or (getenv "LESS") "FrX"))) + (open-pipe* OPEN_WRITE + (or (getenv "GUIX_PAGER") (getenv "PAGER") + "less"))))) + (dynamic-wind + (const #t) + (lambda () (proc pager)) + (lambda () (close-pipe pager)))) + (proc (current-output-port)))) + +(define-syntax-rule (with-paginated-output-port port exp ...) + "Evaluate EXP... with PORT bound to a port that talks to the pager if +standard output is a tty, or with PORT set to the current output port." + (call-with-paginated-output-port (lambda (port) exp ...))) + (define* (display-search-results matches port #:key (command "guix search") @@ -1573,30 +1595,17 @@ them. If PORT is a terminal, print at most a full screen of results." (define (line-count str) (string-count str #\newline)) - (let loop ((matches matches)) - (match matches - (((package . score) rest ...) - (let* ((links? (supports-hyperlinks? port)) - (text (call-with-output-string - (lambda (port) - (print package port - #:hyperlinks? links? - #:extra-fields - `((relevance . ,score))))))) - (if (and (not (getenv "INSIDE_EMACS")) - max-rows - (> (port-line port) first-line) ;print at least one result - (> (+ 4 (line-count text) (port-line port)) - max-rows)) - (unless (null? rest) - (display-hint (format #f (G_ "Run @code{~a ... | less} \ -to view all the results.") - command))) - (begin - (display text port) - (loop rest))))) - (() - #t)))) + (with-paginated-output-port paginated + (let loop ((matches matches)) + (match matches + (((package . score) rest ...) + (let* ((links? (supports-hyperlinks? port))) + (print package paginated + #:hyperlinks? links? + #:extra-fields `((relevance . ,score))) + (loop rest))) + (() + #t))))) (define (string->generations str) -- cgit v1.2.3 From d445c30ea6f9693454ca96bae9089ba8738a6f78 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Thu, 4 Jun 2020 23:26:19 -0700 Subject: daemon: Handle EXDEV when moving to trash directory. Fixes . Reported by Stephen Scheck . * nix/libstore/gc.cc (LocalStore::deletePathRecursive): When we try to move a dead directory into the trashDir using rename(2) but it returns an EXDEV error, just delete the directory instead. This can happen in a Docker container when the directory is not on the "top layer". --- nix/libstore/gc.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc index 8bc4e01eb0..e1d0765154 100644 --- a/nix/libstore/gc.cc +++ b/nix/libstore/gc.cc @@ -455,7 +455,10 @@ void LocalStore::deletePathRecursive(GCState & state, const Path & path) throw SysError(format("unable to rename `%1%' to `%2%'") % path % tmp); state.bytesInvalidated += size; } catch (SysError & e) { - if (e.errNo == ENOSPC) { + /* In a Docker container, rename(2) returns EXDEV when the source + and destination are not both on the "top layer". See: + https://bugs.gnu.org/41607 */ + if (e.errNo == ENOSPC || e.errNo == EXDEV) { printMsg(lvlInfo, format("note: can't create move `%1%': %2%") % path % e.msg()); deleteGarbage(state, path); } -- cgit v1.2.3 From ecbde6505cd12025d7fe92c2c9a56b969ff3cb8e Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Sat, 6 Jun 2020 17:56:54 -0700 Subject: gnu: guix: Update to d445c30ea6. * gnu/packages/package-management.scm (guix): Update to 1.1.0-7.d445c30. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index cc3a40cb93..551dfc9c39 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "ea924134f819eef072ba7df9080d39de97fd73e6") - (revision 6)) + (commit "d445c30ea6f9693454ca96bae9089ba8738a6f78") + (revision 7)) (package (name "guix") @@ -135,7 +135,7 @@ (commit commit))) (sha256 (base32 - "08likdidf3k1zqf8821h6a84dsrvgbdhridhkzpjymc2c884j0w4")) + "17xb4chb8m7kz1dkg19lp3s21imyi6faijzzhwczgy6rq3j5pd1s")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 99d27a1353209c9a33f9c3ba6bd658ae1b1cc617 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 7 Jun 2020 00:23:13 -0400 Subject: gnu: emacs-realgud: Fix realgud:run-process problem. * gnu/packages/emacs-xyz.scm (emacs-realgud)[phases] {fix-realgud:run-process-void-error}: New phase. {fix-autogen-script}: Return #t. {autogen}: Likewise. {set-home}: Likewise. {remove-realgud-pkg.el}: Likewise. --- gnu/packages/emacs-xyz.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 23876932ac..c149f9d030 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6010,22 +6010,35 @@ after buffer changes.") `(#:tests? #t #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-realgud:run-process-void-error + ;; See: https://github.com/realgud/realgud/issues/269. + (lambda _ + (substitute* '("realgud/debugger/gdb/gdb.el" + "realgud/debugger/gub/gub.el") + (("^\\(require 'load-relative\\).*" anchor) + (string-append anchor + "(require-relative-list \ +'(\"../../common/run\") \"realgud:\")\n"))) + #t)) (add-after 'unpack 'fix-autogen-script (lambda _ (substitute* "autogen.sh" - (("./configure") "sh configure")))) + (("./configure") "sh configure")) + #t)) (add-after 'fix-autogen-script 'autogen (lambda _ (setenv "CONFIG_SHELL" "sh") (invoke "sh" "autogen.sh"))) (add-after 'fix-autogen-script 'set-home (lambda _ - (setenv "HOME" (getenv "TMPDIR")))) + (setenv "HOME" (getenv "TMPDIR")) + #t)) (add-before 'patch-el-files 'remove-realgud-pkg.el (lambda _ ;; FIXME: `patch-el-files' crashes on this file with error: ;; unable to locate "bashdb". - (delete-file "./test/test-regexp-bashdb.el")))) + (delete-file "./test/test-regexp-bashdb.el") + #t))) #:include (cons* ".*\\.el$" %default-include))) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From f9d40736125e55976b7c226f00b6919e2bdfddf1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 7 Jun 2020 09:16:32 +0300 Subject: gnu: streamlink: Update to 1.4.1. * gnu/packages/video.scm (streamlink): Update to 1.4.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b2d359cac2..6efe6ed190 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2253,14 +2253,14 @@ and custom quantization matrices.") (define-public streamlink (package (name "streamlink") - (version "1.3.1") + (version "1.4.1") (source (origin (method url-fetch) (uri (pypi-uri "streamlink" version)) (sha256 (base32 - "0cnlg3ra3g6dml4xfy9ysy9b4qwyn458fadd8ac44cfwi3v4gq6y")))) + "1s458k8z1lv0w8i82sxs8dys66fwm4yr9j1m7fzp7r0piz8phcpd")))) (build-system python-build-system) (home-page "https://github.com/streamlink/streamlink") (native-inputs -- cgit v1.2.3 From 388a89750ec60a320dd7b6a0b0f174cbed4f50c6 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Sat, 6 Jun 2020 11:18:00 -0500 Subject: gnu: sbcl-lparallel: Modify system definition to require sb-cltl2. * gnu/packages/lisp-xyz.scm (sbcl-lparallel)[arguments]: Add 'fix-dependency' phase to modify system definition to require sb-cltl2. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e92fd0ba1d..d8009c2638 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3197,6 +3197,17 @@ WebKit browsing engine.") `(("alexandria" ,sbcl-alexandria) ("bordeaux-threads" ,sbcl-bordeaux-threads) ("trivial-garbage" ,sbcl-trivial-garbage))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-dependency + ;; lparallel loads a SBCL specific system in its asd file. This is + ;; not carried over into the fasl which is generated. In order for + ;; it to be carried over, it needs to be listed as a dependency. + (lambda _ + (substitute* "lparallel.asd" + ((":depends-on \\(:alexandria" all) + (string-append all " #+sbcl :sb-cltl2")))))))) (home-page "https://lparallel.org/") (synopsis "Parallelism for Common Lisp") (description -- cgit v1.2.3 From 5dc04da4dfa5330cd634f7a6dddc3fcdfe102f8a Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 7 Jun 2020 10:40:48 +0200 Subject: gnu: sbcl-cl-random-forest: Remove obsolete fix. * gnu/packages/machine-learning.scm (sbcl-cl-random-forest)[arguments]: Remove 'add-sb-cltl2-dependency' phase. --- gnu/packages/machine-learning.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index e26768267b..4be165f390 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2019 Nicolas Goaziou -;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Konrad Hinsen ;;; Copyright © 2020 Edouard Klein @@ -2067,18 +2067,7 @@ online linear classification written in Common Lisp.") ("cl-online-learning" ,sbcl-cl-online-learning) ("lparallel" ,sbcl-lparallel))) (arguments - `(;; The tests download data from the Internet - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'add-sb-cltl2-dependency - (lambda _ - ;; sb-cltl2 is required by lparallel when using sbcl, but it is - ;; not loaded automatically. - (substitute* "cl-random-forest.asd" - (("\\(in-package :cl-user\\)") - "(in-package :cl-user) #+sbcl (require :sb-cltl2)")) - #t))))) + `(#:tests? #f)) ; The tests download data from the Internet (synopsis "Random Forest and Global Refinement for Common Lisp") (description "CL-random-forest is an implementation of Random Forest for multiclass -- cgit v1.2.3 From 64174aff927f4f9da18ea452247c838e6bab3306 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Sun, 7 Jun 2020 10:56:59 +0200 Subject: gnu: Add cl-rdkafka. * gnu/packages/lisp-xyz.scm (sbcl-cl-rdkafka, cl-rdkafka): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d8009c2638..0bf2dec44d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11938,3 +11938,51 @@ tables.") (define-public ecl-cl-ascii-table (sbcl-package->ecl-package sbcl-cl-ascii-table)) + +(define-public sbcl-cl-rdkafka + (package + (name "sbcl-cl-rdkafka") + (version "1.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SahilKang/cl-rdkafka.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qcgfd4h7syilzmrmd4z2vknbvawda3q3ykw7xm8n381syry4g82")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:tests? #f ; Attempts to connect to locally running Kafka + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/low-level/librdkafka-bindings.lisp" + (("librdkafka" all) + (string-append (assoc-ref inputs "librdkafka") "/lib/" + all))))) + (add-before 'cleanup 'move-bundle + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (actual (string-append out "/lib/sbcl/src/cl-rdkafka.fasl")) + (expected (string-append + out "/lib/sbcl/cl-rdkafka--system.fasl"))) + (copy-file actual expected) + #t)))))) + (inputs + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("cffi" ,sbcl-cffi) + ("cffi-grovel" ,sbcl-cffi-grovel) + ("librdkafka" ,librdkafka) + ("lparallel" ,sbcl-lparallel) + ("trivial-garbage" ,sbcl-trivial-garbage))) + (home-page "https://github.com/SahilKang/cl-rdkafka") + (synopsis "Common Lisp client library for Apache Kafka") + (description "A Common Lisp client library for Apache Kafka.") + (license license:gpl3))) + +(define-public cl-rdkafka + (sbcl-package->cl-source-package sbcl-cl-rdkafka)) -- cgit v1.2.3 From cc9d63f370851c18d64bb15d74ff90e6947fe700 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 7 Jun 2020 11:22:23 +0200 Subject: gnu: emacs-lispyville: Update to 20200605. * gnu/packages/emacs-xyz.scm (emacs-lispyville): Update to 20200605. [arguments]: Remove obsolete workaround for tests. --- gnu/packages/emacs-xyz.scm | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c149f9d030..cf8c5ddbde 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6490,8 +6490,8 @@ S-expression.") (license license:gpl3+))) (define-public emacs-lispyville - (let ((commit "d28b937f0cabd8ce61e2020fe9a733ca80d82c74") - (revision "1")) + (let ((commit "1bf38088c981f5ab4ef2e2684952ab6af96378db") + (revision "2")) (package (name "emacs-lispyville") (version (git-version "0.1" revision commit)) @@ -6501,31 +6501,12 @@ S-expression.") (uri (git-reference (url home-page) (commit commit))) (sha256 (base32 - "0f6srwj1qqkfkbmp5n5pjvi6gm7b7xav05p5hrs2i83rjrakzzqx")) + "07z8qqvaxf963kwn7l2gk47989zb7r3d8ybqjs2cg6hzmzb77wbw")) (file-name (git-file-name name version)))) (propagated-inputs `(("emacs-evil" ,emacs-evil) ("emacs-lispy" ,emacs-lispy))) (build-system emacs-build-system) - (arguments - `(#:phases - ;; XXX: mysterious whitespace issue with one test - (modify-phases %standard-phases - (add-before 'check 'make-test-writable - (lambda _ - (make-file-writable "lispyville-test.el") - #t)) - (add-after 'make-test-writable 'remove-test - (lambda _ - (emacs-batch-edit-file "lispyville-test.el" - `(progn (progn (goto-char (point-min)) - (re-search-forward - "ert-deftest lispyville-comment-and-clone-dwim") - (beginning-of-line) - (kill-sexp)) - (basic-save-buffer)))))) - #:tests? #t - #:test-command '("make" "test"))) (synopsis "Minor mode for integrating Evil with lispy") (description "LispyVille's main purpose is to provide a Lisp editing environment -- cgit v1.2.3 From dfb3f2bad8e54f44b5bb0e129ba146f70c7db3a4 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 7 Jun 2020 16:23:29 +0300 Subject: gnu: youtube-dl: Update to 2020.06.06. * gnu/packages/video.scm (youtube-dl): Update to 2020.06.06. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6efe6ed190..8d9d5ecfd1 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1611,7 +1611,7 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2020.05.29") + (version "2020.06.06") (source (origin (method url-fetch) (uri (string-append "https://github.com/ytdl-org/youtube-dl/" @@ -1619,7 +1619,7 @@ To load this plugin, specify the following option when starting mpv: version ".tar.gz")) (sha256 (base32 - "111ganbfi76ipfq5gjgamjbqd7m8l4lim9wwmfnc04bzvwqqzfi3")))) + "1qrrr14glv0jv377n61paq55b6k58jpnwbz2sp5xfl4wnxy5hqny")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 2dcaa7601f8709e2761df7a2a2bcd9eeeb10dcb6 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Mon, 1 Jun 2020 06:00:09 +0000 Subject: gnu: Add vala-0.48. * gnu/packages/gnome.scm (vala-0.48): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/gnome.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 592cab0b49..6a3ff8709b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3295,6 +3295,19 @@ requirements and without using a different ABI compared to applications and libraries written in C.") (license license:lgpl2.1+))) +(define-public vala-0.48 + (package + (inherit vala) + (version "0.48.6") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/vala/" + (version-major+minor version) "/" + "vala-" version ".tar.xz")) + (sha256 + (base32 + "01wppzgacdmp8dgf8047myz1any2yffmrhgl8kqf1q0c0gnhi3fi")))))) + (define-public vte (package (name "vte") -- cgit v1.2.3 From 8d7efc7a950968a73c90bb64af9a431c68781c55 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Wed, 3 Jun 2020 03:06:35 +0000 Subject: gnu: Add vala-language-server. * gnu/packages/gnome-xyz.scm (vala-language-server): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/gnome-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 83e37f97b0..21838ff0cd 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Ekaitz Zarraga ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020 Ryan Prior ;;; ;;; This file is part of GNU Guix. ;;; @@ -585,3 +586,36 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.") (description "Papirus is a fork of the icon theme Paper with a lot of new icons and a few extra features.") (license license:gpl3)))) + +(define-public vala-language-server + (package + (name "vala-language-server") + ;; Note to maintainer: VLS must be built with a Vala toolchain the same + ;; version or newer. Therefore when you update this package you may need + ;; to update Vala too. + (version "0.48") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/benwaffle/vala-language-server.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0chgfpci247skrvsiq1l8cas8sj2z6z42dlarka3df3qwxmh0if0")))) + (build-system meson-build-system) + (arguments '(#:glib-or-gtk? #t)) + (inputs + `(("glib" ,glib) + ("json-glib" ,json-glib) + ("jsonrpc-glib" ,jsonrpc-glib) + ("libgee" ,libgee) + ("vala" ,vala-0.48))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/benwaffle/vala-language-server") + (synopsis "Language server for Vala") + (description "The Vala language server is an implementation of the Vala +language specification for the Language Server Protocol (LSP). This tool is +used in text editing environments to provide a complete and integrated +feature-set for programming Vala effectively.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From ce4b77cc2dfb17f604f0a006bcb65ce954f2fc13 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Jun 2020 02:37:21 +0200 Subject: gnu: wireguard-linux-compat: Update to 1.0.20200520. * gnu/packages/vpn.scm (wireguard-linux-compat): Update to 1.0.20200520. --- gnu/packages/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index e16ac81961..a0aff7a32c 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -499,7 +499,7 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers (define-public wireguard-linux-compat (package (name "wireguard-linux-compat") - (version "1.0.20200401") + (version "1.0.20200520") (source (origin (method url-fetch) (uri (string-append "https://git.zx2c4.com/wireguard-linux-compat/" @@ -507,7 +507,7 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers ".tar.xz")) (sha256 (base32 - "0ymprz3h4b92wlcqm5k5vmcgap8pjv202bgkdx0axmp12n1lmyvx")))) + "1hvpbfpdd3v2k27ypa1y1j422irx7hxpz87f50s28jvkxx5sxrqn")))) (build-system linux-module-build-system) (outputs '("out" "kernel-patch")) -- cgit v1.2.3 From 41c68b6a68a28a54c790a169e508bb5840d96035 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Jun 2020 17:42:04 +0200 Subject: gnu: s6-portable-utils: Update to 2.2.2.3. * gnu/packages/skarnet.scm (s6-portable-utils): Update to 2.2.2.3. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index b4cab33271..0c381582e8 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -263,7 +263,7 @@ environment."))) (define-public s6-portable-utils (package (name "s6-portable-utils") - (version "2.2.2.2") + (version "2.2.2.3") (source (origin (method url-fetch) @@ -271,7 +271,7 @@ environment."))) "https://skarnet.org/software/s6-portable-utils/s6-portable-utils-" version ".tar.gz")) (sha256 - (base32 "1k3la37q46n93vjwk9wm9ym4w87z6lqzv43f03qd0vqj9k94mpv3")))) + (base32 "0dniniw8y9das12ic7bd34ra817qzfrql18rczs49sfnkf67c98n")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments -- cgit v1.2.3 From 7907e7f237f86fe2f8628a00052727ac7a9f36da Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Jun 2020 18:23:19 +0200 Subject: gnu: libgit2: Update to 1.0.1. * gnu/packages/version-control.scm (libgit2): Update to 1.0.1. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index f26d0ca2b4..60a31fb16c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -634,7 +634,7 @@ on @command{git}, and use any regular Git hosting service.") (define-public libgit2 (package (name "libgit2") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/libgit2/libgit2/" @@ -642,7 +642,7 @@ on @command{git}, and use any regular Git hosting service.") "/libgit2-" version ".tar.gz")) (sha256 (base32 - "1d09ni0v3vammk8zqmmwks92fh3wwnsxpyrh4s5wwdb3gxma27va")) + "0nlg35pxhh548nn7aa3y1m81mf81nkbzz86i2psps4f474n497v8")) (patches (search-patches "libgit2-mtime-0.patch")) (snippet '(begin (delete-file-recursively "deps") #t)) -- cgit v1.2.3 From 1fc6f1def974041b92fc411a8ba9ec9037e6ee93 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Jun 2020 18:24:51 +0200 Subject: gnu: python-mwclient: Update to 0.10.1. * gnu/packages/python-xyz.scm (python-mwclient): Update to 0.10.1. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bf0584326b..94e63d1c74 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14147,7 +14147,7 @@ exception message with a traceback that points to the culprit.") (define-public python-mwclient (package (name "python-mwclient") - (version "0.10.0") + (version "0.10.1") (source (origin (method git-fetch) @@ -14157,8 +14157,7 @@ exception message with a traceback that points to the culprit.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1c3q6lwmb05yqywc4ya98ca7hsl15niili8rccl4n1yqp77c103v")))) + (base32 "120snnsh9n5svfwkyj1w9jrxf99jnqm0jk282yypd3lpyca1l9hj")))) (build-system python-build-system) (propagated-inputs `(("python-requests-oauthlib" ,python-requests-oauthlib) -- cgit v1.2.3 From d8a85f8200863757a432314bc0490d3ee8adfcc4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Jun 2020 18:43:11 +0200 Subject: gnu: qwt: Update to 6.1.5. * gnu/packages/qt.scm (qwt): Update to 6.1.5. --- gnu/packages/qt.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index cd5b38d74c..d4b215a0bc 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Thomas Danckaert ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017 Quiliro -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Hartmut Goebel ;;; Copyright © 2018 Eric Bavier @@ -2338,7 +2338,7 @@ securely. It will not store any data unencrypted unless explicitly requested.") (define-public qwt (package (name "qwt") - (version "6.1.4") + (version "6.1.5") (source (origin (method url-fetch) @@ -2346,7 +2346,7 @@ securely. It will not store any data unencrypted unless explicitly requested.") (string-append "mirror://sourceforge/qwt/qwt/" version "/qwt-" version ".tar.bz2")) (sha256 - (base32 "1navkcnmn0qz8kzsyqmk32d929zl72l0b580w1ica7z5559j2a8m")))) + (base32 "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) -- cgit v1.2.3 From c6f557636abc1131e0d3f02a191bc644a4647c73 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 22:13:48 +0200 Subject: gnu: docker, docker-cli: Update to 19.03.11. * gnu/packages/docker.scm (%docker-version): Update to 19.03.11. (docker, docker-cli): Update hashes. --- gnu/packages/docker.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index aeb43a6393..cdde807046 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -47,7 +47,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization)) -(define %docker-version "19.03.9") +(define %docker-version "19.03.11") (define-public python-docker-py (package @@ -314,7 +314,7 @@ built-in registry server of Docker.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1a9hkprkix5d7lqi88r8svvfpzh1qbzw9nrkp11lxrcf9wdan4hg")) + (base32 "1pmbggxbazipl24hxiaccbj32379zv79xba76l78v5131ihx922h")) (patches (search-patches "docker-fix-tests.patch")))) (build-system gnu-build-system) @@ -592,7 +592,7 @@ provisioning etc.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1599ff7699p3m925rdyfg7gl3cga6gy0lli7qh2ybyiw2kwf4gj9")))) + (base32 "1y9ymv70r1hndblr64h19q34arxl2f3dqqi2qcrai5zfimcml6lr")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" -- cgit v1.2.3 From 2d0cd1cab1f470324d3e476eebb64a1eaf35ab44 Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Sat, 6 Jun 2020 10:01:37 -0700 Subject: gnu: Add emacs-flymake-shellcheck. * gnu/packages/emacs-xyz.scm (emacs-flymake-shellcheck): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cf8c5ddbde..932fdd25fc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -984,6 +984,31 @@ different tools. It highlights errors and warnings inline in the buffer, and provides an optional IDE-like error list.") (license license:gpl3+)))) ;+GFDLv1.3+ for the manual +(define-public emacs-flymake-shellcheck + ;; No tag, version grabbed from source .el file. + (let ((commit "78956f0e5bb9c4d35989657a55929e8e3f5691e6") + (revision "0")) + (package + (name "emacs-flymake-shellcheck") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/federicotdn/flymake-shellcheck.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "068mx5p4drwgppy4ry1rfq6qi79w6d82b4rnpl2jm37grsg94lix")))) + (build-system emacs-build-system) + (home-page "https://github.com/federicotdn/flymake-shellcheck") + (synopsis "Flymake backend for Bash/Sh powered by ShellCheck") + (description + "This package provides a backend for Flymake to use the +tool ShellCheck for static analyzing @command{bash} and @command{sh} +scripts.") + (license license:gpl3+)))) + (define-public emacs-a (package (name "emacs-a") -- cgit v1.2.3 From a6e2c477c5ebe28a64d4c5292a783631563fd36e Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Sat, 6 Jun 2020 10:05:07 -0700 Subject: gnu: emacs-lua-mode: Update to 20200508-0.35b6e4c. * gnu/packages/emacs-xyz.scm (emacs-lua-mode): Update to 20200508-0.35b6e4c. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 932fdd25fc..b44652fbba 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8292,11 +8292,11 @@ using package inferred style.") (license license:gpl3+)))) (define-public emacs-lua-mode - (let ((commit "1f596a93b3f1caadd7bba01030f8c179b029600b") - (revision "1")) + (let ((commit "35b6e4c20b8b4eaf783ccc8e613d0dd06dbd165c") + (revision "0")) (package (name "emacs-lua-mode") - (version (git-version "20191204" revision commit)) + (version (git-version "20200508" revision commit)) (home-page "https://github.com/immerrr/lua-mode/") (source (origin (method git-fetch) @@ -8306,14 +8306,14 @@ using package inferred style.") (file-name (git-file-name name version)) (sha256 (base32 - "0i4adlaik3qjx1wkb7rwk2clvj7ci2g8pm0siyb3yk90r6z5mspi")))) + "1hai6rqjm5py0bp57nhggmj9qigwdj3a46ngacpnjc1qmy9kkgfk")))) (build-system emacs-build-system) (arguments `(#:tests? #t - #:test-command '("buttercup" "-l" "lua-mode.el"))) + #:test-command '("buttercup" "-l" "lua-mode.el"))) (native-inputs `(("emacs-buttercup" ,emacs-buttercup) - ("lua" ,lua))) + ("lua" ,lua))) (synopsis "Major mode for lua") (description "This Emacs package provides a mode for @uref{https://www.lua.org/, -- cgit v1.2.3 From 9b5e7d01afc0ca295ccba231b002f5314f5ef9bd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 7 Jun 2020 18:42:49 +0300 Subject: gnu: Add vim-dispatch. * gnu/packages/vim.scm (vim-dispatch): New variable. --- gnu/packages/vim.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index deea538622..2d9447d211 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -872,3 +872,31 @@ through its msgpack-rpc API.") NeoVim) to enable you to run shell commands in background and read output in the quickfix window in realtime.") (license license:expat))) + +(define-public vim-dispatch + (package + (name "vim-dispatch") + (version "1.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tpope/vim-dispatch") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1m8b5mn2zqlphzs6xfwykwmghf6p0wabrhpjmh7vav35jgcxc4wl")))) + (build-system copy-build-system) + (arguments + '(#:install-plan + '(("autoload" "share/vim/vimfiles/") + ("doc" "share/vim/vimfiles/") + ("plugin" "share/vim/vimfiles/")))) + (home-page "https://github.com/tpope/vim-dispatch") + (synopsis "Asynchronous build and test dispatcher") + (description "Leverage the power of Vim's compiler plugins without being +bound by synchronicity. Kick off builds and test suites using one of several +asynchronous adapters (including tmux, screen, and a headless mode), and when +the job completes, errors will be loaded and parsed automatically.") + (license license:vim))) -- cgit v1.2.3 From fae75ff9911b91a8c5ec257335c7ebed04c82929 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 7 Jun 2020 18:46:42 +0300 Subject: gnu: Add epour. * gnu/packages/enlightenment.scm (epour): New variable. --- gnu/packages/enlightenment.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index d852cbb275..40f1191416 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -33,6 +33,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages avahi) #:use-module (gnu packages bash) + #:use-module (gnu packages bittorrent) #:use-module (gnu packages check) #:use-module (gnu packages code) #:use-module (gnu packages compression) @@ -598,3 +599,42 @@ directories. "This is a process monitor and system monitor using the @dfn{Enlightenment Foundation Libraries} (EFL).") (license license:bsd-2))) + +(define-public epour + (package + (name "epour") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.enlightenment.org/rel/apps/epour" + "/epour-" version ".tar.xz")) + (sha256 + (base32 + "0g9f9p01hsq6dcf4cs1pwq95g6fpkyjgwqlvdjk1km1i5gj5ygqw")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ; no test target + #:use-setuptools? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'find-theme-dir + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "epour/gui/__init__.py" + (("join\\(data_path") + (string-append "join(\"" out "/share/epour\""))) + #t)))))) + (native-inputs + `(("intltool" ,intltool) + ("python-distutils-extra" ,python-distutils-extra))) + (inputs + `(("libtorrent-rasterbar" ,libtorrent-rasterbar) + ("python-dbus" ,python-dbus) + ("python-efl" ,python-efl) + ("python-pyxdg" ,python-pyxdg))) + (home-page "https://www.enlightenment.org") + (synopsis "EFL Bittorrent client") + (description "Epour is a BitTorrent client based on the @dfn{Enlightenment +Foundation Libraries} (EFL) and rb-libtorrent.") + (license license:gpl3+))) -- cgit v1.2.3 From 0601fb29fbfe353714ba596363be8a2f80151398 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 22 May 2020 16:58:15 +0200 Subject: gnu: Add go-github-com-stretchr-objx. * gnu/packages/golang.scm (go-github-com-stretchr-objx): New variable. --- gnu/packages/golang.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ae0b7c6779..ca06790032 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -917,6 +917,29 @@ increment versions.") Go.") (license license:expat)))) +(define-public go-github-com-stretchr-objx + (package + (name "go-github-com-stretchr-objx") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stretchr/objx.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pcdvakxgddaiwcdj73ra4da05a3q4cgwbpm2w75ycq4kzv8ij8k")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/stretchr/objx")) + (home-page "https://github.com/stretchr/objx") + (synopsis "Go package for dealing with maps, slices, JSON and other data") + (description "This package provides a Go library for dealing with maps, +slices, JSON and other data.") + (license license:expat))) + (define-public go-github-com-stretchr-testify (let ((commit "b1f989447a57594c728884458a39abf3a73447f7") -- cgit v1.2.3 From 388ffbfbfef1e279e5bc36d1fdd2bb185387dbd1 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 22 May 2020 17:00:09 +0200 Subject: gnu: go-github-com-davecgh-go-spew: Update to 1.1.1. * gnu/packages/golang.scm (go-github-com-davecgh-go-spew): Update to 1.1.1. --- gnu/packages/golang.scm | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ca06790032..a35b21e4b5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1931,28 +1931,26 @@ that's a lot faster (and only does simple bandwidth metrics).") (license license:expat)))) (define-public go-github-com-davecgh-go-spew - (let ((commit "d8f796af33cc11cb798c1aaeb27a4ebc5099927d") - (revision "0")) - (package - (name "go-github-com-davecgh-go-spew") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/davecgh/go-spew.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "19z27f306fpsrjdvkzd61w1bdazcdbczjyjck177g33iklinhpvx")))) - (build-system go-build-system) - (arguments - '(#:unpack-path "github.com/davecgh/go-spew" - #:import-path "github.com/davecgh/go-spew/spew")) - (home-page "https://github.com/davecgh/go-spew") - (synopsis "Deep pretty printer for Go data structures to aid in debugging") - (description "Package @command{spew} implements a deep pretty printer + (package + (name "go-github-com-davecgh-go-spew") + (version "1.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/davecgh/go-spew.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y")))) + (build-system go-build-system) + (arguments + '(#:unpack-path "github.com/davecgh/go-spew" + #:import-path "github.com/davecgh/go-spew/spew")) + (home-page "https://github.com/davecgh/go-spew") + (synopsis "Deep pretty printer for Go data structures to aid in debugging") + (description "Package @command{spew} implements a deep pretty printer for Go data structures to aid in debugging. A quick overview of the additional features spew provides over the built-in printing facilities for Go data types are as follows: @@ -1968,7 +1966,7 @@ pointer receiver are optionally invoked when passing non-pointer variables. includes offsets, byte values in hex, and ASCII output (only when using Dump style). @end itemize\n") - (license license:isc)))) + (license license:isc))) (define-public go-github-com-btcsuite-btclog (let ((commit "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a") -- cgit v1.2.3 From 715f589ea39146fa66cce5470c0368073c471540 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 22 May 2020 17:01:59 +0200 Subject: gnu: go-github-com-stretchr-testify: Update to 1.5.1. * gnu/packages/golang.scm (go-github-com-stretchr-testify): Update to 1.5.1. --- gnu/packages/golang.scm | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a35b21e4b5..d95e195ba5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -941,28 +941,30 @@ slices, JSON and other data.") (license license:expat))) (define-public go-github-com-stretchr-testify - (let ((commit - "b1f989447a57594c728884458a39abf3a73447f7") - (revision "0")) - (package - (name "go-github-com-stretchr-testify") - (version (git-version "1.1.4" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stretchr/testify.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0p0gkqzh2p8r5g0rxm885ljl7ghih7h7hx9w562imx5ka0vdgixv")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/stretchr/testify")) - (home-page "https://github.com/stretchr/testify") - (synopsis "Go helper library for tests and invariant checking") - (description "This package provide many tools for testifying that your + (package + (name "go-github-com-stretchr-testify") + (version "1.5.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stretchr/testify.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/stretchr/testify")) + (propagated-inputs + `(("github.com/davecgh/go-spew" ,go-github-com-davecgh-go-spew) + ("github.com/pmezard/go-difflib" ,go-github-com-pmezard-go-difflib) + ("github.com/stretchr/objx" ,go-github-com-stretchr-objx) + ("gopkg.in/yaml.v2" ,go-gopkg-in-yaml-v2))) + (home-page "https://github.com/stretchr/testify") + (synopsis "Go helper library for tests and invariant checking") + (description "This package provide many tools for testifying that your code will behave as you intend. Features include: @@ -972,7 +974,7 @@ Features include: @item HTTP response trapping @item Testing suite interfaces and functions. @end itemize") - (license license:expat)))) + (license license:expat))) (define-public go-github-com-tevino-abool (let ((commit -- cgit v1.2.3 From 9097f994483dc8abb786fb3b8ad5cc73484e9f24 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jun 2020 22:36:03 +0200 Subject: gnu: python-sip: Update to 4.19.22. * gnu/packages/qt.scm (python-sip): Update to 4.19.22. --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ba12760b1a..31f6134d96 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1887,7 +1887,7 @@ and binaries removed, and adds modular support for using system libraries.") (define-public python-sip (package (name "python-sip") - (version "4.19.18") + (version "4.19.22") (source (origin (method url-fetch) @@ -1895,7 +1895,7 @@ and binaries removed, and adds modular support for using system libraries.") "Downloads/sip/" version "/sip-" version ".tar.gz")) (sha256 (base32 - "07kyd56xgbb40ljb022rq82shgxprlbl0z27mpf1b6zd00w8dgf0")))) + "0idywc326l8v1m3maprg1aq2gph67mmnnsskvlwfx8n19s16idz1")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-wrapper))) -- cgit v1.2.3 From 8cbb32da7dfa53b15f2ecec7361e24961bb93bbc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jun 2020 22:38:30 +0200 Subject: gnu: python-sip: Use PYTHON-VERSION. * gnu/packages/qt.scm (python-sip)[arguments]: Add #:imported-modules. Rewrite phase to use PYTHON-VERSION instead of custom implementation. --- gnu/packages/qt.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 31f6134d96..2b3096a04e 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1901,7 +1901,10 @@ and binaries removed, and adds modular support for using system libraries.") `(("python" ,python-wrapper))) (arguments `(#:tests? #f ; no check target + #:imported-modules ((guix build python-build-system) + ,@%gnu-build-system-modules) #:modules ((srfi srfi-1) + ((guix build python-build-system) #:select (python-version)) ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases @@ -1911,14 +1914,8 @@ and binaries removed, and adds modular support for using system libraries.") (bin (string-append out "/bin")) (include (string-append out "/include")) (python (assoc-ref inputs "python")) - (python-version - (last (string-split python #\-))) - (python-major+minor - (string-join - (take (string-split python-version #\.) 2) - ".")) (lib (string-append out "/lib/python" - python-major+minor + (python-version python) "/site-packages"))) (invoke "python" "configure.py" "--bindir" bin -- cgit v1.2.3 From fd702f8e95c6e77c8658cf657002d2eb3dad29f9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jun 2020 22:39:55 +0200 Subject: gnu: python-pyqt: Update to 5.14.2. * gnu/packages/qt.scm (python-pyqt): Update to 5.14.2. [source](uri): Add PyPI mirror. [source](patches): Remove obsolete. * gnu/packages/patches/pyqt-unbundled-qt.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/patches/pyqt-unbundled-qt.patch | 19 ------------------- gnu/packages/qt.scm | 15 +++++++++------ 3 files changed, 9 insertions(+), 26 deletions(-) delete mode 100644 gnu/packages/patches/pyqt-unbundled-qt.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9bf7e78492..ac095dd77c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1395,7 +1395,6 @@ dist_patch_DATA = \ %D%/packages/patches/pygpgme-disable-problematic-tests.patch \ %D%/packages/patches/pyqt-configure.patch \ %D%/packages/patches/pyqt-public-sip.patch \ - %D%/packages/patches/pyqt-unbundled-qt.patch \ %D%/packages/patches/python-2-deterministic-build-info.patch \ %D%/packages/patches/python-2.7-adjust-tests.patch \ %D%/packages/patches/python-2.7-search-paths.patch \ diff --git a/gnu/packages/patches/pyqt-unbundled-qt.patch b/gnu/packages/patches/pyqt-unbundled-qt.patch deleted file mode 100644 index 5c91ed031c..0000000000 --- a/gnu/packages/patches/pyqt-unbundled-qt.patch +++ /dev/null @@ -1,19 +0,0 @@ -Remove test for bundled Qt which breaks dependent applications. This has -been fixed in 5.13. - -Taken from Arch Linux: -https://git.archlinux.org/svntogit/packages.git/tree/trunk/python2-pyqt5-crash-fix.patch?h=packages/pyqt5&id=3e56e11d1fd7b1eac8242ce64c58db2bd9acba20 - -diff -ur PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in ---- PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in 2019-06-25 14:41:02.000000000 +0200 -+++ PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in 2019-07-01 17:06:34.882644535 +0200 -@@ -151,8 +151,4 @@ - // initialised first (at least for Windows) and this is the only way to - // guarantee things are done in the right order. - PyQtSlotProxy::mutex = new QMutex(QMutex::Recursive); -- -- // Load the embedded qt.conf file if there is a bundled copy of Qt. -- if (!qpycore_qt_conf()) -- Py_FatalError("PyQt5.QtCore: Unable to embed qt.conf"); - } - diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2b3096a04e..17f7c8e8d0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1945,18 +1945,21 @@ module provides support functions to the automatically generated code.") (define-public python-pyqt (package (name "python-pyqt") - (version "5.12.3") + (version "5.14.2") (source (origin (method url-fetch) - (uri (string-append "https://www.riverbankcomputing.com/static/" - "Downloads/PyQt5/" version "/PyQt5_gpl-" - version ".tar.gz")) + ;; PyPI is the canonical distribution point of PyQt. Older + ;; releases are available from the web site. + (uri (list (pypi-uri "PyQt5" version) + (string-append "https://www.riverbankcomputing.com/static/" + "Downloads/PyQt5/" version "/PyQt5-" + version ".tar.gz"))) + (file-name (string-append "PyQt5-"version ".tar.gz")) (sha256 (base32 - "041155bdzp57jy747p5d59740c55yy3241cy1x2lgcdsvqvzmc0d")) + "1c4y4qi1l540gd125ikj0al00k5pg65kmqaixcfbzslrsrphq8xx")) (patches (search-patches "pyqt-configure.patch" - "pyqt-unbundled-qt.patch" "pyqt-public-sip.patch")))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From 3c48fe3658474492307d76f400dc22c98d2a05b7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jun 2020 22:41:14 +0200 Subject: gnu: python-pyqt: Use PYTHON-VERSION. * gnu/packages/qt.scm (python-pyqt)[arguments]: Add #:modules. Use PYTHON-VERSION from PYTHON-BUILD-SYSTEM instead of custom implementation. --- gnu/packages/qt.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 17f7c8e8d0..fb9643bfd3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1984,7 +1984,10 @@ module provides support functions to the automatically generated code.") ("qtxmlpatterns" ,qtxmlpatterns))) (arguments `(#:modules ((srfi srfi-1) + ((guix build python-build-system) #:select (python-version)) ,@%gnu-build-system-modules) + #:imported-modules ((guix build python-build-system) + ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases ;; When building python-pyqtwebengine, can not be @@ -2007,14 +2010,8 @@ module provides support functions to the automatically generated code.") (designer (string-append plugins "/designer")) (qml (string-append plugins "/PyQt5")) (python (assoc-ref inputs "python")) - (python-version - (last (string-split python #\-))) - (python-major+minor - (string-join - (take (string-split python-version #\.) 2) - ".")) (lib (string-append out "/lib/python" - python-major+minor + (python-version python) "/site-packages")) (stubs (string-append lib "/PyQt5"))) (invoke "python" "configure.py" -- cgit v1.2.3 From 7c7e9ac71662013348e5acb78c8df3d6ab718ad0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jun 2020 22:42:27 +0200 Subject: gnu: python-pyqtwebengine: Update to 5.14.0. * gnu/packages/qt.scm (python-pyqtwebengine): Update to 5.14.0. [source](uri): Add PyPI mirror. --- gnu/packages/qt.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index fb9643bfd3..d777048046 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2037,16 +2037,19 @@ contain over 620 classes.") (define-public python-pyqtwebengine (package (name "python-pyqtwebengine") - (version "5.12.1") + (version "5.14.0") (source (origin (method url-fetch) - (uri (string-append - "https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/" - version "/PyQtWebEngine_gpl-" version ".tar.gz")) + ;; The newest releases are only available on PyPI. Older ones + ;; are mirrored at the upstream home page. + (uri (list (pypi-uri "PyQtWebEngine" version) + (string-append "https://www.riverbankcomputing.com/static" + "/Downloads/PyQtWebEngine/" version + "/PyQtWebEngine-" version ".tar.gz"))) (sha256 (base32 - "0wylkd7fh2g27y3710rpxmj9wx0wpi3z7qbv6khiddm15rkh81w6")))) + "14hw49akb35n9pgiw564x8ykmsifihn9p2ax2x4zmywb3w2ra5g1")))) (build-system gnu-build-system) (native-inputs `(("python" ,python) -- cgit v1.2.3 From 24b61fb8ea8a9e8c5320d1db1447f9b62ad04b3d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jun 2020 22:43:00 +0200 Subject: gnu: python-pyqtwebengine: Remove duplicate input. * gnu/packages/qt.scm (python-pyqtwebengine)[inputs]: Remove PYTHON-PYQT. --- gnu/packages/qt.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d777048046..9ed1ee6c4b 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2064,7 +2064,6 @@ contain over 620 classes.") ("qtsvg" ,qtsvg) ("qtdeclarative" ,qtdeclarative) ("qtwebchannel" ,qtwebchannel) - ("python-pyqt" ,python-pyqt) ("qtwebengine" ,qtwebengine))) (arguments `(#:modules ((srfi srfi-1) -- cgit v1.2.3 From 1fd7de45f218ce572a3fe87764ad15927e3dbdc4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 7 Jun 2020 22:14:56 +0200 Subject: git: 'update-cached-checkout' gracefully handles missing starting commit. Fixes Reported by John Soo and zimoun . * guix/git.scm (false-if-git-not-found): New macro. (reference-available?): Use it. (update-cached-checkout): Use it when looking up STARTING-COMMIT. Set RELATION to 'unrelated when OLD is #false. --- guix/git.scm | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index ab3b5075b1..1c45afa050 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -243,18 +243,23 @@ Return true on success, false on failure." (G_ "Support for submodules is missing; \ please upgrade Guile-Git.~%")))) +(define-syntax-rule (false-if-git-not-found exp) + "Evaluate EXP, returning #false if a GIT_ENOTFOUND error is raised." + (catch 'git-error + (lambda () + exp) + (lambda (key error . rest) + (if (= GIT_ENOTFOUND (git-error-code error)) + #f + (apply throw key error rest))))) + (define (reference-available? repository ref) "Return true if REF, a reference such as '(commit . \"cabba9e\"), is definitely available in REPOSITORY, false otherwise." (match ref (('commit . commit) - (catch 'git-error - (lambda () - (->bool (commit-lookup repository (string->oid commit)))) - (lambda (key error . rest) - (if (= GIT_ENOTFOUND (git-error-code error)) - #f - (apply throw key error rest))))) + (false-if-git-not-found + (->bool (commit-lookup repository (string->oid commit))))) (_ #f))) @@ -311,10 +316,13 @@ When RECURSIVE? is true, check out submodules as well, if any." (new (and starting-commit (commit-lookup repository oid))) (old (and starting-commit - (commit-lookup repository - (string->oid starting-commit)))) + (false-if-git-not-found + (commit-lookup repository + (string->oid starting-commit))))) (relation (and starting-commit - (commit-relation old new)))) + (if old + (commit-relation old new) + 'unrelated)))) ;; Reclaim file descriptors and memory mappings associated with ;; REPOSITORY as soon as possible. -- cgit v1.2.3 From e78275608065ef073775fabb9f1a757da65851f2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 7 Jun 2020 23:06:41 +0200 Subject: git-authenticate: Prevent removal of '.guix-authorizations'. * guix/git-authenticate.scm (commit-authorized-keys) [parents-have-authorizations-file?, assert-parents-lack-authorizations]: New procedures. Use the latter before returning DEFAULT-AUTHORIZATIONS. * guix/git.scm (false-if-git-not-found): Export. * guix/tests/git.scm (populate-git-repository): Add 'remove' clause. * tests/git-authenticate.scm ("signed commits, .guix-authorizations removed"): New test. --- guix/git-authenticate.scm | 28 +++++++++++++++++++++++++++- guix/git.scm | 1 + guix/tests/git.scm | 3 +++ tests/git-authenticate.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 1 deletion(-) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index b73f957105..00d22ef479 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -19,6 +19,7 @@ (define-module (guix git-authenticate) #:use-module (git) #:use-module (guix base16) + #:use-module ((guix git) #:select (false-if-git-not-found)) #:use-module (guix i18n) #:use-module (guix openpgp) #:use-module ((guix utils) @@ -145,6 +146,27 @@ return a list of authorized fingerprints." "Return the list of OpenPGP fingerprints authorized to sign COMMIT, based on authorizations listed in its parent commits. If one of the parent commits does not specify anything, fall back to DEFAULT-AUTHORIZATIONS." + (define (parents-have-authorizations-file? commit) + ;; Return true if at least one of the parents of COMMIT has the + ;; '.guix-authorizations' file. + (find (lambda (commit) + (false-if-git-not-found + (tree-entry-bypath (commit-tree commit) + ".guix-authorizations"))) + (commit-parents commit))) + + (define (assert-parents-lack-authorizations commit) + ;; If COMMIT removes the '.guix-authorizations' file found in one of its + ;; parents, raise an error. + (when (parents-have-authorizations-file? commit) + (raise (condition + (&unauthorized-commit-error (commit (commit-id commit)) + (signing-key #f)) + (&message + (message (format #f (G_ "commit ~a attempts \ +to remove '.guix-authorizations' file") + (oid->string (commit-id commit))))))))) + (define (commit-authorizations commit) (catch 'git-error (lambda () @@ -155,7 +177,11 @@ does not specify anything, fall back to DEFAULT-AUTHORIZATIONS." (open-bytevector-input-port (blob-content blob))))) (lambda (key error) (if (= (git-error-code error) GIT_ENOTFOUND) - default-authorizations + (begin + ;; Prevent removal of '.guix-authorizations' since it would make + ;; it trivial to force a fallback to DEFAULT-AUTHORIZATIONS. + (assert-parents-lack-authorizations commit) + default-authorizations) (throw key error))))) (apply lset-intersection bytevector=? diff --git a/guix/git.scm b/guix/git.scm index 1c45afa050..1671f57d9f 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -39,6 +39,7 @@ honor-system-x509-certificates! with-repository + false-if-git-not-found update-cached-checkout url+commit->name latest-repository-commit diff --git a/guix/tests/git.scm b/guix/tests/git.scm index 5d7056bb53..b8e5f7e643 100644 --- a/guix/tests/git.scm +++ b/guix/tests/git.scm @@ -76,6 +76,9 @@ Return DIRECTORY on success." port))) (git "add" file) (loop rest))) + ((('remove file) rest ...) + (git "rm" "-f" file) + (loop rest)) ((('commit text) rest ...) (git "commit" "-m" text) (loop rest)) diff --git a/tests/git-authenticate.scm b/tests/git-authenticate.scm index 5937c37ee6..84689d628e 100644 --- a/tests/git-authenticate.scm +++ b/tests/git-authenticate.scm @@ -282,5 +282,46 @@ merge master3) #:keyring-reference "master")))))) +(unless (gpg+git-available?) (test-skip 1)) +(test-assert "signed commits, .guix-authorizations removed" + (with-fresh-gnupg-setup (list %ed25519-public-key-file + %ed25519-secret-key-file) + (with-temporary-git-repository directory + `((add "signer.key" ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (add ".guix-authorizations" + ,(object->string + `(authorizations (version 0) + ((,(key-fingerprint + %ed25519-public-key-file) + (name "Charlie")))))) + (commit "zeroth commit") + (add "a.txt" "A") + (commit "first commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (remove ".guix-authorizations") + (commit "second commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (add "b.txt" "B") + (commit "third commit" + (signer ,(key-fingerprint %ed25519-public-key-file)))) + (with-repository directory repository + (let ((commit1 (find-commit repository "first")) + (commit2 (find-commit repository "second")) + (commit3 (find-commit repository "third"))) + ;; COMMIT1 and COMMIT2 are fine. + (and (authenticate-commits repository (list commit1 commit2) + #:keyring-reference "master") + + ;; COMMIT3 is rejected because COMMIT2 removes + ;; '.guix-authorizations'. + (guard (c ((unauthorized-commit-error? c) + (oid=? (git-authentication-error-commit c) + (commit-id commit2)))) + (authenticate-commits repository + (list commit1 commit2 commit3) + #:keyring-reference "master") + 'failed))))))) + (test-end "git-authenticate") -- cgit v1.2.3 From cc5792566461b8494f2729ad27e7727754b1e094 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 8 Jun 2020 00:34:20 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.127. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.127. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index db03160085..de42f92ce7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -385,10 +385,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.126") +(define-public linux-libre-4.19-version "4.19.127") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "129ziwvk3f4xh8jvnq2krajc0bnrl2zxffqsiz63j7p3vc57wakf"))) + (hash (base32 "0vsq5vjyh6n8acjnldfs0zny63l12fn2pssb8zbwidc8qmmqibw2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From ec29dc0713d0492e7b5244390df09401b56a3b11 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 8 Jun 2020 00:35:15 -0400 Subject: gnu: linux-libre@5.6: Update to 5.6.17. * gnu/packages/linux.scm (linux-libre-5.6-version): Update to 5.6.17. (linux-libre-5.6-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index de42f92ce7..beeeba09b6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,10 +369,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) -(define-public linux-libre-5.6-version "5.6.16") +(define-public linux-libre-5.6-version "5.6.17") (define-public linux-libre-5.6-pristine-source (let ((version linux-libre-5.6-version) - (hash (base32 "1xvwk6yxi5nhiwhskpmr89a31286mw9hpm0y3l3i5ydswx6lnl15"))) + (hash (base32 "17kzalz8z6svv6nwa3dbmf7nyvpb2wwwyabj19vdwf6v05a28fn3"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.6))) -- cgit v1.2.3 From fa122ac4ca2bd4c87b216e2f478397bcde2c1d8f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 8 Jun 2020 00:35:52 -0400 Subject: gnu: linux-libre: Update to 5.4.45. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.45. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index beeeba09b6..ab19a16bce 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -377,10 +377,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.6))) -(define-public linux-libre-5.4-version "5.4.44") +(define-public linux-libre-5.4-version "5.4.45") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0fc4nsv1zwlknvfv1bzkjlq2vlx28wfl09hg2p7r8cn7a77bphlp"))) + (hash (base32 "0bpy2lb3bqmkaqxzdmssgmhbjsys7d3lyfv4x919q0596jgh6gqh"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 1acf4c59f8bd47002328307ea04b53864b3f2c33 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Sun, 7 Jun 2020 23:49:55 -0400 Subject: gnu: Add v4l2loopback-linux-module. * gnu/packages/linux.scm (v4l2loopback-linux-module): New variable. --- gnu/packages/linux.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ab19a16bce..a31f3d81ca 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -43,6 +43,7 @@ ;;; Copyright © 2020 Chris Marusich ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 Morgan Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -1134,6 +1135,39 @@ module allows the control of the backlight level or luminance property when supported under @file{/sys/class/backlight/}.") (license license:gpl2+))) +(define-public v4l2loopback-linux-module + (package + (name "v4l2loopback-linux-module") + (version "0.12.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/umlaeute/v4l2loopback.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qi4l6yam8nrlmc3zwkrz9vph0xsj1cgmkqci4652mbpbzigg7vn")))) + (build-system linux-module-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "make" + "--directory=./tests" + (string-append "CC=" ,(cc-for-target)))))))) + (home-page "https://github.com/umlaeute/v4l2loopback") + (synopsis "Linux kernel module that allows you to create \"virtual video devices\"") + (description "This module allows you to create \"virtual video devices\" +normal (v4l2) applications will read these devices as if they were ordinary +video devices, but the video will not be read from e.g. a capture card but +instead it is generated by another application. this allows you for instance +to apply some nifty video effects on your Jitsi video... it also allows some +more serious things (e.g. using it to add streaming capabilities to an +application by the means of hooking GStreamer into the loopback devices).") + (license license:gpl2+))) + ;;; ;;; Pluggable authentication modules (PAM). -- cgit v1.2.3 From fdcd193744dbb92d3478c8e4e6c4f4336a872831 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Jun 2020 10:34:20 +0200 Subject: gnu: v4l2loopback-linux-module: Disable ‘test’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It simply built the test programme but nothing more. * gnu/packages/linux.scm (v4l2loopback-linux-module)[arguments]: Remove the ‘check’ phase. --- gnu/packages/linux.scm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a31f3d81ca..7785b6931e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1149,14 +1149,6 @@ supported under @file{/sys/class/backlight/}.") (base32 "1qi4l6yam8nrlmc3zwkrz9vph0xsj1cgmkqci4652mbpbzigg7vn")))) (build-system linux-module-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "make" - "--directory=./tests" - (string-append "CC=" ,(cc-for-target)))))))) (home-page "https://github.com/umlaeute/v4l2loopback") (synopsis "Linux kernel module that allows you to create \"virtual video devices\"") (description "This module allows you to create \"virtual video devices\" -- cgit v1.2.3 From ecb65812765bfbc0def42cdb30eca31fe0fcffd3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Jun 2020 10:36:16 +0200 Subject: gnu: v4l2loopback-linux-module: Edit synopsis and description. * gnu/packages/linux.scm (v4l2loopback-linux-module) [synopsis, description]: Edit. --- gnu/packages/linux.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7785b6931e..de28d4a6e6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1150,14 +1150,16 @@ supported under @file{/sys/class/backlight/}.") "1qi4l6yam8nrlmc3zwkrz9vph0xsj1cgmkqci4652mbpbzigg7vn")))) (build-system linux-module-build-system) (home-page "https://github.com/umlaeute/v4l2loopback") - (synopsis "Linux kernel module that allows you to create \"virtual video devices\"") - (description "This module allows you to create \"virtual video devices\" -normal (v4l2) applications will read these devices as if they were ordinary -video devices, but the video will not be read from e.g. a capture card but -instead it is generated by another application. this allows you for instance -to apply some nifty video effects on your Jitsi video... it also allows some -more serious things (e.g. using it to add streaming capabilities to an -application by the means of hooking GStreamer into the loopback devices).") + (synopsis "Linux kernel module to create virtual V4L2 video devices") + (description + "This Linux module creates virtual video devices. @acronym{V4L2, Video +for Linux 2} applications will treat these as ordinary video devices but read +video data generated by another application, instead of a hardware device such +as a capture card. + +This lets you apply nifty effects to your Jitsi video, for example, but also +allows some more serious things like adding streaming capabilities to an +application by hooking GStreamer into the loopback device.") (license license:gpl2+))) -- cgit v1.2.3 From b2a9d1525342a611f76342b945df35fd1a391b15 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Jun 2020 02:33:28 +0200 Subject: gnu: mu: Update to 1.4.9. * gnu/packages/mail.scm (mu): Update to 1.4.9. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 67ed8c4b68..8337bc7808 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -711,7 +711,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.4.8") + (version "1.4.9") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/" @@ -719,7 +719,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") "mu-" version ".tar.xz")) (sha256 (base32 - "0vww8n7r6pfl4jyijhzas3fpdl6v1ndhc99zr1fsamjldxqpxk5m")))) + "0dgmwdaszh5m7v1py3f9n9f6avb30vrl93g58a1k225iwdsv01d5")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 44adf883f082eaa4881a698de0d49b7b692972f0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Jun 2020 08:44:16 +0200 Subject: gnu: rtl8812au-aircrack-ng-linux-module: Update to 5.6.4.2-1.df2b8df. * gnu/packages/linux.scm (rtl8812au-aircrack-ng-linux-module): Update to 5.6.4.2-1.df2b8df. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index de28d4a6e6..67449c02d2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -988,8 +988,8 @@ and should be used with caution, especially on untested models.") (license license:gpl3+)))) ; see README.md (no licence headers) (define-public rtl8812au-aircrack-ng-linux-module - (let ((commit "945d6ed6505c32f0993b1dba576388e92e78101b") - (revision "0")) + (let ((commit "df2b8dfd8cb7d9f6cfeb55abaeab8a5372011fc9") + (revision "1")) (package (name "rtl8812au-aircrack-ng-linux-module") (version (git-version "5.6.4.2" revision commit)) @@ -1001,7 +1001,7 @@ and should be used with caution, especially on untested models.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1pjws7qb5l4z9k80vgz4zdxmqhbwxjjrmkpf0hijf821byyddvi7")) + (base32 "1qcr0j8yhg8l9l0f5y55zcsk1mgf3qd46yh9xfqgg91szxa3yvca")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From de728cb859738b9f2ec977a09338f9c73656637a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Jun 2020 08:46:25 +0200 Subject: gnu: rtl8812au-aircrack-ng-linux-module: Use MAKE-FLAGS. * gnu/packages/linux.scm (rtl8812au-aircrack-ng-linux-module) [arguments]: Use MAKE-FLAGS keyword. --- gnu/packages/linux.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 67449c02d2..c78f2fe533 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1013,15 +1013,15 @@ and should be used with caution, especially on untested models.") #t)))) (build-system linux-module-build-system) (arguments - `(#:phases + `(#:make-flags + (list (string-append "KSRC=" + (assoc-ref %build-inputs "linux-module-builder") + "/lib/modules/build")) + #:phases (modify-phases %standard-phases (replace 'build - (lambda* (#:key inputs make-flags #:allow-other-keys) - (apply invoke "make" - (string-append "KSRC=" - (assoc-ref inputs "linux-module-builder") - "/lib/modules/build") - (or make-flags '()))))) + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply invoke "make" make-flags)))) #:tests? #f)) ; no test suite (supported-systems '("x86_64-linux" "i686-linux")) (home-page "https://github.com/aircrack-ng/rtl8812au") -- cgit v1.2.3 From d1fe14be6a98bf8dec63bbee7ac82cd9fadc90f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Jun 2020 08:53:07 +0200 Subject: gnu: rtl8821ce-linux-module: Use MAKE-FLAGS. * gnu/packages/linux.scm (rtl8821ce-linux-module)[arguments]: Use MAKE-FLAGS keyword. Make CC environment variable a make flag. --- gnu/packages/linux.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c78f2fe533..329bf7c327 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1051,16 +1051,17 @@ RTL8812AU, RTL8821AU, and RTL8814AU chips.") "17jiw25k74kv5lnvgycvj2g1n06hbrpjz6p4znk4a62g136rhn4s")))) (build-system linux-module-build-system) (arguments - `(#:phases + `(#:make-flags + (list "CC=gcc" + (string-append "KSRC=" + (assoc-ref %build-inputs "linux-module-builder") + "/lib/modules/build")) + #:phases (modify-phases %standard-phases (replace 'build - (lambda* (#:key (make-flags '()) inputs #:allow-other-keys) - (setenv "CC" "gcc") - (invoke "make" - (string-append "KSRC=" - (assoc-ref inputs "linux-module-builder") - "/lib/modules/build"))))) - #:tests? #f)) + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply invoke "make" make-flags)))) + #:tests? #f)) ; no test suite (home-page "https://github.com/tomaspinho/rtl8821ce") (synopsis "Linux driver for Realtek RTL8821CE wireless network adapters") (description "This is Realtek's RTL8821CE Linux driver for wireless -- cgit v1.2.3 From ea5d9bf9916d532005842f220f7da6e522151f6a Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 7 Jun 2020 15:39:39 +0200 Subject: system: install: Add default libcs to gc-roots. During the installation, it may be needed to build locales that are not covered by glibc-utf8-locales. Make sure that the libraries required to build locales are available. This is a follow-up of 0eed77127592323d89f56c215a15374a1aaae110. * gnu/system/install.scm (installation-os)[services]: Add %default-locale-libcs to gc-root-service-type. --- gnu/system/install.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index fe49ffdb94..d0ff2e7c52 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -32,6 +32,7 @@ #:use-module ((guix packages) #:select (package-version)) #:use-module ((guix store) #:select (%store-prefix)) #:use-module (gnu installer) + #:use-module (gnu system locale) #:use-module (gnu services dbus) #:use-module (gnu services networking) #:use-module (gnu services shepherd) @@ -439,10 +440,12 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m ;; things needed by 'profile-derivation' to minimize the amount of ;; download. (service gc-root-service-type - (list bare-bones-os - glibc-utf8-locales - texinfo - guile-3.0)) + (append + (list bare-bones-os + glibc-utf8-locales + texinfo + guile-3.0) + %default-locale-libcs)) ;; Machines without Kernel Mode Setting (those with many old and ;; current AMD GPUs, SiS GPUs, ...) need uvesafb to show the GUI -- cgit v1.2.3 From 173d22a1c03450c804b2c7fab1393670fef45606 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 6 Jun 2020 10:54:58 +0200 Subject: gnu: sudo: Separate Python output. The Python plugin of "sudo" drags the Python interpreter to the closure of Guix System. Put it in a separate output. * gnu/packages/admin.scm (sudo)[arguments]: Add a 'separate-python-output phase, that's populating ... [outputs]: ... the new "python" output. --- gnu/packages/admin.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index bb93f7efb1..bcbdf9b395 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1375,6 +1375,7 @@ system administrator.") (delete-file-recursively "lib/zlib") #t)))) (build-system gnu-build-system) + (outputs (list "out" "python")) (arguments `(#:configure-flags (list (string-append "--docdir=" (assoc-ref %outputs "out") @@ -1432,7 +1433,22 @@ system administrator.") (substitute* "plugins/sudoers/Makefile.in" (("^pre-install:" match) (string-append match "\ndisabled-" match))) - #t))) + #t)) + (add-after 'install 'separate-python-output + (lambda* (#:key target outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (out:python (assoc-ref outputs "python"))) + (if target + (mkdir-p (string-append out:python "/empty")) + (for-each + (lambda (file) + (let ((old (string-append out "/" file)) + (new (string-append out:python "/" file))) + (mkdir-p (dirname new)) + (rename-file old new))) + (list "libexec/sudo/python_plugin.so" + "libexec/sudo/python_plugin.la"))) + #t)))) ;; XXX: The 'testsudoers' test series expects user 'root' to exist, but ;; the chroot's /etc/passwd doesn't have it. Turn off the tests. -- cgit v1.2.3 From 65c8512f9c709a85766e0e1cb8eee12459a3d705 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 6 Jun 2020 11:10:34 +0200 Subject: gnu: Add openssh-sans-x. * gnu/packages/ssh.scm (openssh-sans-x): New variable. --- gnu/packages/ssh.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 73841db6b5..43764a8245 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -239,6 +239,15 @@ Additionally, various channel-specific options can be negotiated.") "See LICENSE in the distribution.")) (home-page "https://www.openssh.com/"))) +;; OpenSSH without X support. This allows to use OpenSSH without dragging X +;; libraries to the closure. +(define-public openssh-sans-x + (package + (inherit openssh) + (name "openssh-sans-x") + (inputs (alist-delete "xauth" (package-inputs openssh))) + (synopsis "OpenSSH client and server without X11 support"))) + (define-public guile-ssh (package (name "guile-ssh") -- cgit v1.2.3 From 0dddaa7b017b9d4c0c1fc6598cc24b951e159d83 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 6 Jun 2020 11:10:42 +0200 Subject: system: bare-bones: Remove dependency to X libraries. Use "openssh-sans-x" to prevent the inclusion of X libraries to the bare-bones system closure. * gnu/system/examples/bare-bones.tmpl (operating-system)[services]: Use openssh-sans-x instead of openssh. --- gnu/system/examples/bare-bones.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare-bones.tmpl index 4f30a5b756..1035ab1d60 100644 --- a/gnu/system/examples/bare-bones.tmpl +++ b/gnu/system/examples/bare-bones.tmpl @@ -3,7 +3,7 @@ (use-modules (gnu)) (use-service-modules networking ssh) -(use-package-modules screen) +(use-package-modules screen ssh) (operating-system (host-name "komputilo") @@ -46,5 +46,6 @@ (services (append (list (service dhcp-client-service-type) (service openssh-service-type (openssh-configuration + (openssh openssh-sans-x) (port-number 2222)))) %base-services))) -- cgit v1.2.3 From bec45e6ddb0fd8b8feff3c0147936e4d8f41208d Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 7 Jun 2020 18:01:38 +0200 Subject: gnu: x265: Build with assembly files. * gnu/packages/video.scm (x265)[native-inputs]: Add nasm. Signed-off-by: Efraim Flashner --- gnu/packages/video.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8d9d5ecfd1..c822075c57 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -625,6 +625,7 @@ available.") (delete-file-recursively "source/compat/getopt") #t)))) (build-system cmake-build-system) + (native-inputs `(("nasm" ,nasm))) (arguments `(#:tests? #f ; tests are skipped if cpu-optimized code isn't built #:configure-flags -- cgit v1.2.3 From 4c26229ccbbcac843567aa6c52a0287ff6eb1494 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 12 May 2020 07:56:46 +0200 Subject: gnu: hurd: Update to upstream Hurd-reserved xattr index. This enables setting (and reading) passive translators when preparing a Hurd file system from GNU/Linux. * gnu/packages/patches/hurd-xattr.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/hurd.scm (hurd): Use it. --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 3 +- gnu/packages/patches/hurd-xattr.patch | 53 +++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/hurd-xattr.patch diff --git a/gnu/local.mk b/gnu/local.mk index ae8a2275f7..6182306dd5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1084,6 +1084,7 @@ dist_patch_DATA = \ %D%/packages/patches/http-parser-fix-assertion-on-armhf.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hurd-cross.patch \ + %D%/packages/patches/hurd-xattr.patch \ %D%/packages/patches/hplip-remove-imageprocessor.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-makeicecat.patch \ diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 55c40710fa..278568b583 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -377,7 +377,8 @@ boot, since this cannot be done from GNU/Linux." (name "hurd") (version (package-version hurd-headers)) (source (origin (inherit (package-source hurd-headers)) - (patches (search-patches "hurd-cross.patch")))) + (patches (search-patches "hurd-cross.patch" + "hurd-xattr.patch")))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/hurd-xattr.patch b/gnu/packages/patches/hurd-xattr.patch new file mode 100644 index 0000000000..0a922c91b5 --- /dev/null +++ b/gnu/packages/patches/hurd-xattr.patch @@ -0,0 +1,53 @@ +From 75cb948c575fca3962c4cce115d31dd178bc389f Mon Sep 17 00:00:00 2001 +From: "Jan (janneke) Nieuwenhuizen" +Date: Tue, 12 May 2020 07:39:59 +0200 +Subject: [PATCH] ext2fs: Update to upstream Hurd-reserved xattr index for + "gnu.*". + +See + https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3980bd3b406addb327d858aebd19e229ea340b9a + +This supports setting (and reading) of passive trasnlators from +GNU/Linux, e.g. + + dd if=/dev/zero of=file bs=1k count=1000 + losetup /dev/loop0 file + mke2fs -t ext2 -o hurd -O ext_attr /dev/loop0 + mount -t ext2 -o x-xattr-translator-records /dev/loop0 /mnt + mkdir -p /mnt/servers/socket + touch /mnt/servers/socket/1 + setfattr --name=gnu.translator --value='/hurd/pflocal\0' /mnt/servers/socket/1 + getfattr --name=gnu.translator /mnt/servers/socket/1 + # file: 1 + gnu.translator="/hurd/pflocal" + +* ext2fs/xattr.c (struct _xattr_prefix): For "gnu.*", use index for +the Hurd (10). +--- + ext2fs/xattr.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ext2fs/xattr.c b/ext2fs/xattr.c +index f6ea0f39..78458214 100644 +--- a/ext2fs/xattr.c ++++ b/ext2fs/xattr.c +@@ -1,6 +1,6 @@ + /* Ext2 support for extended attributes + +- Copyright (C) 2006, 2016 Free Software Foundation, Inc. ++ Copyright (C) 2006, 2016, 2020 Free Software Foundation, Inc. + + Written by Thadeu Lima de Souza Cascardo + and Shengyu Zhang +@@ -39,7 +39,7 @@ xattr_prefixes[] = + { + 1, "user.", sizeof "user." - 1}, + { +- 7, "gnu.", sizeof "gnu." - 1}, ++ 10, "gnu.", sizeof "gnu." - 1}, + { + 0, NULL, 0} + }; +-- +2.26.0 + -- cgit v1.2.3 From 1428926f1f0d7577cd2de8d019a27f8082855d03 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sat, 30 May 2020 15:11:49 +0200 Subject: syscalls: set-thread-name, thread-name: Stub for the Hurd. Avoid crash Backtrace: guix/build/syscalls.scm:405:8: In procedure prctl: Function not implemented because of missing prctl on the Hurd. * guix/build/syscalls.scm (set-thread-name, thread-name): Rename to ... (set-thread-name!/linux,thread-name/linux): ...this. (set-thread-name, thread-name): Swtich between linux implementation and or stub. --- guix/build/syscalls.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index d69b178a0a..549346c5f9 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -1218,7 +1218,7 @@ handler if the lock is already held by another process." ;; zero. 16) -(define (set-thread-name name) +(define (set-thread-name!/linux name) "Set the name of the calling thread to NAME. NAME is truncated to 15 bytes." (let ((ptr (string->pointer name))) @@ -1231,7 +1231,7 @@ bytes." (list (strerror err)) (list err)))))) -(define (thread-name) +(define (thread-name/linux) "Return the name of the calling thread as a string." (let ((buf (make-bytevector %max-thread-name-length))) (let-values (((ret err) @@ -1245,6 +1245,16 @@ bytes." (list (strerror err)) (list err)))))) +(define set-thread-name + (if (string-contains %host-type "linux") + set-thread-name!/linux + (cute const #f))) + +(define thread-name + (if (string-contains %host-type "linux") + thread-name/linux + (cute const ""))) + ;;; ;;; Network interfaces. -- cgit v1.2.3 From 6cea61f2fab26716cd8c2394fc83eac9985f9d97 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 24 May 2020 12:41:32 +0200 Subject: linux-boot: Update 'make-hurd-device-nodes'. * gnu/build/linux-boot.scm (make-hurd-device-nodes): Avoid de-duplication of device mount points; also create mount points for /servers/. --- gnu/build/linux-boot.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index f08bb11514..d62c670684 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -337,6 +337,7 @@ one specific hardware device. These we have to create." (for-each (lambda (file) (call-with-output-file (scope file) (lambda (port) + (display file port) ;avoid hard-linking (chmod port #o666)))) '("dev/null" "dev/zero" @@ -347,6 +348,20 @@ one specific hardware device. These we have to create." ;; console-run on first boot. (mkdir (scope "servers")) + (for-each (lambda (file) + (call-with-output-file (scope (string-append "servers/" file)) + (lambda (port) + (display file port) ;avoid hard-linking + (chmod port #o444)))) + '("startup" + "exec" + "proc" + "password" + "default-pager" + "crash-dump-core" + "kill" + "suspend")) + (mkdir (scope "servers/socket")) ;; Don't create /servers/socket/1 & co: runsystem does that on first boot. -- cgit v1.2.3 From c77b92859fdad2b85f0f32d920048d476a347ff0 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:10:44 +0200 Subject: image: Add Hurd support. * gnu/system/image.scm (hurd-disk-image): New exported variable, (root-offset, root-label): new variables, (esp-partition, root-partition): adapt accordingly, (find-image): add Hurd support. --- gnu/build/image.scm | 5 +++++ gnu/system/image.scm | 40 +++++++++++++++++++++++++++++++++++----- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index 14503b02ba..fb85bd4bb8 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -161,6 +161,8 @@ deduplicates files common to CLOSURE and the rest of PREFIX." references-graphs (register-closures? #t) system-directory + (make-device-nodes + make-essential-device-nodes) #:allow-other-keys) "Initialize the given ROOT directory. Use BOOTCFG and BOOTCFG-LOCATION to install the bootloader configuration. @@ -172,6 +174,9 @@ of the directory of the 'system' derivation." (populate-root-file-system system-directory root) (populate-store references-graphs root) + ;; Populate /dev. + (make-device-nodes root) + (when register-closures? (for-each (lambda (closure) (register-closure root diff --git a/gnu/system/image.scm b/gnu/system/image.scm index f44886c137..15dac8af57 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages genimage) #:use-module (gnu packages guile) #:autoload (gnu packages gnupg) (guile-gcrypt) + #:use-module (gnu packages hurd) #:use-module (gnu packages linux) #:use-module (gnu packages mtools) #:use-module ((srfi srfi-1) #:prefix srfi-1:) @@ -54,6 +55,7 @@ #:export (esp-partition root-partition + hurd-disk-image efi-disk-image iso9660-image @@ -91,6 +93,26 @@ (flags '(boot)) (initializer (gexp initialize-root-partition)))) +(define hurd-initialize-root-partition + #~(lambda* (#:rest args) + (apply initialize-root-partition + (append args + (list #:make-device-nodes + make-hurd-device-nodes))))) + +(define hurd-disk-image + (image + (format 'disk-image) + (partitions + (list (partition + (size 'guess) + (offset root-offset) + (label root-label) + (file-system "ext2") + (file-system-options '("-o" "hurd" "-O" "ext_attr")) + (flags '(boot)) + (initializer hurd-initialize-root-partition)))))) + (define efi-disk-image (image (format 'disk-image) @@ -145,12 +167,14 @@ (with-imported-modules `(,@(source-module-closure '((gnu build vm) (gnu build image) + (gnu build linux-boot) (guix store database)) #:select? not-config?) ((guix config) => ,(make-config.scm))) #~(begin (use-modules (gnu build vm) (gnu build image) + (gnu build linux-boot) (guix store database) (guix build utils)) gexp* ...)))) @@ -525,10 +549,16 @@ image, depending on IMAGE format." "Find and return an image that could match the given FILE-SYSTEM-TYPE. This is useful to adapt to interfaces written before the addition of the record." - (mbegin %store-monad - (return - (match file-system-type - ("iso9660" iso9660-image) - (_ efi-disk-image))))) + (mlet %store-monad ((target (current-target-system))) + (mbegin %store-monad + (return + (match file-system-type + ("iso9660" iso9660-image) + (_ (cond + ((and target + (hurd-triplet? target)) + hurd-disk-image) + (else + efi-disk-image)))))))) ;;; image.scm ends here -- cgit v1.2.3 From 45b2cb439deaa2f438aed3893ee8fc80445d5563 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 3 May 2020 14:13:58 +0200 Subject: system: hurd: Add hurd-default-essential-services. * gnu/system.scm (hurd-default-essential-services): New procedure. --- gnu/system.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/system.scm b/gnu/system.scm index 61cbaef280..79f52acc23 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -127,6 +128,8 @@ operating-system-with-gc-roots operating-system-with-provenance + hurd-default-essential-services + boot-parameters boot-parameters? boot-parameters-label @@ -574,6 +577,10 @@ bookkeeping." (service firmware-service-type (operating-system-firmware os))))))) +(define (hurd-default-essential-services os) + (list (service system-service-type '()) + (service profile-service-type '()))) + (define* (operating-system-services os) "Return all the services of OS, including \"essential\" services." (instantiate-missing-services -- cgit v1.2.3 From 2018fb2afe20988193a50fe30159725f51db0a4b Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 3 May 2020 15:09:15 +0200 Subject: system: Add 'hurd' field to . * gnu/system.scm ()[hurd]: New field. * doc/guix.texi (operating-system Reference): Document 'hurd'. --- doc/guix.texi | 18 +++++++++++++++--- gnu/system.scm | 3 +++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 056bf011f6..46aceae068 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11484,9 +11484,21 @@ configuration (@pxref{Using the Configuration System}). @table @asis @item @code{kernel} (default: @code{linux-libre}) -The package object of the operating system kernel to use@footnote{Currently -only the Linux-libre kernel is supported. In the future, it will be -possible to use the GNU@tie{}Hurd.}. +The package object of the operating system kernel to +use@footnote{Currently only the Linux-libre kernel is fully supported. +Using GNU@tie{}mach with the GNU@tie{}Hurd is experimental and only +available when building a virtual machine disk image.}. + +@cindex hurd +@item @code{hurd} (default: @code{#f}) +The package object of the hurd to be started by the kernel. When this +field is set, produce a GNU/Hurd operating system. In that case, +@code{kernel} must also be set to the @code{gnumach} package---the +microkernel the Hurd runs on. + +@quotation Warning +This feature is experimental and only supported for disk images. +@end quotation @item @code{kernel-loadable-modules} (default: '()) A list of objects (usually packages) to collect loadable kernel modules diff --git a/gnu/system.scm b/gnu/system.scm index 79f52acc23..310a4aac87 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -83,6 +83,7 @@ operating-system-packages operating-system-host-name operating-system-hosts-file + operating-system-hurd operating-system-kernel operating-system-kernel-file operating-system-kernel-arguments @@ -187,6 +188,8 @@ (default '())) ; list of packages (kernel-arguments operating-system-user-kernel-arguments (default %default-kernel-arguments)) ; list of gexps/strings + (hurd operating-system-hurd + (default #f)) ; package (bootloader operating-system-bootloader) ; (label operating-system-label ; string (thunked) -- cgit v1.2.3 From 21acd8d6c11b85d06c82b168807b35cb7d2d0adf Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 26 May 2020 16:54:18 +0200 Subject: bootloader: Extend `' for multiboot. * gnu/bootloader.scm ()[multiboot-kernel,multiboot-arguments, multiboot-modules]: New fields. [linux,initrd]: Add default value '#f'. (menu-entry->sexp, sexp->menu-entry): Support multiboot entry. * doc/guix.texi (Bootloader Configuration): Document them. --- doc/guix.texi | 27 +++++++++++++++++++++++++-- gnu/bootloader.scm | 46 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 66 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 46aceae068..167a0a84d6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26985,7 +26985,7 @@ The type of an entry in the bootloader menu. @item @code{label} The label to show in the menu---e.g., @code{"GNU"}. -@item @code{linux} +@item @code{linux} (default: @code{#f}) The Linux kernel image to boot, for example: @lisp @@ -27007,9 +27007,10 @@ field is ignored entirely. The list of extra Linux kernel command-line arguments---e.g., @code{("console=ttyS0")}. -@item @code{initrd} +@item @code{initrd} (default: @code{#f}) A G-Expression or string denoting the file name of the initial RAM disk to use (@pxref{G-Expressions}). + @item @code{device} (default: @code{#f}) The device where the kernel and initrd are to be found---i.e., for GRUB, @dfn{root} for this menu entry (@pxref{root,,, grub, GNU GRUB manual}). @@ -27020,6 +27021,28 @@ the bootloader will search the device containing the file specified by the @code{linux} field (@pxref{search,,, grub, GNU GRUB manual}). It must @emph{not} be an OS device name such as @file{/dev/sda1}. +@item @code{multiboot-kernel} (default: @code{#f}) +The kernel to boot in Multiboot-mode (@pxref{multiboot,,, grub, GNU GRUB +manual}). When this field is set, a Multiboot menu-entry is generated. +For example: + +@lisp +(file-append mach "/boot/gnumach") +@end lisp + +@item @code{multiboot-arguments} (default: @code{()}) +The list of extra command-line arguments for the multiboot-kernel. + +@item @code{multiboot-modules} (default: @code{()}) +The list of commands for loading Multiboot modules. For example: + +@lisp +(list (list (file-append hurd "/hurd/ext2fs.static") "ext2fs" + @dots{}) + (list (file-append libc "/lib/ld.so.1") "exec" + @dots{})) +@end lisp + @end table @end deftp diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm index 668caa7fc3..2eebb8e9d9 100644 --- a/gnu/bootloader.scm +++ b/gnu/bootloader.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017, 2020 Mathieu Othacehe ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,9 @@ menu-entry-linux-arguments menu-entry-initrd menu-entry-device-mount-point + menu-entry-multiboot-kernel + menu-entry-multiboot-arguments + menu-entry-multiboot-modules menu-entry->sexp sexp->menu-entry @@ -77,22 +81,41 @@ (default #f)) (device-mount-point menu-entry-device-mount-point (default #f)) - (linux menu-entry-linux) + (linux menu-entry-linux + (default #f)) (linux-arguments menu-entry-linux-arguments (default '())) ; list of string-valued gexps - (initrd menu-entry-initrd)) ; file name of the initrd as a gexp + (initrd menu-entry-initrd ; file name of the initrd as a gexp + (default #f)) + (multiboot-kernel menu-entry-multiboot-kernel + (default #f)) + (multiboot-arguments menu-entry-multiboot-arguments + (default '())) ; list of string-valued gexps + (multiboot-modules menu-entry-multiboot-modules + (default '()))) ; list of multiboot commands, where + ; a command is a list of (define (menu-entry->sexp entry) "Return ENTRY serialized as an sexp." (match entry - (($ label device mount-point linux linux-arguments initrd) + (($ label device mount-point linux linux-arguments initrd #f + ()) `(menu-entry (version 0) (label ,label) (device ,device) (device-mount-point ,mount-point) (linux ,linux) (linux-arguments ,linux-arguments) - (initrd ,initrd))))) + (initrd ,initrd))) + (($ label device mount-point #f () #f + multiboot-kernel multiboot-arguments multiboot-modules) + `(menu-entry (version 0) + (label ,label) + (device ,device) + (device-mount-point ,mount-point) + (multiboot-kernel ,multiboot-kernel) + (multiboot-arguments ,multiboot-arguments) + (multiboot-modules ,multiboot-modules))))) (define (sexp->menu-entry sexp) "Turn SEXP, an sexp as returned by 'menu-entry->sexp', into a @@ -109,7 +132,20 @@ record." (device-mount-point mount-point) (linux linux) (linux-arguments linux-arguments) - (initrd initrd))))) + (initrd initrd))) + (('menu-entry ('version 0) + ('label label) ('device device) + ('device-mount-point mount-point) + ('multiboot-kernel multiboot-kernel) + ('multiboot-arguments multiboot-arguments) + ('multiboot-modules multiboot-modules) _ ...) + (menu-entry + (label label) + (device device) + (device-mount-point mount-point) + (multiboot-kernel multiboot-kernel) + (multiboot-arguments multiboot-arguments) + (multiboot-modules multiboot-modules))))) ;;; -- cgit v1.2.3 From 912b857ede450828805e09bb718658f79c40703a Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 26 May 2020 17:38:30 +0200 Subject: system: Add 'multiboot-modules' field to . * gnu/system.scm ()[multiboot-modules]: New field. (read-boot-parameters): Initialize it. (operating-system-multiboot-modules, hurd-multiboot-modules): New procedure. (operating-system-boot-parameters): Cater for multiboot the Hurd and initialize it; avoid initrd in that case. (operating-system-kernel-file): Cater for for Gnumach (the Hurd) besides Linux. (boot-parameters->menu-entry): Use it to support a multiboot . --- gnu/system.scm | 86 +++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 67 insertions(+), 19 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 310a4aac87..0722bcf771 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -39,9 +39,11 @@ #:use-module (guix utils) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages cross-base) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages admin) + #:use-module (gnu packages hurd) #:use-module (gnu packages linux) #:use-module (gnu packages pciutils) #:use-module (gnu packages package-management) @@ -142,6 +144,7 @@ boot-parameters-kernel boot-parameters-kernel-arguments boot-parameters-initrd + boot-parameters-multiboot-modules read-boot-parameters read-boot-parameters-file boot-parameters->menu-entry @@ -283,7 +286,8 @@ directly by the user." (store-mount-point boot-parameters-store-mount-point) (kernel boot-parameters-kernel) (kernel-arguments boot-parameters-kernel-arguments) - (initrd boot-parameters-initrd)) + (initrd boot-parameters-initrd) + (multiboot-modules boot-parameters-multiboot-modules)) (define (ensure-not-/dev device) "If DEVICE starts with a slash, return #f. This is meant to filter out @@ -314,7 +318,7 @@ file system labels." (match (read port) (('boot-parameters ('version 0) ('label label) ('root-device root) - ('kernel linux) + ('kernel kernel) rest ...) (boot-parameters (label label) @@ -330,12 +334,12 @@ file system labels." ((_ entries) (map sexp->menu-entry entries)) (#f '()))) - ;; In the past, we would store the directory name of the kernel instead - ;; of the absolute file name of its image. Detect that and correct it. - (kernel (if (string=? linux (direct-store-path linux)) - (string-append linux "/" + ;; In the past, we would store the directory name of linux instead of + ;; the absolute file name of its image. Detect that and correct it. + (kernel (if (string=? kernel (direct-store-path kernel)) + (string-append kernel "/" (system-linux-image-file-name)) - linux)) + kernel)) (kernel-arguments (match (assq 'kernel-arguments rest) @@ -349,6 +353,8 @@ file system labels." (('initrd (? string? file)) file))) + (multiboot-modules (or (assq 'multiboot-modules rest) '())) + (store-device ;; Linux device names like "/dev/sda1" are not suitable GRUB device ;; identifiers, so we just filter them out. @@ -386,14 +392,25 @@ The object has its kernel-arguments extended in order to make it bootable." (boot-parameters-kernel-arguments params)))))) (define (boot-parameters->menu-entry conf) - (menu-entry - (label (boot-parameters-label conf)) - (device (boot-parameters-store-device conf)) - (device-mount-point (boot-parameters-store-mount-point conf)) - (linux (boot-parameters-kernel conf)) - (linux-arguments (boot-parameters-kernel-arguments conf)) - (initrd (boot-parameters-initrd conf)))) - + (let* ((kernel (boot-parameters-kernel conf)) + (multiboot-modules (boot-parameters-multiboot-modules conf)) + (multiboot? (pair? multiboot-modules))) + (menu-entry + (label (boot-parameters-label conf)) + (device (boot-parameters-store-device conf)) + (device-mount-point (boot-parameters-store-mount-point conf)) + (linux (and (not multiboot?) kernel)) + (linux-arguments (if (not multiboot?) ' + (boot-parameters-kernel-arguments conf) + '())) + (initrd (boot-parameters-initrd conf)) + (multiboot-kernel (and multiboot? kernel)) + (multiboot-arguments (if multiboot? + (boot-parameters-kernel-arguments conf) + '())) + (multiboot-modules (if multiboot? + (boot-parameters-multiboot-modules conf) + '()))))) ;;; @@ -485,8 +502,10 @@ from the initrd." (define (operating-system-kernel-file os) "Return an object representing the absolute file name of the kernel image of OS." - (file-append (operating-system-kernel os) - "/" (system-linux-image-file-name))) + (if (operating-system-hurd os) + (file-append (operating-system-kernel os) "/boot/gnumach") + (file-append (operating-system-kernel os) + "/" (system-linux-image-file-name)))) (define (package-for-kernel target-kernel module-package) "Return a package like MODULE-PACKAGE, adapted for TARGET-KERNEL, if @@ -1131,17 +1150,45 @@ a list of , to populate the \"old entries\" menu." #:store-directory-prefix (btrfs-store-subvolume-file-name file-systems)))) +(define (operating-system-multiboot-modules os) + (if (operating-system-hurd os) (hurd-multiboot-modules os) '())) + +(define (hurd-multiboot-modules os) + (let* ((hurd (operating-system-hurd os)) + (root-file-system-command + (list (file-append hurd "/hurd/ext2fs.static") + "ext2fs" + "--multiboot-command-line='${kernel-command-line}'" + "--host-priv-port='${host-port}'" + "--device-master-port='${device-port}'" + "--exec-server-task='${exec-task}'" + "--store-type=typed" + "'${root}'" "'$(task-create)'" "'$(task-resume)'")) + (target (%current-target-system)) + (libc (if target + (with-parameters ((%current-target-system #f)) + ;; TODO: cross-libc has extra patches for the Hurd; + ;; remove in next rebuild cycle + (cross-libc target)) + glibc)) + (exec-server-command + (list (file-append libc "/lib/ld.so.1") "exec" + (file-append hurd "/hurd/exec") "'$(exec-task=task-create)'"))) + (list root-file-system-command exec-server-command))) + (define* (operating-system-boot-parameters os root-device #:key system-kernel-arguments?) "Return a monadic record that describes the boot parameters of OS. When SYSTEM-KERNEL-ARGUMENTS? is true, add kernel arguments such as '--root' and '--load' to ." - (let* ((initrd (operating-system-initrd-file os)) + (let* ((initrd (and (not (hurd-target?)) + (operating-system-initrd-file os))) (store (operating-system-store-file-system os)) (bootloader (bootloader-configuration-bootloader (operating-system-bootloader os))) (bootloader-name (bootloader-name bootloader)) - (label (operating-system-label os))) + (label (operating-system-label os)) + (multiboot-modules (operating-system-multiboot-modules os))) (boot-parameters (label label) (root-device root-device) @@ -1151,6 +1198,7 @@ such as '--root' and '--load' to ." (operating-system-kernel-arguments os root-device) (operating-system-user-kernel-arguments os))) (initrd initrd) + (multiboot-modules multiboot-modules) (bootloader-name bootloader-name) (bootloader-menu-entries (bootloader-configuration-menu-entries (operating-system-bootloader os))) -- cgit v1.2.3 From 1244491a0d5334e1589159a2ff67bbc967b9648b Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 26 May 2020 18:09:01 +0200 Subject: bootloader: grub: Add support for multiboot. * gnu/bootloader/grub.scm (grub-configuration-file): Add support for multiboot. --- gnu/bootloader/grub.scm | 76 +++++++++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 27 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 2d9a39afc3..d4dbb57131 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -330,36 +330,58 @@ when booting a root file system on a Btrfs subvolume." (define all-entries (append entries (bootloader-configuration-menu-entries config))) (define (menu-entry->gexp entry) - (let* ((device (menu-entry-device entry)) - (device-mount-point (menu-entry-device-mount-point entry)) - (label (menu-entry-label entry)) - (arguments (menu-entry-linux-arguments entry)) - (kernel (normalize-file (menu-entry-linux entry) - device-mount-point - store-directory-prefix)) - (initrd (normalize-file (menu-entry-initrd entry) - device-mount-point - store-directory-prefix))) - ;; Here DEVICE is the store and DEVICE-MOUNT-POINT is its mount point. - ;; Use the right file names for KERNEL and INITRD in case - ;; DEVICE-MOUNT-POINT is not "/", meaning that the store is on a - ;; separate partition. - #~(format port "menuentry ~s { + (let ((label (menu-entry-label entry)) + (linux (menu-entry-linux entry)) + (device (menu-entry-device entry)) + (device-mount-point (menu-entry-device-mount-point entry))) + (if linux + (let ((arguments (menu-entry-linux-arguments entry)) + (linux (normalize-file linux + device-mount-point + store-directory-prefix)) + (initrd (normalize-file (menu-entry-initrd entry) + device-mount-point + store-directory-prefix))) + ;; Here DEVICE is the store and DEVICE-MOUNT-POINT is its mount point. + ;; Use the right file names for LINUX and INITRD in case + ;; DEVICE-MOUNT-POINT is not "/", meaning that the store is on a + ;; separate partition. + + ;; When BTRFS-SUBVOLUME-FILE-NAME is defined, prepend it the linux and + ;; initrd paths, to allow booting from a Btrfs subvolume. + #~(format port "menuentry ~s { ~a linux ~a ~a initrd ~a }~%" - #$label - #$(grub-root-search device kernel) - #$kernel (string-join (list #$@arguments)) - #$initrd))) - (define sugar - (eye-candy config - (menu-entry-device (first all-entries)) - (menu-entry-device-mount-point (first all-entries)) - #:store-directory-prefix store-directory-prefix - #:system system - #:port #~port)) + #$label + #$(grub-root-search device linux) + #$linux (string-join (list #$@arguments)) + #$initrd)) + (let ((kernel (menu-entry-multiboot-kernel entry)) + (arguments (menu-entry-multiboot-arguments entry)) + (modules (menu-entry-multiboot-modules entry)) + (root-index 1)) ; XXX EFI will need root-index 2 + #~(format port " +menuentry ~s { + multiboot ~a root=device:hd0s~a~a~a +}~%" + #$label + #$kernel + #$root-index (string-join (list #$@arguments) " " 'prefix) + (string-join (map string-join '#$modules) + "\n module " 'prefix)))))) + + (define (sugar) + (let* ((entry (first all-entries)) + (device (menu-entry-device entry)) + (mount-point (menu-entry-device-mount-point entry))) + (eye-candy config + device + mount-point + #:store-directory-prefix store-directory-prefix + #:system system + #:port #~port))) (define keyboard-layout-config (let* ((layout (bootloader-configuration-keyboard-layout config)) @@ -384,7 +406,7 @@ keymap ~a~%" #$keymap)))) "# This file was generated from your Guix configuration. Any changes # will be lost upon reconfiguration. ") - #$sugar + #$(sugar) #$keyboard-layout-config (format port " set default=~a -- cgit v1.2.3 From e6cd8581c192f739712013874dfa9690522ea9f1 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 10 May 2020 15:31:45 +0200 Subject: system: Use 'hurd' package in label. * gnu/system.scm (kernel->boot-label): Add keyword parameter 'hurd'. If set, use it for label. (operating-system-default-label): Call with it with operating-system-hurd. --- gnu/system.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 0722bcf771..a37c5ba4f3 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1091,9 +1091,13 @@ listed in OS. The C library expects to find it under (locale-directory definitions #:libcs (operating-system-locale-libcs os))) -(define (kernel->boot-label kernel) +(define* (kernel->boot-label kernel #:key hurd) "Return a label for the bootloader menu entry that boots KERNEL." - (cond ((package? kernel) + (cond ((package? hurd) + (string-append "GNU with the " + (string-titlecase (package-name hurd)) " " + (package-version hurd))) + ((package? kernel) (string-append "GNU with " (string-titlecase (package-name kernel)) " " (package-version kernel))) @@ -1106,7 +1110,8 @@ listed in OS. The C library expects to find it under (define (operating-system-default-label os) "Return the default label for OS, as it will appear in the bootloader menu entry." - (kernel->boot-label (operating-system-kernel os))) + (kernel->boot-label (operating-system-kernel os) + #:hurd (operating-system-hurd os))) (define (store-file-system file-systems) "Return the file system object among FILE-SYSTEMS that contains the store." -- cgit v1.2.3 From 59bcffa314171294278444aad4b7012abe50257a Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 13 Apr 2020 17:15:10 +0200 Subject: system: examples: Add bare-hurd.tmpl. * gnu/system/hurd.scm (%hurd-def%hurd-default-operating-system-kernel, %hurd-default-operating-system): New exported variables. * gnu/system/examples/bare-hurd.tmpl: New file. * Makefile.am (EXAMPLES): Add it. * tests/guix-system.sh: Add --target=i586-pc-gnu when testing it. --- Makefile.am | 3 ++- gnu/services.scm | 2 ++ gnu/system/examples/bare-hurd.tmpl | 31 +++++++++++++++++++++++++ gnu/system/hurd.scm | 47 ++++++++++++++++++++++++++++++++++++-- tests/guix-system.sh | 7 +++++- 5 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 gnu/system/examples/bare-hurd.tmpl diff --git a/Makefile.am b/Makefile.am index f3985f9572..0feb75c7c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ # Copyright © 2017 Mathieu Othacehe # Copyright © 2017 Leo Famulari # Copyright © 2017 Ricardo Wurmus -# Copyright © 2017 Jan Nieuwenhuizen +# Copyright © 2017, 2020 Jan (janneke) Nieuwenhuizen # Copyright © 2017 Arun Isaac # Copyright © 2018 Nikita # Copyright © 2018 Julien Lepiller @@ -348,6 +348,7 @@ AUX_FILES = \ EXAMPLES = \ gnu/system/examples/asus-c201.tmpl \ gnu/system/examples/bare-bones.tmpl \ + gnu/system/examples/bare-hurd.tmpl \ gnu/system/examples/beaglebone-black.tmpl \ gnu/system/examples/desktop.tmpl \ gnu/system/examples/lightweight-desktop.tmpl \ diff --git a/gnu/services.scm b/gnu/services.scm index 2e4648bf78..63a709fc95 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2016 Chris Marusich +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ #:use-module (guix modules) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages hurd) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-9 gnu) diff --git a/gnu/system/examples/bare-hurd.tmpl b/gnu/system/examples/bare-hurd.tmpl new file mode 100644 index 0000000000..16f20416aa --- /dev/null +++ b/gnu/system/examples/bare-hurd.tmpl @@ -0,0 +1,31 @@ +;; -*-scheme-*- + +;; This is an operating system configuration template +;; for a "bare bones" setup, with no X11 display server. + +;; To build a disk image for a virtual machine, do +;; +;; ./pre-inst-env guix system disk-image --target=i586-pc-gnu --no-grafts \ +;; gnu/system/examples/bare-hurd.tmpl +;; +;; it boots, but needs activation, more setup and services to be useful. + +(use-modules (gnu) (gnu system hurd) (guix utils)) + +(define %hurd-os + (operating-system + (inherit %hurd-default-operating-system) + (bootloader (bootloader-configuration + (bootloader grub-minimal-bootloader) + (target "/dev/sdX"))) + (file-systems (cons (file-system + (device (file-system-label "my-root")) + (mount-point "/") + (type "ext2")) + %base-file-systems)) + (host-name "guixygnu") + (timezone "Europe/Amsterdam") + (packages %base-packages/hurd) + (services %base-services/hurd))) + +%hurd-os diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 3ccf47aa21..e11055cbb8 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -21,6 +21,7 @@ #:use-module (guix gexp) #:use-module (guix profiles) #:use-module (guix utils) + #:use-module (gnu bootloader) #:use-module (gnu bootloader grub) #:use-module (gnu packages admin) #:use-module (gnu packages base) @@ -31,8 +32,18 @@ #:use-module (gnu packages guile-xyz) #:use-module (gnu packages hurd) #:use-module (gnu packages less) + #:use-module (gnu services) + #:use-module (gnu services base) + #:use-module (gnu services hurd) + #:use-module (gnu services shepherd) + #:use-module (gnu system) + #:use-module (gnu system shadow) #:use-module (gnu system vm) - #:export (cross-hurd-image)) + #:export (cross-hurd-image + %base-packages/hurd + %base-services/hurd + %hurd-default-operating-system + %hurd-default-operating-system-kernel)) ;;; Commentary: ;;; @@ -41,10 +52,42 @@ ;;; ;;; Code: +(define %hurd-default-operating-system-kernel + (if (hurd-system?) + gnumach + ;; A cross-built GNUmach does not work + (with-parameters ((%current-system "i686-linux") + (%current-target-system #f)) + gnumach))) + (define %base-packages/hurd (list hurd bash coreutils file findutils grep sed guile-3.0 guile-colorized guile-readline - net-base inetutils less which)) + net-base inetutils less shepherd which)) + +(define %base-services/hurd + '()) + +(define %hurd-default-operating-system + (operating-system + (kernel %hurd-default-operating-system-kernel) + (kernel-arguments '()) + (hurd hurd) + (bootloader (bootloader-configuration + (bootloader grub-minimal-bootloader) + (target "/dev/vda"))) + (initrd (lambda _ '())) + (initrd-modules (lambda _ '())) + (firmware '()) + (host-name "guixygnu") + (file-systems '()) + (packages %base-packages/hurd) + (timezone "GNUrope") + (name-service-switch #f) + (essential-services (hurd-default-essential-services this-operating-system)) + (pam-services '()) + (setuid-programs '()) + (sudoers-file #f))) (define* (cross-hurd-image #:key (hurd hurd) (gnumach gnumach)) "Return a cross-built GNU/Hurd image." diff --git a/tests/guix-system.sh b/tests/guix-system.sh index 3a831cba1d..0e22686a34 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -307,7 +307,12 @@ guix system search anonym network | grep "^name: tor" # Verify that the examples can be built. for example in gnu/system/examples/*.tmpl; do - guix system -n disk-image "$example" + if echo "$example" | grep hurd; then + target="--target=i586-pc-gnu" + else + target= + fi + guix system -n disk-image $target "$example" done # Verify that the disk image types can be built. -- cgit v1.2.3 From c3fd2df705695a0dc9f393545606360be1ea6104 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 3 May 2020 16:32:09 +0200 Subject: system: Support activation service for the Hurd. * gnu/build/activation.scm (boot-time-system): Use "command-line" for the Hurd. * gnu/system.scm (hurd-default-essential-services): Add %boot-service and %activation-service. --- gnu/build/activation.scm | 4 +++- gnu/system.scm | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index 30f5e87d5a..b915e6bb67 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -320,7 +320,9 @@ improvement." (define (boot-time-system) "Return the '--system' argument passed on the kernel command line." - (find-long-option "--system" (linux-command-line))) + (find-long-option "--system" (if (string-contains %host-type "linux-gnu") + linux-command-line + (command-line)))) (define* (activate-current-system #:optional (system (or (getenv "GUIX_NEW_SYSTEM") diff --git a/gnu/system.scm b/gnu/system.scm index a37c5ba4f3..4c23178b18 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -601,6 +601,8 @@ bookkeeping." (define (hurd-default-essential-services os) (list (service system-service-type '()) + %boot-service + %activation-service (service profile-service-type '()))) (define* (operating-system-services os) -- cgit v1.2.3 From f5ca79d2a26ece8ce58693916d3bec21749f14cb Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sat, 25 Apr 2020 11:55:56 +0200 Subject: services: Support etc-service for the Hurd. * gnu/system.scm (operating-system-etc-service): Cater for missing nsswitch and missing sudoers-file. For the Hurd, add "login" and "motd". (hurd-default-essential-services): Add operating-system-etc-service. --- gnu/system.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 4c23178b18..cca1c09f5d 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -603,6 +603,7 @@ bookkeeping." (list (service system-service-type '()) %boot-service %activation-service + (operating-system-etc-service os) (service profile-service-type '()))) (define* (operating-system-services os) @@ -708,7 +709,7 @@ This is the GNU system. Welcome.\n") (define* (operating-system-etc-service os) "Return a that builds containing the static part of the /etc directory." - (let ((login.defs + (let* ((login.defs (plain-file "login.defs" (string-append "# Default paths for non-login shells started by su(1).\n" @@ -719,10 +720,13 @@ directory." "/run/current-system/profile/bin:" "/run/current-system/profile/sbin\n"))) - (issue (plain-file "issue" (operating-system-issue os))) - (nsswitch (plain-file "nsswitch.conf" - (name-service-switch->string - (operating-system-name-service-switch os)))) + (hurd (operating-system-hurd os)) + (issue (plain-file "issue" (operating-system-issue os))) + (nsswitch (operating-system-name-service-switch os)) + (nsswitch (and nsswitch + (plain-file "nsswitch.conf" + (name-service-switch->string nsswitch)))) + (sudoers (operating-system-sudoers-file os)) ;; Startup file for POSIX-compliant login shells, which set system-wide ;; environment variables. @@ -812,7 +816,7 @@ fi\n"))) ("rpc" ,(file-append net-base "/etc/rpc")) ("login.defs" ,#~#$login.defs) ("issue" ,#~#$issue) - ("nsswitch.conf" ,#~#$nsswitch) + ,@(if nsswitch `(("nsswitch.conf" ,#~#$nsswitch)) '()) ("profile" ,#~#$profile) ("bashrc" ,#~#$bashrc) ("hosts" ,#~#$(or (operating-system-hosts-file os) @@ -828,7 +832,11 @@ fi\n"))) ("timezone" ,(plain-file "timezone" (operating-system-timezone os))) ("localtime" ,(file-append tzdata "/share/zoneinfo/" (operating-system-timezone os))) - ("sudoers" ,(operating-system-sudoers-file os)))))) + ,@(if sudoers `(("sudoers" ,sudoers)) '()) + ,@(if hurd + `(("login" ,(file-append hurd "/etc/login")) + ("motd" ,(file-append hurd "/etc/motd"))) + '()))))) (define %root-account ;; Default root account. -- cgit v1.2.3 From c03e513a41ff983703e010b2bb636ed7f8188281 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 3 May 2020 16:37:27 +0200 Subject: services: hurd: Populate system profile. * gnu/system.scm (hurd-default-essential-services): Populate profile with packages. --- gnu/system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index cca1c09f5d..ce574d8c51 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -604,7 +604,7 @@ bookkeeping." %boot-service %activation-service (operating-system-etc-service os) - (service profile-service-type '()))) + (service profile-service-type (operating-system-packages os)))) (define* (operating-system-services os) "Return all the services of OS, including \"essential\" services." -- cgit v1.2.3 From 97c94fc2c210341edc5099856c5c0e83cfc0bd86 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 6 May 2020 08:22:41 +0200 Subject: gnu: hurd: Create minimal "runsystem" script to invoke "rc". This moves towards a regular Guix startup, loading SYSTEM/boot to activate the system and start the shepherd. * gnu/packages/hurd.scm (hurd-rc-script): Update to handle "runsystem" tasks. Load system/boot to activate the system and start the shepherd. Create /hurd symlink. (hurd)[arguments]: Add 'create-runsystem' phase. Do not substitute now unused init.c, runsystem.hurd. Substitute "/hurd/" for the fixed 'out + "/hurd/"' in boot.c, console-run.c and startup.c. Also substitute _HURD_STARTUP ("/hurd/startup") to the fixed 'out + "/hurd/startup"' in libdiskfs/boot-start.c and libdiskfs/opts-std-startup.c. --- gnu/packages/hurd.scm | 152 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 115 insertions(+), 37 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 278568b583..b341683afe 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -329,10 +329,26 @@ boot, since this cannot be done from GNU/Linux." (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils) - (ice-9 match)) - - ;; "@HURD@" is a placeholder. - (setenv "PATH" "@HURD@/bin") + (ice-9 match) + (system repl repl) + (srfi srfi-1) + (srfi srfi-26)) + + (display "Welcome, this is GNU's early boot Guile.\n") + (display "Use '--repl' for an initrd REPL.\n\n") + + ;; "@HURD@" and "@COREUTILS@" are a placeholders. + (setenv "PATH" "@HURD@/bin:@HURD@/sbin:@COREUTILS@/bin") + + ;; XXX FIXME c&p from linux-boot.scm + (define (find-long-option option arguments) + "Find OPTION among ARGUMENTS, where OPTION is something like \"--load\". +Return the value associated with OPTION, or #f on failure." + (let ((opt (string-append option "="))) + (and=> (find (cut string-prefix? opt <>) + arguments) + (lambda (arg) + (substring arg (+ 1 (string-index arg #\=))))))) (define (translated? node) ;; Return true if a translator is installed on NODE. @@ -349,10 +365,54 @@ boot, since this cannot be done from GNU/Linux." (apply invoke "settrans" "-c" node command)))) '#$translators) - ;; Start the oh-so-fancy console client. - (mkdir-p "/var/run") ;for the PID file - (invoke "console" "--daemonize" "-c" "/dev/vcs" - "-d" "vga" "-d" "pc_kbd" "-d" "generic_speaker")))) + (format #t "Creating essential device nodes...\n") + (with-directory-excursion "/dev" + (invoke "MAKEDEV" "--devdir=/dev" "std") + (invoke "MAKEDEV" "--devdir=/dev" "vcs") + (invoke "MAKEDEV" "--devdir=/dev" "tty1""tty2" "tty3" "tty4" "tty5" "tty6") + (invoke "MAKEDEV" "--devdir=/dev" "ptyp0" "ptyp1" "ptyp2") + (invoke "MAKEDEV" "--devdir=/dev" "console")) + + (let* ((args (command-line)) + (system (find-long-option "--system" args)) + (to-load (find-long-option "--load" args))) + + (false-if-exception (delete-file "/hurd")) + (let ((hurd/hurd (string-append system "/profile/hurd"))) + (symlink hurd/hurd "/hurd")) + + (format #t "Starting pager...\n") + (unless (zero? (system* "/hurd/mach-defpager")) + (format #t "FAILED...Good luck!\n")) + + (cond ((member "--repl" args) + (format #t "Starting repl...\n") + (start-repl)) + (to-load + (format #t "loading '~a'...\n" to-load) + (primitive-load to-load) + (format (current-error-port) + "boot program '~a' terminated, rebooting~%" + to-load) + (let ((shepherd.conf + (if (file-exists? "/etc/shepherd.conf") + "/etc/shepherd.conf" + (let ((files (find-files "/gnu/store" ".*-shepherd.conf"))) + (and (pair? files) (car files)))))) + (unless shepherd.conf + (format #t "No shepherd.conf found, dropping to a shell...\n") + (invoke "/run/current-system/profile/bin/bash") + (reboot)) + (false-if-exception (delete-file "/var/run/shepherd/socket")) + (format #t "Starting the Shepherd... ~a\n" shepherd.conf) + (execl "/run/current-system/profile/bin/shepherd" "shepherd" + "--config" shepherd.conf)) + (sleep 2) + (reboot)) + (else + (display "no boot file passed via '--load'\n") + (display "entering a warm and cozy REPL\n") + (start-repl))))))) ;; FIXME: We want the program to use the cross-compiled Guile when ;; cross-compiling. But why do we need to be explicit here? @@ -425,6 +485,28 @@ boot, since this cannot be done from GNU/Linux." (substitute* '("daemons/Makefile" "utils/Makefile") (("-o root -m 4755") "")) #t)) + (add-after 'unpack 'create-runsystem + (lambda _ + ;; XXX Work towards having startup.c invoke the Guile rc + (delete-file "daemons/runsystem.sh") + (with-output-to-file "daemons/runsystem.sh" + (lambda _ + (display "#! /bin/bash + +# XXX Guile needs pipe support for its finalizer thread, to start. +# Remove this script when Linux and the Hurd have xattr patches. +PATH=@PATH@ + +fsck --yes --force / +fsysopts / --writable + +# Note: this /hurd/ gets substituted +settrans --create /servers/socket/1 /hurd/pflocal +echo Starting /libexec/rc ... +exec /libexec/rc \"$@\" +"))) + )) + (add-before 'build 'set-file-names (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -437,45 +519,39 @@ boot, since this cannot be done from GNU/Linux." (("/bin/login") (string-append out "/bin/login")) (("/bin/bash") (string-append bash "/bin/bash"))) - (substitute* '("startup/startup.c" "init/init.c" "config/ttys") + (substitute* '("startup/startup.c" "config/ttys") (("/libexec/") (string-append out "/libexec/"))) (substitute* '("utils/uptime.sh") (("/bin/w") (string-append out "/bin/w"))) - (substitute* "daemons/console-run.c" + ;; Upon first boot the /hurd symlink does not exist; it is + ;; created during activation: Hard-code the .../hurd store file + ;; name. + (substitute* '("boot/boot.c" + "daemons/console-run.c" + "startup/startup.c") (("/hurd/") (string-append out "/hurd/"))) - + (substitute* '("libdiskfs/boot-start.c" + "libdiskfs/opts-std-startup.c") + (("_HURD_STARTUP") + (string-append "\"" out "/hurd/startup\""))) (substitute* '("daemons/runsystem.sh" - "daemons/runsystem.hurd.sh" - "sutils/MAKEDEV.sh") + "utils/fakeroot.sh" + "utils/remap.sh" + "sutils/MAKEDEV.sh" + "sutils/losetup.sh") (("^PATH=.*") - (string-append "PATH=" out "/bin:" out "/sbin:" - coreutils "/bin:" - sed "/bin:" grep "/bin:" - util-linux "/bin\n")) - (("^SHELL=.*") - (string-append "SHELL=" bash "/bin/bash\n")) + (string-append "PATH=" out "/bin" + ":" out "/sbin" + ":" coreutils "/bin" + ":" grep "/bin" + ":" sed "/bin" + ":" util-linux "/sbin\n")) (("/sbin/") (string-append out "/sbin/")) (("/libexec/") (string-append out "/libexec/")) (("/hurd/") (string-append out "/hurd/"))) - - (substitute* "daemons/runsystem.sh" - (("export PATH") - (string-append "export PATH\n" - "\ -fsysopts / --writable - -# MAKEDEV relies on pipes so this needs to be set up. -settrans -c /servers/socket/1 /hurd/pflocal - -(cd /dev; MAKEDEV -D /dev std vcs tty{1,2,3,4,5,6})\n"))) - - (substitute* "daemons/runsystem.hurd.sh" - (("export PATH") - "export PATH -fsysopts / --writable\n")) #t))) (add-after 'patch-shebangs 'patch-libexec-shebangs (lambda* (#:key inputs outputs #:allow-other-keys) @@ -511,11 +587,13 @@ fsysopts / --writable\n")) (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (file (string-append out "/libexec/rc")) - (rc (assoc-ref inputs "hurd-rc"))) + (rc (assoc-ref inputs "hurd-rc")) + (coreutils (assoc-ref inputs "coreutils"))) (delete-file file) (copy-file rc file) (substitute* file - (("@HURD@") out)) + (("@HURD@") out) + (("@COREUTILS@") coreutils)) #t)))) #:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") -- cgit v1.2.3 From f9c04580bf5462bb088f47ad8fc6c3136649cbd6 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 12 Apr 2020 22:17:03 +0200 Subject: services: Add `hurd-console-service-type'. * gnu/services/hurd.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * doc/guix.texi (Hurd Services): Document it. --- doc/guix.texi | 22 ++++++++++++++++ gnu/local.mk | 1 + gnu/services/hurd.scm | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 gnu/services/hurd.scm diff --git a/doc/guix.texi b/doc/guix.texi index 167a0a84d6..9a57b927da 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -319,7 +319,9 @@ Services * Version Control Services:: Providing remote access to Git repositories. * Game Services:: Game servers. * PAM Mount Service:: Service to mount volumes when logging in. +* Guix Services:: Services relating specifically to Guix. * Linux Services:: Services tied to the Linux kernel. +* Hurd Services:: Services specific to a Hurd System. * Miscellaneous Services:: Other services. Defining Services @@ -12599,6 +12601,7 @@ declaration. * PAM Mount Service:: Service to mount volumes when logging in. * Guix Services:: Services relating specifically to Guix. * Linux Services:: Services tied to the Linux kernel. +* Hurd Services:: Services specific for a Hurd System. * Miscellaneous Services:: Other services. @end menu @@ -26037,6 +26040,25 @@ parameters, can be done as follow: @end lisp @end deffn +@node Hurd Services +@subsection Hurd Services + +@defvr {Scheme Variable} hurd-console-service-type +This service starts the fancy @code{VGA} console client on the Hurd. + +The service's value is a @code{hurd-console-configuration} record. +@end defvr + +@deftp {Data Type} hurd-console-configuration +This is the data type representing the configuration for the +hurd-console-service. + +@table @asis +@item @code{hurd} (default: @var{hurd}) +The Hurd package to use. +@end table +@end deftp + @node Miscellaneous Services @subsection Miscellaneous Services diff --git a/gnu/local.mk b/gnu/local.mk index 6182306dd5..442e981830 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -582,6 +582,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/games.scm \ %D%/services/getmail.scm \ %D%/services/guix.scm \ + %D%/services/hurd.scm \ %D%/services/kerberos.scm \ %D%/services/linux.scm \ %D%/services/lirc.scm \ diff --git a/gnu/services/hurd.scm b/gnu/services/hurd.scm new file mode 100644 index 0000000000..36da8e218f --- /dev/null +++ b/gnu/services/hurd.scm @@ -0,0 +1,73 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu services hurd) + #:use-module (gnu packages admin) + #:use-module (gnu packages hurd) + #:use-module (gnu services) + #:use-module (gnu services shepherd) + #:use-module (gnu system) + #:use-module (guix gexp) + #:use-module (guix records) + #:export (hurd-console-configuration + hurd-console-service-type)) + +;;; Commentary: +;;; +;;; This module implements services for the Hurd. +;;; +;;; Code: + +;;; +;;; The Hurd VGA console service. +;;; + +(define-record-type* + hurd-console-configuration make-hurd-console-configuration + hurd-console-configuration? + (hurd hurd-console-configuration-hurd ;package + (default hurd))) + +(define (hurd-console-shepherd-service config) + "Return a for a Hurd VGA console with CONFIG." + + (define console-command + #~(list + (string-append #$(hurd-console-configuration-hurd config) "/bin/console") + "-c" "/dev/vcs" + "-d" "vga" + "-d" "pc_kbd" + "-d" "generic_speaker")) + + (list (shepherd-service + (documentation "Run the Hurd’s VGA console client.") + (provision '(console)) + (requirement '(user-processes)) + (start #~(make-forkexec-constructor #$console-command)) + (stop #~(make-kill-destructor))))) + +(define hurd-console-service-type + (service-type + (name 'console) + (description "Run the Hurd console client.") + (extensions + (list (service-extension shepherd-root-service-type + hurd-console-shepherd-service))) + (default-value (hurd-console-configuration)))) + +;;; hurd.scm ends here -- cgit v1.2.3 From 7ccd471c71d650055e99cd02381bc8dcd86d5313 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 7 May 2020 11:14:01 +0200 Subject: services: Add `hurd-getty-service-type'. * gnu/services/hurd.scm (): New record. (hurd-ttys-shepherd-service): New procedure. (hurd-getty-service-type): New variable. * doc/guix.texi (Hurd Services): Document it. --- doc/guix.texi | 23 +++++++++++++++++++++++ gnu/services/hurd.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 9a57b927da..13e3c017d3 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26059,6 +26059,29 @@ The Hurd package to use. @end table @end deftp +@defvr {Scheme Variable} hurd-getty-service-type +This service starts a tty using the Hurd @code{getty} program. + +The service's value is a @code{hurd-getty-configuration} record. +@end defvr + +@deftp {Data Type} hurd-getty-configuration +This is the data type representing the configuration for the +hurd-getty-service. + +@table @asis +@item @code{hurd} (default: @var{hurd}) +The Hurd package to use. + +@item @code{tty} +The name of the console this Getty runs on---e.g., @code{"tty1"}. + +@item @code{baud-rate} (default: @code{38400}) +An integer specifying the baud rate of the tty. + +@end table +@end deftp + @node Miscellaneous Services @subsection Miscellaneous Services diff --git a/gnu/services/hurd.scm b/gnu/services/hurd.scm index 36da8e218f..1ccf164223 100644 --- a/gnu/services/hurd.scm +++ b/gnu/services/hurd.scm @@ -25,7 +25,9 @@ #:use-module (guix gexp) #:use-module (guix records) #:export (hurd-console-configuration - hurd-console-service-type)) + hurd-console-service-type + hurd-getty-configuration + hurd-getty-service-type)) ;;; Commentary: ;;; @@ -70,4 +72,52 @@ hurd-console-shepherd-service))) (default-value (hurd-console-configuration)))) + +;;; +;;; The Hurd getty service. +;;; + +(define-record-type* + hurd-getty-configuration make-hurd-getty-configuration + hurd-getty-configuration? + (hurd hurd-getty-configuration-hurd ; + (default hurd)) + (tty hurd-getty-configuration-tty) ;string + (baud-rate hurd-getty-configuration-baud-rate + (default 38400))) ;integer + +(define (hurd-getty-shepherd-service config) + "Return a for a Hurd getty with CONFIG." + + (let ((hurd (hurd-getty-configuration-hurd config)) + (tty (hurd-getty-configuration-tty config)) + (baud-rate (hurd-getty-configuration-baud-rate config))) + + (define getty-command + #~(list + (string-append #$hurd "/libexec/getty") + #$(number->string baud-rate) + #$tty)) + + (list + (shepherd-service + (documentation "Run getty on a tty.") + (provision (list (string->symbol (string-append "term-" tty)))) + (requirement '(user-processes console)) + (start #~(make-forkexec-constructor #$getty-command)) + (stop #~(make-kill-destructor)))))) + +(define hurd-getty-service-type + (service-type + (name 'getty) + (extensions (list (service-extension shepherd-root-service-type + hurd-getty-shepherd-service))) + (description + "Provide console login using the Hurd @command{getty} program."))) + +(define* (hurd-getty-service config) + "Return a service to run the Hurd getty according to @var{config}, which +specifies the tty to run, among other things." + (service hurd-getty-service-type config)) + ;;; hurd.scm ends here -- cgit v1.2.3 From 11e4200feeffcf1abdd1559c9fca48373599ab10 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 6 May 2020 10:07:08 +0200 Subject: system: hurd: Populate services. * gnu/system/hurd.scm (%base-services/hurd): Add hurd-console-service, hurd-getty-services, guix-service. Also add sylog and loopback, needed for ... * gnu/system.scm (hurd-default-essential-services): ... add %shepherd-root-service with dependencies: %boot-service, %activation-service, user-processes, root-file-system-service, file-system-service, pam-root-service. --- gnu/system.scm | 11 +++++++++++ gnu/system/hurd.scm | 18 +++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index ce574d8c51..88b208277e 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -603,6 +603,17 @@ bookkeeping." (list (service system-service-type '()) %boot-service %activation-service + %shepherd-root-service + (service user-processes-service-type) + (account-service (append (operating-system-accounts os) + (operating-system-groups os)) + (operating-system-skeletons os)) + (root-file-system-service) + (service file-system-service-type '()) + (service fstab-service-type + (filter file-system-needed-for-boot? + (operating-system-file-systems os))) + (pam-root-service (operating-system-pam-services os)) (operating-system-etc-service os) (service profile-service-type (operating-system-packages os)))) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index e11055cbb8..956682357e 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -66,7 +66,23 @@ net-base inetutils less shepherd which)) (define %base-services/hurd - '()) + (list (service hurd-console-service-type + (hurd-console-configuration (hurd hurd))) + (service hurd-getty-service-type (hurd-getty-configuration + (tty "tty1"))) + (service hurd-getty-service-type (hurd-getty-configuration + (tty "tty2"))) + (service static-networking-service-type + (list (static-networking (interface "lo") + (ip "127.0.0.1") + (requirement '()) + (provision '(loopback)) + (name-servers '("10.0.2.3"))))) + (syslog-service) + (service guix-service-type + (guix-configuration + (extra-options '("--disable-chroot" + "--disable-deduplication")))))) (define %hurd-default-operating-system (operating-system -- cgit v1.2.3 From b37c544196898cc3dfa3da07ed344fbe11abc120 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 1 Jun 2020 09:46:39 +0200 Subject: hurd-boot: Further cleanup of "rc". * gnu/packages/hurd.scm (hurd-rc-script): Move implementation to ... * gnu/build/hurd-boot.scm (boot-hurd-system): ...here, new file. * gnu/build/linux-boot.scm (make-hurd-device-nodes): Move there likewise. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/build/hurd-boot.scm | 202 +++++++++++++++++++++++++++++++++++++++++++++++ gnu/build/linux-boot.scm | 48 +---------- gnu/local.mk | 1 + gnu/packages/hurd.scm | 100 +++-------------------- gnu/system/image.scm | 2 + gnu/system/vm.scm | 5 +- 6 files changed, 219 insertions(+), 139 deletions(-) create mode 100644 gnu/build/hurd-boot.scm diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm new file mode 100644 index 0000000000..729822dcbd --- /dev/null +++ b/gnu/build/hurd-boot.scm @@ -0,0 +1,202 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ludovic Courtès +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu build hurd-boot) + #:use-module (system repl error-handling) + #:autoload (system repl repl) (start-repl) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) + #:use-module (ice-9 match) + #:use-module (guix build utils) + #:use-module ((guix build syscalls) + #:hide (file-system-type)) + #:export (make-hurd-device-nodes + boot-hurd-system)) + +;;; Commentary: +;;; +;;; Utility procedures useful to boot a Hurd system. +;;; +;;; Code: + +;; XXX FIXME c&p from linux-boot.scm +(define (find-long-option option arguments) + "Find OPTION among ARGUMENTS, where OPTION is something like \"--load\". +Return the value associated with OPTION, or #f on failure." + (let ((opt (string-append option "="))) + (and=> (find (cut string-prefix? opt <>) + arguments) + (lambda (arg) + (substring arg (+ 1 (string-index arg #\=))))))) + +;; XXX FIXME c&p from guix/utils.scm +(define (readlink* file) + "Call 'readlink' until the result is not a symlink." + (define %max-symlink-depth 50) + + (let loop ((file file) + (depth 0)) + (define (absolute target) + (if (absolute-file-name? target) + target + (string-append (dirname file) "/" target))) + + (if (>= depth %max-symlink-depth) + file + (call-with-values + (lambda () + (catch 'system-error + (lambda () + (values #t (readlink file))) + (lambda args + (let ((errno (system-error-errno args))) + (if (or (= errno EINVAL)) + (values #f file) + (apply throw args)))))) + (lambda (success? target) + (if success? + (loop (absolute target) (+ depth 1)) + file)))))) + +(define* (make-hurd-device-nodes #:optional (root "/")) + "Make some of the nodes needed on GNU/Hurd." + (define (scope dir) + (string-append root (if (string-suffix? "/" root) "" "/") dir)) + + (mkdir (scope "dev")) + (for-each (lambda (file) + (call-with-output-file (scope file) + (lambda (port) + (display file port) ;avoid hard-linking + (chmod port #o666)))) + '("dev/null" + "dev/zero" + "dev/full" + "dev/random" + "dev/urandom")) + ;; Don't create /dev/console, /dev/vcs, etc.: they are created by + ;; console-run on first boot. + + (mkdir (scope "servers")) + (for-each (lambda (file) + (call-with-output-file (scope (string-append "servers/" file)) + (lambda (port) + (display file port) ;avoid hard-linking + (chmod port #o444)))) + '("startup" + "exec" + "proc" + "password" + "default-pager" + "crash-dump-core" + "kill" + "suspend")) + + (mkdir (scope "servers/socket")) + ;; Don't create /servers/socket/1 & co: runsystem does that on first boot. + + ;; TODO: Set the 'gnu.translator' extended attribute for passive translator + ;; settings? + ) + + +(define* (boot-hurd-system #:key (on-error 'debug)) + "This procedure is meant to be called from an early RC script. + +Install the relevant passive translators on the first boot. Then, run system +activation by using the kernel command-line options '--system' and '--load'; +starting the Shepherd. + +XXX TODO: see linux-boot.scm:boot-system. +XXX TODO: add proper file-system checking, mounting +XXX TODO: move bits to (new?) (hurd?) (activation?) services +XXX TODO: use settrans/setxattr instead of MAKEDEV + +" + (define translators + '(("/servers/crash-dump-core" ("/hurd/crash" "--dump-core")) + ("/servers/crash-kill" ("/hurd/crash" "--kill")) + ("/servers/crash-suspend" ("/hurd/crash" "--suspend")) + ("/servers/password" ("/hurd/password")) + ("/servers/socket/1" ("/hurd/pflocal")) + ("/servers/socket/2" ("/hurd/pfinet" "--interface" "eth0" + "--address" "10.0.2.15" ;the default QEMU guest IP + "--netmask" "255.255.255.0" + "--gateway" "10.0.2.2" + "--ipv6" "/servers/socket/16")))) + + (display "Welcome, this is GNU's early boot Guile.\n") + (display "Use '--repl' for an initrd REPL.\n\n") + + (call-with-error-handling + (lambda () + + (define (translated? node) + ;; Return true if a translator is installed on NODE. + (with-output-to-port (%make-void-port "w") + (lambda () + (with-error-to-port (%make-void-port "w") + (lambda () + (zero? (system* "showtrans" "-s" node))))))) + + (for-each (match-lambda + ((node command) + (unless (translated? node) + (mkdir-p (dirname node)) + (apply invoke "settrans" "-c" node command)))) + translators) + + (format #t "Creating essential device nodes...\n") + (with-directory-excursion "/dev" + (invoke "MAKEDEV" "--devdir=/dev" "std") + (invoke "MAKEDEV" "--devdir=/dev" "vcs") + (invoke "MAKEDEV" "--devdir=/dev" "tty1""tty2" "tty3" "tty4" "tty5" "tty6") + (invoke "MAKEDEV" "--devdir=/dev" "ptyp0" "ptyp1" "ptyp2") + (invoke "MAKEDEV" "--devdir=/dev" "console")) + + (let* ((args (command-line)) + (system (find-long-option "--system" args)) + (to-load (find-long-option "--load" args))) + + (false-if-exception (delete-file "/hurd")) + (let ((hurd/hurd (readlink* (string-append system "/profile/hurd")))) + (symlink hurd/hurd "/hurd")) + + (format #t "Starting pager...\n") + (unless (zero? (system* "/hurd/mach-defpager")) + (format #t "FAILED...Good luck!\n")) + + (cond ((member "--repl" args) + (format #t "Starting repl...\n") + (start-repl)) + (to-load + (format #t "loading '~a'...\n" to-load) + (primitive-load to-load) + (format (current-error-port) + "boot program '~a' terminated, rebooting~%" + to-load) + (sleep 2) + (reboot)) + (else + (display "no boot file passed via '--load'\n") + (display "entering a warm and cozy REPL\n") + (start-repl))))) + #:on-error on-error)) + +;;; hurd-boot.scm ends here diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index d62c670684..80fe0cfb9d 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -40,7 +40,6 @@ find-long-option find-long-options make-essential-device-nodes - make-hurd-device-nodes make-static-device-nodes configure-qemu-networking @@ -324,51 +323,6 @@ one specific hardware device. These we have to create." ;; File systems in user space (FUSE). (mknod (scope "dev/fuse") 'char-special #o666 (device-number 10 229))) -(define* (make-hurd-device-nodes #:optional (root "/")) - "Make some of the nodes needed on GNU/Hurd." - (define (scope dir) - (string-append root - (if (string-suffix? "/" root) - "" - "/") - dir)) - - (mkdir (scope "dev")) - (for-each (lambda (file) - (call-with-output-file (scope file) - (lambda (port) - (display file port) ;avoid hard-linking - (chmod port #o666)))) - '("dev/null" - "dev/zero" - "dev/full" - "dev/random" - "dev/urandom")) - ;; Don't create /dev/console, /dev/vcs, etc.: they are created by - ;; console-run on first boot. - - (mkdir (scope "servers")) - (for-each (lambda (file) - (call-with-output-file (scope (string-append "servers/" file)) - (lambda (port) - (display file port) ;avoid hard-linking - (chmod port #o444)))) - '("startup" - "exec" - "proc" - "password" - "default-pager" - "crash-dump-core" - "kill" - "suspend")) - - (mkdir (scope "servers/socket")) - ;; Don't create /servers/socket/1 & co: runsystem does that on first boot. - - ;; TODO: Set the 'gnu.translator' extended attribute for passive translator - ;; settings? - ) - (define %host-qemu-ipv4-address (inet-pton AF_INET "10.0.2.10")) @@ -610,4 +564,4 @@ upon error." (start-repl))))) #:on-error on-error)) -;;; linux-initrd.scm ends here +;;; linux-boot.scm ends here diff --git a/gnu/local.mk b/gnu/local.mk index 442e981830..b4d7ba5174 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -638,6 +638,7 @@ GNU_SYSTEM_MODULES = \ %D%/build/cross-toolchain.scm \ %D%/build/image.scm \ %D%/build/file-systems.scm \ + %D%/build/hurd-boot.scm \ %D%/build/install.scm \ %D%/build/linux-boot.scm \ %D%/build/linux-container.scm \ diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index b341683afe..d02bbe6013 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -31,6 +31,7 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) + #:use-module (gnu build hurd-boot) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages flex) @@ -312,107 +313,26 @@ Hurd-minimal package which are needed for both glibc and GCC.") (define (hurd-rc-script) "Return a script to be installed as /libexec/rc in the 'hurd' package. The script takes care of installing the relevant passive translators on the first -boot, since this cannot be done from GNU/Linux." - (define translators - '(("/servers/crash-dump-core" ("/hurd/crash" "--dump-core")) - ("/servers/crash-kill" ("/hurd/crash" "--kill")) - ("/servers/crash-suspend" ("/hurd/crash" "--suspend")) - ("/servers/password" ("/hurd/password")) - ("/servers/socket/1" ("/hurd/pflocal")) - ("/servers/socket/2" ("/hurd/pfinet" "--interface" "eth0" - "--address" "10.0.2.15" ;the default QEMU guest IP - "--netmask" "255.255.255.0" - "--gateway" "10.0.2.2" - "--ipv6" "/servers/socket/16")))) +boot, since this cannot be done from GNU/Linux. Then, it runs system +activation; starting the Shepherd." (define rc - (with-imported-modules '((guix build utils)) + (with-imported-modules '((guix build utils) + (gnu build hurd-boot) + (guix build syscalls)) #~(begin (use-modules (guix build utils) + (gnu build hurd-boot) + (guix build syscalls) (ice-9 match) (system repl repl) (srfi srfi-1) (srfi srfi-26)) - (display "Welcome, this is GNU's early boot Guile.\n") - (display "Use '--repl' for an initrd REPL.\n\n") - - ;; "@HURD@" and "@COREUTILS@" are a placeholders. + ;; "@HURD@" and "@COREUTILS@" are placeholders. (setenv "PATH" "@HURD@/bin:@HURD@/sbin:@COREUTILS@/bin") - ;; XXX FIXME c&p from linux-boot.scm - (define (find-long-option option arguments) - "Find OPTION among ARGUMENTS, where OPTION is something like \"--load\". -Return the value associated with OPTION, or #f on failure." - (let ((opt (string-append option "="))) - (and=> (find (cut string-prefix? opt <>) - arguments) - (lambda (arg) - (substring arg (+ 1 (string-index arg #\=))))))) - - (define (translated? node) - ;; Return true if a translator is installed on NODE. - (with-output-to-port (%make-void-port "w") - (lambda () - (with-error-to-port (%make-void-port "w") - (lambda () - (zero? (system* "showtrans" "-s" node))))))) - - (for-each (match-lambda - ((node command) - (unless (translated? node) - (mkdir-p (dirname node)) - (apply invoke "settrans" "-c" node command)))) - '#$translators) - - (format #t "Creating essential device nodes...\n") - (with-directory-excursion "/dev" - (invoke "MAKEDEV" "--devdir=/dev" "std") - (invoke "MAKEDEV" "--devdir=/dev" "vcs") - (invoke "MAKEDEV" "--devdir=/dev" "tty1""tty2" "tty3" "tty4" "tty5" "tty6") - (invoke "MAKEDEV" "--devdir=/dev" "ptyp0" "ptyp1" "ptyp2") - (invoke "MAKEDEV" "--devdir=/dev" "console")) - - (let* ((args (command-line)) - (system (find-long-option "--system" args)) - (to-load (find-long-option "--load" args))) - - (false-if-exception (delete-file "/hurd")) - (let ((hurd/hurd (string-append system "/profile/hurd"))) - (symlink hurd/hurd "/hurd")) - - (format #t "Starting pager...\n") - (unless (zero? (system* "/hurd/mach-defpager")) - (format #t "FAILED...Good luck!\n")) - - (cond ((member "--repl" args) - (format #t "Starting repl...\n") - (start-repl)) - (to-load - (format #t "loading '~a'...\n" to-load) - (primitive-load to-load) - (format (current-error-port) - "boot program '~a' terminated, rebooting~%" - to-load) - (let ((shepherd.conf - (if (file-exists? "/etc/shepherd.conf") - "/etc/shepherd.conf" - (let ((files (find-files "/gnu/store" ".*-shepherd.conf"))) - (and (pair? files) (car files)))))) - (unless shepherd.conf - (format #t "No shepherd.conf found, dropping to a shell...\n") - (invoke "/run/current-system/profile/bin/bash") - (reboot)) - (false-if-exception (delete-file "/var/run/shepherd/socket")) - (format #t "Starting the Shepherd... ~a\n" shepherd.conf) - (execl "/run/current-system/profile/bin/shepherd" "shepherd" - "--config" shepherd.conf)) - (sleep 2) - (reboot)) - (else - (display "no boot file passed via '--load'\n") - (display "entering a warm and cozy REPL\n") - (start-repl))))))) + (boot-hurd-system)))) ;; FIXME: We want the program to use the cross-compiled Guile when ;; cross-compiling. But why do we need to be explicit here? diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 15dac8af57..a0e6bf31f1 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -167,6 +167,7 @@ (with-imported-modules `(,@(source-module-closure '((gnu build vm) (gnu build image) + (gnu build hurd-boot) (gnu build linux-boot) (guix store database)) #:select? not-config?) @@ -174,6 +175,7 @@ #~(begin (use-modules (gnu build vm) (gnu build image) + (gnu build hurd-boot) (gnu build linux-boot) (guix store database) (guix build utils)) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 038cce19b6..686e56348d 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -344,9 +344,10 @@ system that is passed to 'populate-root-file-system'." #~(begin (use-modules (gnu build bootloader) (gnu build vm) + ((gnu build hurd-boot) + #:select (make-hurd-device-nodes)) ((gnu build linux-boot) - #:select (make-essential-device-nodes - make-hurd-device-nodes)) + #:select (make-essential-device-nodes)) (guix store database) (guix build utils) (srfi srfi-26) -- cgit v1.2.3 From 68d8c094659565fe19abc1c433a17337ce5cacb7 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 30 Apr 2020 15:40:07 +0200 Subject: gnu: services: Add %hurd-startup-service. This decouples startup of the Hurd from the "hurd" package, moving the RC script into SYSTEM. * gnu/packages/hurd.scm (hurd)[inputs]: Remove hurd-rc-script. [arguments]: Do not substitute it. Update "runsystem.sh" to parse kernel arguments and exec into --system=SYSTEM/rc. (hurd-rc-script): Move to... * gnu/services.scm (%hurd-rc-file): ...this new variable. (hurd-rc-entry): New procedure. (%hurd-startup-service): Use it in new variable. * gnu/system.scm (hurd-default-essential-services): Use it. --- gnu/build/hurd-boot.scm | 35 +++++++++++++++-------------- gnu/packages/hurd.scm | 58 ++++++++++--------------------------------------- gnu/services.scm | 35 +++++++++++++++++++++++++++++ gnu/system.scm | 1 + 4 files changed, 67 insertions(+), 62 deletions(-) diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm index 729822dcbd..09326233d2 100644 --- a/gnu/build/hurd-boot.scm +++ b/gnu/build/hurd-boot.scm @@ -153,27 +153,30 @@ XXX TODO: use settrans/setxattr instead of MAKEDEV (lambda () (with-error-to-port (%make-void-port "w") (lambda () - (zero? (system* "showtrans" "-s" node))))))) - - (for-each (match-lambda - ((node command) - (unless (translated? node) - (mkdir-p (dirname node)) - (apply invoke "settrans" "-c" node command)))) - translators) - - (format #t "Creating essential device nodes...\n") - (with-directory-excursion "/dev" - (invoke "MAKEDEV" "--devdir=/dev" "std") - (invoke "MAKEDEV" "--devdir=/dev" "vcs") - (invoke "MAKEDEV" "--devdir=/dev" "tty1""tty2" "tty3" "tty4" "tty5" "tty6") - (invoke "MAKEDEV" "--devdir=/dev" "ptyp0" "ptyp1" "ptyp2") - (invoke "MAKEDEV" "--devdir=/dev" "console")) + (zero? (system* "showtrans" "--silent" node))))))) (let* ((args (command-line)) (system (find-long-option "--system" args)) (to-load (find-long-option "--load" args))) + (format #t "Creating essential servers...\n") + (setenv "PATH" (string-append system "/profile/bin" + ":" system "/profile/sbin")) + (for-each (match-lambda + ((node command) + (unless (translated? node) + (mkdir-p (dirname node)) + (apply invoke "settrans" "--create" node command)))) + translators) + + (format #t "Creating essential device nodes...\n") + (with-directory-excursion "/dev" + (invoke "MAKEDEV" "--devdir=/dev" "std") + (invoke "MAKEDEV" "--devdir=/dev" "vcs") + (invoke "MAKEDEV" "--devdir=/dev" "tty1""tty2" "tty3" "tty4" "tty5" "tty6") + (invoke "MAKEDEV" "--devdir=/dev" "ptyp0" "ptyp1" "ptyp2") + (invoke "MAKEDEV" "--devdir=/dev" "console")) + (false-if-exception (delete-file "/hurd")) (let ((hurd/hurd (readlink* (string-append system "/profile/hurd")))) (symlink hurd/hurd "/hurd")) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index d02bbe6013..dd2d0f1b95 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -310,35 +310,6 @@ Hurd-minimal package which are needed for both glibc and GCC.") (base32 "0p2vhnc18cnbmb39vq4m7hzv4mhnm2l0a2s7gx3ar277fwng3hys")))) -(define (hurd-rc-script) - "Return a script to be installed as /libexec/rc in the 'hurd' package. The -script takes care of installing the relevant passive translators on the first -boot, since this cannot be done from GNU/Linux. Then, it runs system -activation; starting the Shepherd." - - (define rc - (with-imported-modules '((guix build utils) - (gnu build hurd-boot) - (guix build syscalls)) - #~(begin - (use-modules (guix build utils) - (gnu build hurd-boot) - (guix build syscalls) - (ice-9 match) - (system repl repl) - (srfi srfi-1) - (srfi srfi-26)) - - ;; "@HURD@" and "@COREUTILS@" are placeholders. - (setenv "PATH" "@HURD@/bin:@HURD@/sbin:@COREUTILS@/bin") - - (boot-hurd-system)))) - - ;; FIXME: We want the program to use the cross-compiled Guile when - ;; cross-compiling. But why do we need to be explicit here? - (with-parameters ((%current-target-system "i586-pc-gnu")) - (program-file "rc" rc))) - (define dde-sources ;; This is the current tip of the dde branch (let ((commit "ac1c7eb7a8b24b7469bed5365be38a968d59a136")) @@ -422,11 +393,19 @@ fsysopts / --writable # Note: this /hurd/ gets substituted settrans --create /servers/socket/1 /hurd/pflocal -echo Starting /libexec/rc ... -exec /libexec/rc \"$@\" -"))) - )) +# parse multiboot arguments +for i in \"$@\"; do + case $i in + (--system=*) + system=${i#--system=} + ;; + esac +done + +echo Starting ${system}/rc... +exec ${system}/rc \"$@\" +"))))) (add-before 'build 'set-file-names (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -502,18 +481,6 @@ exec /libexec/rc \"$@\" (mkdir-p datadir) (copy-file "unifont" (string-append datadir "/vga-system.bdf")) - #t))) - (add-after 'install 'install-rc-file - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (file (string-append out "/libexec/rc")) - (rc (assoc-ref inputs "hurd-rc")) - (coreutils (assoc-ref inputs "coreutils"))) - (delete-file file) - (copy-file rc file) - (substitute* file - (("@HURD@") out) - (("@COREUTILS@") coreutils)) #t)))) #:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") @@ -528,7 +495,6 @@ exec /libexec/rc \"$@\" (build-system gnu-build-system) (inputs `(("glibc-hurd-headers" ,glibc/hurd-headers) - ("hurd-rc" ,(hurd-rc-script)) ("libgcrypt" ,libgcrypt) ;for /hurd/random ("libdaemon" ,libdaemon) ;for /bin/console --daemonize diff --git a/gnu/services.scm b/gnu/services.scm index 63a709fc95..27e5558231 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -93,6 +93,8 @@ activation-service-type activation-service->script %linux-bare-metal-service + %hurd-rc-script + %hurd-startup-service special-files-service-type extra-special-file etc-service-type @@ -605,6 +607,39 @@ ACTIVATION-SCRIPT-TYPE." activation-service-type %linux-kernel-activation)) +(define %hurd-rc-script + ;; The RC script to be started upon boot. + (program-file "rc" + (with-imported-modules (source-module-closure + '((guix build utils) + (gnu build hurd-boot) + (guix build syscalls))) + #~(begin + (use-modules (guix build utils) + (gnu build hurd-boot) + (guix build syscalls) + (ice-9 match) + (system repl repl) + (srfi srfi-1) + (srfi srfi-26)) + (boot-hurd-system))))) + +(define (hurd-rc-entry rc) + "Return, as a monadic value, an entry for the RC script in the system +directory." + (mlet %store-monad ((rc (lower-object rc))) + (return `(("rc" ,rc))))) + +(define hurd-startup-service-type + ;; The service that creates the initial SYSTEM/rc startup file. + (service-type (name 'startup) + (extensions + (list (service-extension system-service-type hurd-rc-entry))) + (default-value %hurd-rc-script))) + +(define %hurd-startup-service + ;; The service that produces the RC script. + (service hurd-startup-service-type %hurd-rc-script)) (define special-files-service-type ;; Service to install "special files" such as /bin/sh and /usr/bin/env. diff --git a/gnu/system.scm b/gnu/system.scm index 88b208277e..21d0fbd190 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -602,6 +602,7 @@ bookkeeping." (define (hurd-default-essential-services os) (list (service system-service-type '()) %boot-service + %hurd-startup-service %activation-service %shepherd-root-service (service user-processes-service-type) -- cgit v1.2.3 From 835b3d893fa84efd49ab4dd1a34dd3cbfb8a393d Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 7 May 2020 18:25:26 +0200 Subject: gnu: guix: Update to 68d8c09465. * gnu/packages/package-management.scm (guix): Update to 1.1.0-1.68d8c09465. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 551dfc9c39..3ff61c70ab 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "d445c30ea6f9693454ca96bae9089ba8738a6f78") - (revision 7)) + (commit "68d8c094659565fe19abc1c433a17337ce5cacb7") + (revision 8)) (package (name "guix") @@ -135,7 +135,7 @@ (commit commit))) (sha256 (base32 - "17xb4chb8m7kz1dkg19lp3s21imyi6faijzzhwczgy6rq3j5pd1s")) + "1pmfvlvr9vd06zy92icc7k7llnn7lvvd4b9dbcgkl7ghplyl96qp")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From ab9e30039d9312285ea3f4ed43f81c9c2c0dae08 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 8 Jun 2020 16:49:03 +0200 Subject: syscalls: set-thread-name, thread-name: Fix thinko. * guix/build/syscalls.scm (set-thread-name, thread-name): Oops, fix thinko. --- guix/build/syscalls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 549346c5f9..85c1c45f81 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -1248,12 +1248,12 @@ bytes." (define set-thread-name (if (string-contains %host-type "linux") set-thread-name!/linux - (cute const #f))) + (const #f))) (define thread-name (if (string-contains %host-type "linux") thread-name/linux - (cute const ""))) + (const ""))) ;;; -- cgit v1.2.3 From 8176ce6fde681a94558cf4be129fa1f385010664 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 7 May 2020 18:25:26 +0200 Subject: gnu: guix: Update to ab9e30039d. * gnu/packages/package-management.scm (guix): Update to 1.1.0-1.ab9e30039d. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3ff61c70ab..b1c96f18e7 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "68d8c094659565fe19abc1c433a17337ce5cacb7") - (revision 8)) + (commit "ab9e30039d9312285ea3f4ed43f81c9c2c0dae08") + (revision 9)) (package (name "guix") @@ -135,7 +135,7 @@ (commit commit))) (sha256 (base32 - "1pmfvlvr9vd06zy92icc7k7llnn7lvvd4b9dbcgkl7ghplyl96qp")) + "0qb2haf5dyq5x1hcjyx58v455lzi6ffa68ldm0615jy25w5phmxq")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 4a6974667e838c82ae375c8b9c1b3eaca7a72ac4 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 8 Jun 2020 15:03:05 +0200 Subject: gnu: openssh: Remove exception to build without xauth for the Hurd. * gnu/packages/ssh.scm (openssh)[inputs]: Unconditionally include xauth; for the Hurd: use openssh-sans-x for now. --- gnu/packages/ssh.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 43764a8245..d42971d4f0 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -43,7 +43,6 @@ #:use-module (gnu packages groff) #:use-module (gnu packages guile) #:use-module (gnu packages libedit) - #:use-module (gnu packages hurd) #:use-module (gnu packages linux) #:use-module (gnu packages logging) #:use-module (gnu packages m4) @@ -150,9 +149,7 @@ a server that supports the SSH-2 protocol.") ("pam" ,linux-pam) ("mit-krb5" ,mit-krb5) ("zlib" ,zlib) - ,@(if (hurd-target?) - '() - `(("xauth" ,xauth))))) ; for 'ssh -X' and 'ssh -Y' + ("xauth" ,xauth))) ; for 'ssh -X' and 'ssh -Y' (arguments `(#:test-target "tests" ;; Otherwise, the test scripts try to use a nonexistent directory and -- cgit v1.2.3 From b470122f677d1d11db2e88a34eab5c257ba7b8b8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jun 2020 18:51:04 +0200 Subject: gnu: python-odfpy: Update to 1.4.1. * gnu/packages/python-xyz.scm (python-odfpy): Update to 1.4.1. [arguments]: Remove #:modules. Rewrite test phase to use pytest. [native-inputs]: Add PYTHON-PYTEST. [propagated-inputs]: Add PYTHON-DEFUSEDXML. --- gnu/packages/python-xyz.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 94e63d1c74..aaded24af3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12581,27 +12581,26 @@ discovery, monitoring and configuration.") (define-public python-odfpy (package (name "python-odfpy") - (version "1.3.3") + (version "1.4.1") (source (origin (method url-fetch) (uri (pypi-uri "odfpy" version)) (sha256 (base32 - "1a6ms0w9zfhhkqhvrnynwwbxrivw6hgjc0s5k7j06npc7rq0blxw")))) + "1v1qqk9p12qla85yscq2g413l3qasn6yr4ncyc934465b5p6lxnv")))) (arguments - `(#:modules ((srfi srfi-1) - (guix build python-build-system) - (guix build utils)) - #:phases + `(#:phases (modify-phases %standard-phases (replace 'check - ;; The test runner invokes python2 and python3 for test*.py. - ;; To avoid having both in inputs, we replicate it here. (lambda _ - (for-each (lambda (test-file) (invoke "python" test-file)) - (find-files "tests" "^test.*\\.py$")) - #t))))) + (setenv "PYTHONPATH" (string-append "./build/lib:" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv")))))) (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-defusedxml" ,python-defusedxml))) (home-page "https://github.com/eea/odfpy") (synopsis "Python API and tools to manipulate OpenDocument files") (description "Collection of libraries and utility programs written in -- cgit v1.2.3 From 59e646ab4edaa296ac1b5147f8b495f60ac2e216 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jun 2020 18:51:49 +0200 Subject: gnu: python-cssselect: Update to 1.1.0. * gnu/packages/python-web.scm (python-cssselect): Update to 1.1.0. [source]: Change to GIT-FETCH. [arguments]: Remove #:tests?. Add #:phases. [native-inputs]: Add PYTHON-LXML and PYTHON-PYTEST. [home-page]: Update to current. --- gnu/packages/python-web.scm | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 61d21418d4..c01a86935c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -796,25 +796,30 @@ ebooks, due to cssutils not receiving updates as of 1.0.2.") (define-public python-cssselect (package (name "python-cssselect") - (version "0.9.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "cssselect" version)) - (sha256 - (base32 - "1xg6gbva1yswghiycmgincv6ab4bn7hpm720ndbj40h8xycmnfvi")))) + (version "1.1.0") + (source (origin + ;; The PyPI release does not contain tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/scrapy/cssselect") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xslrnhbrmgakp4xg6k26qffay3kqffp3a2z2sk27c65rwxa79kc")))) (build-system python-build-system) (arguments - ;; tests fail with message - ;; AttributeError: 'module' object has no attribute 'tests' - `(#:tests? #f)) - (home-page - "https://pythonhosted.org/cssselect/") - (synopsis - "CSS3 selector parser and translator to XPath 1.0") + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "pytest" "-vv")))))) + (native-inputs + `(("python-lxml" ,python-lxml) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/scrapy/cssselect") + (synopsis "CSS3 selector parser and translator to XPath 1.0") (description - "Cssselect ia a Python module that parses CSS3 Selectors and translates + "Cssselect ia a Python module that parses CSS3 Selectors and translates them to XPath 1.0 expressions. Such expressions can be used in lxml or another XPath engine to find the matching elements in an XML or HTML document.") (license license:bsd-3))) -- cgit v1.2.3 From a8a7a2c7972af22457041c36c4c2b4d28621a0e0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jun 2020 18:52:29 +0200 Subject: gnu: python-netifaces: Update to 0.10.9. * gnu/packages/python-xyz.scm (python-netifaces): Update to 0.10.9. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index aaded24af3..d6165e3f3e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6921,14 +6921,14 @@ some are not yet implemented).") (define-public python-netifaces (package (name "python-netifaces") - (version "0.10.7") + (version "0.10.9") (source (origin (method url-fetch) (uri (pypi-uri "netifaces" version)) (sha256 (base32 - "1gccklrcplbbqh81g1mdgpa5y8na7kkf29cq2ka3f5a2fp5hyndx")))) + "1wxby874kcr3pp4ygzk5aiarbzhg1yi093d56s1qg4k2s7yrzvid")))) (build-system python-build-system) (home-page "https://github.com/al45tair/netifaces") (synopsis -- cgit v1.2.3 From 183858d938d60b0ba7ea0ca183f6da153a74864e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jun 2020 18:53:51 +0200 Subject: gnu: python-regex: Update to 2020.6.8. * gnu/packages/python-xyz.scm (python-regex): Update to 2020.6.8. [arguments]: New field. --- gnu/packages/python-xyz.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d6165e3f3e..abf25c6107 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15105,16 +15105,22 @@ window memory map manager.") (define-public python-regex (package (name "python-regex") - (version "2019.04.14") + (version "2020.6.8") (source (origin (method url-fetch) (uri (pypi-uri "regex" version)) (sha256 (base32 - "1a6hhfs6l6snr1z654ay6wzbmwdkmv282fzfkd5hk2d1n73y8v6m")))) - ;; TODO: Fix and enable regex_test.py tests that complain about the - ;; test.support module not existing. + "1b3k0zi1pd99q5mk7ri7vcx2y1mq5inm9hk8dryqyhrpkmh4xdp9")))) (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "python" "-c" + "from regex.test_regex import test_main; test_main()")))))) (home-page "https://bitbucket.org/mrabarnett/mrab-regex") (synopsis "Alternative regular expression module") (description "This regular expression implementation is backwards- -- cgit v1.2.3 From 087e760e293f6fe9c7d608d732576c4b559f1e2f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jun 2020 18:57:08 +0200 Subject: gnu: Add python-mechanize. * gnu/packages/python-xyz.scm (python2-mechanize): Rename to ... (python-mechanize): ... this. Update to 0.4.5. [arguments]: Remove. [propagated-inputs]: Add PYTHON-HTML5LIB. [home-page]: Update to current. [license]: Set to LICENSE:BSD-3. (python2-mechanize): Define in terms of PACKAGE-WITH-PYTHON2. --- gnu/packages/python-xyz.scm | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index abf25c6107..abf12ec4e0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1669,38 +1669,30 @@ human-friendly syntax.") (define-public python2-schedule (package-with-python2 python-schedule)) -(define-public python2-mechanize +(define-public python-mechanize (package - (name "python2-mechanize") - (version "0.2.5") + (name "python-mechanize") + (version "0.4.5") (source (origin (method url-fetch) (uri (pypi-uri "mechanize" version)) (sha256 (base32 - "0rj7r166i1dyrq0ihm5rijfmvhs8a04im28lv05c0c3v206v4rrf")))) + "1z9kqcwb8gfq2l6i42z624kxpd8692a0c8gw2x5bbm7n848w2mb3")))) (build-system python-build-system) - (arguments - `(#:python ,python-2 ; apparently incompatible with Python 3 - #:tests? #f)) - ;; test fails with message - ;; AttributeError: 'module' object has no attribute 'test_pullparser' - ;; (python-3.3.2) or - ;; AttributeError: 'module' object has no attribute 'test_urllib2_localnet' - ;; (python-2.7.5). - ;; The source code is from March 2011 and probably not up-to-date - ;; with respect to python unit tests. - (home-page "http://wwwsearch.sourceforge.net/mechanize/") + (propagated-inputs + `(("python-html5lib" ,python-html5lib))) + (home-page "https://github.com/python-mechanize/mechanize") (synopsis "Stateful programmatic web browsing in Python") (description "Mechanize implements stateful programmatic web browsing in Python, after Andy Lester’s Perl module WWW::Mechanize.") - (license (license:non-copyleft - "file://COPYING" - "See COPYING in the distribution.")))) + (license license:bsd-3))) +(define-public python2-mechanize + (package-with-python2 python-mechanize)) (define-public python-simplejson (package -- cgit v1.2.3 From 1fd2c00efbe701a81d86c254d5f4f285e63c1cde Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jun 2020 18:58:15 +0200 Subject: gnu: font-liberation: Update to 2.1.1. * gnu/packages/fonts.scm (font-liberation): Update to 2.1.1. --- gnu/packages/fonts.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 5964294202..4ed0f9a037 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -310,14 +310,14 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over (define-public font-liberation (package (name "font-liberation") - (version "2.00.5") + (version "2.1.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/liberationfonts/liberation-fonts/" - "files/2926169/liberation-fonts-ttf-" version ".tar.gz")) + "files/4743886/liberation-fonts-ttf-" version ".tar.gz")) (sha256 - (base32 "0kdjsbf0y716k1kv0i0ixdpvg7b9b8xkcsg6favaxdc7pshg0kzi")))) + (base32 "1jkg8j8jx7ffj13z5ilw7dids99dyypljm1pv06ycmghw1pw3qlf")))) (build-system font-build-system) (home-page "https://github.com/liberationfonts") (synopsis "Fonts compatible with Arial, Times New Roman, and Courier New") -- cgit v1.2.3 From 4c1ca824871d4cd28c76e1b12e04946ced31a44e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jun 2020 19:12:31 +0200 Subject: gnu: python2-pyqt: Propagate requireed inputs. * gnu/packages/qt.scm (python2-pyqt)[propagated-inputs]: Add PYTHON2-SIP and PYTHON-ENUM34. New field. --- gnu/packages/qt.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 9c1689ec8f..34a29b07af 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2130,6 +2130,9 @@ itself.") (define-public python2-pyqt (package (inherit python-pyqt) (name "python2-pyqt") + (propagated-inputs + `(("python-enum34" ,python2-enum34) + ("python-sip" ,python2-sip))) (native-inputs `(("python-sip" ,python2-sip) ("qtbase" ,qtbase))) -- cgit v1.2.3 From 5ded8494ca8aedff9432b6a2ea7ffcc0c0684325 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jun 2020 19:13:28 +0200 Subject: gnu: Add python2-pyqtwebengine. * gnu/packages/qt.scm (python2-pyqtwebengine): New public variable. --- gnu/packages/qt.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 34a29b07af..4d95563403 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2141,6 +2141,25 @@ itself.") ("python2-enum34" ,python2-enum34) ,@(alist-delete "python" (package-inputs python-pyqt)))))) +(define-public python2-pyqtwebengine + (package/inherit + python-pyqtwebengine + (name "python2-pyqtwebengine") + (native-inputs + `(("python" ,python-2) + ("python-sip" ,python2-sip) + ;; qtbase is required for qmake + ("qtbase" ,qtbase))) + (inputs + `(("python" ,python-2) + ("python-sip" ,python2-sip) + ("python-pyqt" ,python2-pyqt) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtdeclarative" ,qtdeclarative) + ("qtwebchannel" ,qtwebchannel) + ("qtwebengine" ,qtwebengine))))) + (define-public python2-pyqt-4 (package (inherit python-pyqt) (name "python2-pyqt") -- cgit v1.2.3 From 7b7b3cef7e46b8eae03fcfb397bed15727d2dff9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jun 2020 19:14:35 +0200 Subject: gnu: python-html5-parser: Update to 0.4.9. * gnu/packages/python-web.scm (python-html5-parser): Update to 0.4.9. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 510ba0931e..af414b7b62 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -577,13 +577,13 @@ and written in Python.") (define-public python-html5-parser (package (name "python-html5-parser") - (version "0.4.5") + (version "0.4.9") (source (origin (method url-fetch) (uri (pypi-uri "html5-parser" version)) (sha256 (base32 - "01mx33sx4dhl4kj6wc48nj6jz7ry60rkhjv0s6k8h5xmjf5yy0x9")))) + "13yl3vnf3sxl05m0nhpngnrz3g1jvyahd33lys3m3hfb91l8zzi5")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From d79ec4fd343bc2a72652aa3a4b4ae14bd8df88ac Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jun 2020 19:18:05 +0200 Subject: gnu: calibre: Update to 4.18.0. * gnu/packages/patches/calibre-remove-test-bs4.patch, gnu/packages/patches/calibre-msgpack-compat.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/ebook.scm (calibre): Update to 4.18.0. [source](patches): Remove obsolete patches. [source](snippet): Disable test for bundled odfpy. [inputs]: Add HUNSPELL, HYPHEN, PYTHON2-BEAUTIFULSOUP4, PYTHON2-PYQTWEBENGINE, and QTWEBENGINE. [arguments]: Add phase 'patch-more-shebangs'. Adjust configure phase to set HOME and make fonts available. Simplify one substitution, and provide the absolute file name of 'sip'. --- gnu/local.mk | 2 - gnu/packages/ebook.scm | 51 ++++++++++++++++++---- gnu/packages/patches/calibre-msgpack-compat.patch | 18 -------- gnu/packages/patches/calibre-remove-test-bs4.patch | 34 --------------- 4 files changed, 43 insertions(+), 62 deletions(-) delete mode 100644 gnu/packages/patches/calibre-msgpack-compat.patch delete mode 100644 gnu/packages/patches/calibre-remove-test-bs4.patch diff --git a/gnu/local.mk b/gnu/local.mk index 93be1dc0db..771ad59b84 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -804,9 +804,7 @@ dist_patch_DATA = \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ %D%/packages/patches/byobu-writable-status.patch \ - %D%/packages/patches/calibre-msgpack-compat.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ - %D%/packages/patches/calibre-remove-test-bs4.patch \ %D%/packages/patches/calibre-remove-test-sqlite.patch \ %D%/packages/patches/calibre-remove-test-unrar.patch \ %D%/packages/patches/casync-renameat2-declaration.patch \ diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 4243c71673..d290b19f5f 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -46,6 +46,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages javascript) #:use-module (gnu packages libusb) + #:use-module (gnu packages libreoffice) #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -82,7 +83,7 @@ (define-public calibre (package (name "calibre") - (version "3.42.0") + (version "4.18.0") (source (origin (method url-fetch) @@ -91,13 +92,18 @@ version ".tar.xz")) (sha256 (base32 - "0ymdhws3cb44p3fb24vln1wx6s7qnb8rr241jvm6qbj5rnp984dm")) - ;; Unbundle python2-odfpy. - ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html + "0w9pcfvskjh4v00vjw3i6hzrafy863pgsmmqdx4lffip3p856brw")) (modules '((guix build utils))) (snippet '(begin + ;; Unbundle python2-odfpy. (delete-file-recursively "src/odf") + ;; Disable test that attempts to load it. + (substitute* "setup/test.py" + ((".*SRC, 'odf'.*") + "")) + + ;; Remove unneeded resources. (delete-file "resources/viewer.js") (delete-file "resources/viewer.html") (delete-file "resources/mozilla-ca-certs.pem") @@ -105,8 +111,6 @@ (delete-file "resources/calibre-portable.sh") #t)) (patches (search-patches "calibre-no-updates-dialog.patch" - "calibre-msgpack-compat.patch" - "calibre-remove-test-bs4.patch" ; TODO: fix test. "calibre-remove-test-sqlite.patch" ; TODO: fix test. "calibre-remove-test-unrar.patch")))) (build-system python-build-system) @@ -115,12 +119,13 @@ ("qtbase" ,qtbase) ; for qmake ("python2-flake8" ,python2-flake8) ("xdg-utils" ,xdg-utils))) - ;; Beautifulsoup3 is bundled but obsolete and not packaged, so just leave it bundled. (inputs `(("chmlib" ,chmlib) ("fontconfig" ,fontconfig) ("font-liberation" ,font-liberation) ("glib" ,glib) + ("hunspell" ,hunspell) + ("hyphen" ,hyphen) ("icu4c" ,icu4c) ("js-mathjax" ,js-mathjax) ("libmtp" ,libmtp) @@ -132,6 +137,7 @@ ("poppler" ,poppler) ("python" ,python-2) ("python2-apsw" ,python2-apsw) + ("python2-beautifulsoup4" ,python2-beautifulsoup4) ("python2-chardet" ,python2-chardet) ("python2-cssselect" ,python2-cssselect) ("python2-css-parser" ,python2-css-parser) @@ -153,9 +159,11 @@ ("python2-pillow" ,python2-pillow) ("python2-psutil" ,python2-psutil) ("python2-pygments" ,python2-pygments) + ("python2-pyqtwebengine" ,python2-pyqtwebengine) ("python2-pyqt" ,python2-pyqt) ("python2-sip" ,python2-sip) ("python2-regex" ,python2-regex) + ("qtwebengine" ,qtwebengine) ("sqlite" ,sqlite))) (arguments `(#:python ,python-2 @@ -170,6 +178,18 @@ ;; We can't use the uninstaller in Guix. Don't build it. (("self\\.create_uninstaller()") "")) #t)) + (add-after 'patch-source-shebangs 'patch-more-shebangs + (lambda _ + ;; Patch various inline shebangs. + (substitute* '("src/calibre/gui2/preferences/tweaks.py" + "src/calibre/gui2/dialogs/custom_recipes.py" + "setup/install.py" + "setup/linux-installer.sh") + (("#!/usr/bin/env python") + (string-append "#!" (which "python"))) + (("#!/bin/sh") + (string-append "#!" (which "sh")))) + #t)) (add-after 'unpack 'dont-load-remote-icons (lambda _ (substitute* "setup/plugins_mirror.py" @@ -180,9 +200,12 @@ (lambda* (#:key inputs outputs #:allow-other-keys) (let ((podofo (assoc-ref inputs "podofo")) (pyqt (assoc-ref inputs "python2-pyqt")) + (python-sip (assoc-ref inputs "python2-sip")) (out (assoc-ref outputs "out"))) (substitute* "setup/build_environment.py" - (("sys.prefix") (string-append "'" pyqt "'"))) + (("= get_sip_dir\\(\\)") + (string-append "= '" pyqt "/share/sip'"))) + (substitute* "src/calibre/ebooks/pdf/pdftohtml.py" (("PDFTOHTML = 'pdftohtml'") (string-append "PDFTOHTML = \"" (assoc-ref inputs "poppler") @@ -195,6 +218,18 @@ (substitute* "src/calibre/linux.py" (("'~/.local/share'") "''")) + ;; 'python setup.py rapydscript' uses QtWebEngine, which + ;; needs to create temporary files in $HOME. + (setenv "HOME" "/tmp") + + ;; XXX: QtWebEngine will fail if no fonts are available. This + ;; can likely be removed when fontconfig has been patched to + ;; include TrueType fonts by default. + (symlink (string-append (assoc-ref inputs "font-liberation") + "/share/fonts") + "/tmp/.fonts") + + (setenv "SIP_BIN" (string-append python-sip "/bin/sip")) (setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo")) (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")) ;; This informs the tests we are a continuous integration diff --git a/gnu/packages/patches/calibre-msgpack-compat.patch b/gnu/packages/patches/calibre-msgpack-compat.patch deleted file mode 100644 index 9920103bea..0000000000 --- a/gnu/packages/patches/calibre-msgpack-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix deserialization with msgpack 1.0. - -Patch copied from upstream source repository: -https://github.com/kovidgoyal/calibre/commit/0ff41ac64994ec11b7859fc004c94d08769e3af3 - -diff --git a/src/calibre/utils/serialize.py b/src/calibre/utils/serialize.py -index f5d560c468..c35ae53849 100644 ---- a/src/calibre/utils/serialize.py -+++ b/src/calibre/utils/serialize.py -@@ -110,7 +110,7 @@ def msgpack_decoder(code, data): - def msgpack_loads(dump, use_list=True): - # use_list controls whether msgpack arrays are unpacked as lists or tuples - import msgpack -- return msgpack.unpackb(dump, ext_hook=msgpack_decoder, raw=False, use_list=use_list) -+ return msgpack.unpackb(dump, ext_hook=msgpack_decoder, raw=False, use_list=use_list, strict_map_key=False) - - - def json_loads(data): diff --git a/gnu/packages/patches/calibre-remove-test-bs4.patch b/gnu/packages/patches/calibre-remove-test-bs4.patch deleted file mode 100644 index 77dd45d329..0000000000 --- a/gnu/packages/patches/calibre-remove-test-bs4.patch +++ /dev/null @@ -1,34 +0,0 @@ -In my efforts to fix all Calibre tests, this test would always complain about -backports.functools_lru_cache not existing even after I packaged and added -python2-soupsieve as an input and confirmed it was in the -PYTHONPATH. Currently Calibre does not actually use it for anything other than -testing it's there, so I assume they will start using it in future Calibre -versions. - -From 2738dd42caebe55326c76922a12ba8740bdb22e7 Mon Sep 17 00:00:00 2001 -From: Brendan Tildesley -Date: Sat, 27 Apr 2019 00:42:39 +1000 -Subject: [PATCH] Remove test_bs4 - ---- - src/calibre/test_build.py | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py -index 73f1172e8c..07bdffd3e5 100644 ---- a/src/calibre/test_build.py -+++ b/src/calibre/test_build.py -@@ -73,10 +73,6 @@ class BuildTest(unittest.TestCase): - from html5_parser import parse - parse('

xxx') - -- def test_bs4(self): -- import soupsieve, bs4 -- del soupsieve, bs4 -- - def test_zeroconf(self): - if ispy3: - import zeroconf as z, ifaddr --- -2.21.0 - -- cgit v1.2.3 From 933abfba365b03a146b1898d9e785e0daf3ee317 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 8 Jun 2020 13:55:07 -0400 Subject: gnu: Blender: Update to 2.83.0. * gnu/packages/graphics.scm (blender): Update to 2.83.0. --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index b2bc63b9d0..44d78c036b 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -206,14 +206,14 @@ with the @command{autotrace} utility or as a C library, @code{libautotrace}.") (define-public blender (package (name "blender") - (version "2.82a") + (version "2.83.0") (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" "blender-" version ".tar.xz")) (sha256 (base32 - "18zbdgas6qf2kmvvlimxgnq7y9kj7hdxcgixrs6fj50x40q01q2d")))) + "07rzm4xaj94pjxy2vlqfhi1adsqpshfkrzrq8kljmcbnw22vrqhl")))) (build-system cmake-build-system) (arguments (let ((python-version (version-major+minor (package-version python)))) -- cgit v1.2.3 From 838c4b10e9905e1957a57a281152599c1cdd17ce Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 8 Jun 2020 15:37:21 -0400 Subject: gnu: opensmtpd: Patch bug in 'smtpctl encrypt'. * gnu/packages/mail.scm (opensmtpd)[phases]{fix-smtpctl-encrypt-bug}: New phase. --- gnu/packages/mail.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8337bc7808..0c683f0c92 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2322,6 +2322,13 @@ transfer protocols.") "--with-table-db") #:phases (modify-phases %standard-phases + ;; See: https://github.com/OpenSMTPD/OpenSMTPD/issues/1069. + (add-after 'unpack 'fix-smtpctl-encrypt-bug + (lambda _ + (substitute* "smtpd/smtpctl.c" + (("\"encrypt\", \"--\",") + "\"encrypt\",")) + #t)) ;; Fix some incorrectly hard-coded external tool file names. (add-after 'unpack 'patch-FHS-file-names (lambda _ -- cgit v1.2.3 From 21569e53b2fcbd00ad458898ad170be6edef315e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 2 Jun 2020 22:46:01 -0700 Subject: gnu: Add linux-libre 5.7.1. * gnu/packages/linux (deblob-scripts-5.7): New variable. (linux-libre-5.7-version): New variable. (linux-libre-5.7-pristine-source): New variable. (linux-libre-5.7-source): New variable. (linux-libre-headers-5.7): New variable. --- gnu/packages/linux.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 329bf7c327..f5329445cf 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -193,6 +193,12 @@ defconfig. Return the appropriate make target if applicable, otherwise return "deblob-check")) (sha256 deblob-check-hash)))) +(define deblob-scripts-5.7 + (linux-libre-deblob-scripts + "5.7.1" + (base32 "1c0n39wg6xij4x63ppg0m80kfcffkn3iilm3chyiix09n9g7vb78") + (base32 "02is246xaql1br3kizqicrkp982nw4gdwpn7nlzjazvsmyd1hcv2"))) + (define deblob-scripts-5.6 (linux-libre-deblob-scripts "5.6.7" @@ -370,6 +376,14 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) +(define-public linux-libre-5.7-version "5.7.1") +(define-public linux-libre-5.7-pristine-source + (let ((version linux-libre-5.7-version) + (hash (base32 "1vcxrrb2i4366iciw0mfahwbdrzmhrrsr7gi4vdkzznfv2niils0"))) + (make-linux-libre-source version + (%upstream-linux-source version hash) + deblob-scripts-5.7))) + (define-public linux-libre-5.6-version "5.6.17") (define-public linux-libre-5.6-pristine-source (let ((version linux-libre-5.6-version) @@ -446,6 +460,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (patches (append (origin-patches source) patches)))) +(define-public linux-libre-5.7-source + (source-with-patches linux-libre-5.7-pristine-source + (list %boot-logo-patch + %linux-libre-arm-export-__sync_icache_dcache-patch))) + (define-public linux-libre-5.6-source (source-with-patches linux-libre-5.6-pristine-source (list %boot-logo-patch @@ -554,6 +573,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (description "Headers of the Linux-Libre kernel.") (license license:gpl2))) +(define-public linux-libre-headers-5.7 + (make-linux-libre-headers* linux-libre-5.7-version + linux-libre-5.7-source)) + (define-public linux-libre-headers-5.6 (make-linux-libre-headers* linux-libre-5.6-version linux-libre-5.6-source)) -- cgit v1.2.3 From 637b64ce7c185891339ae8b78c020a336995b64d Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 2 Jun 2020 22:52:05 -0700 Subject: gnu: Add linux-libre-arm64-generic-5.7. * gnu/packages/linux (linux-libre-arm64-generic): New variable. --- gnu/packages/linux.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f5329445cf..dc85fe805b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -956,6 +956,18 @@ It has been modified to remove all non-free binary blobs.") ("CONFIG_RTC_DRV_RK808" . #t)) %default-extra-linux-options))) +(define-public linux-libre-arm64-generic-5.7 + (make-linux-libre* linux-libre-5.7-version + linux-libre-5.7-source + '("aarch64-linux") + #:defconfig "defconfig" + #:extra-version "arm64-generic" + #:extra-options + (append + `(;; needed to fix the RTC on rockchip platforms + ("CONFIG_RTC_DRV_RK808" . #t)) + %default-extra-linux-options))) + (define-public linux-libre-riscv64-generic (make-linux-libre* linux-libre-version linux-libre-source -- cgit v1.2.3 From 076779c4d4669c7f72c5f04b6d7ba73244478e73 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 2 Jun 2020 22:55:19 -0700 Subject: gnu: Add linux-libre-arm-generic-5.7. * gnu/packages/linux (linux-libre-arm-generic): New variable. --- gnu/packages/linux.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index dc85fe805b..19f59d219e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -894,6 +894,18 @@ It has been modified to remove all non-free binary blobs.") ("CONFIG_RTC_DRV_RK808" . #t)) %default-extra-linux-options))) +(define-public linux-libre-arm-generic-5.7 + (make-linux-libre* linux-libre-5.7-version + linux-libre-5.7-source + '("armhf-linux") + #:defconfig "multi_v7_defconfig" + #:extra-version "arm-generic" + #:extra-options + (append + `(;; needed to fix the RTC on rockchip platforms + ("CONFIG_RTC_DRV_RK808" . #t)) + %default-extra-linux-options))) + (define-public linux-libre-arm-veyron (deprecated-package "linux-libre-arm-veyron" linux-libre-arm-generic)) -- cgit v1.2.3 From c34a7dc2bb1380b3b0150f3d2fb64ca83381912c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Jun 2020 23:00:44 +0200 Subject: gnu: v4l2loopback-linux-module: Really disable tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit fdcd193744dbb92d3478c8e4e6c4f4336a872831 was a botched by-hand ‘merge’ that caused the default check phase to run, and fail. * gnu/packages/linux.scm (v4l2loopback-linux-module)[arguments]: Set #:tests? to #f. --- gnu/packages/linux.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 19f59d219e..b3329c92c6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1197,6 +1197,8 @@ supported under @file{/sys/class/backlight/}.") (base32 "1qi4l6yam8nrlmc3zwkrz9vph0xsj1cgmkqci4652mbpbzigg7vn")))) (build-system linux-module-build-system) + (arguments + `(#:tests? #f)) ; no test suite (home-page "https://github.com/umlaeute/v4l2loopback") (synopsis "Linux kernel module to create virtual V4L2 video devices") (description -- cgit v1.2.3 From 9084fc2e90bd9e0b8939f9661f0e03424290df30 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Jun 2020 23:02:57 +0200 Subject: gnu: znc: Update to 1.8.1. * gnu/packages/messaging.scm (znc): Update to 1.8.1. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 12b0cd4782..3216f0d88d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -565,14 +565,14 @@ compromised.") (define-public znc (package (name "znc") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) (uri (string-append "http://znc.in/releases/archive/znc-" version ".tar.gz")) (sha256 (base32 - "0m5xf60r40pgbg9lyk56dafxj2hj149pn2wf8vzsp8xgq4kv5zcl")))) + "0hb1v167aa6gv5bcwz352l6b8gnd74ymjw92y4x882l099hzg59i")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 5d95ac9178c2b4f5510390b0c31d440efc3c203d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 8 Jun 2020 14:16:24 +0200 Subject: maint: 'make authenticate' starts from v1.0.0. * Makefile.am (commit_v1_0_1): Remove. (commit_v1_0_0): New variable. (authenticate): Use it. --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0feb75c7c1..9cf9318e8a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -633,17 +633,17 @@ $(guix_install_go_files): install-nobase_dist_guilemoduleDATA install-data-hook: touch "$(DESTDIR)$(guileobjectdir)/guix/config.go" -# Commit corresponding to the 'v1.0.1' tag. -commit_v1_0_1 = d68de958b60426798ed62797ff7c96c327a672ac +# Commit corresponding to the 'v1.0.0' tag. +commit_v1_0_0 = 6298c3ffd9654d3231a6f25390b056483e8f407c # Authenticate the current Git checkout by checking signatures on every commit -# starting from $(commit_v1_0_1). +# starting from $(commit_v1_0_0). authenticate: guix/openpgp.go guix/git-authenticate.go guix/git.go $(AM_V_at)echo "Authenticating Git checkout..." ; \ "$(top_builddir)/pre-inst-env" $(GUILE) \ --no-auto-compile -e git-authenticate \ "$(top_srcdir)/build-aux/git-authenticate.scm" \ - "$(commit_v1_0_1)" + "$(commit_v1_0_0)" # Assuming Guix is already installed and the daemon is up and running, this # rule builds from $(srcdir), creating and building derivations. -- cgit v1.2.3 From 72357e2170e88f73c11ff089f87a744cee8606ec Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 8 Jun 2020 21:39:55 +0200 Subject: git: 'commit-difference' really excludes the ancestors of #:excluded. * guix/git.scm (commit-difference): Initialize VISITED to the closure of OLD and EXCLUDED, as written in the docstring. * tests/git.scm ("commit-difference, excluded commits"): Adjust accordingly. --- guix/git.scm | 4 +++- tests/git.scm | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index 1671f57d9f..0d8e617cc9 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -416,7 +416,9 @@ Essentially, this computes the set difference between the closure of NEW and that of OLD." (let loop ((commits (list new)) (result '()) - (visited (commit-closure old (list->setq excluded)))) + (visited (fold commit-closure + (setq) + (cons old excluded)))) (match commits (() (reverse result)) diff --git a/tests/git.scm b/tests/git.scm index 4a806abcc3..aa4f03ca62 100644 --- a/tests/git.scm +++ b/tests/git.scm @@ -119,8 +119,7 @@ (list commit3 commit4)) (lset= eq? (commit-difference commit4 commit1 (list commit3)) (list commit4)) - (lset= eq? (commit-difference commit4 commit1 (list commit5)) - (list commit2 commit3 commit4))))))) + (null? (commit-difference commit4 commit1 (list commit5)))))))) (unless (which (git-command)) (test-skip 1)) (test-equal "commit-relation" -- cgit v1.2.3 From eef859e8538a74f7dd743bf294f9c32a62a52381 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 8 Jun 2020 22:25:59 +0200 Subject: git-authenticate: 'commit-authorized-keys' properly handles orphan commits. Previously it would trigger a wrong-number-of-arguments error for 'lset-intersection'. * guix/git-authenticate.scm (commit-authorized-keys): Add case for when 'commit-parents' returns the empty list. --- guix/git-authenticate.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index 00d22ef479..c333717136 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -184,8 +184,11 @@ to remove '.guix-authorizations' file") default-authorizations) (throw key error))))) - (apply lset-intersection bytevector=? - (map commit-authorizations (commit-parents commit)))) + (match (commit-parents commit) + (() default-authorizations) + (parents + (apply lset-intersection bytevector=? + (map commit-authorizations parents))))) (define* (authenticate-commit repository commit keyring #:key (default-authorizations '())) -- cgit v1.2.3 From 535a6be2e59e02585548194ab82b80012d8a9714 Mon Sep 17 00:00:00 2001 From: Royce Strange Date: Mon, 8 Jun 2020 20:12:24 -0500 Subject: system: Fix typo that breaks grub.cfg generation. * gnu/system.scm (boot-parameters->menu-entry): Delete quote to evalutate and get kernel boot parameters. Signed-off-by: Maxim Cournoyer --- gnu/system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index 21d0fbd190..081e0f2fb3 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -400,7 +400,7 @@ The object has its kernel-arguments extended in order to make it bootable." (device (boot-parameters-store-device conf)) (device-mount-point (boot-parameters-store-mount-point conf)) (linux (and (not multiboot?) kernel)) - (linux-arguments (if (not multiboot?) ' + (linux-arguments (if (not multiboot?) (boot-parameters-kernel-arguments conf) '())) (initrd (boot-parameters-initrd conf)) -- cgit v1.2.3 From 23567138f842136f83f318b5915457af882ca38a Mon Sep 17 00:00:00 2001 From: Royce Strange Date: Mon, 8 Jun 2020 20:13:10 -0500 Subject: system: vm: Add missing imported module. * gnu/system/vm.scm (qemu-image): Import missing (gnu build hurd-boot) module. Signed-off-by: Maxim Cournoyer --- gnu/system/vm.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 686e56348d..f2b6b71b4d 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -337,6 +337,7 @@ system that is passed to 'populate-root-file-system'." (with-extensions gcrypt-sqlite3&co (with-imported-modules `(,@(source-module-closure '((gnu build vm) (gnu build bootloader) + (gnu build hurd-boot) (guix store database) (guix build utils)) #:select? not-config?) -- cgit v1.2.3 From 1b5d26c967b17b635c88a094e010cd42a9afb220 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 24 May 2020 17:06:11 +0200 Subject: doc: Add note to 'udisks-service'. * doc/guix.texi (Desktop Services): Specify how to add file-systems utilities to 'udisks-service'. --- doc/guix.texi | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 13e3c017d3..15e077a41c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -16523,9 +16523,14 @@ Possible values are: @deffn {Scheme Procedure} udisks-service [#:udisks @var{udisks}] Return a service for @uref{https://udisks.freedesktop.org/docs/latest/, -UDisks}, a @dfn{disk management} daemon that provides user interfaces with -notifications and ways to mount/unmount disks. Programs that talk to UDisks -include the @command{udisksctl} command, part of UDisks, and GNOME Disks. +UDisks}, a @dfn{disk management} daemon that provides user interfaces +with notifications and ways to mount/unmount disks. Programs that talk +to UDisks include the @command{udisksctl} command, part of UDisks, and +GNOME Disks. Note that Udisks relies on the @command{mount} command, so +it will only be able to use the file-system utilities installed in the +system profile. For example if you want to be able to mount NTFS +file-systems in read and write fashion, you'll need to have +@code{ntfs-3g} installed system-wide. @end deffn @deffn {Scheme Variable} colord-service-type -- cgit v1.2.3 From 8423c2d3097da2d9d25b6f56c1971ac7147d3ad9 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 9 Jun 2020 10:23:15 +0200 Subject: build: image: Do not call make-essential-device-nodes by default. Calling "mknod" without root permissions fails. Plus those device nodes do not appear to be needed to boot. * gnu/build/image.scm (initialize-root-partition): Do not use make-essential-device-nodes as default make-device-nodes procedure. --- gnu/build/image.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index fb85bd4bb8..893b846976 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -161,8 +161,7 @@ deduplicates files common to CLOSURE and the rest of PREFIX." references-graphs (register-closures? #t) system-directory - (make-device-nodes - make-essential-device-nodes) + make-device-nodes #:allow-other-keys) "Initialize the given ROOT directory. Use BOOTCFG and BOOTCFG-LOCATION to install the bootloader configuration. @@ -175,7 +174,8 @@ of the directory of the 'system' derivation." (populate-store references-graphs root) ;; Populate /dev. - (make-device-nodes root) + (when make-device-nodes + (make-device-nodes root)) (when register-closures? (for-each (lambda (closure) -- cgit v1.2.3 From f73ed5579157a074093bae7a2ffb59a85412be0d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 8 Jun 2020 15:14:49 +0200 Subject: installer: utils: Dump command output to syslog when testing. When debugging the installation tests, it can be very handy to be able to read "run-command" output, for instance when executing "guix system init". Introduce a new "invoke-with-log" procedure that is able to log a command standard and error outputs to the syslog. Use it, only when running the installation tests, to dump "run-command" output. * gnu/installer/utils.scm (open-pipe-with-stderr, invoke-with-log): New procedures, (invoke-log-port): new variable, (run-command): move to the end of the file and use invoke-with-log when running the installation tests. --- gnu/installer/utils.scm | 164 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 120 insertions(+), 44 deletions(-) diff --git a/gnu/installer/utils.scm b/gnu/installer/utils.scm index 5f8fe8ca01..d73698df15 100644 --- a/gnu/installer/utils.scm +++ b/gnu/installer/utils.scm @@ -22,8 +22,13 @@ #:use-module (guix build utils) #:use-module (guix i18n) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-11) + #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:use-module (ice-9 match) + #:use-module (ice-9 popen) #:use-module (ice-9 rdelim) #:use-module (ice-9 regex) #:use-module (ice-9 format) @@ -68,50 +73,6 @@ number. If no percentage is found, return #f" (and result (string->number (match:substring result 1))))) -(define* (run-command command #:key locale) - "Run COMMAND, a list of strings, in the given LOCALE. Return true if -COMMAND exited successfully, #f otherwise." - (define env (environ)) - - (define (pause) - (format #t (G_ "Press Enter to continue.~%")) - (send-to-clients '(pause)) - (environ env) ;restore environment variables - (match (select (cons (current-input-port) (current-clients)) - '() '()) - (((port _ ...) _ _) - (read-line port)))) - - (setenv "PATH" "/run/current-system/profile/bin") - - (when locale - (let ((supported? (false-if-exception - (setlocale LC_ALL locale)))) - ;; If LOCALE is not supported, then set LANGUAGE, which might at - ;; least give us translated messages. - (if supported? - (setenv "LC_ALL" locale) - (setenv "LANGUAGE" - (string-take locale - (or (string-index locale #\_) - (string-length locale))))))) - - (guard (c ((invoke-error? c) - (newline) - (format (current-error-port) - (G_ "Command failed with exit code ~a.~%") - (invoke-error-exit-status c)) - (syslog "command ~s failed with exit code ~a" - command (invoke-error-exit-status c)) - (pause) - #f)) - (syslog "running command ~s~%" command) - (apply invoke command) - (syslog "command ~s succeeded~%" command) - (newline) - (pause) - #t)) - ;;; ;;; Logging. @@ -219,3 +180,118 @@ accepting socket." (current-clients (reverse remainder)) exp) + + +;;; +;;; Run commands. +;;; + +;; XXX: This is taken from (guix build utils) and could be factorized. +(define (open-pipe-with-stderr program . args) + "Run PROGRAM with ARGS in an input pipe, but, unlike 'open-pipe*', redirect +both its standard output and standard error to the pipe. Return two value: +the pipe to read PROGRAM's data from, and the PID of the child process running +PROGRAM." + ;; 'open-pipe*' doesn't attempt to capture stderr in any way, which is why + ;; we need to roll our own. + (match (pipe) + ((input . output) + (match (primitive-fork) + (0 + (dynamic-wind + (const #t) + (lambda () + (close-port input) + (close-port (syslog-port)) + (dup2 (fileno output) 1) + (dup2 (fileno output) 2) + (apply execlp program program args)) + (lambda () + (primitive-exit 127)))) + (pid + (close-port output) + (values input pid)))))) + +(define invoke-log-port + ;; Port used by INVOKE-WITH-LOG for logging. + (make-parameter #f)) + +(define* (invoke-with-log program . args) + "Invoke PROGRAM with ARGS and log PROGRAM's standard output and standard +error to INVOKE-LOG-PORT. If PROGRAM succeeds, print nothing and return the +unspecified value; otherwise, raise a '&message' error condition with the +status code. This procedure is very similar to INVOKE/QUIET with the +noticeable difference that the program output, that can be quite heavy, is not +stored but directly sent to INVOKE-LOG-PORT if defined." + (let-values (((pipe pid) + (apply open-pipe-with-stderr program args))) + (let loop () + (match (read-line pipe) + ((? eof-object?) + (close-port pipe) + (match (waitpid pid) + ((_ . status) + (unless (zero? status) + (raise + (condition (&invoke-error + (program program) + (arguments args) + (exit-status (status:exit-val status)) + (term-signal (status:term-sig status)) + (stop-signal (status:stop-sig status))))))))) + (line + (and=> (invoke-log-port) (cut format <> "~a~%" line)) + (loop)))))) + +(define* (run-command command #:key locale) + "Run COMMAND, a list of strings, in the given LOCALE. Return true if +COMMAND exited successfully, #f otherwise." + (define env (environ)) + + (define (pause) + (format #t (G_ "Press Enter to continue.~%")) + (send-to-clients '(pause)) + (environ env) ;restore environment variables + (match (select (cons (current-input-port) (current-clients)) + '() '()) + (((port _ ...) _ _) + (read-line port)))) + + (setenv "PATH" "/run/current-system/profile/bin") + + (when locale + (let ((supported? (false-if-exception + (setlocale LC_ALL locale)))) + ;; If LOCALE is not supported, then set LANGUAGE, which might at + ;; least give us translated messages. + (if supported? + (setenv "LC_ALL" locale) + (setenv "LANGUAGE" + (string-take locale + (or (string-index locale #\_) + (string-length locale))))))) + + (guard (c ((invoke-error? c) + (newline) + (format (current-error-port) + (G_ "Command failed with exit code ~a.~%") + (invoke-error-exit-status c)) + (syslog "command ~s failed with exit code ~a" + command (invoke-error-exit-status c)) + (pause) + #f)) + (syslog "running command ~s~%" command) + ;; If there are any connected clients, assume that we are running + ;; installation tests. In that case, dump the standard and error outputs + ;; to syslog. + (let ((testing? (not (null? (current-clients))))) + (if testing? + (parameterize ((invoke-log-port (syslog-port))) + (apply invoke-with-log command)) + (apply invoke command))) + (syslog "command ~s succeeded~%" command) + (newline) + (pause) + #t)) + +;;; utils.scm ends here -- cgit v1.2.3 From 5f7c4416b5afb95ece26bdb1d000e026387d002f Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 9 Jun 2020 10:33:04 +0200 Subject: Revert "installer: utils: Dump command output to syslog when testing." This reverts commit f73ed5579157a074093bae7a2ffb59a85412be0d. This was pushed by error, as this is not reviewed yet. --- gnu/installer/utils.scm | 164 +++++++++++++----------------------------------- 1 file changed, 44 insertions(+), 120 deletions(-) diff --git a/gnu/installer/utils.scm b/gnu/installer/utils.scm index d73698df15..5f8fe8ca01 100644 --- a/gnu/installer/utils.scm +++ b/gnu/installer/utils.scm @@ -22,13 +22,8 @@ #:use-module (guix build utils) #:use-module (guix i18n) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) - #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) - #:use-module (srfi srfi-34) - #:use-module (srfi srfi-35) #:use-module (ice-9 match) - #:use-module (ice-9 popen) #:use-module (ice-9 rdelim) #:use-module (ice-9 regex) #:use-module (ice-9 format) @@ -73,6 +68,50 @@ number. If no percentage is found, return #f" (and result (string->number (match:substring result 1))))) +(define* (run-command command #:key locale) + "Run COMMAND, a list of strings, in the given LOCALE. Return true if +COMMAND exited successfully, #f otherwise." + (define env (environ)) + + (define (pause) + (format #t (G_ "Press Enter to continue.~%")) + (send-to-clients '(pause)) + (environ env) ;restore environment variables + (match (select (cons (current-input-port) (current-clients)) + '() '()) + (((port _ ...) _ _) + (read-line port)))) + + (setenv "PATH" "/run/current-system/profile/bin") + + (when locale + (let ((supported? (false-if-exception + (setlocale LC_ALL locale)))) + ;; If LOCALE is not supported, then set LANGUAGE, which might at + ;; least give us translated messages. + (if supported? + (setenv "LC_ALL" locale) + (setenv "LANGUAGE" + (string-take locale + (or (string-index locale #\_) + (string-length locale))))))) + + (guard (c ((invoke-error? c) + (newline) + (format (current-error-port) + (G_ "Command failed with exit code ~a.~%") + (invoke-error-exit-status c)) + (syslog "command ~s failed with exit code ~a" + command (invoke-error-exit-status c)) + (pause) + #f)) + (syslog "running command ~s~%" command) + (apply invoke command) + (syslog "command ~s succeeded~%" command) + (newline) + (pause) + #t)) + ;;; ;;; Logging. @@ -180,118 +219,3 @@ accepting socket." (current-clients (reverse remainder)) exp) - - -;;; -;;; Run commands. -;;; - -;; XXX: This is taken from (guix build utils) and could be factorized. -(define (open-pipe-with-stderr program . args) - "Run PROGRAM with ARGS in an input pipe, but, unlike 'open-pipe*', redirect -both its standard output and standard error to the pipe. Return two value: -the pipe to read PROGRAM's data from, and the PID of the child process running -PROGRAM." - ;; 'open-pipe*' doesn't attempt to capture stderr in any way, which is why - ;; we need to roll our own. - (match (pipe) - ((input . output) - (match (primitive-fork) - (0 - (dynamic-wind - (const #t) - (lambda () - (close-port input) - (close-port (syslog-port)) - (dup2 (fileno output) 1) - (dup2 (fileno output) 2) - (apply execlp program program args)) - (lambda () - (primitive-exit 127)))) - (pid - (close-port output) - (values input pid)))))) - -(define invoke-log-port - ;; Port used by INVOKE-WITH-LOG for logging. - (make-parameter #f)) - -(define* (invoke-with-log program . args) - "Invoke PROGRAM with ARGS and log PROGRAM's standard output and standard -error to INVOKE-LOG-PORT. If PROGRAM succeeds, print nothing and return the -unspecified value; otherwise, raise a '&message' error condition with the -status code. This procedure is very similar to INVOKE/QUIET with the -noticeable difference that the program output, that can be quite heavy, is not -stored but directly sent to INVOKE-LOG-PORT if defined." - (let-values (((pipe pid) - (apply open-pipe-with-stderr program args))) - (let loop () - (match (read-line pipe) - ((? eof-object?) - (close-port pipe) - (match (waitpid pid) - ((_ . status) - (unless (zero? status) - (raise - (condition (&invoke-error - (program program) - (arguments args) - (exit-status (status:exit-val status)) - (term-signal (status:term-sig status)) - (stop-signal (status:stop-sig status))))))))) - (line - (and=> (invoke-log-port) (cut format <> "~a~%" line)) - (loop)))))) - -(define* (run-command command #:key locale) - "Run COMMAND, a list of strings, in the given LOCALE. Return true if -COMMAND exited successfully, #f otherwise." - (define env (environ)) - - (define (pause) - (format #t (G_ "Press Enter to continue.~%")) - (send-to-clients '(pause)) - (environ env) ;restore environment variables - (match (select (cons (current-input-port) (current-clients)) - '() '()) - (((port _ ...) _ _) - (read-line port)))) - - (setenv "PATH" "/run/current-system/profile/bin") - - (when locale - (let ((supported? (false-if-exception - (setlocale LC_ALL locale)))) - ;; If LOCALE is not supported, then set LANGUAGE, which might at - ;; least give us translated messages. - (if supported? - (setenv "LC_ALL" locale) - (setenv "LANGUAGE" - (string-take locale - (or (string-index locale #\_) - (string-length locale))))))) - - (guard (c ((invoke-error? c) - (newline) - (format (current-error-port) - (G_ "Command failed with exit code ~a.~%") - (invoke-error-exit-status c)) - (syslog "command ~s failed with exit code ~a" - command (invoke-error-exit-status c)) - (pause) - #f)) - (syslog "running command ~s~%" command) - ;; If there are any connected clients, assume that we are running - ;; installation tests. In that case, dump the standard and error outputs - ;; to syslog. - (let ((testing? (not (null? (current-clients))))) - (if testing? - (parameterize ((invoke-log-port (syslog-port))) - (apply invoke-with-log command)) - (apply invoke command))) - (syslog "command ~s succeeded~%" command) - (newline) - (pause) - #t)) - -;;; utils.scm ends here -- cgit v1.2.3 From ea80cdbcea3763ded87d2fc3b5e97a427a6bb1d4 Mon Sep 17 00:00:00 2001 From: Royce Strange Date: Mon, 8 Jun 2020 21:53:30 -0500 Subject: activation: Fix function call for system activation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/build/activation.scm (boot-time-system): Evaluate the linux-command-line thunk for linux systems to boot Signed-off-by: Ludovic Courtès --- gnu/build/activation.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index b915e6bb67..4b67926e88 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -321,7 +321,7 @@ improvement." (define (boot-time-system) "Return the '--system' argument passed on the kernel command line." (find-long-option "--system" (if (string-contains %host-type "linux-gnu") - linux-command-line + (linux-command-line) (command-line)))) (define* (activate-current-system -- cgit v1.2.3 From 7a45b5d5ba892e82fba836df94a6c6889e08c959 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 5 Jun 2020 10:38:32 +0200 Subject: store: Use buffered I/O for all protocol writes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/store.scm (run-gc) Use buffered output port. (export-path) Same. (add-file-tree-to-store) Same. (set-build-options): Same. Add explicit flush. Signed-off-by: Ludovic Courtès --- guix/store.scm | 70 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/guix/store.scm b/guix/store.scm index 014d08aaec..9b3879b4a7 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018 Jan Nieuwenhuizen ;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; Copyright © 2020 Florian Pelz +;;; Copyright © 2020 Lars-Dominik Braun ;;; ;;; This file is part of GNU Guix. ;;; @@ -821,8 +822,8 @@ encoding conversion errors." (locale (false-if-exception (setlocale LC_ALL)))) ;; Must be called after `open-connection'. - (define socket - (store-connection-socket server)) + (define buffered + (store-connection-output-port server)) (unless (unspecified? use-build-hook?) (warn-about-deprecation #:use-build-hook? #f @@ -831,9 +832,9 @@ encoding conversion errors." (let-syntax ((send (syntax-rules () ((_ (type option) ...) (begin - (write-arg type option socket) + (write-arg type option buffered) ...))))) - (write-int (operation-id set-options) socket) + (write-int (operation-id set-options) buffered) (send (boolean keep-failed?) (boolean keep-going?) (boolean fallback?) (integer verbosity)) (when (< (store-connection-minor-version server) #x61) @@ -896,6 +897,7 @@ encoding conversion errors." `(("locale" . ,locale)) '())))) (send (string-pairs pairs)))) + (write-buffered-output server) (let loop ((done? (process-stderr server))) (or done? (process-stderr server))))) @@ -1108,13 +1110,14 @@ path." ;; We don't use the 'operation' macro so we can pass SELECT? to ;; 'write-file'. (record-operation 'add-to-store) - (let ((port (store-connection-socket server))) - (write-int (operation-id add-to-store) port) - (write-string basename port) - (write-int 1 port) ;obsolete, must be #t - (write-int (if recursive? 1 0) port) - (write-string hash-algo port) - (write-file file-name port #:select? select?) + (let ((port (store-connection-socket server)) + (buffered (store-connection-output-port server))) + (write-int (operation-id add-to-store) buffered) + (write-string basename buffered) + (write-int 1 buffered) ;obsolete, must be #t + (write-int (if recursive? 1 0) buffered) + (write-string hash-algo buffered) + (write-file file-name buffered #:select? select?) (write-buffered-output server) (let loop ((done? (process-stderr server))) (or done? (loop (process-stderr server)))) @@ -1220,13 +1223,14 @@ an arbitrary directory layout in the store without creating a derivation." ;; We don't use the 'operation' macro so we can use 'write-file-tree' ;; instead of 'write-file'. (record-operation 'add-to-store/tree) - (let ((port (store-connection-socket server))) - (write-int (operation-id add-to-store) port) - (write-string basename port) - (write-int 1 port) ;obsolete, must be #t - (write-int (if recursive? 1 0) port) - (write-string hash-algo port) - (write-file-tree basename port + (let ((port (store-connection-socket server)) + (buffered (store-connection-output-port server))) + (write-int (operation-id add-to-store) buffered) + (write-string basename buffered) + (write-int 1 buffered) ;obsolete, must be #t + (write-int (if recursive? 1 0) buffered) + (write-string hash-algo buffered) + (write-file-tree basename buffered #:file-type+size file-type+size #:file-port file-port #:symlink-target symlink-target @@ -1644,17 +1648,19 @@ the list of store paths to delete. IGNORE-LIVENESS? should always be #f. MIN-FREED is the minimum amount of disk space to be freed, in bytes, before the GC can stop. Return the list of store paths delete, and the number of bytes freed." - (let ((s (store-connection-socket server))) - (write-int (operation-id collect-garbage) s) - (write-int action s) - (write-store-path-list to-delete s) - (write-arg boolean #f s) ; ignore-liveness? - (write-long-long min-freed s) - (write-int 0 s) ; obsolete + (let ((s (store-connection-socket server)) + (buffered (store-connection-output-port server))) + (write-int (operation-id collect-garbage) buffered) + (write-int action buffered) + (write-store-path-list to-delete buffered) + (write-arg boolean #f buffered) ; ignore-liveness? + (write-long-long min-freed buffered) + (write-int 0 buffered) ; obsolete (when (>= (store-connection-minor-version server) 5) ;; Obsolete `use-atime' and `max-atime' parameters. - (write-int 0 s) - (write-int 0 s)) + (write-int 0 buffered) + (write-int 0 buffered)) + (write-buffered-output server) ;; Loop until the server is done sending error output. (let loop ((done? (process-stderr server))) @@ -1711,10 +1717,12 @@ is raised if the set of paths read from PORT is not signed (as per (define* (export-path server path port #:key (sign? #t)) "Export PATH to PORT. When SIGN? is true, sign it." - (let ((s (store-connection-socket server))) - (write-int (operation-id export-path) s) - (write-store-path path s) - (write-arg boolean sign? s) + (let ((s (store-connection-socket server)) + (buffered (store-connection-output-port server))) + (write-int (operation-id export-path) buffered) + (write-store-path path buffered) + (write-arg boolean sign? buffered) + (write-buffered-output server) (let loop ((done? (process-stderr server port))) (or done? (loop (process-stderr server port)))) (= 1 (read-int s)))) -- cgit v1.2.3 From dacd126640bfcc5883b0ef618b8ac7a48c1f2d92 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Sat, 6 Jun 2020 11:42:49 +0200 Subject: gnu: icedove: Update to 68.9.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnuzilla.scm (%icedove-build-id): Update. (icedove): Update version and corresponding hg changeset. Signed-off-by: Ludovic Courtès --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e00a09e989..1f5deb3302 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1135,11 +1135,11 @@ standards of the IceCat project.") (cpe-version . ,(first (string-split version #\-))))))) ;; Update this together with icecat! -(define %icedove-build-id "20200505000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20200602000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "68.8.0") + (version "68.9.0") (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1425,7 +1425,7 @@ standards of the IceCat project.") ;; in the Thunderbird release tarball. We don't use the release ;; tarball because it duplicates the Icecat sources and only adds the ;; "comm" directory, which is provided by this repository. - ,(let ((changeset "4c022a34cd5dd776671721c44db89f693f59132c")) + ,(let ((changeset "787d887f43fcbfe254ff0c9650c5517710071b74")) (origin (method hg-fetch) (uri (hg-reference @@ -1434,7 +1434,7 @@ standards of the IceCat project.") (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "0k3653ic1g5pwcmf87a95lbzjah25l9qx0r49c4j04c21069fhad"))))) + "1z1k3r1jilwmsywiyp8gh49f61cl9n085k95x7ihyld3rvgcjm9f"))))) ("autoconf" ,autoconf-2.13) ("cargo" ,rust "cargo") ("clang" ,clang) -- cgit v1.2.3 From fbc1cbb527b4c0e953d19fee537188c748621977 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 16:25:37 -0500 Subject: gnu: Add apache-thrift. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/rpc.scm (apache-thrift): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/rpc.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm index 28c61b54f9..de7d08ae4d 100644 --- a/gnu/packages/rpc.scm +++ b/gnu/packages/rpc.scm @@ -25,10 +25,16 @@ #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages adns) + #:use-module (gnu packages autotools) + #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) + #:use-module (gnu packages flex) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -192,3 +198,46 @@ browsers to backend services.") (description "This package provides a Python library for communicating with the HTTP/2-based RPC framework gRPC.") (license license:asl2.0))) + +(define-public apache-thrift + (package + (name "apache-thrift") + (version "0.13.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apache/thrift.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17ckl7p7s3ga33yrjisilsimp80ansqxl54wvpkv0j7vx2zvc13y")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f + #:configure-flags + (list (string-append "--with-boost=" + (assoc-ref %build-inputs "boost"))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("flex" ,flex) + ("bison" ,bison))) + (inputs + `(("boost" ,boost) + ("libressl" ,libressl))) + (outputs '("out" "lib" "include")) + (home-page "https://thrift.apache.org/") + (synopsis + "Lightweight, language-independent software stack for point-to-point +RPC") + (description + "Thrift provides clean abstractions and implementations for data +transport, data serialization, and application level processing. The code +generation system takes a simple definition language as input and generates +code across programming languages that uses the abstracted stack to build +interoperable RPC clients and servers.") + (license license:asl2.0))) -- cgit v1.2.3 From a50628bbe0fa4ba3835e311098e4fdf7a1d8a29e Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 16:33:36 -0500 Subject: gnu: apache-arrow: Update to 0.17.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/databases.scm (apache-arrow): Update to 0.17.1. * gnu/packages/databases.scm (python-pyarrow): Update to 0.17.1. * gnu/packages/serialization.scm (python-feather-format): Update to 0.4.1. Signed-off-by: Ludovic Courtès --- gnu/packages/databases.scm | 145 ++++++++++++++++++++++++++++------------- gnu/packages/serialization.scm | 4 +- 2 files changed, 100 insertions(+), 49 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c8cbac5a07..e0634b7aca 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -88,7 +88,9 @@ #:use-module (gnu packages language) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) + #:use-module (gnu packages logging) #:use-module (gnu packages man) + #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages parallel) @@ -98,6 +100,7 @@ #:use-module (gnu packages perl-web) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) @@ -105,6 +108,8 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages rdf) #:use-module (gnu packages readline) + #:use-module (gnu packages regex) + #:use-module (gnu packages rpc) #:use-module (gnu packages ruby) #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) @@ -3216,20 +3221,22 @@ Monitor read/write activity on a mongo server @end table") (license license:asl2.0))) +;; There are many wrappers for this in other languages. When touching, please +;; be sure to ensure all dependencies continue to build. (define-public apache-arrow (package (name "apache-arrow") - (version "0.10.0") + (version "0.17.1") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/apache/arrow") - (commit (string-append "apache-arrow-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "04xkp922b8qrrnpvv9ixxnvk7151n1plzx6aqdff6frn9651zvxs")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apache/arrow") + (commit (string-append "apache-arrow-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02r6yx3yhywzikd3b0vfkjgddhfiriyx2vpm3jf5880wq59x798a")))) (build-system cmake-build-system) (arguments `(#:tests? #f @@ -3242,91 +3249,135 @@ Monitor read/write activity on a mongo server (setenv "BOOST_ROOT" (assoc-ref %build-inputs "boost")) (setenv "BROTLI_HOME" (assoc-ref %build-inputs "brotli")) (setenv "FLATBUFFERS_HOME" (assoc-ref %build-inputs "flatbuffers")) - (setenv "JEMALLOC_HOME" (assoc-ref %build-inputs "jemalloc")) (setenv "RAPIDJSON_HOME" (assoc-ref %build-inputs "rapidjson")) #t))) #:build-type "Release" #:configure-flags (list "-DARROW_PYTHON=ON" - - ;; Install to PREFIX/lib (the default is - ;; PREFIX/lib64). - (string-append "-DCMAKE_INSTALL_LIBDIR=" - (assoc-ref %outputs "out") + "-DARROW_GLOG=ON" + ;; Parquet options + "-DARROW_PARQUET=ON" + "-DPARQUET_BUILD_EXECUTABLES=ON" + ;; The maintainers disallow using system versions of + ;; jemalloc: + ;; https://issues.apache.org/jira/browse/ARROW-3507. This + ;; is unfortunate because jemalloc increases performance: + ;; https://arrow.apache.org/blog/2018/07/20/jemalloc/. + "-DARROW_JEMALLOC=OFF" + + ;; The CMake option ARROW_DEPENDENCY_SOURCE is a global + ;; option that instructs the build system how to resolve + ;; each dependency. SYSTEM = Finding the dependency in + ;; system paths using CMake's built-in find_package + ;; function, or using pkg-config for packages that do not + ;; have this feature + "-DARROW_DEPENDENCY_SOURCE=SYSTEM" + + ;; Split output into its component packages. + (string-append "-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "lib")) + (string-append "-DCMAKE_INSTALL_RPATH=" + (assoc-ref %outputs "lib") "/lib") - - ;; XXX These Guix package offer static - ;; libraries that are not position independent, - ;; and ld fails to link them into the arrow .so - "-DARROW_WITH_SNAPPY=OFF" - "-DARROW_WITH_ZLIB=OFF" - "-DARROW_WITH_ZSTD=OFF" - "-DARROW_WITH_LZ4=OFF" + (string-append "-DCMAKE_INSTALL_BINDIR=" + (assoc-ref %outputs "out") + "/bin") + (string-append "-DCMAKE_INSTALL_INCLUDEDIR=" + (assoc-ref %outputs "include") + "/share/include") + + + "-DARROW_WITH_SNAPPY=ON" + "-DARROW_WITH_ZLIB=ON" + "-DARROW_WITH_ZSTD=ON" + "-DARROW_WITH_LZ4=ON" + "-DARROW_COMPUTE=ON" + "-DARROW_CSV=ON" + "-DARROW_DATASET=ON" + "-DARROW_FILESYSTEM=ON" + "-DARROW_HDFS=ON" + "-DARROW_JSON=ON" + ;; Arrow Python C++ integration library (required for + ;; building pyarrow). This library must be built against + ;; the same Python version for which you are building + ;; pyarrow. NumPy must also be installed. Enabling this + ;; option also enables ARROW_COMPUTE, ARROW_CSV, + ;; ARROW_DATASET, ARROW_FILESYSTEM, ARROW_HDFS, and + ;; ARROW_JSON. + "-DARROW_PYTHON=ON" ;; Building the tests forces on all the ;; optional features and the use of static ;; libraries. "-DARROW_BUILD_TESTS=OFF" + "-DBENCHMARK_ENABLE_GTEST_TESTS=OFF" + ;;"-DBENCHMARK_ENABLE_TESTING=OFF" "-DARROW_BUILD_STATIC=OFF"))) (inputs `(("boost" ,boost) - ("rapidjson" ,rapidjson) ("brotli" ,google-brotli) - ("flatbuffers" ,flatbuffers) - ("jemalloc" ,jemalloc) + ("double-conversion" ,double-conversion) + ("snappy" ,snappy) + ("gflags" ,gflags) + ("glog" ,glog) + ("apache-thrift" ,apache-thrift "lib") + ("protobuf" ,protobuf) + ("rapidjson" ,rapidjson) + ("zlib" ,zlib) + ("bzip2" ,bzip2) + ("lz4" ,lz4) + ("zstd" ,zstd "lib") + ("re2" ,re2) + ("grpc" ,grpc) ("python-3" ,python) ("python-numpy" ,python-numpy))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (outputs '("out" "lib" "include")) (home-page "https://arrow.apache.org/") (synopsis "Columnar in-memory analytics") (description "Apache Arrow is a columnar in-memory analytics layer -designed to accelerate big data. It houses a set of canonical in-memory +designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple -language-bindings for structure manipulation. It also provides IPC and common +language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.") (license license:asl2.0))) (define-public python-pyarrow (package + (inherit apache-arrow) (name "python-pyarrow") - (version "0.10.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/apache/arrow") - (commit (string-append "apache-arrow-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "04xkp922b8qrrnpvv9ixxnvk7151n1plzx6aqdff6frn9651zvxs")))) (build-system python-build-system) (arguments - '(#:tests? #f ; XXX There are no tests in the "python" directory + '(#:tests? #f ; XXX There are no tests in the "python" directory #:phases (modify-phases %standard-phases (delete 'build) ; XXX the build is performed again during the install phase (add-after 'unpack 'enter-source-directory (lambda _ (chdir "python") #t)) - (add-after 'unpack 'set-env + (add-after 'unpack 'make-git-checkout-writable (lambda _ - (setenv "ARROW_HOME" (assoc-ref %build-inputs "apache-arrow")) + (for-each make-file-writable (find-files ".")) #t))))) (propagated-inputs - `(("apache-arrow" ,apache-arrow) + `(("apache-arrow" ,apache-arrow "lib") ("python-numpy" ,python-numpy) ("python-pandas" ,python-pandas) ("python-six" ,python-six))) (native-inputs `(("cmake" ,cmake-minimal) + ("pkg-config" ,pkg-config) ("python-cython" ,python-cython) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner) ("python-setuptools-scm" ,python-setuptools-scm))) + (outputs '("out")) (home-page "https://arrow.apache.org/docs/python/") (synopsis "Python bindings for Apache Arrow") - (description "This library provides a Pythonic API wrapper for the reference -Arrow C++ implementation, along with tools for interoperability with pandas, -NumPy, and other traditional Python scientific computing packages.") + (description + "This library provides a Pythonic API wrapper for the reference Arrow C++ +implementation, along with tools for interoperability with pandas, NumPy, and +other traditional Python scientific computing packages.") (license license:asl2.0))) (define-public python2-pyarrow diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index bee7a2e917..be81715116 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -467,14 +467,14 @@ game development and other performance-critical applications.") (define-public python-feather-format (package (name "python-feather-format") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) (uri (pypi-uri "feather-format" version)) (sha256 (base32 - "1adivm5w5ji4qv7hq7942vqlk8l2wgw87bdlsia771z14z3zp857")))) + "00w9hwz7sj3fkdjc378r066vdy6lpxmn6vfac3qx956k8lvpxxj5")))) (build-system python-build-system) (propagated-inputs `(("python-pandas" ,python-pandas) -- cgit v1.2.3 From 141b5c162048f5cb52e8c90ff7c16a2e98babcfb Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 9 Jun 2020 10:44:59 +0200 Subject: gnu: emacs-helm: Update to 3.6.2. * gnu/packages/emacs-xyz.scm (emacs-helm): Update to 3.6.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b44652fbba..946d01cba5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7780,7 +7780,7 @@ ack, ag, helm and pt.") (define-public emacs-helm (package (name "emacs-helm") - (version "3.6.0") + (version "3.6.2") (source (origin (method git-fetch) @@ -7789,7 +7789,7 @@ ack, ag, helm and pt.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0miq2q52pbicijp7pmj0widk252qixswywc03d120s4hya2b7vd7")))) + (base32 "0bf2glydc0vhp52z8zg8phmsglb63nac15zd82zr35dscc50bzrb")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) -- cgit v1.2.3 From 536c53d347291dcc75e1073af6e6c5c614e0fff4 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 9 Jun 2020 14:16:59 +0200 Subject: gnu: grub: Support graphical gfxterm on all systems. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/bootloaders/grub.scm (eye-candy): Use gfxterm depending only on (bootloader-configuration (terminal-outputs …)), which defaults to '(gfxterm). This makes the system argument obsolete. Signed-off-by: Mathieu Othacehe --- gnu/bootloader/grub.scm | 47 ++++++++++++++--------------------------------- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index d4dbb57131..fa391fd6b4 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2020 Mathieu Othacehe ;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020 Stefan ;;; ;;; This file is part of GNU Guix. ;;; @@ -135,41 +136,25 @@ file with the resolution provided in CONFIG." (_ #f))))) (define* (eye-candy config store-device store-mount-point - #:key store-directory-prefix system port) + #:key store-directory-prefix port) "Return a gexp that writes to PORT (a port-valued gexp) the 'grub.cfg' part concerned with graphics mode, background images, colors, and all that. STORE-DEVICE designates the device holding the store, and STORE-MOUNT-POINT is its mount point; these are used to determine where the background image and -fonts must be searched for. SYSTEM must be the target system string---e.g., -\"x86_64-linux\". STORE-DIRECTORY-PREFIX is a directory prefix to prepend to -any store file name." - (define setup-gfxterm-body - (let ((gfxmode - (or (and-let* ((theme (bootloader-configuration-theme config)) - (gfxmode (grub-theme-gfxmode theme))) - (string-join gfxmode ";")) - "auto"))) - - ;; Intel and EFI systems need to be switched into graphics mode, whereas - ;; most other modern architectures have no other mode and therefore - ;; don't need to be switched. - - ;; XXX: Do we really need to restrict to x86 systems? We could imitate - ;; what the GRUB default configuration does and decide based on whether - ;; a user provided 'gfxterm' in the terminal-outputs field of their - ;; bootloader-configuration record. - (if (string-match "^(x86_64|i[3-6]86)-" system) - (format #f " - set gfxmode=~a - insmod all_video - insmod gfxterm~%" gfxmode) - ""))) - +fonts must be searched for. STORE-DIRECTORY-PREFIX is a directory prefix to +prepend to any store file name." (define (setup-gfxterm config font-file) (if (memq 'gfxterm (bootloader-configuration-terminal-outputs config)) - #~(format #f "if loadfont ~a; then - setup_gfxterm -fi~%" #+font-file) + #~(format #f " +if loadfont ~a; then + set gfxmode=~a + insmod all_video + insmod gfxterm +fi~%" + #$font-file + #$(string-join + (grub-theme-gfxmode (bootloader-theme config)) + ";")) "")) (define (theme-colors type) @@ -190,8 +175,6 @@ fi~%" #+font-file) (and image #~(format #$port " -function setup_gfxterm {~a} - # Set 'root' to the partition that contains /gnu/store. ~a @@ -206,7 +189,6 @@ else set menu_color_normal=cyan/blue set menu_color_highlight=white/blue fi~%" - #$setup-gfxterm-body #$(grub-root-search store-device font-file) #$(setup-gfxterm config font-file) #$(grub-setup-io config) @@ -380,7 +362,6 @@ menuentry ~s { device mount-point #:store-directory-prefix store-directory-prefix - #:system system #:port #~port))) (define keyboard-layout-config -- cgit v1.2.3 From 5648ce07ff94ce9764de358c562423960a01988f Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 7 May 2020 18:25:26 +0200 Subject: gnu: guix: Update to 141b5c1620. * gnu/packages/package-management.scm (guix): Update to 1.1.0-1.141b5c1620. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b1c96f18e7..c1e6657dff 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "ab9e30039d9312285ea3f4ed43f81c9c2c0dae08") - (revision 9)) + (commit "141b5c162048f5cb52e8c90ff7c16a2e98babcfb") + (revision 10)) (package (name "guix") @@ -135,7 +135,7 @@ (commit commit))) (sha256 (base32 - "0qb2haf5dyq5x1hcjyx58v455lzi6ffa68ldm0615jy25w5phmxq")) + "1j3vag994kj05b09a7w4lyas991a19hbbslcm9xvn5k2ilf4qskz")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From ce16b07d10ebda486d6e4cb6fd30fe797125aeac Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 9 Jun 2020 12:33:38 +0200 Subject: installer: final: Remove left-over pk call. * gnu/installer/final.scm (kill-cow-users): Remove pk call. --- gnu/installer/final.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index ece1aff95c..90c76e9d5f 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -127,7 +127,7 @@ USERS." (lambda (port) (match (string-tokenize (read-string port) %not-nul) ((argv0 _ ...) - (unless (member (pk (basename argv0)) spare) + (unless (member (basename argv0) spare) (syslog "Killing process ~a (~a)~%" pid argv0) (kill pid SIGKILL))) (_ #f)))))) -- cgit v1.2.3 From 9392652e911b3963ef0f52f39677a6fc953f1e1e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 9 Jun 2020 17:29:23 +0200 Subject: installer: final: Dump "guix system init" command output when testing. When debugging the installation tests, it can be very handy to be able to read "guix system init" command output. * gnu/installer/final.scm (install-system): Dump installation command output to the console when running the installation tests. --- gnu/installer/final.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index 90c76e9d5f..e06b104d59 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -205,7 +205,18 @@ or #f. Return #t on success and #f on failure." (lambda () (start-service 'cow-store (list (%installer-target-dir)))) (lambda () - (run-command install-command #:locale locale)) + ;; If there are any connected clients, assume that we are running + ;; installation tests. In that case, dump the standard and error + ;; outputs to syslog. + (if (not (null? (current-clients))) + (with-output-to-file "/dev/console" + (lambda () + (with-error-to-file "/dev/console" + (lambda () + (setvbuf (current-output-port) 'none) + (setvbuf (current-error-port) 'none) + (run-command install-command #:locale locale))))) + (run-command install-command #:locale locale))) (lambda () (stop-service 'cow-store) ;; Remove the store overlay created at cow-store service start. -- cgit v1.2.3 From 5681ce50745203c4ee3a469f1b9bb0a24c4090fb Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Tue, 9 Jun 2020 17:44:52 +0200 Subject: services: etc: Add '/etc/ttys' symlink for the Hurd. Reported by Vitaliy Shatrov via IRC. * gnu/system.scm (operating-system-etc-service): For the Hurd, add '/etc/ttys' symlink. This fixes terminal behavior in the console by setting TERM=hurd. --- gnu/system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index 081e0f2fb3..d51691fe76 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -847,7 +847,8 @@ fi\n"))) ,@(if sudoers `(("sudoers" ,sudoers)) '()) ,@(if hurd `(("login" ,(file-append hurd "/etc/login")) - ("motd" ,(file-append hurd "/etc/motd"))) + ("motd" ,(file-append hurd "/etc/motd")) + ("ttys" ,(file-append hurd "/etc/ttys"))) '()))))) (define %root-account -- cgit v1.2.3 From 80352a2f6878a3a51c3e26cb768b9ae3d63a5de7 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 9 Jun 2020 18:47:13 +0200 Subject: bootloader: grub: Fix cross-compilation. This is a follow-up of 536c53d347291dcc75e1073af6e6c5c614e0fff4, that do not use the native version of "font-file", breaking cross-compilation. * gnu/bootloader/grub.scm (eye-candy): Use the native version of "font-file". --- gnu/bootloader/grub.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index fa391fd6b4..b905ae360c 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -151,7 +151,7 @@ if loadfont ~a; then insmod all_video insmod gfxterm fi~%" - #$font-file + #+font-file #$(string-join (grub-theme-gfxmode (bootloader-theme config)) ";")) -- cgit v1.2.3 From d7a341f8e186279a6be11fbc25c5347d6925145f Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 11 May 2020 12:00:16 +0200 Subject: gnu: Add yml2. * gnu/packages/pep.scm: New file. * gnu/locak.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/pep.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 gnu/packages/pep.scm diff --git a/gnu/local.mk b/gnu/local.mk index b4d7ba5174..8f39c1c036 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -413,6 +413,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/pcre.scm \ %D%/packages/pdf.scm \ %D%/packages/pem.scm \ + %D%/packages/pep.scm \ %D%/packages/perl.scm \ %D%/packages/perl-check.scm \ %D%/packages/perl-compression.scm \ diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm new file mode 100644 index 0000000000..9e5be66f78 --- /dev/null +++ b/gnu/packages/pep.scm @@ -0,0 +1,49 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016, 2020 Hartmut Goebel +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages pep) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix hg-download) + #:use-module (guix build-system python) + #:use-module (gnu packages) + #:use-module (gnu packages xml)) + +(define-public yml2 + (package + (name "yml2") + (version "2.6.3") + (source (origin + (method hg-fetch) + (uri (hg-reference + (url "https://pep.foundation/dev/repos/yml2") + (changeset version))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "10jjjyq1mz18zkzvxd62aba00h69gd9cglisqcvb81j67ml2v1bx")))) + (build-system python-build-system) + (propagated-inputs + `(("python-lxml" ,python-lxml))) + (home-page "https://fdik.org/yml/") + (synopsis "Use a Domain Specific Language for XML without defining +a grammar") + (description "The YML compiler is a small Python script. It +provides the command line front end yml2c. As default, it compiles +your script and outputs to stdout, that usually is the terminal. Your +shell provides options to redirect the output into a pipe or a file.") + (license license:gpl2))) -- cgit v1.2.3 From 221c514451917caa98060cdb285454bacfc25014 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 22 May 2020 23:48:40 +0200 Subject: gnu: Add pep-engine. * gnu/packages/pep.scm (fdik-libetpan, sequoia4pEp, pep-engine): New variables. --- gnu/packages/pep.scm | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index 9e5be66f78..d7121d6dd6 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -19,9 +19,19 @@ (define-module (gnu packages pep) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix git-download) #:use-module (guix hg-download) + #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages base) + #:use-module (gnu packages linux) + #:use-module (gnu packages mail) ; for libetpan + #:use-module (gnu packages nettle) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages sequoia) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages tls) #:use-module (gnu packages xml)) (define-public yml2 @@ -47,3 +57,99 @@ provides the command line front end yml2c. As default, it compiles your script and outputs to stdout, that usually is the terminal. Your shell provides options to redirect the output into a pipe or a file.") (license license:gpl2))) + +(define fdik-libetpan + ;; pEp Engine requires libetpan with a set of patches that have not been + ;; upstreamed yet. + (let ((commit "210ba2b3b310b8b7a6ee4a4e35e50f7fa379643f") ; 2020-06-03 + (checksum "00000nij3ray7nssvq0lzb352wmnab8ffzk7dgff2c68mvjbh1l6") + (revision "5")) + (package + (inherit libetpan) + (name "fdik-libetpan") + (version (string-append "1.6-" revision "." (string-take commit 8))) + (source + (origin + (inherit (package-source libetpan)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/fdik/libetpan") + (commit commit))) + (file-name (string-append name "-" version)) + (sha256 (base32 checksum))))))) + +(define sequoia4pEp + ;; Currently pEp Engine requires sequoia in not-so-current version + (package/inherit sequoia + (name "sequoia") + (version "0.15.0-pEp") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/sequoia-pgp/sequoia.git") + (commit "0eb1b6cd846ea8c36b3dfdf01ec88383fc64f2fe"))) + (sha256 + (base32 "06dqs9whwp9lfibwp8dqm0aw4nm3s3v4jp2n4fz51zcvsld40nfh")) + (file-name (git-file-name name version)))))) + +(define-public pep-engine + (package + (name "pep-engine") + (version "2.0.6") + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://pep.foundation/dev/repos/pEpEngine") + (changeset "ebb62ba262dd"))) ;; r4721 + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "0ljf79j4ng7l8w6pbdcrfzb4yk51zslypvq0n72ib1d7grqvnagi")))) + (build-system gnu-build-system) + (arguments + '(#:parallel-build? #f + #:phases + (modify-phases %standard-phases + (replace 'configure + ;; pEpEngie does not use autotools and configure, + ;; but a local.conf. We need to tweak the values there. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (yml2 (assoc-ref inputs "yml2"))) + (with-output-to-file "local.conf" + (lambda () + (format #t " +PREFIX=~a +PER_MACHINE_DIRECTORY=${PREFIX}/share/pEp +SYSTEM_DB=~a/share/pEp/system.db +ASN1C=~a +YML2_PATH=~a +OPENPGP=SEQUOIA +" + out out (which "asn1c") + (string-append yml2 "/bin")))) + #t))) + (delete 'check) + (add-after 'install 'install-db + (lambda _ + (invoke "make" "-C" "db" "install")))))) + (native-inputs + `(("asn1c" ,asn1c) ; >= 0.9.27 + ("pkg-config" ,pkg-config) + ("yml2" ,yml2))) + (inputs + `(("libetpan" ,fdik-libetpan) + ("libiconv" ,libiconv) + ("nettle" ,nettle) + ("openssl" ,openssl) + ("sequoia" ,sequoia4pEp) + ("sqlite3" ,sqlite) + ("util-linux" ,util-linux "lib"))) ;; uuid.h + (home-page "https://pep.foundation/") + (synopsis "Library for automatic key management and encryption of +messages") + (description "The p≡p engine is the core part of p≡p (pretty Easy +privacy).") + (license ;; code: GPL 3, docs: CC-BY-SA + (list license:gpl3 license:cc-by-sa3.0)))) -- cgit v1.2.3 From cfd15d96e612d0017da2f8e515da7af1ebd65231 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 22 May 2020 23:52:43 +0200 Subject: gnu: Add libpepadapter. * gnu/packages/pep.scm (libpepadapter): New variable. --- gnu/packages/pep.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index d7121d6dd6..27993d4f1b 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -153,3 +153,44 @@ messages") privacy).") (license ;; code: GPL 3, docs: CC-BY-SA (list license:gpl3 license:cc-by-sa3.0)))) + +(define-public libpepadapter + (package + (name "libpepadapter") + (version "2.0.2") + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://pep.foundation/dev/repos/libpEpAdapter") + (changeset "e8fe371c870a"))) ;; r168 + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "1mlpavjbnmslvmr5jxcvpjgb2x40nhmxjb10hza3kn4qzj0k1pjz")))) + (build-system gnu-build-system) + (arguments + '(#:test-target "test" + #:tests? #f ;; building the tests fails + #:phases + (modify-phases %standard-phases + (replace 'configure + ;; libpEpAdapter does not use autotools and configure, + ;; but a local.conf. We need to tweak the values there. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (engine (assoc-ref inputs "pep-engine"))) + (with-output-to-file "local.conf" + (lambda _ ;() + (format #t " +PREFIX=~a +ENGINE_LIB_PATH=~a/lib +ENGINE_INC_PATH=~a/include +" out engine engine)))) + #t))))) + (inputs + `(("pep-engine" ,pep-engine))) + (home-page "https://pep.foundation/") + (synopsis "Library for building p≡p adapters") + (description "This C++ library provides common structures used in p≡p +(pretty Easy privacy) adapters.") + (license license:bsd-3))) -- cgit v1.2.3 From 9b72216630b3ba53eca1ca8031476c99c3579f34 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 22 May 2020 23:55:39 +0200 Subject: gnu: Add python-pep-adapter. * gnu/packages/pep.scm (python-pep-adapter): New variable. --- gnu/packages/pep.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index 27993d4f1b..e397cfd111 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -25,6 +25,7 @@ #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages boost) #:use-module (gnu packages linux) #:use-module (gnu packages mail) ; for libetpan #:use-module (gnu packages nettle) @@ -194,3 +195,55 @@ ENGINE_INC_PATH=~a/include (description "This C++ library provides common structures used in p≡p (pretty Easy privacy) adapters.") (license license:bsd-3))) + +(define-public python-pep-adapter + (package + (name "python-pep-adapter") + (version "2.0.5") + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://pep.foundation/dev/repos/pEpPythonAdapter") + (changeset "66df0e5b9405"))) ;; r374 + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "107i1s8jf8gyhpmqcs64q9csxa3fwc8g7s57iyccqb4czw8gph6d")))) + (build-system python-build-system) + (arguments + `(;; Adding configure-flags does not work, running `build_ext` + ;; with these flags, neither does adding the options to + ;; `setup.cfg`: Either `build` or `install` fails (since + ;; flags are given or missing), or "command 'BuildExtCommand' + ;; has no such option 'pep_engine" + ;; '(#:configure-flags + ;; (list (string-append "--with-pEp-engine=" + ;; (assoc-ref inputs "pEpEngine")) + ;; (string-append "--with-pEp-libadapter=" + ;; (assoc-ref inputs "libpEpAdapter")) + ;; ;;(string-append "--boost=" + ;; (assoc-ref inputs "boost")) not supported + ;; (string-append "--with-asn1c-share=" + ;; (assoc-ref inputs "asn1c") "/share")) + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-setup.py + (lambda _ + (substitute* "setup.py" + (("^(\\s+SYS_INCLUDES = )\\['/usr.*" _ a) + (string-append a "os.getenv('CPATH', '').split(os.pathsep)\n")) + (("^(\\s+SYS_LIB_PREFIXES = )\\['/usr.*" _ a) + (string-append a "os.getenv('LIBRARY_PATH', '').split(os.pathsep)\n")) + (("^(\\s+SYS_SHARES = )\\['/usr.*" _ a) + (string-append a "['" (assoc-ref %build-inputs "asn1c") "/share']\n"))) + #t))))) + (inputs + `(("asn1c" ,asn1c) + ("boost-python" ,boost-with-python3) + ("libpepadapter" ,libpepadapter) + ("pep-engine" ,pep-engine))) + (home-page "https://pep.foundation/") + (synopsis "Python adapter for p≡p (pretty Easy Privacy)") + (description "The p≡p Python adapter is an adaptor interface to the p≡p +(pretty Easy privacy) engine.") + (license license:gpl3))) -- cgit v1.2.3 From 3cf7088fc646e07158914dea1314151123472ec2 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 22 May 2020 23:57:12 +0200 Subject: gnu: Add java-pep-adapter. * gnu/packages/pep.scm (java-pep-adapter): New variable. --- gnu/packages/pep.scm | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index e397cfd111..2bcedf9979 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -26,6 +26,8 @@ #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages boost) + #:use-module (gnu packages documentation) + #:use-module (gnu packages java) #:use-module (gnu packages linux) #:use-module (gnu packages mail) ; for libetpan #:use-module (gnu packages nettle) @@ -247,3 +249,101 @@ ENGINE_INC_PATH=~a/include (description "The p≡p Python adapter is an adaptor interface to the p≡p (pretty Easy privacy) engine.") (license license:gpl3))) + +(define-public java-pep-adapter + (package + (name "java-pep-adapter") + (version "2.0.5") + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://pep.foundation/dev/repos/pEpJNIAdapter") + (changeset "534537c9cd50"))) ;; r763 + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "107ldpssc80bq8kndn2n000000gphj4lqagaiv3fddlfph4vji48")))) + (build-system gnu-build-system) + (outputs '("out" "doc")) + (arguments + `(#:test-target "test" + #:make-flags (list "doxy-all") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-includes + (lambda _ + (substitute* "src/jniutils.hh" + (("#pragma once\n" line) + (string-append line + "#include \n" + "#include \n" + "#include \n"))) + #t)) + (add-before 'configure 'pin-shared-lib-path + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/foundation/pEp/jniadapter/AbstractEngine.java" + (("System.loadLibrary\\(\"pEpJNI\"\\);") + (string-append "System.load(\"" + (assoc-ref outputs "out") + "/lib/libpEpJNI.so" "\");"))) + #t)) + (replace 'configure + ;; pEpJNIAdapter does not use autotools and configure, + ;; but a local.conf. We need to tweak the values there. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (engine (assoc-ref inputs "pep-engine")) + (libadapter (assoc-ref inputs "libpepadapter")) + (openjdk (assoc-ref inputs "openjdk"))) + (with-output-to-file "local.conf" + (lambda _ ;() + (format #t " +PREFIX=~a +ENGINE_LIB_PATH=~a/lib +ENGINE_INC_PATH=~a/include +AD_LIB_PATH=~a/lib +AD_INC_PATH=~a/include +YML2_PROC=~a +JAVA_HOME=~a +" + out engine engine libadapter libadapter + (which "yml2proc") openjdk))) + (substitute* "src/Makefile" ;; suppress some warnings + (("^\\s+OLD_JAVA=") " xxx_OLD_JAVA=")) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libout (string-append out "/lib/")) + (javaout (string-append out "/share/java/"))) + (mkdir-p libout) + (mkdir-p javaout) + (copy-file "src/libpEpJNI.so" + (string-append libout "/libpEpJNI.so")) + (copy-file "src/pEp.jar" (string-append javaout "/pEp.jar")) + #t))) + (add-after 'install 'install-docs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "doc")) + (docout (string-append out "/share/doc/pEp-JNI-adapter")) + (cxxout (string-append docout "/cxx")) + (javaout (string-append docout "/java"))) + (mkdir-p cxxout) + (mkdir-p javaout) + (copy-recursively "doc/doxygen/cxx/html" cxxout) + (copy-recursively "doc/doxygen/java/html" javaout) + #t)))))) + (native-inputs + `(("doxygen" ,doxygen) + ("openjdk" ,openjdk9 "jdk") + ("which" ,which) + ("yml2" ,yml2))) + (inputs + `(("libpepadapter" ,libpepadapter) + ("pep-engine" ,pep-engine) + ("util-linux" ,util-linux))) ;; uuid.h + (home-page "https://pep.foundation/") + (synopsis "Java adapter for p≡p (pretty Easy Privacy)") + (description "The p≡p JNI adapter is a Java adapter interface to the p≡p +(pretty Easy privacy) engine.") + (license license:gpl3))) -- cgit v1.2.3 From 2e08394b3c64ad77cebb94f54677130e4fdaf9e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jun 2020 21:13:46 +0200 Subject: import: stackage: Fix typo. * guix/import/stackage.scm (latest-lts-release): Fix spelling of "included". --- guix/import/stackage.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index 14150201b5..9572f8c26d 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -122,7 +122,7 @@ included in the Stackage LTS release." (let ((pkgs-info (mlambda () (lts-info-packages (stackage-lts-info-fetch))))) (lambda* (package) "Return an for the latest Stackage LTS release of -PACKAGE or #f it the package is not inlucded in the Stackage LTS release." +PACKAGE or #f it the package is not included in the Stackage LTS release." (let* ((hackage-name (guix-package->hackage-name package)) (version (lts-package-version (pkgs-info) hackage-name)) (name-version (hackage-name-version hackage-name version))) -- cgit v1.2.3 From d32a3b395c4b9926316779aecec4e5e02ad571ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jun 2020 20:27:09 +0200 Subject: gnu: x265: Disable assembly optimizations on i686-linux. Fixes . * gnu/packages/video.scm (x265)[native-inputs]: Conditionally add NASM. --- gnu/packages/video.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c822075c57..18244c368a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -625,7 +625,11 @@ available.") (delete-file-recursively "source/compat/getopt") #t)))) (build-system cmake-build-system) - (native-inputs `(("nasm" ,nasm))) + (native-inputs + ;; XXX: ASM optimization fails on i686-linux, see . + (if (string-prefix? "i686" (%current-system)) + '() + `(("nasm" ,nasm)))) (arguments `(#:tests? #f ; tests are skipped if cpu-optimized code isn't built #:configure-flags -- cgit v1.2.3 From c178d5fa5a2cfc07f4a9ab9cadeb6218d6c64839 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jun 2020 20:45:33 +0200 Subject: gnu: Remove ganv-devel. * gnu/packages/gtk.scm (ganv-devel): Remove variable. * gnu/packages/music.scm (ingen)[inputs]: Change from GANV-DEVEL to GANV. --- gnu/packages/gtk.scm | 18 ------------------ gnu/packages/music.scm | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index eb1984fb20..0efbc3b3c6 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -353,24 +353,6 @@ graph-like environments, e.g. modular synths or finite state machine diagrams.") (license license:gpl3+))) -(define-public ganv-devel - (let ((commit "12f7d6b0438c94dd87f773a92eee3453d971846e") - (revision "1")) - (package - (inherit ganv) - (name "ganv") - (version (string-append "1.5.4-" revision "." - (string-take commit 9))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.drobilla.net/ganv.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1cr8w02lr6bk9mkxa12j3imq721b2an2yn4bj5wnwmpm91ddn2gi"))))))) - (define-public gtksourceview-2 (package (name "gtksourceview") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a26c4fc250..f22207579f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3691,7 +3691,7 @@ plugins, a switch trigger, a toggle switch, and a peakmeter.") ("lv2" ,lv2) ("lilv" ,lilv) ("raul" ,raul-devel) - ("ganv" ,ganv-devel) + ("ganv" ,ganv) ("suil" ,suil) ("serd" ,serd) ("sord" ,sord) -- cgit v1.2.3 From 152d50d903003e2e88ba6064d09a5ec1a0a7fc34 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 4 Jun 2020 17:30:01 -0500 Subject: gnu: Add sbcl-clx-xembed. * gnu/packages/lisp-xyz.scm (sbcl-clx-xembed, cl-clx-xembed, ecl-clx-xembed): New variables. Signed-off-by: Oleg Pykhalov --- gnu/packages/lisp-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0bf2dec44d..025d1bc9ef 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11567,6 +11567,38 @@ accompaniment to the standard ANSI facilities.") (define-public cl-osicat (sbcl-package->cl-source-package sbcl-osicat)) +(define-public sbcl-clx-xembed + (let ((commit "a5c4b844d31ee68ffa58c933cc1cdddde6990743") + (revision "1")) + (package + (name "sbcl-clx-xembed") + (version (git-version "0.1" revision commit)) + (home-page "https://github.com/laynor/clx-xembed") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/laynor/clx-xembed.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1abx4v36ycmfjdwpjk4hh8058ya8whwia7ds9vd96q2qsrs57f12")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:asd-system-name "xembed")) + (inputs + `(("sbcl-clx" ,sbcl-clx))) + (synopsis "CL(x) xembed protocol implementation ") + (description "CL(x) xembed protocol implementation") + ;; MIT License + (license license:expat)))) + +(define-public cl-clx-xembed + (sbcl-package->cl-source-package sbcl-clx-xembed)) + +(define-public ecl-clx-xembed + (sbcl-package->ecl-package sbcl-clx-xembed)) + (define-public sbcl-quantile-estimator (package (name "sbcl-quantile-estimator") -- cgit v1.2.3 From 81b045e149daffd113208601b764fdb47cf6c14b Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 4 Jun 2020 17:32:55 -0500 Subject: gnu: stumpwm: Update contrib module package names. This also causes the contribution modules to inherit from a common base. * gnu/packages/wm.scm (stumpish, sbcl-stumpwm-ttf-fonts, sbcl-stumpwm-pass, sbcl-stumpwm-globalwindows, sbcl-stumpwm-swm-gaps): Bring package name in line with the Guix symbol name. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 220 ++++++++++++++++++++++------------------------------ 1 file changed, 91 insertions(+), 129 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 06d28e30c1..daeddc3c0f 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1660,11 +1660,11 @@ productive, customizable lisp based systems.") (delete 'cleanup) (delete 'create-symlinks))))))) -(define-public stumpish - (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") +(define stumpwm-contrib + (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d63") (revision "2")) (package - (name "stumpish") + (name "stumpwm-contrib") (version (git-version "0.0.1" revision commit)) ;no upstream release (source (origin @@ -1672,154 +1672,116 @@ productive, customizable lisp based systems.") (uri (git-reference (url "https://github.com/stumpwm/stumpwm-contrib.git") (commit commit))) - (file-name (git-file-name name version)) (sha256 (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) + (build-system asdf-build-system/sbcl) (inputs - `(("bash" ,bash) - ("rlwrap" ,rlwrap))) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (copy-recursively (assoc-ref %build-inputs "source") ".") - (chdir "util/stumpish") - (substitute* "stumpish" - (("rlwrap") (string-append (assoc-ref %build-inputs "rlwrap") - "/bin/rlwrap")) - (("/bin/sh") (string-append (assoc-ref %build-inputs "bash") - "/bin/bash"))) - (install-file "stumpish" (string-append %output "/bin"))))) + `(("stumpwm" ,stumpwm "lib"))) (home-page "https://github.com/stumpwm/stumpwm-contrib") (synopsis "StumpWM interactive shell") (description "This package provides a StumpWM interactive shell.") (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) +(define-public stumpish + (package + (inherit stumpwm-contrib) + (name "stumpish") + (inputs + `(("bash" ,bash) + ("rlwrap" ,rlwrap))) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build utils)) + #:tests? #f + #:builder + (begin + (use-modules (guix build utils)) + (copy-recursively (assoc-ref %build-inputs "source") ".") + (chdir "util/stumpish") + (substitute* "stumpish" + (("rlwrap") (string-append (assoc-ref %build-inputs "rlwrap") + "/bin/rlwrap")) + (("/bin/sh") (string-append (assoc-ref %build-inputs "bash") + "/bin/bash"))) + (install-file "stumpish" (string-append %output "/bin"))))) + (home-page "https://github.com/stumpwm/stumpwm-contrib") + (synopsis "StumpWM interactive shell") + (description "This package provides a StumpWM interactive shell.") + (license (list license:gpl2+ license:gpl3+ license:bsd-2)))) + (define-public sbcl-stumpwm+slynk (deprecated-package "sbcl-stumpwm-with-slynk" stumpwm+slynk)) (define-public sbcl-stumpwm-ttf-fonts - (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") - (revision "2")) - (package - (name "sbcl-ttf-fonts") - (version (git-version "0.0.1" revision commit)) ;no upstream release - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stumpwm/stumpwm-contrib.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) - (inputs - `(("stumpwm" ,stumpwm "lib") - ("clx-truetype" ,sbcl-clx-truetype))) - (build-system asdf-build-system/sbcl) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "util/ttf-fonts")))))) - (home-page "https://github.com/stumpwm/stumpwm-contrib") - (synopsis "Implementation of TTF font rendering for Lisp") - (description "This package provides a Lisp implementation of TTF font + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-ttf-fonts") + (inputs + `(("stumpwm" ,stumpwm "lib") + ("clx-truetype" ,sbcl-clx-truetype))) + (arguments + '(#:asd-system-name "ttf-fonts" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "util/ttf-fonts") #t))))) + (home-page "https://github.com/stumpwm/stumpwm-contrib") + (synopsis "Implementation of TTF font rendering for Lisp") + (description "This package provides a Lisp implementation of TTF font rendering.") - (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) + (license (list license:gpl2+ license:gpl3+ license:bsd-2)))) (define-public sbcl-stumpwm-pass - (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") - (revision "2")) - (package - (name "sbcl-pass") - (version (git-version "0.0.1" revision commit)) ;no upstream release - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stumpwm/stumpwm-contrib.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) - (inputs - `(("stumpwm" ,stumpwm "lib"))) - (build-system asdf-build-system/sbcl) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "util/pass")))))) - (home-page "https://github.com/stumpwm/stumpwm-contrib") - (synopsis "Integrate @code{pass} wih StumpWM") - (description "This package provides an interface which integrates + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-pass") + (arguments + '(#:asd-system-name "pass" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "util/pass") #t))))) + (home-page "https://github.com/stumpwm/stumpwm-contrib") + (synopsis "Integrate @code{pass} wih StumpWM") + (description "This package provides an interface which integrates password-store into StumpWM.") - (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) + (license (list license:gpl2+ license:gpl3+ license:bsd-2)))) (define-public sbcl-stumpwm-globalwindows - (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") - (revision "2")) - (package - (name "sbcl-globalwindows") - (version (git-version "0.0.1" revision commit)) ;no upstream release - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stumpwm/stumpwm-contrib.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) - (inputs - `(("stumpwm" ,stumpwm "lib"))) - (build-system asdf-build-system/sbcl) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "util/globalwindows")))))) - (home-page "https://github.com/stumpwm/stumpwm-contrib") - (synopsis "Manipulate all windows in the current X session") - (description "This package provides a StumpWM module to manipulate all + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-globalwindows") + (arguments + '(#:asd-system-name "globalwindows" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "util/globalwindows") #t))))) + (home-page "https://github.com/stumpwm/stumpwm-contrib") + (synopsis "Manipulate all windows in the current X session") + (description "This package provides a StumpWM module to manipulate all windows in the current X session.") - (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) + (license (list license:gpl2+ license:gpl3+ license:bsd-2)))) (define-public sbcl-stumpwm-swm-gaps - (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") - (revision "2")) - (package - (name "sbcl-swm-gaps") - (version (git-version "0.0.1" revision commit)) ;no upstream release - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stumpwm/stumpwm-contrib.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) - (inputs - `(("stumpwm" ,stumpwm "lib"))) - (build-system asdf-build-system/sbcl) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "util/swm-gaps")))))) - (home-page "https://github.com/stumpwm/stumpwm-contrib") - (synopsis "Gaps between windows for StumpWM") - (description "This package provides a StumpWM module which adds gaps + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-swm-gaps") + (arguments + '(#:asd-system-name "swm-gaps" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "util/swm-gaps") #t))))) + (home-page "https://github.com/stumpwm/stumpwm-contrib") + (synopsis "Gaps between windows for StumpWM") + (description "This package provides a StumpWM module which adds gaps between windows.") - (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) + (license (list license:gpl2+ license:gpl3+ license:bsd-2)))) (define-public lemonbar (let ((commit "35183ab81d2128dbb7b6d8e119cc57846bcefdb4") -- cgit v1.2.3 From ea94e4d38eec38ead58492907a2b14321e986bd1 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 4 Jun 2020 17:40:56 -0500 Subject: gnu: Add sbcl-stumpwm-net. * gnu/packages/wm.scm (sbcl-stumpwm-net): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index daeddc3c0f..6165c805da 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1783,6 +1783,24 @@ windows in the current X session.") between windows.") (license (list license:gpl2+ license:gpl3+ license:bsd-2)))) +(define-public sbcl-stumpwm-net + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-net") + (arguments + '(#:asd-system-name "net" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir (lambda _ (chdir "modeline/net") #t))))) + (home-page + "https://github.com/stumpwm/stumpwm-contrib/tree/master/modeline/net") + (synopsis "Modeline support for network connectivity") + (description "Modeline support for network connectivity.") + (supported-systems + (filter (lambda (a) (string-contains a "linux")) %supported-systems)) + (license license:gpl3+))) + (define-public lemonbar (let ((commit "35183ab81d2128dbb7b6d8e119cc57846bcefdb4") (revision "1")) -- cgit v1.2.3 From 86ee8d15aa4950b52a148153e8fa0eeb826afdec Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 4 Jun 2020 17:41:21 -0500 Subject: gnu: Add sbcl-stumpwm-wifi. * gnu/packages/wm.scm (sbcl-stumpwm-wifi): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 6165c805da..b1747d6c58 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1801,6 +1801,24 @@ between windows.") (filter (lambda (a) (string-contains a "linux")) %supported-systems)) (license license:gpl3+))) +(define-public sbcl-stumpwm-wifi + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-wifi") + (arguments + '(#:asd-system-name "wifi" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir (lambda _ (chdir "modeline/wifi") #t))))) + (home-page + "https://github.com/stumpwm/stumpwm-contrib/tree/master/modeline/wifi") + (synopsis "Modeline support for wifi connectivity") + (description "Modeline support for wifi connectivity.") + (supported-systems + (filter (lambda (a) (string-contains a "linux")) %supported-systems)) + (license license:gpl3+))) + (define-public lemonbar (let ((commit "35183ab81d2128dbb7b6d8e119cc57846bcefdb4") (revision "1")) -- cgit v1.2.3 From 1afe58e47f181729d06f44f127468ea05a28d035 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 4 Jun 2020 17:41:43 -0500 Subject: gnu: Add sbcl-stumpwm-stumptray. * gnu/packages/wm.scm (sbcl-stumpwm-stumptray): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index b1747d6c58..723c0dda1f 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1819,6 +1819,28 @@ between windows.") (filter (lambda (a) (string-contains a "linux")) %supported-systems)) (license license:gpl3+))) +(define-public sbcl-stumpwm-stumptray + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-stumptray") + (arguments + '(#:asd-system-name "stumptray" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir (lambda _ (chdir "modeline/stumptray") #t))))) + (inputs + `(("stumpwm" ,stumpwm "lib") + ("xembed" ,sbcl-clx-xembed) + ("alexandria" ,sbcl-alexandria))) + (home-page + "https://github.com/stumpwm/stumpwm-contrib/tree/master/modeline/stumptray") + (synopsis "Modeline support for stumptray connectivity") + (description "Modeline support for stumptray connectivity.") + (supported-systems + (filter (lambda (a) (string-contains a "linux")) %supported-systems)) + (license license:gpl3+))) + (define-public lemonbar (let ((commit "35183ab81d2128dbb7b6d8e119cc57846bcefdb4") (revision "1")) -- cgit v1.2.3 From b70e612b9a1d1943dfed2a7b27af37deb10a83ca Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 4 Jun 2020 17:41:53 -0500 Subject: gnu: Add sbcl-stumpwm-kbd-layouts. * gnu/packages/wm.scm (sbcl-stumpwm-kbd-layouts): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 723c0dda1f..46ac1dcadc 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1841,6 +1841,22 @@ between windows.") (filter (lambda (a) (string-contains a "linux")) %supported-systems)) (license license:gpl3+))) +(define-public sbcl-stumpwm-kbd-layouts + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-kbd-layouts") + (arguments + '(#:asd-system-name "kbd-layouts" + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir (lambda _ (chdir "util/kbd-layouts") #t))))) + (home-page + "https://github.com/stumpwm/stumpwm-contrib/tree/master/util/kbd-layouts") + (synopsis "Keyboard layout switcher for StumpWM") + (description "Keyboard layout switcher for StumpWM") + (license license:gpl3+))) + (define-public lemonbar (let ((commit "35183ab81d2128dbb7b6d8e119cc57846bcefdb4") (revision "1")) -- cgit v1.2.3 From 35b00d4caa798ca03a0d4c01ca02c656590ccaa5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 22:29:38 +0200 Subject: import: stackage: Fix typo. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/import/stackage.scm (latest-lts-release): Fix spelling of ‘if’. --- guix/import/stackage.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index 9572f8c26d..e04073d193 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -122,7 +122,7 @@ included in the Stackage LTS release." (let ((pkgs-info (mlambda () (lts-info-packages (stackage-lts-info-fetch))))) (lambda* (package) "Return an for the latest Stackage LTS release of -PACKAGE or #f it the package is not included in the Stackage LTS release." +PACKAGE or #f if the package is not included in the Stackage LTS release." (let* ((hackage-name (guix-package->hackage-name package)) (version (lts-package-version (pkgs-info) hackage-name)) (name-version (hackage-name-version hackage-name version))) -- cgit v1.2.3 From 14adb59ab0ff4aa44ee949a0b0626a8e88037df2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 15:00:23 +0200 Subject: gnu: borg: Update to 1.1.13. * gnu/packages/backup.scm (borg): Update to 1.1.13. [arguments]: Skip a new FUSE test. --- gnu/packages/backup.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 950dbc55ff..74acd791ac 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -563,14 +563,13 @@ detection, and lossless compression.") (define-public borg (package (name "borg") - (version "1.1.11") + (version "1.1.13") (source (origin (method url-fetch) (uri (pypi-uri "borgbackup" version)) (sha256 - (base32 - "190gjzx83b6p64nqj840x382dgz9gfv0gm7wj585lnkrpa90j29n")) + (base32 "089q3flmwbz7dc28zlscwylf64kgck3jf1n6lqpwww8hlrk8cjhn")) (modules '((guix build utils))) (snippet '(begin @@ -653,7 +652,8 @@ detection, and lossless compression.") ;; These tests assume the kernel supports FUSE. "and not test_fuse " "and not test_fuse_allow_damaged_files " - "and not test_mount_hardlinks"))))) + "and not test_mount_hardlinks " + "and not test_readonly_mount "))))) (add-after 'install 'install-doc (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 3320966068027c8a61faf3202074dd6fe306ab62 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 15:00:40 +0200 Subject: gnu: singular: Update to 4.1.3p2. * gnu/packages/algebra.scm (singular): Update to 4.1.3p2. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 1008d24cd3..b78e6ef304 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -609,7 +609,7 @@ matrices, and polynomials over the integers and over finite fields.") (define-public singular (package (name "singular") - (version "4.1.3p1") + (version "4.1.3p2") (source (origin (method url-fetch) @@ -623,7 +623,7 @@ matrices, and polynomials over the integers and over finite fields.") #\.) "-") "/singular-" version ".tar.gz")) (sha256 (base32 - "1f02mrjwh7pd3pydfvjxsw5rph2qmkg1idwqrdsax924sa77sljw")))) + "1524yrni7gh0hir5ckridq671q5s6avfjdsdyahj51kzdl3wcypf")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From 583fcb27ae491039b608623250db23240e969d94 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 15:00:50 +0200 Subject: gnu: thunar: Update to 1.8.15. * gnu/packages/xfce.scm (thunar): Update to 1.8.15. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 7a6784b928..89a4206363 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -661,7 +661,7 @@ like appearance, display, keyboard and mouse settings.") (define-public thunar (package (name "thunar") - (version "1.8.14") + (version "1.8.15") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -669,7 +669,7 @@ like appearance, display, keyboard and mouse settings.") "thunar-" version ".tar.bz2")) (sha256 (base32 - "17r1z8cyp709lz38w7b5vqi1zbgm2i3sqvdvicsbvma2b0gppica")))) + "14vw4yaf9fff24zmj4dp8r8hf8mb19hl4w4l0jc8c4qzy865c93n")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 9bb102dc1c47275d2906a9f4e0b813e1940176d3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 23:32:33 +0200 Subject: gnu: stumpish: Remove bogus keyword. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This follows up on commit 81b045e149daffd113208601b764fdb47cf6c14b. ‘#:tests’ is not supported by the trivial build system and broke ‘guix pull’. * gnu/packages/wm.scm (stumpish)[argument]: Remove #:tests?. --- gnu/packages/wm.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 46ac1dcadc..3ed19c35a7 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1692,7 +1692,6 @@ productive, customizable lisp based systems.") (build-system trivial-build-system) (arguments '(#:modules ((guix build utils)) - #:tests? #f #:builder (begin (use-modules (guix build utils)) -- cgit v1.2.3 From 96484ab9f740a06993e251fc4c5a9edc27161237 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 15:17:19 +0200 Subject: gnu: python-pylint: Update to 2.5.3. * gnu/packages/check.scm (python-pylint): Update to 2.5.3. --- gnu/packages/check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 3edb79d55b..6ae4273738 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1889,7 +1889,7 @@ statements in the module it tests.") (define-public python-pylint (package (name "python-pylint") - (version "2.5.2") + (version "2.5.3") (source (origin (method git-fetch) @@ -1898,8 +1898,7 @@ statements in the module it tests.") (commit (string-append "pylint-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "150x679mrlgm1s4ym7irf9mnsjilqyaakss4spc4pbrzkl11agnh")))) + (base32 "04cgbh2z1mygar63plzziyz34yg6bdr4i0g63jp256fgnqwb1bi3")))) (build-system python-build-system) ;; FIXME: Tests are failing since version 2.4.3, see: ;; https://github.com/PyCQA/pylint/issues/3198. -- cgit v1.2.3 From 840857bf48237d15d1608b9272cae480cd28874f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 15:20:47 +0200 Subject: gnu: minisign: Update to 0.9. * gnu/packages/crypto.scm (minisign): Update to 0.9. --- gnu/packages/crypto.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index ccf1c2875f..99b23b7b7e 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1031,7 +1031,7 @@ quickly by using all your CPU cores and hardware acceleration.") (define-public minisign (package (name "minisign") - (version "0.8") + (version "0.9") (source (origin (method url-fetch) @@ -1039,8 +1039,7 @@ quickly by using all your CPU cores and hardware acceleration.") (string-append "https://github.com/jedisct1/minisign/releases/download/" version "/minisign-" version ".tar.gz")) (sha256 - (base32 - "10hhgwxf9rcdlr00shrkcyxndrc22dh5lj8k5z27xg3nc0jba3hk")))) + (base32 "1h9cfvvm6lqq33b2wdar1x3w4k7zyrscavllyb0l5dmcdabq60r2")))) (build-system cmake-build-system) (arguments ; No test suite -- cgit v1.2.3 From d2d7be35fe01d8913afc593782574bf6e5b91163 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 15:32:47 +0200 Subject: gnu: rust-yaml-rust: Update to 0.4.4. * gnu/packages/crates-io.scm (rust-yaml-rust): Update to 0.4.4. [arguments]: Update rust-quickcheck to 0.9. --- gnu/packages/crates-io.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 788ec02654..05bc85395e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27477,22 +27477,20 @@ to XDG Base Directory specification") (define-public rust-yaml-rust-0.4 (package (name "rust-yaml-rust") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (crate-uri "yaml-rust" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0ka3qhqc5lvk3hz14wmsj32jhmh44blcbfrx5hfxli2gg38kv4k5")))) + (base32 "038byay0dxsz6isckviz4qshfpyjqmyvda7pq96i6d53y4ickw1r")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-linked-hash-map" ,rust-linked-hash-map-0.5)) #:cargo-development-inputs - (("rust-quickcheck" ,rust-quickcheck-0.7)))) + (("rust-quickcheck" ,rust-quickcheck-0.9)))) (home-page "https://chyh1990.github.io/yaml-rust/") (synopsis "The missing YAML 1.2 parser for rust") (description -- cgit v1.2.3 From 7a358c7886c33790d80417bed814545ab0736bf3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 16:53:16 +0200 Subject: gnu: perl-sql-abstract: Update to 1.87. * gnu/packages/databases.scm (perl-sql-abstract): Update to 1.87. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e0634b7aca..08577a9f3b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1753,14 +1753,14 @@ libmysqlclient. It will fill an aray with long options, ready to be parsed by (define-public perl-sql-abstract (package (name "perl-sql-abstract") - (version "1.86") + (version "1.87") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/I/IL/ILMARI/" "SQL-Abstract-" version ".tar.gz")) (sha256 - (base32 "1pwcm8hwxcgidyyrak37lx69d85q728jxsb0b14jz93gbvdgg9z7")))) + (base32 "0jhw91b23wc9bkfwcgvka4x5ddxk58m9bcp5ay7a3vx77nla09p9")))) (build-system perl-build-system) (native-inputs `(("perl-module-install" ,perl-module-install) -- cgit v1.2.3 From 3a629d36e92edd3452b69d556b6e8ac91618b157 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 17:19:36 +0200 Subject: gnu: rocksdb: Update to 6.10.1. * gnu/packages/databases.scm (rocksdb): Update to 6.10.1. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 08577a9f3b..33c3e37427 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1147,7 +1147,7 @@ including field and record folding."))) (define-public rocksdb (package (name "rocksdb") - (version "6.8.1") + (version "6.10.1") (source (origin (method git-fetch) (uri (git-reference @@ -1156,7 +1156,7 @@ including field and record folding."))) (file-name (git-file-name name version)) (sha256 (base32 - "0i6qglyrcqwxnrvq67zm7ln79a4sj8mzgij9h0nz5zkxax8v1zg1")) + "0rp8q73dx5f1nkcf2qp6fljm4dpj281y6cqckqgv976kvwvqdgz1")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 5e7daec9b4bfd2a3a430fc800ab6b1b527a5fa27 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 18:10:16 +0200 Subject: gnu: dhall: Disable network tests differently. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/dhall.scm (dhall)[source]: Remove patch. [arguments]: Rename ‘remove-more-tests’ phase to ‘remove-network-tests’. Identify the tests by name instead of by content. * gnu/packages/patches/dhall-remove-network-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/dhall.scm | 22 ++++- .../patches/dhall-remove-network-tests.patch | 97 ---------------------- 3 files changed, 18 insertions(+), 102 deletions(-) delete mode 100644 gnu/packages/patches/dhall-remove-network-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8f39c1c036..76d6b5deba 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -867,7 +867,6 @@ dist_patch_DATA = \ %D%/packages/patches/desmume-gcc6-fixes.patch \ %D%/packages/patches/desmume-gcc7-fixes.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ - %D%/packages/patches/dhall-remove-network-tests.patch \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/dkimproxy-add-ipv6-support.patch \ %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \ diff --git a/gnu/packages/dhall.scm b/gnu/packages/dhall.scm index bbe2d271d7..86cbe764c6 100644 --- a/gnu/packages/dhall.scm +++ b/gnu/packages/dhall.scm @@ -1,4 +1,5 @@ ;;; Copyright © 2020 John Soo +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,8 +40,7 @@ ".tar.gz")) (sha256 (base32 - "18v7vvcbcm9s7slh6h43rj9yakkkxwnwgj6kv84i6qzd2j7d80mc")) - (patches (search-patches "dhall-remove-network-tests.patch")))) + "18v7vvcbcm9s7slh6h43rj9yakkkxwnwgj6kv84i6qzd2j7d80mc")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) @@ -99,9 +99,23 @@ (arguments `(#:phases (modify-phases %standard-phases - ;; Remove tests that require network - (add-after 'unpack 'remove-more-tests + (add-after 'unpack 'remove-network-tests (lambda _ + (with-directory-excursion "dhall-lang/tests" + (for-each + delete-file + '("import/failure/referentiallyInsane.dhall" + "import/success/customHeadersA.dhall" + "import/success/noHeaderForwardingA.dhall" + "import/success/unit/RemoteAsTextA.dhall" + "import/success/unit/SimpleRemoteA.dhall" + "import/success/unit/asLocation/RemoteChain1A.dhall" + "import/success/unit/asLocation/RemoteChain2A.dhall" + "import/success/unit/asLocation/RemoteChain3A.dhall" + "import/success/unit/asLocation/RemoteChainEnvA.dhall" + "import/success/unit/asLocation/RemoteChainMissingA.dhall" + "type-inference/success/CacheImportsA.dhall" + "type-inference/success/CacheImportsCanonicalizeA.dhall"))) (substitute* "src/Dhall/Tutorial.hs" (((string-append "-- >>> input auto " diff --git a/gnu/packages/patches/dhall-remove-network-tests.patch b/gnu/packages/patches/dhall-remove-network-tests.patch deleted file mode 100644 index c260e7844d..0000000000 --- a/gnu/packages/patches/dhall-remove-network-tests.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff a/dhall-lang/tests/import/failure/referentiallyInsane.dhall b/dhall-lang/tests/import/failure/referentiallyInsane.dhall ---- a/dhall-lang/tests/import/failure/referentiallyInsane.dhall -+++ /dev/null -@@ -1,13 +0,0 @@ --{- The following remote import attempts to import an environment variable, which -- must be disallowed by the referential sanity check -- -- One reason for doing this is to protect against remote imports exfiltrating -- environment variables (such as via custom headers). Only referentially -- opaque imports (i.e. local imports) have permission to refer to other -- referentially opaque imports in order to protect against this attack. -- -- The referential sanity check also ensures that remote imports are -- referentially transparent. Or in other words, any import that is globally -- addressable must have a meaning that is not context-sensitive. ---} --https://raw.githubusercontent.com/dhall-lang/dhall-lang/master/tests/import/data/referentiallyOpaque.dhall -diff a/dhall-lang/tests/import/success/customHeadersA.dhall b/dhall-lang/tests/import/success/customHeadersA.dhall ---- a/dhall-lang/tests/import/success/customHeadersA.dhall -+++ /dev/null -@@ -1,3 +0,0 @@ --https://httpbin.org/user-agent -- using [ { mapKey = "User-Agent", mapValue = "Dhall" } ] -- as Text -diff a/dhall-lang/tests/import/success/noHeaderForwardingA.dhall b/dhall-lang/tests/import/success/noHeaderForwardingA.dhall ---- a/dhall-lang/tests/import/success/noHeaderForwardingA.dhall -+++ /dev/null -@@ -1,6 +0,0 @@ --{- The purpose of this test is to verify that the custom headers supplied to -- this import are not forwarded to the transitive import of -- https://httpbin.org/user-agent ---} --https://raw.githubusercontent.com/dhall-lang/dhall-lang/master/tests/import/success/customHeadersA.dhall -- using [ { mapKey = "User-Agent", mapValue = "Secret" } ] -diff a/dhall-lang/tests/import/success/unit/RemoteAsTextA.dhall b/dhall-lang/tests/import/success/unit/RemoteAsTextA.dhall ---- a/dhall-lang/tests/import/success/unit/RemoteAsTextA.dhall -+++ /dev/null -@@ -1 +0,0 @@ --https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/example.txt as Text -diff a/dhall-lang/tests/import/success/unit/SimpleRemoteA.dhall b/dhall-lang/tests/import/success/unit/SimpleRemoteA.dhall ---- a/dhall-lang/tests/import/success/unit/SimpleRemoteA.dhall -+++ /dev/null -@@ -1 +0,0 @@ --https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simple.dhall -diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain1A.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChain1A.dhall ---- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain1A.dhall -+++ /dev/null -@@ -1 +0,0 @@ --https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simpleLocation.dhall -diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain2A.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChain2A.dhall ---- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain2A.dhall -+++ /dev/null -@@ -1 +0,0 @@ --https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/Canonicalize3A.dhall -diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain3A.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChain3A.dhall ---- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain3A.dhall -+++ /dev/null -@@ -1 +0,0 @@ --https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/Canonicalize5A.dhall -diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainEnvA.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChainEnvA.dhall ---- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainEnvA.dhall -+++ /dev/null -@@ -1,5 +0,0 @@ --{- -- This test verifies that `env:VAR as Location` isn't rejected as referentially opaque, -- as `env:VAR` on its own would. ---} --https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/EnvA.dhall -diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainMissingA.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChainMissingA.dhall ---- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainMissingA.dhall -+++ /dev/null -@@ -1,6 +0,0 @@ --{- This test verifies that `missing as Location` succeeds when chained since: -- * The `missing` is never actually resolved (due to the `as Location`) -- * The `missing` should be treated as referentially transparent (and therefore -- be a valid transitive dependency of a remote import) ---} --https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/MissingA.dhall -diff a/dhall-lang/tests/type-inference/success/CacheImportsA.dhall b/dhall-lang/tests/type-inference/success/CacheImportsA.dhall ---- a/dhall-lang/tests/type-inference/success/CacheImportsA.dhall -+++ /dev/null -@@ -1,6 +0,0 @@ --{- -- This URL returns (probably) a different result for each request. This test -- ensures that import results for a given URL are correctly cached within an -- execution of dhall. ---} --let _ = assert : https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text === https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text in 0 -diff a/dhall-lang/tests/type-inference/success/CacheImportsCanonicalizeA.dhall b/dhall-lang/tests/type-inference/success/CacheImportsCanonicalizeA.dhall ---- a/dhall-lang/tests/type-inference/success/CacheImportsCanonicalizeA.dhall -+++ /dev/null -@@ -1,5 +0,0 @@ --{- -- This URL returns (probably) a different result for each request. This test -- ensures that import locations are canonicalized before being cached. ---} --let _ = assert : https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text === https://csrng.net/csrng/../csrng/csrng.php?min=0&max=1000 as Text in 0 -- cgit v1.2.3 From 2971ed57345ee4e00058efeaf27c6a0790fdc9dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Jun 2020 23:10:47 +0200 Subject: gnu: dhall: Update to 1.32.0. * gnu/packages/dhall.scm (dhall): Update to 1.32.0. [inputs]: Add ghc-half. --- gnu/packages/dhall.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/dhall.scm b/gnu/packages/dhall.scm index 86cbe764c6..c0776902e7 100644 --- a/gnu/packages/dhall.scm +++ b/gnu/packages/dhall.scm @@ -30,17 +30,14 @@ (define-public dhall (package (name "dhall") - (version "1.31.1") + (version "1.32.0") (source (origin (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/dhall/dhall-" - version - ".tar.gz")) + (uri (string-append "https://hackage.haskell.org/package/dhall/dhall-" + version ".tar.gz")) (sha256 - (base32 - "18v7vvcbcm9s7slh6h43rj9yakkkxwnwgj6kv84i6qzd2j7d80mc")))) + (base32 "1imj0bh5365pdizvjbw2wqz0g9hakigf1zm4fr6379qdchxpp90p")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) @@ -56,6 +53,7 @@ ("ghc-dotgen" ,ghc-dotgen) ("ghc-either" ,ghc-either) ("ghc-exceptions" ,ghc-exceptions) + ("ghc-half" ,ghc-half) ("ghc-hashable" ,ghc-hashable) ("ghc-lens-family-core" ,ghc-lens-family-core) ("ghc-megaparsec" ,ghc-megaparsec) @@ -131,10 +129,8 @@ "examples/True\" :: IO Bool")) "")) #t))))) - (home-page - "https://dhall-lang.org/") - (synopsis - "Configuration language guaranteed to terminate") + (home-page "https://dhall-lang.org/") + (synopsis "Configuration language guaranteed to terminate") (description "Dhall is an explicitly typed configuration language that is not Turing complete. Despite being Turing incomplete, Dhall is a real programming -- cgit v1.2.3 From e6c2a88f3d9717be183a0346766cd65d10a904f4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 00:33:03 +0200 Subject: gnu: djview: Update to 4.11. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/djvu.scm (djview): Update to 4.11. [source]: Use GIT-FETCH and add a FILE-NAME. [native-inputs]: Add autoconf, automake, and libtool. [arguments]: Add a ‘make-files-writable’ phase. --- gnu/packages/djvu.scm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index 1fb5b5267e..f5ea9bd332 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,7 +23,9 @@ #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (gnu packages autotools) #:use-module (gnu packages glib) #:use-module (gnu packages image) #:use-module (gnu packages pkg-config) @@ -59,18 +62,22 @@ utilities.") (define-public djview (package (name "djview") - (version "4.10.6") + (version "4.11") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/djvu/DjView/" - (version-major+minor version) "/" - "djview-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://git.code.sf.net/p/djvu/djview-git") + (commit (string-append "release." version)))) (sha256 - (base32 "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4")))) + (base32 "0qlhd0xlxn8i869m0hwdjvwivi2vigqm88wliyr1h7s84zl3qhsy")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs `(("djvulibre" ,djvulibre) @@ -86,6 +93,11 @@ utilities.") (lambda _ (substitute* "desktopfiles/djvulibre-djview4.desktop" (("Exec=djview4 %f") "Exec=djview %f")) + #t)) + (add-after 'unpack 'make-files-writable + (lambda _ + (for-each make-file-writable + (find-files ".")) #t))))) (home-page "http://djvu.sourceforge.net/djview4.html") (synopsis "Viewer for the DjVu image format") -- cgit v1.2.3 From 3f352df035539cea0219ef08cd79a3b5f7607b74 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 00:41:07 +0200 Subject: gnu: simple-scan: Update to 3.36.3. * gnu/packages/gnome.scm (simple-scan): Update to 3.36.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6a3ff8709b..b4a1fbae76 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5400,7 +5400,7 @@ USB transfers with your high-level application or system daemon.") (define-public simple-scan (package (name "simple-scan") - (version "3.36.2.1") + (version "3.36.3") (source (origin (method url-fetch) @@ -5408,7 +5408,7 @@ USB transfers with your high-level application or system daemon.") (version-major+minor version) "/" "simple-scan-" version ".tar.xz")) (sha256 - (base32 "0aq1pf0wk536b91as54684xgmhl7lps0k2xcwha5wh6h1isyb35v")))) + (base32 "0gsz7jqk0fdj0mama3cnss9i1adw18cpdnlcjcjh4r5qijmvx0vh")))) (build-system meson-build-system) ;; TODO: Fix icons in home screen, About dialogue, and scan menu. (arguments -- cgit v1.2.3 From 02cb4ca75750c117906537296b8b38c880b5e283 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 00:42:06 +0200 Subject: gnu: mm-common: Don't use NAME in source URI. * gnu/packages/gnome.scm (mm-common)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b4a1fbae76..514f8e6fc8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -292,9 +292,9 @@ freedesktop.org desktop notification specification.") (version "1.0.0") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/mm-common/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "mm-common-" version ".tar.xz")) (sha256 (base32 "1m4w33da9f4rx2d6kdj3ix3kl0gn16ml82v2mdn4hljr3q29nzdr")))) -- cgit v1.2.3 From 553f2f3f54c358a144b3571d217cca21c463a128 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 00:42:12 +0200 Subject: gnu: mm-common: Update to 1.0.1. * gnu/packages/gnome.scm (mm-common): Update to 1.0.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 514f8e6fc8..e1b21c37db 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -289,7 +289,7 @@ freedesktop.org desktop notification specification.") (define-public mm-common (package (name "mm-common") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/mm-common/" @@ -297,7 +297,7 @@ freedesktop.org desktop notification specification.") "mm-common-" version ".tar.xz")) (sha256 (base32 - "1m4w33da9f4rx2d6kdj3ix3kl0gn16ml82v2mdn4hljr3q29nzdr")))) + "1jasx9a9g7nqf7jcv3mrg4qh5cp9sq724jxjaz4wa1dzmxsxg8i8")))) (build-system meson-build-system) (arguments `(#:phases -- cgit v1.2.3 From ed4447236d6aa490854561b4e6e343222da15d9c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 00:55:20 +0200 Subject: gnu: smb4k: Update to 3.0.6. * gnu/packages/kde-utils.scm (smb4k): Update to 3.0.6. --- gnu/packages/kde-utils.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 38bdfbfaba..fad308c86f 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2019 Hartmut Goebel +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -403,14 +404,14 @@ remind you to take a break now and then.") (define-public smb4k (package (name "smb4k") - (version "3.0.2") + (version "3.0.6") (source (origin (method url-fetch) (uri (string-append "https://sourceforge.net/projects/smb4k/files/" version "/smb4k-" version ".tar.xz/download")) (sha256 - (base32 "1daajaj8qhxkzz8dsaracwi49z4i57466h6qnqnh2ir2l54q00ir")))) + (base32 "0hz6nfd845bykf78s4g2qs77szl96gy6g8rpg44pqd39a0k0xbh7")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From 088e186b3558d4a78a654f7d741851cf42361ae6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 02:20:02 +0200 Subject: gnu: gtkspell3: Update to 3.0.10. * gnu/packages/gtk.scm (gtkspell3): Update to 3.0.10. [propagated-inputs]: Replace enchant-1.6 with default version 2. --- gnu/packages/gtk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 0efbc3b3c6..889f4eb014 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1707,14 +1707,14 @@ glass artworks done by Venicians glass blowers.") (define-public gtkspell3 (package (name "gtkspell3") - (version "3.0.9") + (version "3.0.10") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gtkspell/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "09jdicmpipmj4v84gnkqwbmj4lh8v0i6pn967rb9jx4zg2ia9x54")))) + "0cjp6xdcnzh6kka42w9g0w2ihqjlq8yl8hjm9wsfnixk6qwgch5h")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) @@ -1725,7 +1725,7 @@ glass artworks done by Venicians glass blowers.") ("gtk+" ,gtk+) ("pango" ,pango))) (propagated-inputs - `(("enchant" ,enchant-1.6))) ;gtkspell3-3.0.pc refers to it + `(("enchant" ,enchant))) ; gtkspell3-3.0.pc refers to it (home-page "http://gtkspell.sourceforge.net") (synopsis "Spell-checking addon for GTK's TextView widget") (description -- cgit v1.2.3 From 67e890ec182129873f44de66b0e5219d1b588645 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 02:26:48 +0200 Subject: gnu: libnftnl: Update to 1.1.7. * gnu/packages/linux.scm (libnftnl): Update to 1.1.7. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b3329c92c6..2baa8b27cc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6068,14 +6068,14 @@ re-use code and to avoid re-inventing the wheel.") (define-public libnftnl (package (name "libnftnl") - (version "1.1.6") + (version "1.1.7") (source (origin (method url-fetch) (uri (string-append "mirror://netfilter.org/libnftnl/" "libnftnl-" version ".tar.bz2")) (sha256 - (base32 "1jhyxsfrfqjascrm5lnxlcyzj6n0gc0qc1bp2asb7m61dxlmmsy1")))) + (base32 "13zd90bfrr0q3j0l0cbc8kiizccw6n8gp727kqnfljh024zw3nr0")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 2d63cca1460fbd3798cacd95bb75e5a0005e7c36 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 02:36:25 +0200 Subject: gnu: nftables: Update to 0.9.5. * gnu/packages/linux.scm (nftables): Update to 0.9.5. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2baa8b27cc..db83069eaf 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6092,7 +6092,7 @@ used by nftables.") (define-public nftables (package (name "nftables") - (version "0.9.3") + (version "0.9.5") (source (origin (method url-fetch) @@ -6101,7 +6101,7 @@ used by nftables.") (string-append "https://www.nftables.org/projects/nftables" "/files/nftables-" version ".tar.bz2"))) (sha256 - (base32 "0y6vbqp6x8w165q65h4n9sba1406gaz0d4744gqszbm7w9f92swm")))) + (base32 "05kyri19q776mymkbcxq3786l6nrf4xg7f3n8my0aw63mdz9bhgj")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-man-doc"))) ; FIXME: Needs docbook2x. -- cgit v1.2.3 From 0cafb90d15658f7f69af251d25f9a55ca8098520 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 02:37:13 +0200 Subject: gnu: iptables: Update to 1.8.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (iptables): Update to 1.8.5. [source]: Add URL. [arguments]: Add an ‘install-missing-script’ phase. --- gnu/packages/linux.scm | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index db83069eaf..fc781727ee 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2073,15 +2073,17 @@ external rate conversion.") (define-public iptables (package (name "iptables") - (version "1.8.4") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://netfilter.org/iptables/iptables-" - version ".tar.bz2")) - (sha256 - (base32 - "0z0mgs1ghvn3slc868mgbf2g26njgrzcy5ggyb5w4i55j1a3lflr")))) + ;; XXX When updating, remove the ‘install-missing-script’ phase. + (version "1.8.5") + (source + (origin + (method url-fetch) + (uri (list (string-append "mirror://netfilter.org/iptables/iptables-" + version ".tar.bz2") + (string-append "https://www.netfilter.org/projects/iptables/" + "files/iptables-" version ".tar.bz2"))) + (sha256 + (base32 "02a3575ypdpg6a2x752mhk3f7h1381ymkq1n0gss6fp6292xfmyl")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -2093,7 +2095,19 @@ external rate conversion.") (arguments '(#:tests? #f ; no test suite #:configure-flags ; add $libdir to the RUNPATH of executables - (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")))) + (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-missing-script + ;; A typo prevents installation of /sbin/iptables-apply. It's been + ;; fixed upstream (d4ed0c741fc789bb09d977d74d30875fdd50d08b), but + ;; a patch would require bootstrapping and more inputs. Simply copy + ;; the file ourselves. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (sbin (string-append out "/sbin"))) + (install-file "iptables/iptables-apply" sbin) + #t)))))) (home-page "https://www.netfilter.org/projects/iptables/index.html") (synopsis "Programs to configure Linux IP packet filtering rules") (description -- cgit v1.2.3 From 5bc22ba81ee1f605b4ddfa041e5db3a0eeb33707 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 02:37:23 +0200 Subject: gnu: nvme-cli: Update to 1.11.2. * gnu/packages/linux.scm (nvme-cli): Update to 1.11.2. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fc781727ee..08b5b69d16 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3947,7 +3947,7 @@ Translation (@dfn{SAT}) are also supported.") (define-public nvme-cli (package (name "nvme-cli") - (version "1.10.1") + (version "1.11.2") (home-page "https://github.com/linux-nvme/nvme-cli") (source (origin (method git-fetch) @@ -3955,7 +3955,7 @@ Translation (@dfn{SAT}) are also supported.") (url home-page) (commit (string-append "v" version)))) (sha256 - (base32 "12wp2wxmsw2v8m9bhvwvdbhdgx1md8iilhbl19sfzz2araiwi2x8")) + (base32 "0ngh7zffjf6ac8b22hdi4ry7hjlafih172hrbpw8j17r7c0wjy9i")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From bfdce9ffdae2b3e42f46955caee4de1a3e4c1d33 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 02:39:45 +0200 Subject: gnu: mpop: Update to 1.4.10. * gnu/packages/mail.scm (mpop): Update to 1.4.10. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 0c683f0c92..728d242c71 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2159,14 +2159,14 @@ converts them to maildir format directories.") (define-public mpop (package (name "mpop") - (version "1.4.9") + (version "1.4.10") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/mpop/releases/" "mpop-" version ".tar.xz")) (sha256 - (base32 "0hinmyd4lipy9wi3grwm72vv6xrpf4m08i9g9nlxzxnwfanw885q")))) + (base32 "1243hazpiwgvz2m3p48cdh0yw1019i6xjxgc7qyhmxcdy0inb6wy")))) (build-system gnu-build-system) (inputs `(("gnutls" ,gnutls))) -- cgit v1.2.3 From 56e1cc0c34f5634563cfb6e0c188827551de0539 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 02:41:12 +0200 Subject: gnu: msmtp: Update to 1.8.11. * gnu/packages/mail.scm (msmtp): Update to 1.8.11. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 728d242c71..485dd1db1d 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1209,14 +1209,14 @@ which can add many functionalities to the base client.") (define-public msmtp (package (name "msmtp") - (version "1.8.10") + (version "1.8.11") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/msmtp/releases/" "/msmtp-" version ".tar.xz")) (sha256 - (base32 "041g921rdjiv8bapp61gp4rylq8cckfkcwzyh8bs7xwxs4wpzfna")))) + (base32 "0q0fg235qk448l1xjcwyxr7vcpzk6w57jzhjbkb0m7nffyhhypzj")))) (build-system gnu-build-system) (inputs `(("libsecret" ,libsecret) -- cgit v1.2.3 From 7801e9f2d4c6761593a9078d5ef019be8f350396 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 03:25:59 +0200 Subject: gnu: libnumbertext: Update to 1.0.6. * gnu/packages/libreoffice.scm (libnumbertext): Update to 1.0.6. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 34579a776c..a98ae152f6 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -599,7 +599,7 @@ Microsoft Publisher documents of all versions.") (define-public libnumbertext (package (name "libnumbertext") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) @@ -607,7 +607,7 @@ Microsoft Publisher documents of all versions.") "releases/download/" version "/libnumbertext-" version ".tar.xz")) (sha256 - (base32 "1xzlwhwwhvr76kfdsw5gvfjfdayz803z65h331gv5dpc9imhijg1")))) + (base32 "0mxf22gpbr818ib4av17zmyx6i6nf4br5qlxq0qvfz5z6h5j57vk")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From 98f08a99c6a0fefeca043cfac1fd89be8deebe5f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 03:38:28 +0200 Subject: gnu: pd: Don't hard-code Tk version. * gnu/packages/music.scm (pd)[arguments]: Construct the wish file name from the tk package version. --- gnu/packages/music.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f22207579f..beecdcc670 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1892,20 +1892,22 @@ export.") "0dz6r6jy0zfs1xy1xspnrxxks8kddi9c7pxz4vpg2ygwv83ghpg5")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no "check" target - #:configure-flags - (list - "--enable-jack" - (string-append "--with-wish=" (string-append - (assoc-ref %build-inputs "tk") - "/bin/wish8.6"))) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-with-path - (lambda _ - (substitute* "tcl/pd-gui.tcl" - (("exec wish ") (string-append "exec " (which "wish8.6") " "))) - #t))))) + (let ((wish (string-append "wish" (version-major+minor + (package-version tk))))) + `(#:tests? #f ; no "check" target + #:configure-flags + (list + "--enable-jack" + (string-append "--with-wish=" (string-append + (assoc-ref %build-inputs "tk") + "/bin/" ,wish))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-with-path + (lambda _ + (substitute* "tcl/pd-gui.tcl" + (("exec wish ") (string-append "exec " (which ,wish) " "))) + #t)))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 8c5b29c7960e308bc11e887d742effa46a6a6b85 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 03:38:40 +0200 Subject: gnu: pd: Use HTTPS home page. * gnu/packages/music.scm (pd)[home-page]: Use HTTPS. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index beecdcc670..c9b6c94dd7 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1918,7 +1918,7 @@ export.") `(("tk" ,tk) ("alsa-lib" ,alsa-lib) ("jack" ,jack-1))) - (home-page "http://puredata.info") + (home-page "https://puredata.info") (synopsis "Visual programming language for artistic performances") (description "Pure Data (aka Pd) is a visual programming language. Pd enables -- cgit v1.2.3 From f6b8b1817e31f72c654398cc7014e36a5d2bcf53 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 03:38:52 +0200 Subject: gnu: pd: Update to 0.51-0. * gnu/packages/music.scm (pd): Update to 0.51-0. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c9b6c94dd7..49f784f529 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1881,7 +1881,7 @@ export.") (define-public pd (package (name "pd") - (version "0.50-2") + (version "0.51-0") (source (origin (method url-fetch) (uri @@ -1889,7 +1889,7 @@ export.") version ".src.tar.gz")) (sha256 (base32 - "0dz6r6jy0zfs1xy1xspnrxxks8kddi9c7pxz4vpg2ygwv83ghpg5")))) + "0qzv4hjf4h7xx00ihnbl43pxa0fia9qkc8nwgzhqrs12jiljz6ps")))) (build-system gnu-build-system) (arguments (let ((wish (string-append "wish" (version-major+minor -- cgit v1.2.3 From d2a7cb46a62f55ce8de6dc3c963aee176a1d7684 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 03:58:57 +0200 Subject: gnu: dlib: Update to 19.20. * gnu/packages/machine-learning.scm (dlib): Update to 19.20. --- gnu/packages/machine-learning.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 4be165f390..0e11da41ca 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2020 Efraim Flashner ;;; Copyright © 2016, 2017, 2020 Marius Bakke ;;; Copyright © 2016 Hartmut Goebel -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2018 Mark Meyer ;;; Copyright © 2018 Ben Woodcroft @@ -715,14 +715,14 @@ than 8 bits, and at the end only some significant 8 bits are kept.") (define-public dlib (package (name "dlib") - (version "19.7") + (version "19.20") (source (origin (method url-fetch) (uri (string-append "http://dlib.net/files/dlib-" version ".tar.bz2")) (sha256 (base32 - "1mljz02kwkrbggyncxv5fpnyjdybw2qihaacb3js8yfkw12vwpc2")) + "139jyi19qz37wwmmy48gil9d1kkh2r3w3bwdzabha6ayxmba96nz")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 01979fafb327cbd502ce290d7439791a80dfcaa6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 04:45:04 +0200 Subject: gnu: haproxy: Update to 2.1.6. * gnu/packages/networking.scm (haproxy): Update to 2.1.6. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 3ad68ad070..2ed4b4d767 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3106,7 +3106,7 @@ cables.") (define-public haproxy (package (name "haproxy") - (version "2.1.5") + (version "2.1.6") (source (origin (method url-fetch) (uri (string-append "https://www.haproxy.org/download/" @@ -3114,7 +3114,7 @@ cables.") "/src/haproxy-" version ".tar.gz")) (sha256 (base32 - "188ff33610jj11knjwjqwxci4p0i63n9k0l8bdb47ckahg2ll5s2")))) + "1pyz4gckdn8982vpb1iiw9agwp2s5p8wc0nn1qh1ic0wq3lrnpg6")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 75d493aea1f8c38e67ebcec21ea2ca114ae05326 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 04:45:12 +0200 Subject: gnu: ethtool: Update to 5.7. * gnu/packages/networking.scm (ethtool): Update to 5.7. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 2ed4b4d767..11344216aa 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -589,14 +589,14 @@ receiving NDP messages.") (define-public ethtool (package (name "ethtool") - (version "5.6") + (version "5.7") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/network/" "ethtool/ethtool-" version ".tar.xz")) (sha256 (base32 - "159r0hwax0qs5diayw2glxshqxrigk0v67hgmbq56ldddm91n3ya")))) + "0f9w0pqkvwn540rasmj6c8897g9gj2hmjnbkhpi9yf1s7jyvhkkj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From d87c9fc50682f4509f66f0e54b11d8d94c382325 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 05:09:10 +0200 Subject: gnu: herbstluftwm: Update to 0.8.3. * gnu/packages/wm.scm (herbstluftwm): Update to 0.8.3. --- gnu/packages/wm.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 3ed19c35a7..615ac788ed 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -151,15 +151,14 @@ the leaves of a full binary tree.") (define-public herbstluftwm (package (name "herbstluftwm") - (version "0.8.2") + (version "0.8.3") (source (origin (method url-fetch) (uri (string-append "https://herbstluftwm.org/tarballs/herbstluftwm-" version ".tar.gz")) (sha256 - (base32 - "0wbl1s1gwdc61ll6qmkwb56swjxv99by1dhi080bdqn0w8p75804")) + (base32 "1qmb4pjf2f6g0dvcg11cw9njwmxblhqzd70ai8qnlgqw1iz3nkm1")) (file-name (string-append "herbstluftwm-" version ".tar.gz")))) (build-system cmake-build-system) (inputs -- cgit v1.2.3 From 88e1d36ba6413fe3c2414178b0916ee7a5892354 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 05:15:40 +0200 Subject: gnu: mu: Update to 1.4.10. * gnu/packages/mail.scm (mu): Update to 1.4.10. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 485dd1db1d..ec1233f83b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -711,7 +711,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.4.9") + (version "1.4.10") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/" @@ -719,7 +719,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") "mu-" version ".tar.xz")) (sha256 (base32 - "0dgmwdaszh5m7v1py3f9n9f6avb30vrl93g58a1k225iwdsv01d5")))) + "0vbyrmv3d2bja4vx86za93gq46vxg18j12g0lca3x1dl8d5g2xa6")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From e1e9baf22f57b2926859a6d3d29ecb6875233162 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 10 Jun 2020 16:19:57 +0300 Subject: gnu: qtpass: Update to 1.3.2. * gnu/packages/password-utils.scm (qtpass): Update to 1.3.2. --- gnu/packages/password-utils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index a59fb9dc75..8e1339eb85 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -581,7 +581,7 @@ key URIs using the standard otpauth:// scheme.") (define-public qtpass (package (name "qtpass") - (version "1.2.3") + (version "1.3.2") (source (origin (method git-fetch) @@ -591,7 +591,7 @@ key URIs using the standard otpauth:// scheme.") (file-name (git-file-name name version)) (sha256 (base32 - "1vfhfyccrxq9snyvayqfzm5rqik8ny2gysyv7nipc91kvhq3bhky")))) + "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 73d9caba79b63e8ac714b8b851b7ae92a3878eca Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 10 Jun 2020 16:21:18 +0300 Subject: gnu: qtpass: Wrap binary. * gnu/packages/password-utils.scm (qtpass)[arguments]: Import qt-utils modules. Add phase to wrap qtpass binary. --- gnu/packages/password-utils.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 8e1339eb85..6bd1e94c91 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -594,7 +594,12 @@ key URIs using the standard otpauth:// scheme.") "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:modules ((guix build gnu-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build qt-utils)) + #:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) @@ -630,6 +635,10 @@ key URIs using the standard otpauth:// scheme.") (string-append icons "/qtpass-icon.svg")) (install-file "qtpass.1" man) #t))) + (add-after 'install 'wrap-qt + (lambda* (#:key outputs #:allow-other-keys) + (wrap-qt-program (assoc-ref outputs "out") "qtpass") + #t)) (add-before 'check 'check-setup ;; Make Qt render "offscreen", required for tests. (lambda _ -- cgit v1.2.3 From b26ad6dbe2ac53f1d42f22a4e62c99d90e937078 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 17:04:25 +0200 Subject: gnu: grammalecte: Update to 1.10.0. * gnu/packages/dictionaries.scm (grammalecte): Update to 1.10.0. --- gnu/packages/dictionaries.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index c13dbc2454..aee8799c98 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -205,14 +205,14 @@ It comes with a German-English dictionary with approximately 270,000 entries.") (define-public grammalecte (package (name "grammalecte") - (version "1.9.0") + (version "1.10.0") (source (origin (method url-fetch/zipbomb) (uri (string-append "https://grammalecte.net/grammalecte/zip/" "Grammalecte-fr-v" version ".zip")) (sha256 - (base32 "1dmbmvf27dy0cnq2x7ldp9xmni8fl1p7vflgpy0yrgifgrjvnxzr")))) + (base32 "0lyngnvg995qdm9bhqj8vd8aywpcdqmzv3j4j77wxhsfa9k0pz08")))) (build-system python-build-system) (home-page "https://grammalecte.net") (synopsis "French spelling and grammar checker") -- cgit v1.2.3 From 42d1159335747f1dafa6d733f6326895dbb4b165 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 17:19:02 +0200 Subject: gnu: asciidoc: Use HTTPS home page URI. * gnu/packages/documentation.scm (asciidoc)[home-page]: Use HTTPS URI. --- gnu/packages/documentation.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index dcacdb456f..a3a07f56db 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -111,7 +111,7 @@ release/xsl/current") ("docbook-xsl" ,docbook-xsl) ("libxml2" ,libxml2) ("libxslt" ,libxslt))) - (home-page "http://asciidoc.org/") + (home-page "https://asciidoc.org/") (synopsis "Text-based document generation system") (description "AsciiDoc is a text document format for writing notes, documentation, -- cgit v1.2.3 From bf8e10051be091fdb81576fdcf58aee8f5afe6b2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 17:25:17 +0200 Subject: gnu: fsarchiver: Use HTTPS home page URI. * gnu/packages/file-systems.scm (fsarchiver)[home-page]: Use HTTPS URI. --- gnu/packages/file-systems.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index ca02a1e593..dd72152c51 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -103,7 +103,7 @@ file permissions, timestamps, symbolic and hard links, and extended attributes. Each file in the archive is protected by a checksum. If part of the archive is corrupted you'll lose the affected file(s) but not the whole back-up.") - (home-page "http://www.fsarchiver.org/") + (home-page "https://www.fsarchiver.org/") (license license:gpl2))) (define-public gphotofs -- cgit v1.2.3 From 0661638f5ef2b874769720a2109a8499aef3ae34 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 17:26:07 +0200 Subject: gnu: grfcodec: Use HTTPS home page URI. * gnu/packages/game-development.scm (grfcodec)[home-page]: Use HTTPS URI. --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index fae5d591aa..785447644c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -240,7 +240,7 @@ with a specific task: @item @code{nforenum} checks NFO code for errors, making corrections when necessary. @end enumerate") - (home-page "http://dev.openttdcoop.org/projects/grfcodec") + (home-page "https://dev.openttdcoop.org/projects/grfcodec") ;; GRFCodec, GRFID, and GRFStrip are exclusively under the GPL2. ;; NFORenum is under the GPL2+. ;; The MD5 implementation contained in GRFID is under the zlib license. -- cgit v1.2.3 From d5fd9c72235cfe5302edf9a5bed01edd1288c5b7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 17:27:41 +0200 Subject: gnu: ipopt: Use HTTPS home page URI. * gnu/packages/maths.scm (ipopt)[home-page]: Use HTTPS URI. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9a24625a52..fe1dfdcb67 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1601,7 +1601,7 @@ online as well as original implementations of various other algorithms.") (inputs ;; TODO: Maybe add dependency on COIN-MUMPS, ASL, and HSL. `(("lapack" ,lapack))) ;for both libblas and liblapack - (home-page "http://www.coin-or.org") + (home-page "https://www.coin-or.org") (synopsis "Large-scale nonlinear optimizer") (description "The Interior Point Optimizer (IPOPT) is a software package for -- cgit v1.2.3 From c0f297e85f37034e6fc8249966d3a7167951a3dd Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Jun 2020 17:31:08 +0200 Subject: gnu: cuirass: Update to 0.0.1-2280ae18. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-2280ae18. --- gnu/packages/ci.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index b74e73ceea..317136e38f 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2017 Mathieu Lirzin -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2020 Mathieu Othacehe ;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2018 Clément Lassieur ;;; @@ -47,8 +47,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "9559fd18d4b89bf797216fbe187f2b26b0a2d165") - (revision "30")) + (let ((commit "2280ae18eb25aa7034636c58bf288c9bd5a8fa3b") + (revision "31")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -60,7 +60,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "026cpcws8mb483mywwx2znpy9i7lw5n3lyqa9k6d87kxmw59060c")))) + "1gbmpwgiwy740d936b052gfivzw52pgrny7j7lbl56wi9wnawkc9")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 127c7fba1aee2a547cd4653cb548c3eed9a699ee Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 17:33:58 +0200 Subject: gnu: grfcodec: Fix source URL. * gnu/packages/game-development.scm (grfcodec)[source]: Use HTTPS for URL. Re-indent package. --- gnu/packages/game-development.scm | 60 +++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 785447644c..b899c2fe6c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -191,39 +191,39 @@ DeuTex has functions such as merging wads, etc.") (package (name "grfcodec") (version "6.0.6") - (source (origin - (method url-fetch) - (uri (string-append "http://binaries.openttd.org/extra/" - name "/" version "/" name "-" version - "-source.tar.xz")) - (sha256 - (base32 - "08admgnpqcsifpicbm56apgv360fxapqpbbsp10qyk8i22w1ivsk")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://binaries.openttd.org/extra/" + name "/" version "/" name "-" version + "-source.tar.xz")) + (sha256 + (base32 "08admgnpqcsifpicbm56apgv360fxapqpbbsp10qyk8i22w1ivsk")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no check target + '(#:tests? #f ;no check target #:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (replace 'install ; no install target - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (doc (string-append out "/share/doc")) - (man (string-append out "/share/man/man1"))) - (for-each (lambda (file) - (install-file file bin)) - '("grfcodec" "grfid" "grfstrip" "nforenum")) - (install-file "COPYING" doc) - (with-directory-excursion "docs" - (for-each (lambda (file) - (install-file (string-append file ".txt") doc)) - '("auto_correct" "commands" "grf" "grfcodec" "grftut" - "readme" "readme.rpn")) - (for-each (lambda (file) - (install-file file man)) - (find-files "." "\\.1")))) - #t))))) + (modify-phases %standard-phases + (delete 'configure) ;no configure script + (replace 'install ;no install target + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append out "/share/doc")) + (man (string-append out "/share/man/man1"))) + (for-each (lambda (file) + (install-file file bin)) + '("grfcodec" "grfid" "grfstrip" "nforenum")) + (install-file "COPYING" doc) + (with-directory-excursion "docs" + (for-each (lambda (file) + (install-file (string-append file ".txt") doc)) + '("auto_correct" "commands" "grf" "grfcodec" "grftut" + "readme" "readme.rpn")) + (for-each (lambda (file) + (install-file file man)) + (find-files "." "\\.1")))) + #t))))) (inputs `(("boost" ,boost) ("libpng" ,libpng) -- cgit v1.2.3 From 58cb52a31d5fd6c303440bf2fb900a267734d106 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 17:34:41 +0200 Subject: gnu: ipopt: Fix source URI. * gnu/packages/maths.scm (ipopt)[source]: Fix URI. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index fe1dfdcb67..45d699e39c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1567,7 +1567,7 @@ online as well as original implementations of various other algorithms.") (source (origin (method url-fetch) (uri (string-append - "http://www.coin-or.org/download/source/Ipopt/Ipopt-" + "https://www.coin-or.org/download/source/Ipopt/Ipopt-" version".tgz")) (sha256 (base32 -- cgit v1.2.3 From a474999c260c8afa8ebb114f65ada3aeb0d7c17c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 17:27:41 +0200 Subject: gnu: man-pages: Update to 5.07. * gnu/packages/man.scm (man-pages): Update to 5.07. --- gnu/packages/man.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 779781f822..2d059baddc 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -164,7 +164,7 @@ the traditional flat-text whatis databases.") (define-public man-pages (package (name "man-pages") - (version "5.06") + (version "5.07") (source (origin (method url-fetch) @@ -174,7 +174,7 @@ the traditional flat-text whatis databases.") (string-append "mirror://kernel.org/linux/docs/man-pages/Archive/" "man-pages-" version ".tar.xz"))) (sha256 - (base32 "0l7ypgl36jswa077qvdh1rcsvnwr64vja6cc32bab86sm41akf3h")))) + (base32 "13b3q7c67r0wkla4pdihl1qh09k67ms2z5jgzfqgpdqqy6mgziwd")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From c90730aefef8906d4a3c2056695d79fd44946247 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 20:36:23 +0200 Subject: gnu: progress: Update to 0.15. * gnu/packages/admin.scm (progress): Update to 0.15. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index bcbdf9b395..1a0e19b19a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -213,7 +213,7 @@ usual file attributes can be checked for inconsistencies.") (define-public progress (package (name "progress") - (version "0.14") + (version "0.15") (source (origin (method git-fetch) @@ -221,7 +221,7 @@ usual file attributes can be checked for inconsistencies.") (url "https://github.com/Xfennec/progress.git") (commit (string-append "v" version)))) (sha256 - (base32 "1lk2v4b767klib93an4g3f7z5qrv9kdk9jf7545vw1immc4kamrl")) + (base32 "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From a8c8b8904840d492f5f46c0f85abfae7c767e37d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 21:53:48 +0200 Subject: gnu: thinkfan: Update to 1.2. * gnu/packages/linux.scm (thinkfan): Update to 1.2. [home-page]: Switch to an up-to-date home page. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 08b5b69d16..73d99be48c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4988,7 +4988,7 @@ feature, and a laptop with an accelerometer. It has no effect on SSDs.") (define-public thinkfan (package (name "thinkfan") - (version "1.1") + (version "1.2") (source (origin (method git-fetch) @@ -4997,7 +4997,7 @@ feature, and a laptop with an accelerometer. It has no effect on SSDs.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1fxd1w3z65glw6y04myn7ihgswkx6sqnkky159mik4n96pfrsvr5")))) + (base32 "0vmkpj575a1w52zx1jn6kdrk8rc9vp0f1bldi1bajicpgbs6rjd3")))) (build-system cmake-build-system) (arguments `(#:modules ((guix build cmake-build-system) @@ -5033,7 +5033,7 @@ feature, and a laptop with an accelerometer. It has no effect on SSDs.") (inputs `(("libatasmart" ,libatasmart) ("yaml-cpp" ,yaml-cpp))) - (home-page "http://thinkfan.sourceforge.net/") + (home-page "https://github.com/vmatare/thinkfan") (synopsis "Simple fan control program") (description "Thinkfan is a simple fan control program. It reads temperatures, -- cgit v1.2.3 From 4ee117d56bde738189cb75dc745e309169f27289 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 21:57:40 +0200 Subject: gnu: scintilla: Update to 4.4.3. * gnu/packages/text-editors.scm (scintilla): Update to 4.4.3. --- gnu/packages/text-editors.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 1740404709..2edc9820a8 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -743,14 +743,14 @@ and Octave. TeXmacs is completely extensible via Guile.") (define-public scintilla (package (name "scintilla") - (version "4.4.0") + (version "4.4.3") (source (origin (method url-fetch) (uri (let ((v (apply string-append (string-split version #\.)))) (string-append "https://www.scintilla.org/scintilla" v ".tgz"))) (sha256 - (base32 "10qnab10gfkzdfyqpmsl4c3mhh7533l4q6jrdfy5ssvj4da6hawd")))) + (base32 "080v9l7dn3qgkdg0nc0kwpj6warwpi904zjgz9kzg1l6pknxf21s")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk") -- cgit v1.2.3 From a4620c019b8d5e9b24f3ea8470cd20b9a0bebb70 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Jun 2020 22:17:11 +0200 Subject: gnu: fet: Update to 5.45.0. * gnu/packages/education.scm (fet): Update to 5.45.0. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 2ccda4b7a0..0a186736d4 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -609,14 +609,14 @@ Portuguese, Spanish and Italian.") (define-public fet (package (name "fet") - (version "5.44.8") + (version "5.45.0") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "1i59xpkdnrd3qzgqs11vsws57g33zvkad5q3an56vd94aw7z3kpw")))) + (base32 "04jns6wc20rz6cp410znsllknhp4zlf4rn8wgv712855nffs42c6")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 3cd92a855e8f6768a4470cd5522749a39d5f9047 Mon Sep 17 00:00:00 2001 From: Caleb Ristvedt Date: Mon, 1 Jun 2020 18:50:07 -0500 Subject: database: work around guile-sqlite3 bug preventing statement reset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit guile-sqlite3 provides statement caching, making it unnecessary for sqlite to keep re-preparing statements that are frequently used. Unfortunately it doesn't quite emulate the semantics of sqlite_finalize properly, because it doesn't cause a commit if the statement being finalized is the last "active" statement (see https://notabug.org/guile-sqlite3/guile-sqlite3/issues/12). We work around this by wrapping sqlite-finalize with our own version that ensures sqlite-reset is called, which does The Right Thing™. * guix/store/database.scm (sqlite-finalize): new procedure that shadows the sqlite-finalize from (sqlite3). --- guix/store/database.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/guix/store/database.scm b/guix/store/database.scm index ef52036ede..ae7e96df2f 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -130,6 +130,17 @@ transaction after it finishes." If FILE doesn't exist, create it and initialize it as a new database." (call-with-database file (lambda (db) exp ...))) +(define (sqlite-finalize stmt) + ;; As of guile-sqlite3 0.1.0, cached statements aren't reset when + ;; sqlite-finalize is invoked on them (see + ;; https://notabug.org/guile-sqlite3/guile-sqlite3/issues/12). This can + ;; cause problems with automatically-started transactions, so we work around + ;; it by wrapping sqlite-finalize so that sqlite-reset is always called. + ;; This always works, because resetting a statement twice has no adverse + ;; effects. We can remove this once the fixed guile-sqlite3 is widespread. + (sqlite-reset stmt) + ((@ (sqlite3) sqlite-finalize) stmt)) + (define (last-insert-row-id db) ;; XXX: (sqlite3) currently lacks bindings for 'sqlite3_last_insert_rowid'. ;; Work around that. -- cgit v1.2.3 From 5d6e2255286e591def122ec2f4a3cbda497fea21 Mon Sep 17 00:00:00 2001 From: Caleb Ristvedt Date: Mon, 1 Jun 2020 19:21:43 -0500 Subject: database: rewrite query procedures in terms of with-statement. Most of our queries would fail to finalize their statements properly if sqlite returned an error during their execution. This resolves that, and also makes them somewhat more concise as a side-effect. This also makes some small changes to improve certain queries where behavior was strange or overly verbose. * guix/store/database.scm (call-with-statement): new procedure. (with-statement): new macro. (last-insert-row-id, path-id, update-or-insert, add-references): rewrite to use with-statement. (update-or-insert): factor last-insert-row-id out of the end of both branches. (add-references): remove pointless last-insert-row-id call. * .dir-locals.el (with-statement): add indenting information. --- .dir-locals.el | 1 + guix/store/database.scm | 53 +++++++++++++++++++++++++++---------------------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index dc8bc0e437..77c12f9411 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -89,6 +89,7 @@ (eval . (put 'with-database 'scheme-indent-function 2)) (eval . (put 'call-with-transaction 'scheme-indent-function 2)) + (eval . (put 'with-statement 'scheme-indent-function 3)) (eval . (put 'call-with-container 'scheme-indent-function 1)) (eval . (put 'container-excursion 'scheme-indent-function 1)) diff --git a/guix/store/database.scm b/guix/store/database.scm index ae7e96df2f..e74c4ba991 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -141,14 +141,26 @@ If FILE doesn't exist, create it and initialize it as a new database." (sqlite-reset stmt) ((@ (sqlite3) sqlite-finalize) stmt)) +(define (call-with-statement db sql proc) + (let ((stmt (sqlite-prepare db sql #:cache? #t))) + (dynamic-wind + (const #t) + (lambda () + (proc stmt)) + (lambda () + (sqlite-finalize stmt))))) + +(define-syntax-rule (with-statement db sql stmt exp ...) + "Run EXP... with STMT bound to a prepared statement corresponding to the sql +string SQL for DB." + (call-with-statement db sql + (lambda (stmt) exp ...))) + (define (last-insert-row-id db) ;; XXX: (sqlite3) currently lacks bindings for 'sqlite3_last_insert_rowid'. ;; Work around that. - (let* ((stmt (sqlite-prepare db "SELECT last_insert_rowid();" - #:cache? #t)) - (result (sqlite-fold cons '() stmt))) - (sqlite-finalize stmt) - (match result + (with-statement db "SELECT last_insert_rowid();" stmt + (match (sqlite-fold cons '() stmt) ((#(id)) id) (_ #f)))) @@ -158,13 +170,11 @@ If FILE doesn't exist, create it and initialize it as a new database." (define* (path-id db path) "If PATH exists in the 'ValidPaths' table, return its numerical identifier. Otherwise, return #f." - (let ((stmt (sqlite-prepare db path-id-sql #:cache? #t))) + (with-statement db path-id-sql stmt (sqlite-bind-arguments stmt #:path path) - (let ((result (sqlite-fold cons '() stmt))) - (sqlite-finalize stmt) - (match result - ((#(id) . _) id) - (_ #f))))) + (match (sqlite-fold cons '() stmt) + ((#(id) . _) id) + (_ #f)))) (define update-sql "UPDATE ValidPaths SET hash = :hash, registrationTime = :time, deriver = @@ -181,20 +191,17 @@ and re-inserting instead of updating, which causes problems with foreign keys, of course. Returns the row id of the row that was modified or inserted." (let ((id (path-id db path))) (if id - (let ((stmt (sqlite-prepare db update-sql #:cache? #t))) + (with-statement db update-sql stmt (sqlite-bind-arguments stmt #:id id #:deriver deriver #:hash hash #:size nar-size #:time time) - (sqlite-fold cons '() stmt) - (sqlite-finalize stmt) - (last-insert-row-id db)) - (let ((stmt (sqlite-prepare db insert-sql #:cache? #t))) + (sqlite-fold cons '() stmt)) + (with-statement db insert-sql stmt (sqlite-bind-arguments stmt #:path path #:deriver deriver #:hash hash #:size nar-size #:time time) - (sqlite-fold cons '() stmt) ;execute it - (sqlite-finalize stmt) - (last-insert-row-id db))))) + (sqlite-fold cons '() stmt))) + (last-insert-row-id db))) (define add-reference-sql "INSERT OR REPLACE INTO Refs (referrer, reference) VALUES (:referrer, :reference);") @@ -202,15 +209,13 @@ of course. Returns the row id of the row that was modified or inserted." (define (add-references db referrer references) "REFERRER is the id of the referring store item, REFERENCES is a list ids of items referred to." - (let ((stmt (sqlite-prepare db add-reference-sql #:cache? #t))) + (with-statement db add-reference-sql stmt (for-each (lambda (reference) (sqlite-reset stmt) (sqlite-bind-arguments stmt #:referrer referrer #:reference reference) - (sqlite-fold cons '() stmt) ;execute it - (last-insert-row-id db)) - references) - (sqlite-finalize stmt))) + (sqlite-fold cons '() stmt)) + references))) (define* (sqlite-register db #:key path (references '()) deriver hash nar-size time) -- cgit v1.2.3 From 37545de4a3bf59611c184b31506fe9a16abe4c8b Mon Sep 17 00:00:00 2001 From: Caleb Ristvedt Date: Mon, 1 Jun 2020 21:43:14 -0500 Subject: database: ensure update-or-insert is run within a transaction update-or-insert can break if an insert occurs between when it decides whether to update or insert and when it actually performs that operation. Putting the check and the update/insert operation in the same transaction ensures that the update/insert will only succeed if no other write has occurred in the middle. * guix/store/database.scm (call-with-savepoint): new procedure. (update-or-insert): use call-with-savepoint to ensure the read and the insert/update occur within the same transaction. --- .dir-locals.el | 1 + guix/store/database.scm | 68 +++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 56 insertions(+), 13 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index 77c12f9411..d9c81b2a48 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -90,6 +90,7 @@ (eval . (put 'with-database 'scheme-indent-function 2)) (eval . (put 'call-with-transaction 'scheme-indent-function 2)) (eval . (put 'with-statement 'scheme-indent-function 3)) + (eval . (put 'call-with-savepoint 'scheme-indent-function 1)) (eval . (put 'call-with-container 'scheme-indent-function 1)) (eval . (put 'container-excursion 'scheme-indent-function 1)) diff --git a/guix/store/database.scm b/guix/store/database.scm index e74c4ba991..3193dcf23c 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -120,6 +120,26 @@ transaction after it finishes." (begin (sqlite-exec db "rollback;") (throw 'sqlite-error who error description)))))) +(define* (call-with-savepoint db proc + #:optional (savepoint-name "SomeSavepoint")) + "Call PROC after creating a savepoint named SAVEPOINT-NAME. If PROC exits +abnormally, rollback to that savepoint. In all cases, remove the savepoint +prior to returning." + (define (exec sql) + (with-statement db sql stmt + (sqlite-fold cons '() stmt))) + + (dynamic-wind + (lambda () + (exec (string-append "SAVEPOINT " savepoint-name ";"))) + (lambda () + (catch #t + proc + (lambda args + (exec (string-append "ROLLBACK TO " savepoint-name ";")) + (apply throw args)))) + (lambda () + (exec (string-append "RELEASE " savepoint-name ";"))))) (define %default-database-file ;; Default location of the store database. @@ -189,19 +209,41 @@ VALUES (:path, :hash, :time, :deriver, :size)") doesn't exactly have... they've got something close, but it involves deleting and re-inserting instead of updating, which causes problems with foreign keys, of course. Returns the row id of the row that was modified or inserted." - (let ((id (path-id db path))) - (if id - (with-statement db update-sql stmt - (sqlite-bind-arguments stmt #:id id - #:deriver deriver - #:hash hash #:size nar-size #:time time) - (sqlite-fold cons '() stmt)) - (with-statement db insert-sql stmt - (sqlite-bind-arguments stmt - #:path path #:deriver deriver - #:hash hash #:size nar-size #:time time) - (sqlite-fold cons '() stmt))) - (last-insert-row-id db))) + + ;; It's important that querying the path-id and the insert/update operation + ;; take place in the same transaction, as otherwise some other + ;; process/thread/fiber could register the same path between when we check + ;; whether it's already registered and when we register it, resulting in + ;; duplicate paths (which, due to a 'unique' constraint, would cause an + ;; exception to be thrown). With the default journaling mode this will + ;; prevent writes from occurring during that sensitive time, but with WAL + ;; mode it will instead arrange to return SQLITE_BUSY when a write occurs + ;; between the start of a read transaction and its upgrading to a write + ;; transaction (see https://sqlite.org/rescode.html#busy_snapshot). + ;; Experimentally, it seems this SQLITE_BUSY will ignore a busy_timeout and + ;; immediately return (makes sense, since waiting won't change anything). + + ;; Note that when that kind of SQLITE_BUSY error is returned, it will keep + ;; being returned every time we try to upgrade the same outermost + ;; transaction to a write transaction. So when retrying, we have to restart + ;; the *outermost* write transaction. We can't inherently tell whether + ;; we're the outermost write transaction, so we leave the retry-handling to + ;; the caller. + (call-with-savepoint db + (lambda () + (let ((id (path-id db path))) + (if id + (with-statement db update-sql stmt + (sqlite-bind-arguments stmt #:id id + #:deriver deriver + #:hash hash #:size nar-size #:time time) + (sqlite-fold cons '() stmt)) + (with-statement db insert-sql stmt + (sqlite-bind-arguments stmt + #:path path #:deriver deriver + #:hash hash #:size nar-size #:time time) + (sqlite-fold cons '() stmt))) + (last-insert-row-id db))))) (define add-reference-sql "INSERT OR REPLACE INTO Refs (referrer, reference) VALUES (:referrer, :reference);") -- cgit v1.2.3 From 8971f626f2e69987bea729307adb93a0be243234 Mon Sep 17 00:00:00 2001 From: Caleb Ristvedt Date: Mon, 1 Jun 2020 22:15:21 -0500 Subject: database: separate transaction-handling and retry-handling. Previously call-with-transaction would both retry when SQLITE_BUSY errors were thrown and do what its name suggested (start and rollback/commit a transaction). This changes it to do only what its name implies, which simplifies its implementation. Retrying is provided by the new call-with-SQLITE_BUSY-retrying procedure. * guix/store/database.scm (call-with-transaction): no longer restarts, new #:restartable? argument controls whether "begin" or "begin immediate" is used. (call-with-SQLITE_BUSY-retrying, call-with-retrying-transaction, call-with-retrying-savepoint): new procedures. (register-items): use call-with-retrying-transaction to preserve old behavior. * .dir-locals.el (call-with-retrying-transaction, call-with-retrying-savepoint): add indentation information. --- .dir-locals.el | 2 ++ guix/store/database.scm | 69 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 51 insertions(+), 20 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index d9c81b2a48..b88ec7a795 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -90,7 +90,9 @@ (eval . (put 'with-database 'scheme-indent-function 2)) (eval . (put 'call-with-transaction 'scheme-indent-function 2)) (eval . (put 'with-statement 'scheme-indent-function 3)) + (eval . (put 'call-with-retrying-transaction 'scheme-indent-function 2)) (eval . (put 'call-with-savepoint 'scheme-indent-function 1)) + (eval . (put 'call-with-retrying-savepoint 'scheme-indent-function 1)) (eval . (put 'call-with-container 'scheme-indent-function 1)) (eval . (put 'container-excursion 'scheme-indent-function 1)) diff --git a/guix/store/database.scm b/guix/store/database.scm index 3193dcf23c..ad9ca68efe 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -99,27 +99,44 @@ create it and initialize it as a new database." ;; XXX: missing in guile-sqlite3@0.1.0 (define SQLITE_BUSY 5) -(define (call-with-transaction db proc) - "Start a transaction with DB (make as many attempts as necessary) and run -PROC. If PROC exits abnormally, abort the transaction, otherwise commit the -transaction after it finishes." +(define (call-with-SQLITE_BUSY-retrying thunk) + "Call THUNK, retrying as long as it exits abnormally due to SQLITE_BUSY +errors." (catch 'sqlite-error + thunk + (lambda (key who code errmsg) + (if (= code SQLITE_BUSY) + (call-with-SQLITE_BUSY-retrying thunk) + (throw key who code errmsg))))) + + + +(define* (call-with-transaction db proc #:key restartable?) + "Start a transaction with DB and run PROC. If PROC exits abnormally, abort +the transaction, otherwise commit the transaction after it finishes. +RESTARTABLE? may be set to a non-#f value when it is safe to run PROC multiple +times. This may reduce contention for the database somewhat." + (define (exec sql) + (with-statement db sql stmt + (sqlite-fold cons '() stmt))) + ;; We might use begin immediate here so that if we need to retry, we figure + ;; that out immediately rather than because some SQLITE_BUSY exception gets + ;; thrown partway through PROC - in which case the part already executed + ;; (which may contain side-effects!) might have to be executed again for + ;; every retry. + (exec (if restartable? "begin;" "begin immediate;")) + (catch #t (lambda () - ;; We use begin immediate here so that if we need to retry, we - ;; figure that out immediately rather than because some SQLITE_BUSY - ;; exception gets thrown partway through PROC - in which case the - ;; part already executed (which may contain side-effects!) would be - ;; executed again for every retry. - (sqlite-exec db "begin immediate;") - (let ((result (proc))) - (sqlite-exec db "commit;") - result)) - (lambda (key who error description) - (if (= error SQLITE_BUSY) - (call-with-transaction db proc) - (begin - (sqlite-exec db "rollback;") - (throw 'sqlite-error who error description)))))) + (let-values ((result (proc))) + (exec "commit;") + (apply values result))) + (lambda args + ;; The roll back may or may not have occurred automatically when the + ;; error was generated. If it has occurred, this does nothing but signal + ;; an error. If it hasn't occurred, this needs to be done. + (false-if-exception (exec "rollback;")) + (apply throw args)))) + (define* (call-with-savepoint db proc #:optional (savepoint-name "SomeSavepoint")) "Call PROC after creating a savepoint named SAVEPOINT-NAME. If PROC exits @@ -141,6 +158,18 @@ prior to returning." (lambda () (exec (string-append "RELEASE " savepoint-name ";"))))) +(define* (call-with-retrying-transaction db proc #:key restartable?) + (call-with-SQLITE_BUSY-retrying + (lambda () + (call-with-transaction db proc #:restartable? restartable?)))) + +(define* (call-with-retrying-savepoint db proc + #:optional (savepoint-name + "SomeSavepoint")) + (call-with-SQLITE_BUSY-retrying + (lambda () + (call-with-savepoint db proc savepoint-name)))) + (define %default-database-file ;; Default location of the store database. (string-append %store-database-directory "/db.sqlite")) @@ -412,7 +441,7 @@ Write a progress report to LOG-PORT." (mkdir-p db-dir) (parameterize ((sql-schema schema)) (with-database (string-append db-dir "/db.sqlite") db - (call-with-transaction db + (call-with-retrying-transaction db (lambda () (let* ((prefix (format #f "registering ~a items" (length items))) (progress (progress-reporter/bar (length items) -- cgit v1.2.3 From 7a7a29445ced24af0dcdabfe8011538711fe05d9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 10 Jun 2020 18:02:01 +0300 Subject: gnu: lyx: Wrap binary. Fixes . * gnu/packages/tex.scm (lyx)[arguments]: Import qt-utils. Add phase to wrap the lyx2.3 binary. --- gnu/packages/tex.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 6f6ea73ffc..16c80324fd 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Roel Janssen -;;; Copyright © 2016, 2018, 2019 Efraim Flashner +;;; Copyright © 2016, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Federico Beffa ;;; Copyright © 2016 Thomas Danckaert ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus @@ -6140,6 +6140,11 @@ and Karl Berry.") (assoc-ref %outputs "out") ;; Exact name and level is necessary. "/lyx" ,(version-major+minor version))) + #:modules ((guix build cmake-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%cmake-build-system-modules + (guix build qt-utils)) #:phases (modify-phases %standard-phases ;; See ;; https://www.lyx.org/trac/changeset/3a123b90af838b08680471d87170c38e56787df9/lyxgit @@ -6177,6 +6182,14 @@ and Karl Berry.") ,(version-major+minor version) #\-)) "x") (string-append (getcwd) "/../lyx-" ,version "/lib")) #t)) + (add-after 'install 'wrap-qt + (lambda* (#:key outputs #:allow-other-keys) + (wrap-qt-program (assoc-ref outputs "out") + (string-append "../lyx" + ,(version-major+minor version) + "/bin/lyx" + ,(version-major+minor version))) + #t)) (add-after 'install 'install-symlinks (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit v1.2.3 From 03a7b67b314286a9185535f5ecbb7cde97ae2c97 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 10 Jun 2020 21:42:14 +0300 Subject: gnu: lyx: Update to 2.3.5.1. * gnu/packages/tex.scm (lyx): Update to 2.3.5.1. [arguments]: Remove 'fix-compilation-with-boost-1.69 phase. In 'patch-python phase patch more files, substitute with python3. Split 'setenv-check and create empty file after 'unpack. --- gnu/packages/tex.scm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 16c80324fd..cd8270634c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6116,15 +6116,15 @@ and Karl Berry.") (define-public lyx (package (name "lyx") - (version "2.3.3") + (version "2.3.5.1") (source (origin (method url-fetch) (uri (string-append "https://ftp.lyx.org/pub/lyx/stable/" (version-major+minor version) ".x/" - "lyx-" version ".tar.gz")) + "lyx-" version ".tar.xz")) (sha256 (base32 - "0j3xincwmsscfgv13g3z6h4kx1qfzgg8x71fs393akcdxsh2g07c")) + "0mv32s26igm0pd8vs7d2mk1240dpr83y0a2wyh3xz6b67ph0w157")) (modules '((guix build utils))) (snippet '(begin @@ -6147,19 +6147,17 @@ and Karl Berry.") (guix build qt-utils)) #:phases (modify-phases %standard-phases - ;; See ;; https://www.lyx.org/trac/changeset/3a123b90af838b08680471d87170c38e56787df9/lyxgit - (add-after 'unpack 'fix-compilation-with-boost-1.69 - (lambda _ - (substitute* "src/support/FileName.cpp" - (("^template struct boost::detail::crc_table_t.*") "")) - #t)) (add-after 'unpack 'patch-python (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("src/support/os.cpp") + (substitute* '("lib/configure.py" + "src/support/ForkedCalls.cpp" + "src/support/Systemcall.cpp" + "src/support/os.cpp" + "src/support/filetools.cpp") (("\"python ") (string-append "\"" (assoc-ref inputs "python") - "/bin/python "))) + "/bin/python3 "))) #t)) (add-after 'patch-python 'patch-desktop-file (lambda* (#:key outputs #:allow-other-keys) @@ -6169,13 +6167,14 @@ and Karl Berry.") (assoc-ref outputs "out") "/"))) #t)) - (add-before 'check 'setenv-check + (add-after 'unpack 'add-missing-test-file (lambda _ ;; Create missing file that would cause tests to fail. - (with-output-to-file (string-append "../lyx-" - ,version - "/src/tests/check_layout.cmake") + (with-output-to-file "src/tests/check_layout.cmake" (const #t)) + #t)) + (add-before 'check 'setenv-check + (lambda _ (setenv (string-append "LYX_DIR_" (string-join (string-split -- cgit v1.2.3 From dadf97952d574e6e44d10a2eb0e2afef86a96818 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 09:26:38 +0300 Subject: gnu: lyx: Don't install to custom directory. * gnu/packages/tex.scm (lyx)[arguments]: Adjust configure-flags to not add the version to the binary's suffix. Remove custom 'patch-desktop-file, 'setenv-check and 'install-symlink phases. --- gnu/packages/tex.scm | 37 ++++--------------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index cd8270634c..f7d5fd1506 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6136,10 +6136,9 @@ and Karl Berry.") "-DLYX_EXTERNAL_BOOST=1" "-DLYX_INSTALL=1" "-DLYX_RELEASE=1" + "-DLYX_PROGRAM_SUFFIX=OFF" ,(string-append "-DLYX_INSTALL_PREFIX=" - (assoc-ref %outputs "out") - ;; Exact name and level is necessary. - "/lyx" ,(version-major+minor version))) + (assoc-ref %outputs "out"))) #:modules ((guix build cmake-build-system) (guix build qt-utils) (guix build utils)) @@ -6159,44 +6158,16 @@ and Karl Berry.") (assoc-ref inputs "python") "/bin/python3 "))) #t)) - (add-after 'patch-python 'patch-desktop-file - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "lib/lyx.desktop.in" - (("Exec=") - (string-append "Exec=" - (assoc-ref outputs "out") - "/"))) - #t)) (add-after 'unpack 'add-missing-test-file (lambda _ ;; Create missing file that would cause tests to fail. (with-output-to-file "src/tests/check_layout.cmake" (const #t)) #t)) - (add-before 'check 'setenv-check - (lambda _ - (setenv (string-append "LYX_DIR_" - (string-join - (string-split - ,(version-major+minor version) #\-)) "x") - (string-append (getcwd) "/../lyx-" ,version "/lib")) - #t)) (add-after 'install 'wrap-qt (lambda* (#:key outputs #:allow-other-keys) - (wrap-qt-program (assoc-ref outputs "out") - (string-append "../lyx" - ,(version-major+minor version) - "/bin/lyx" - ,(version-major+minor version))) - #t)) - (add-after 'install 'install-symlinks - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/bin")) - (symlink (string-append "../lyx" ,(version-major+minor version) - "/bin/lyx" ,(version-major+minor version)) - (string-append out "/bin/lyx" ,(version-major+minor version))) - #t)))))) + (wrap-qt-program (assoc-ref outputs "out") "lyx") + #t))))) (inputs `(("boost" ,boost) ("hunspell" ,hunspell) ; Note: Could also use aspell instead. -- cgit v1.2.3 From e192b9e02d7cf6f063b6fe0895a0d3f7b34cc9b7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 09:49:45 +0300 Subject: gnu: lyx: Use qt-build-system. * gnu/packages/tex.scm (lyx)[build-system]: Switch to qt-build-system. [arguments]: Remove imported modules. Remove custom 'wrap-qt phase. --- gnu/packages/tex.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index f7d5fd1506..47645a3e34 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -33,9 +33,9 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) + #:use-module (guix build-system qt) #:use-module (guix build-system trivial) #:use-module (guix build-system texlive) #:use-module (guix utils) @@ -6130,7 +6130,7 @@ and Karl Berry.") '(begin (delete-file-recursively "3rdparty") #t)))) - (build-system cmake-build-system) + (build-system qt-build-system) (arguments `(#:configure-flags `("-DLYX_USE_QT=QT5" "-DLYX_EXTERNAL_BOOST=1" @@ -6139,11 +6139,6 @@ and Karl Berry.") "-DLYX_PROGRAM_SUFFIX=OFF" ,(string-append "-DLYX_INSTALL_PREFIX=" (assoc-ref %outputs "out"))) - #:modules ((guix build cmake-build-system) - (guix build qt-utils) - (guix build utils)) - #:imported-modules (,@%cmake-build-system-modules - (guix build qt-utils)) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-python @@ -6163,10 +6158,6 @@ and Karl Berry.") ;; Create missing file that would cause tests to fail. (with-output-to-file "src/tests/check_layout.cmake" (const #t)) - #t)) - (add-after 'install 'wrap-qt - (lambda* (#:key outputs #:allow-other-keys) - (wrap-qt-program (assoc-ref outputs "out") "lyx") #t))))) (inputs `(("boost" ,boost) -- cgit v1.2.3 From 3d79fd59fee6716fcb457b17b5c54208ad789cbb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:34:59 +0300 Subject: gnu: subversion: Use a mirror URL. * gnu/packages/version-control.scm (subversion)[source]: Use an apache mirror:// URL. --- gnu/packages/version-control.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 60a31fb16c..bac51e3181 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2016 Mathieu Lirzin ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2014, 2016, 2019 Eric Bavier -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2015, 2018 Kyle Meyer ;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2016, 2017 Leo Famulari @@ -1572,12 +1572,8 @@ following features: (version "1.10.6") (source (origin (method url-fetch) - (uri - (list - (string-append "https://archive.apache.org/dist/subversion/" - "subversion-" version ".tar.bz2") - (string-append "https://www-eu.apache.org/dist/subversion/" - "subversion-" version ".tar.bz2"))) + (uri (string-append "mirror://apache/dist/subversion/" + "subversion-" version ".tar.bz2")) (sha256 (base32 "19zc215mhpnm92mlyl5jbv57r5zqp6cavr3s2g9yglp6j4kfgj0q")))) -- cgit v1.2.3 From 1c32eb95af304800b65c0bdebe0ea81f70b90080 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:46:51 +0300 Subject: gnu: serf: Use a mirror URL. * gnu/packages/web.scm (serf)[source]: Use an apache mirror:// URL. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 30ef341fa3..82174c0033 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1575,7 +1575,7 @@ from streaming URLs. It is a command-line wrapper for the libquvi library.") (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/serf/serf-" + (uri (string-append "mirror://apache/dist/serf/serf-" version ".tar.bz2")) (sha256 (base32 "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l")))) -- cgit v1.2.3 From a00687427d89321fd796d3cdc657d134374aae56 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:48:08 +0300 Subject: gnu: maven-shared-utils: Use a mirror URL. * gnu/packages/maven.scm (maven-shared-utils)[source]: Use an apache mirror:// URL. --- gnu/packages/maven.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index c18850bb26..13091edd5b 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Björn Höfling +;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -339,7 +340,7 @@ Maven Wagon, for use in Maven."))) (version "3.2.1") (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/maven/shared/" + (uri (string-append "mirror://apache/dist/maven/shared/" "maven-shared-utils-" version "-source-release.zip")) (sha256 (base32 -- cgit v1.2.3 From 623aa56402b257d01169a375420f13f80f8a57df Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:48:58 +0300 Subject: gnu: maven-plugin-annotations: Use a mirror URL. * gnu/packages/maven.scm (maven-plugin-annotations)[source]: Use an apache mirror:// URL. --- gnu/packages/maven.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 13091edd5b..5c7e49b3a1 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -380,7 +380,7 @@ replacement with improvements.") (version "3.5") (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/maven/" + (uri (string-append "mirror://apache/dist/maven/" "plugin-tools/maven-plugin-tools-" version "-source-release.zip")) (sha256 (base32 "1ryqhs62j5pas93brhf5dsnvp99hxbvssf681yj5rk3r9h24hqm2")))) -- cgit v1.2.3 From 67b1257775d8b42b60d57627888fa385631eb570 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:49:41 +0300 Subject: gnu: maven-wagon-provider-api: Use a mirror URL. * gnu/packages/maven.scm (maven-wagon-provider-api)[source]: Use an apache mirror:// URL. --- gnu/packages/maven.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 5c7e49b3a1..fe960ec9ef 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -404,7 +404,7 @@ replacement with improvements.") (version "3.1.0") (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/maven/wagon/" + (uri (string-append "mirror://apache/dist/maven/wagon/" "wagon-" version "-source-release.zip")) (sha256 (base32 "0r07j6xdzdnrvqnv8ida7dx1m05pznh5qgmcfcfpyvg9nxbj3l1n")))) (build-system ant-build-system) -- cgit v1.2.3 From 21d3307875e1e515739306aa4cff0ff0f7f4c4b5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:50:29 +0300 Subject: gnu: maven-artifact: Use a mirror URL. * gnu/packages/maven.scm (maven-artifact)[source]: Use an apache mirror:// URL. --- gnu/packages/maven.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index fe960ec9ef..a62eb7469e 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -691,7 +691,7 @@ gets and puts artifacts through HTTP(S) using Apache HttpClient-4.x."))) (version "3.6.1") (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/maven/" + (uri (string-append "mirror://apache/dist/maven/" "maven-3/" version "/source/" "apache-maven-" version "-src.tar.gz")) (sha256 (base32 "0grw9zp166ci53rd7qkyy2qmwmik37xhiz1z84jpm0msyvzj2n82")) -- cgit v1.2.3 From f4bb881abda8f3cf3312b2da86ba93c8fdb13a7b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:52:18 +0300 Subject: gnu: ant-bootstrap: Use a mirror URL. * gnu/packages/java.scm (ant-bootstrap)[source]: Use an apache mirror:// URL. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 43f0f37b91..2d778d98cc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -276,7 +276,7 @@ JNI.") (version "1.8.4") (source (origin (method url-fetch) - (uri (string-append "http://archive.apache.org/dist/" + (uri (string-append "mirror://apache/dist/" "ant/source/apache-ant-" version "-src.tar.bz2")) (sha256 -- cgit v1.2.3 From 894d6a085dc47f767efa43520b524e0f6c53d224 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:53:39 +0300 Subject: gnu: java-commons-httpclient: Use a mirror URL. * gnu/packages/java.scm (java-commons-httpclient)[source]: Use an apache mirror:// URL. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2d778d98cc..d36e3b0f92 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10832,7 +10832,7 @@ graphs, and pie charts.") (version "3.1") (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/httpcomponents/" + (uri (string-append "mirror://apache/dist/httpcomponents/" "commons-httpclient/source/commons-httpclient-" version "-src.tar.gz")) (sha256 -- cgit v1.2.3 From bb0d840b7dffac94f8be298cfa4846f12157ad5b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:54:31 +0300 Subject: gnu: java-jakarta-oro: Use a mirror URL. * gnu/packages/java.scm (java-jakarta-oro)[source]: Download using an apache mirror:// URL. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d36e3b0f92..885086fe30 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10928,7 +10928,7 @@ inside a Zip archive.") (version "2.0.8") (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/jakarta/oro/" + (uri (string-append "mirror://apache/dist/jakarta/oro/" "jakarta-oro-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From f65adfa445b7e061cbff9b699b9dd4eaa66e3b19 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Thu, 11 Jun 2020 14:08:07 +0200 Subject: gnu: sameboy: Update to 0.13.2. * gnu/packages/emulators.scm (sameboy): Update to 0.13.2. [arguments]: Specify NATIVE_CC to avoid requiring the `cc' program. --- gnu/packages/emulators.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 9798ac370e..59240f17c4 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -470,7 +470,7 @@ and Game Boy Color games.") (define-public sameboy (package (name "sameboy") - (version "0.13.1") + (version "0.13.2") (source (origin (method git-fetch) @@ -479,7 +479,7 @@ and Game Boy Color games.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1il2bpbc3xyvvhbs2bgid64svjxcdl4dbqz6jy1azfmvzdp7jkrn")))) + (base32 "19qb1ib9sk5bjdv4arbwkv8l2afpll5axrif3wi7p2yhvpba10c0")))) (build-system gnu-build-system) (native-inputs `(("rgbds" ,rgbds) @@ -489,7 +489,7 @@ and Game Boy Color games.") `(("sdl2" ,sdl2))) (arguments `(#:tests? #f ; There are no tests - #:make-flags `("CC=gcc" "CONF=release" + #:make-flags `("CC=gcc" "NATIVE_CC=gcc" "CONF=release" ,(string-append "DATA_DIR=" (assoc-ref %outputs "out") "/share/sameboy/")) -- cgit v1.2.3 From 82b9ed4eae78cd9dd672c4ecea16c9270e2a95a4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 11 Jun 2020 15:44:21 +0200 Subject: gnu: php: Update to 7.4.7. * gnu/packages/php.scm (php): Update to 7.4.7. --- gnu/packages/php.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 8cd8cace8c..6d9f46e960 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -60,7 +60,7 @@ (define-public php (package (name "php") - (version "7.4.6") + (version "7.4.7") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -68,7 +68,7 @@ "php-" version ".tar.xz")) (sha256 (base32 - "0ck8s3zlqnkswwmz3p1bgma7ddjsx9j9sdlz5di1jc7nhhpk4h6p")) + "1brgnp11vpy1619cx0cncih02rg2k20wllm21vxbd2nd4j7qymak")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" -- cgit v1.2.3 From 0b684d087d4b50ea276761ac36ee5f01a84a2547 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:29:29 +0200 Subject: gnu: r-foreign: Update to 0.8-80. * gnu/packages/statistics.scm (r-foreign): Update to 0.8-80. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index fd898a32c5..a15baf2c92 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -513,14 +513,14 @@ code for possible problems.") (define-public r-foreign (package (name "r-foreign") - (version "0.8-79") + (version "0.8-80") (source (origin (method url-fetch) (uri (cran-uri "foreign" version)) (sha256 (base32 - "1d5rk4k3khjrir1b4ciridd6vdpcgzi35r7p7ra4ky7vbaabcdmg")))) + "0wjdi3qn9famsxmpdyyahidaid0yhxlpx4ad9k8vrxhxd6xspasp")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/foreign") (synopsis "Read data stored by other statistics software") -- cgit v1.2.3 From 06dfe35322406bb3f995331e49df5070e1fb7b3e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:29:39 +0200 Subject: gnu: r-nlme: Update to 3.1-148. * gnu/packages/statistics.scm (r-nlme): Update to 3.1-148. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a15baf2c92..94794560ae 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -599,13 +599,13 @@ and operations on them using LAPACK and SuiteSparse.") (define-public r-nlme (package (name "r-nlme") - (version "3.1-147") + (version "3.1-148") (source (origin (method url-fetch) (uri (cran-uri "nlme" version)) (sha256 - (base32 "1rqc3wy3lmy0wczsvsn8yszzsxhppfwg4iznb1j6ki2qawpdij7g")))) + (base32 "1cmf43r82kar1hpj9dhqfi3rbjka0z5s6cbdy7fklwh99xj3phkp")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From 015a7455a88c05c080aa5771c716bad9d2bfebfc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:29:48 +0200 Subject: gnu: r-ggplot2: Update to 3.3.1. * gnu/packages/statistics.scm (r-ggplot2): Update to 3.3.1. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 94794560ae..8f29abde66 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1097,13 +1097,13 @@ using just two functions: melt and dcast (or acast).") (define-public r-ggplot2 (package (name "r-ggplot2") - (version "3.3.0") + (version "3.3.1") (source (origin (method url-fetch) (uri (cran-uri "ggplot2" version)) (sha256 - (base32 "0j21am605kqqzlwhm45kaj0m2irnmy2vz0j7kzi9f0qdzrv3q3ij")))) + (base32 "04wvswadlry2n9gnfqlpdqsav1wllnlzb5c9w9ydynllv4vkwfm0")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) @@ -1117,6 +1117,8 @@ using just two functions: melt and dcast (or acast).") ("r-scales" ,r-scales) ("r-svglite" ,r-svglite) ; Needed for 'ggsave' ("r-withr" ,r-withr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://ggplot2.tidyverse.org") (synopsis "An implementation of the grammar of graphics") (description -- cgit v1.2.3 From b2c29827557893214cf02169b9865bfa707dbb3d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:30:11 +0200 Subject: gnu: r-dplyr: Update to 1.0.0. * gnu/packages/statistics.scm (r-dplyr): Update to 1.0.0. [propagated-inputs]: Remove r-assertthat, r-bh, r-pkgconfig, r-plogr, and r-rcpp; add r-generics, r-lifecycle, and r-vctrs. --- gnu/packages/statistics.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 8f29abde66..4c2e75a8ae 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1667,27 +1667,25 @@ and printing capabilities than traditional data frames.") (define-public r-dplyr (package (name "r-dplyr") - (version "0.8.5") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "dplyr" version)) (sha256 (base32 - "0602b4a9nffxx67q57csqp87nkrv33nn9wlaw1458yys9fzx6l2p")))) + "1wxi7pzw1mqkgay2s9hwlkpkxfzydngf56wrf7k93n14rlqm3dmz")))) (build-system r-build-system) (propagated-inputs - `(("r-assertthat" ,r-assertthat) - ("r-bh" ,r-bh) - ("r-ellipsis" ,r-ellipsis) + `(("r-ellipsis" ,r-ellipsis) + ("r-generics" ,r-generics) ("r-glue" ,r-glue) + ("r-lifecycle" ,r-lifecycle) ("r-magrittr" ,r-magrittr) - ("r-pkgconfig" ,r-pkgconfig) - ("r-plogr" ,r-plogr) ("r-r6" ,r-r6) - ("r-rcpp" ,r-rcpp) ("r-rlang" ,r-rlang) ("r-tibble" ,r-tibble) - ("r-tidyselect" ,r-tidyselect))) + ("r-tidyselect" ,r-tidyselect) + ("r-vctrs" ,r-vctrs))) (native-inputs `(("r-knitr" ,r-knitr))) (home-page "https://github.com/hadley/dplyr") -- cgit v1.2.3 From 91428c3611ad5c91b5149af9564d269afcaab220 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:31:06 +0200 Subject: gnu: r-dbplyr: Update to 1.4.4. * gnu/packages/statistics.scm (r-dbplyr): Update to 1.4.4. [propagated-inputs]: Add r-blob and r-magrittr. --- gnu/packages/statistics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 4c2e75a8ae..a0a7446d7d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1703,21 +1703,23 @@ database.") (define-public r-dbplyr (package (name "r-dbplyr") - (version "1.4.3") + (version "1.4.4") (source (origin (method url-fetch) (uri (cran-uri "dbplyr" version)) (sha256 (base32 - "1si8sahr1kwq1xgjzi9klkahad07pyrsngy75y1f74f64907pb39")))) + "1v0p0557n6bz84nq9jc4182k00mdd1hvz7h4w3bbg81z0fmpj0d8")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) + ("r-blob" ,r-blob) ("r-dbi" ,r-dbi) ("r-dplyr" ,r-dplyr) ("r-glue" ,r-glue) ("r-lifecycle" ,r-lifecycle) + ("r-magrittr" ,r-magrittr) ("r-purrr" ,r-purrr) ("r-r6" ,r-r6) ("r-rlang" ,r-rlang) -- cgit v1.2.3 From 17788c8c2ff09192ff0d99b15fe4c30319cf9f63 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:31:32 +0200 Subject: gnu: r-backports: Update to 1.1.7. * gnu/packages/statistics.scm (r-backports): Update to 1.1.7. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a0a7446d7d..1869ff1a60 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2094,14 +2094,14 @@ limited to R.") (define-public r-backports (package (name "r-backports") - (version "1.1.6") + (version "1.1.7") (source (origin (method url-fetch) (uri (cran-uri "backports" version)) (sha256 (base32 - "170rphqq28j0pcr28g6dxv3isp436ajhyzkpri31pn0lfm3szs6h")))) + "02vfkqm1kw54y1qax8cmiyg2nk6bmh8j87fc3j22k7852s3y4xxj")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/backports") (synopsis "Reimplementations of functions introduced since R 3.0.0") -- cgit v1.2.3 From 8637b77a9fbc63c1c7a173ce6c5fb50472a35977 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:31:41 +0200 Subject: gnu: r-rcpparmadillo: Update to 0.9.900.1.0. * gnu/packages/statistics.scm (r-rcpparmadillo): Update to 0.9.900.1.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 1869ff1a60..f5fcceb7c2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2591,13 +2591,13 @@ well as additional utilities such as panel and axis annotation functions.") (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.9.870.2.0") + (version "0.9.900.1.0") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "1r7iajxvbyvslsy16rqacc95azmjciw9lvcq31xl97fl09kmsq5v")))) + "1zisw2yrb9qmmrs7q8y83mrm7lh1c2786h70gs8jwc0si16x0lq5")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From d41b944938b184309f57727f42130cd620d47416 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:31:50 +0200 Subject: gnu: r-rmarkdown: Update to 2.2. * gnu/packages/statistics.scm (r-rmarkdown): Update to 2.2. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index f5fcceb7c2..2670c425b2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2683,13 +2683,13 @@ certain criterion, e.g., it contains a certain regular file.") (define-public r-rmarkdown (package (name "r-rmarkdown") - (version "2.1") + (version "2.2") (source (origin (method url-fetch) (uri (cran-uri "rmarkdown" version)) (sha256 - (base32 "0pa5xs0vzwn9vsgysjqbks9v5lbqphxh5agciskllibc40hhwigg")))) + (base32 "196r3hq1gcr6iamxllq4k40cb109b16ng24ky0q68bwrll80q1mh")))) (properties `((upstream-name . "rmarkdown"))) (build-system r-build-system) (propagated-inputs @@ -2704,6 +2704,8 @@ certain criterion, e.g., it contains a certain regular file.") ("r-xfun" ,r-xfun) ("r-yaml" ,r-yaml) ("ghc-pandoc" ,ghc-pandoc))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://rmarkdown.rstudio.com") (synopsis "Convert R Markdown documents into a variety of formats") (description -- cgit v1.2.3 From ba8ebc96c2f9e6481e09b9435fb46b075e8c46d6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:32:03 +0200 Subject: gnu: r-glmnet: Update to 4.0. * gnu/packages/statistics.scm (r-glmnet): Update to 4.0. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 2670c425b2..854cde3bd1 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3233,16 +3233,17 @@ analysis of large sparse or dense matrices.") (define-public r-glmnet (package (name "r-glmnet") - (version "3.0-2") + (version "4.0") (source (origin (method url-fetch) (uri (cran-uri "glmnet" version)) (sha256 - (base32 "0b3nnfzp8dxcdkvxr0yvy6d58yk3xg4kz1wqa42bxqppbakmd2gl")))) + (base32 "1vy8v6filhw9sflk8wwnbgz2mryg70ml4iq4y1c34dlwxczcbzv8")))) (build-system r-build-system) (native-inputs - `(("gfortran" ,gfortran))) + `(("gfortran" ,gfortran) + ("r-knitr" ,r-knitr))) (propagated-inputs `(("r-foreach" ,r-foreach) ("r-matrix" ,r-matrix) -- cgit v1.2.3 From f208a5ecc5ba70158df97abceb0839e0c613eae5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:32:26 +0200 Subject: gnu: r-mvtnorm: Update to 1.1-1. * gnu/packages/statistics.scm (r-mvtnorm): Update to 1.1-1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 854cde3bd1..2724c7069a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3577,13 +3577,13 @@ vignettes.") (define-public r-mvtnorm (package (name "r-mvtnorm") - (version "1.1-0") + (version "1.1-1") (source (origin (method url-fetch) (uri (cran-uri "mvtnorm" version)) (sha256 (base32 - "0pfb6qk4yb6xaya8i1wvx6dnc3jj4s2g94sq2kzv4p8zn4pf24l1")))) + "1pj51mi0g6ip7a2nhzc93yv9289kaayvspjvsbgbgarvx7axlrg9")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 7518244343f9773670bbb5dc19e8eb3229caa90a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:32:33 +0200 Subject: gnu: r-tidyr: Update to 1.1.0. * gnu/packages/statistics.scm (r-tidyr): Update to 1.1.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 2724c7069a..02773995ff 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3704,14 +3704,14 @@ selection.") (define-public r-tidyr (package (name "r-tidyr") - (version "1.0.3") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "tidyr" version)) (sha256 (base32 - "18ypk63nifp5jj5d9880m49zdv7n4a18gac59wj5z5xk6qr7vfal")))) + "0vqj5dakb35axv4l0yrihpa16vnz2b5bhaaqg7l0gsqbb04qcb00")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) -- cgit v1.2.3 From 51dd48b0bd6040a10874e1d320fd9dc8fb1c14d4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:32:40 +0200 Subject: gnu: r-cardata: Update to 3.0-4. * gnu/packages/statistics.scm (r-cardata): Update to 3.0-4. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 02773995ff..f450ef320f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5220,13 +5220,13 @@ bootstrap test for generalized linear mixed models.") (define-public r-cardata (package (name "r-cardata") - (version "3.0-3") + (version "3.0-4") (source (origin (method url-fetch) (uri (cran-uri "carData" version)) (sha256 - (base32 "0cg2yxzn0pdjqykr60my1fzpfkqac21fll5hv3m9w5c9sayq8swq")))) + (base32 "09270j39n4jpswxqps20b12zaj8dz4rrqpk2l2j5bnf1xzizb9nd")))) (properties `((upstream-name . "carData"))) (build-system r-build-system) (home-page "https://r-forge.r-project.org/projects/car/") -- cgit v1.2.3 From 8c9474ad6dde0d0116f2d086776ce62880e9ae68 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:32:49 +0200 Subject: gnu: r-car: Update to 3.0-8. * gnu/packages/statistics.scm (r-car): Update to 3.0-8. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index f450ef320f..30a0d44392 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5239,13 +5239,13 @@ Companion to Applied Regression, Third Edition, Sage.") (define-public r-car (package (name "r-car") - (version "3.0-7") + (version "3.0-8") (source (origin (method url-fetch) (uri (cran-uri "car" version)) (sha256 - (base32 "11sfk1l41j27mrfy16g7b02c570n3gy9icvpcrfjh1biykqa565d")))) + (base32 "0ig1691kxbzkrsq8xi5a6fq2f0vq22j1dn54jxdkldqr5vri1m57")))) (build-system r-build-system) (propagated-inputs `(("r-abind" ,r-abind) -- cgit v1.2.3 From 5c6e70346efc6a581a4acbec16d0b228d1bddb82 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:33:01 +0200 Subject: gnu: Add r-tmvnsim. * gnu/packages/statistics.scm (r-tmvnsim): New variable. --- gnu/packages/statistics.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 30a0d44392..2a878a44e2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5289,6 +5289,35 @@ computations taking place in C++ code, and support for interrupting those comput even in multithreaded code, typically using OpenMP.") (license license:gpl3+))) +(define-public r-tmvnsim + (package + (name "r-tmvnsim") + (version "1.0-2") + (source + (origin + (method url-fetch) + (uri (cran-uri "tmvnsim" version)) + (sha256 + (base32 + "03xsvsg9bqvgl98ywid3h91mmlhax5s6wvmypp3hq91vmc5kvxlp")))) + (properties `((upstream-name . "tmvnsim"))) + (build-system r-build-system) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "https://www.r-project.org") + (synopsis "Truncated multivariate normal simulation") + (description + "This package implements importance sampling from the truncated +multivariate normal using the @dfn{Geweke-Hajivassiliou-Keane} (GHK) +simulator. Unlike Gibbs sampling which can get stuck in one truncation +sub-region depending on initial values, this package allows truncation based +on disjoint regions that are created by truncation of absolute values. The +GHK algorithm uses simple Cholesky transformation followed by recursive +simulation of univariate truncated normals hence there are also no convergence +issues. Importance sample is returned along with sampling weights, based on +which, one can calculate integrals over truncated regions for multivariate +normals.") + (license license:gpl2))) + (define-public r-mnormt (package (name "r-mnormt") -- cgit v1.2.3 From bbf495d59fe07973e6232f2dbffb7bb34cb0f35a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:36:19 +0200 Subject: gnu: r-mnormt: Update to 2.0.0. * gnu/packages/statistics.scm (r-mnormt): Update to 2.0.0. [propagated-inputs]: Add r-tmvnsim. --- gnu/packages/statistics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 2a878a44e2..4a1d35a210 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5321,15 +5321,17 @@ normals.") (define-public r-mnormt (package (name "r-mnormt") - (version "1.5-7") + (version "2.0.0") (source (origin (method url-fetch) (uri (cran-uri "mnormt" version)) (sha256 (base32 - "1y0vlvh02wza2wvfd29wxjlw3jg9rnwnx3kph5qz4179kz87fgfg")))) + "1gxhma0zqsx5pkc0871vszq1y7akwdmpm8rhws5b3gr6w9mx4agf")))) (build-system r-build-system) + (propagated-inputs + `(("r-tmvnsim" ,r-tmvnsim))) (native-inputs `(("gfortran" ,gfortran))) (home-page "http://azzalini.stat.unipd.it/SW/Pkg-mnormt") -- cgit v1.2.3 From b5613d63a205adc23e154166e178b21949e2540c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:36:40 +0200 Subject: gnu: r-sn: Update to 1.6-2. * gnu/packages/statistics.scm (r-sn): Update to 1.6-2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 4a1d35a210..09f6695cb5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5366,14 +5366,14 @@ first and second order derivatives.") (define-public r-sn (package (name "r-sn") - (version "1.6-1") + (version "1.6-2") (source (origin (method url-fetch) (uri (cran-uri "sn" version)) (sha256 (base32 - "0snri2k8qslb7478c5jz4a5xxmmb1ipmp8x1jizi8mhj2cjic1w0")))) + "179xb7yb8br99aa5awm2yxsy0v5w1kdhv6a7ifaliz2y64677m1g")))) (build-system r-build-system) (propagated-inputs `(("r-mnormt" ,r-mnormt) -- cgit v1.2.3 From 249f082806cfda225200f8eb3373aaf2e5ece338 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:36:46 +0200 Subject: gnu: r-lubridate: Update to 1.7.9. * gnu/packages/statistics.scm (r-lubridate): Update to 1.7.9. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 09f6695cb5..7e88e1e54a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5497,14 +5497,14 @@ is supported.") (define-public r-lubridate (package (name "r-lubridate") - (version "1.7.8") + (version "1.7.9") (source (origin (method url-fetch) (uri (cran-uri "lubridate" version)) (sha256 (base32 - "0g2m9dyhgds4shdrk76w7rqdl9msam4rii2qrhz12gipzhi9k89x")))) + "0wnjzvfkrgp2hkr8g5r5vcgcxmsq8bhdmkzkk0m93wr3fgh5xyfb")))) (build-system r-build-system) (propagated-inputs `(("r-generics" ,r-generics) -- cgit v1.2.3 From 280fbacf78e6665be5ba200b669c388253ed3a92 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:37:05 +0200 Subject: gnu: r-ggpmisc: Update to 0.3.5. * gnu/packages/cran.scm (r-ggpmisc): Update to 0.3.5. [propagated-inputs]: Add r-magrittr, r-rlang, r-scales, and r-stringr. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b27dd40871..0e2825d82a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -124,13 +124,13 @@ the system clipboards.") (define-public r-ggpmisc (package (name "r-ggpmisc") - (version "0.3.4") + (version "0.3.5") (source (origin (method url-fetch) (uri (cran-uri "ggpmisc" version)) (sha256 (base32 - "0xc1yp0kphipq23ri4ij93garx1x2nrf4i0lhs6m10pp9yz7fbmj")))) + "0ma2d3a3v8n85sghxr9anl6vgbs8gi82i1dllw99n81gsm59wgin")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) @@ -138,13 +138,19 @@ the system clipboards.") ("r-ggplot2" ,r-ggplot2) ("r-gridextra" ,r-gridextra) ("r-lubridate" ,r-lubridate) + ("r-magrittr" ,r-magrittr) ("r-mass" ,r-mass) ("r-plyr" ,r-plyr) ("r-polynom" ,r-polynom) + ("r-rlang" ,r-rlang) + ("r-scales" ,r-scales) ("r-splus2r" ,r-splus2r) + ("r-stringr" ,r-stringr) ("r-tibble" ,r-tibble) ("r-xts" ,r-xts) ("r-zoo" ,r-zoo))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://www.r4photobiology.info/") (synopsis "Miscellaneous Extensions to @code{ggplot2}") (description "This package provides extensions to @code{ggplot2}, -- cgit v1.2.3 From b0e813f65a3f3b9be4fdcd6cfb5920b241a56207 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:37:41 +0200 Subject: gnu: r-ellipsis: Update to 0.3.1. * gnu/packages/cran.scm (r-ellipsis): Update to 0.3.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0e2825d82a..c5843c7cf7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -259,14 +259,14 @@ information.") (define-public r-ellipsis (package (name "r-ellipsis") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (cran-uri "ellipsis" version)) (sha256 (base32 - "01z9gq311nzwv3a0sa49jhm5ylqd59srip4vjkrf23hzgb5i9y0b")))) + "1nvmkcca57d9067rcggw1gby80ibx5hplk2myz0cs9zwilaib2jg")))) (build-system r-build-system) (propagated-inputs `(("r-rlang" ,r-rlang))) -- cgit v1.2.3 From 55d34bf2161701004ed4adda4863163944410f59 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:37:51 +0200 Subject: gnu: r-modelr: Update to 0.1.8. * gnu/packages/cran.scm (r-modelr): Update to 0.1.8. [propagated-inputs]: Remove r-dplyr; add r-vctrs. --- gnu/packages/cran.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c5843c7cf7..01adb0bae9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -602,24 +602,24 @@ the embedded @code{RapidXML} C++ library.") (define-public r-modelr (package (name "r-modelr") - (version "0.1.7") + (version "0.1.8") (source (origin (method url-fetch) (uri (cran-uri "modelr" version)) (sha256 (base32 - "1nln33ajad0c917hmal4v6fbw8rncsch9xz5sifqfw6wgqjx9yy6")))) + "1i31nff7bqibk6r4hhd4j1vzwbyaf8493v0bjaagn36njmysfnw2")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) - ("r-dplyr" ,r-dplyr) ("r-magrittr" ,r-magrittr) ("r-purrr" ,r-purrr) ("r-rlang" ,r-rlang) ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr) - ("r-tidyselect" ,r-tidyselect))) + ("r-tidyselect" ,r-tidyselect) + ("r-vctrs" ,r-vctrs))) (home-page "https://github.com/tidyverse/modelr") (synopsis "Helper functions for modelling in pipelines") (description -- cgit v1.2.3 From 340c40b70138a820c8898ba1b94b96ca9a294097 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:38:14 +0200 Subject: gnu: r-httpuv: Update to 1.5.4. * gnu/packages/cran.scm (r-httpuv): Update to 1.5.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 01adb0bae9..068edc67c9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -630,13 +630,13 @@ into a pipeline of data manipulation and visualisation.") (define-public r-httpuv (package (name "r-httpuv") - (version "1.5.2") + (version "1.5.4") (source (origin (method url-fetch) (uri (cran-uri "httpuv" version)) (sha256 (base32 - "13ax0hs2lc39ilznh1zarwqdzahcbhb8adilrfik3xg0fkljpcwk")))) + "066rprqvz9qln6xd85x1yh1wbbmzd157xjl8zq1zbgr8l6347inm")))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) -- cgit v1.2.3 From 1812ff93fc9e1da7568af19266aa02feaabac497 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 14:38:24 +0200 Subject: gnu: r-servr: Update to 0.17. * gnu/packages/cran.scm (r-servr): Update to 0.17. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 068edc67c9..aaaa16abd0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -683,13 +683,13 @@ in systems and applications.") (define-public r-servr (package (name "r-servr") - (version "0.16") + (version "0.17") (source (origin (method url-fetch) (uri (cran-uri "servr" version)) (sha256 (base32 - "106skz04iq4dkblr17idxsxfcfqic6rcaz8mahydkwjjppnhp5fc")))) + "0lxkjr7mwdk96cdpx66j92nn4w2vkgn2j2bbg7kd4238jsk9srs7")))) (build-system r-build-system) (propagated-inputs `(("r-httpuv" ,r-httpuv) -- cgit v1.2.3 From 130134b6b5b17853f507cc3d23ad8005ee4d927b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:02:36 +0200 Subject: gnu: r-d3r: Update to 0.9.0. * gnu/packages/cran.scm (r-d3r): Update to 0.9.0. [propagated-inputs]: Add r-rlang. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index aaaa16abd0..9d441109cb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1182,14 +1182,14 @@ Bootstrap themes, which are packaged for use with Shiny applications.") (define-public r-d3r (package (name "r-d3r") - (version "0.8.7") + (version "0.9.0") (source (origin (method url-fetch) (uri (cran-uri "d3r" version)) (sha256 (base32 - "0xl3im76lp7pd5lhp8jfyqdm4j4zvjrx5a5fl81xv2cf7x3n4f2a")))) + "0vd1qk8yr18xdfkv5ybhqvf0mmccpi721wqa7c881nzm9nnlzc4y")))) (build-system r-build-system) (arguments `(#:modules ((guix build utils) @@ -1224,6 +1224,7 @@ Bootstrap themes, which are packaged for use with Shiny applications.") (propagated-inputs `(("r-dplyr" ,r-dplyr) ("r-htmltools" ,r-htmltools) + ("r-rlang" ,r-rlang) ("r-tidyr" ,r-tidyr))) (native-inputs `(("uglify-js" ,uglify-js) -- cgit v1.2.3 From 6b2126f3329736cda0ffe8fdeb540531cbd938a0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:03:06 +0200 Subject: gnu: r-haven: Update to 2.3.1. * gnu/packages/cran.scm (r-haven): Update to 2.3.1. [native-inputs]: Add r-knitr. [propagated-inputs]: Add r-vctrs. --- gnu/packages/cran.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9d441109cb..09d53030ee 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1536,17 +1536,19 @@ including functions for geolocation and routing.") (define-public r-haven (package (name "r-haven") - (version "2.2.0") + (version "2.3.1") (source (origin (method url-fetch) (uri (cran-uri "haven" version)) (sha256 (base32 - "0g9d6mxqmrw2zdms78jpx2sx73pczlyy771v1h5hmxqz9sqyk7hr")))) + "03cypgqhdkrfbfpl1yx2wb7flczrbak1w654wkicmd5ajwr9zvkf")))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) + (native-inputs + `(("r-knitr" ,r-knitr))) (propagated-inputs `(("r-forcats" ,r-forcats) ("r-hms" ,r-hms) @@ -1554,7 +1556,8 @@ including functions for geolocation and routing.") ("r-rlang" ,r-rlang) ("r-readr" ,r-readr) ("r-tibble" ,r-tibble) - ("r-tidyselect" ,r-tidyselect))) + ("r-tidyselect" ,r-tidyselect) + ("r-vctrs" ,r-vctrs))) (home-page "https://haven.tidyverse.org") (synopsis "Import and Export 'SPSS', 'Stata' and 'SAS' Files") (description -- cgit v1.2.3 From e671034cf4c51d495ef64eec765119d76b3f6430 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:03:28 +0200 Subject: gnu: r-ape: Update to 5.4. * gnu/packages/cran.scm (r-ape): Update to 5.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 09d53030ee..b30b2911e8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1587,14 +1587,14 @@ component analysis (with robust methods, and parallelized functions).") (define-public r-ape (package (name "r-ape") - (version "5.3") + (version "5.4") (source (origin (method url-fetch) (uri (cran-uri "ape" version)) (sha256 (base32 - "08wbk1kxhs32bmmvqlqanbdg1w235amd35k8m00fngsj9h9xzc08")))) + "0f74x9vx9sxpns2hlq4w2x80cd2gw42isfgncvs9pqbjf4hiyqnr")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice) -- cgit v1.2.3 From 75766c8e7812e40598160b3aa8b71eed4ddb9f66 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:03:38 +0200 Subject: gnu: r-glue: Update to 1.4.1. * gnu/packages/cran.scm (r-glue): Update to 1.4.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b30b2911e8..3a38d7d000 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1663,14 +1663,14 @@ colors are provided.") (define-public r-glue (package (name "r-glue") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (cran-uri "glue" version)) (sha256 (base32 - "1hb9j2519jv9zgkgjb25hnqi22i7zxnaksqd16m4nxa1f6gl0v7a")))) + "1j1va4vi3g9sl0cyjdwxvh5lvh10x8k9qvnsr9zyxddcbk9qgdpq")))) (build-system r-build-system) ;; knitr depends on glue, so we can't add knitr here to build the ;; vignettes. -- cgit v1.2.3 From 9de5f92a1047b100c4cd4c1efd305ada2795460e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:03:49 +0200 Subject: gnu: r-pkgload: Update to 1.1.0. * gnu/packages/cran.scm (r-pkgload): Update to 1.1.0. [propagated-inputs]: Add r-cli and r-crayon. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3a38d7d000..f12868e6eb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1809,17 +1809,19 @@ is configured appropriately so R can use them.") (define-public r-pkgload (package (name "r-pkgload") - (version "1.0.2") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "pkgload" version)) (sha256 (base32 - "0z7jvharafahi2gv5547mk1n499isjzw06kfwymmxc0gd575d1ii")))) + "03bv8xq4s6s7m34y1kjs99jzlb95vwrfi76mbnhmzcx2pc6ld78q")))) (build-system r-build-system) (propagated-inputs - `(("r-desc" ,r-desc) + `(("r-cli" ,r-cli) + ("r-crayon" ,r-crayon) + ("r-desc" ,r-desc) ("r-pkgbuild" ,r-pkgbuild) ("r-rlang" ,r-rlang) ("r-rprojroot" ,r-rprojroot) -- cgit v1.2.3 From dcfdf2def6bbf20483a32a89c5509ed31616b0a2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:04:05 +0200 Subject: gnu: r-globaloptions: Update to 0.1.2. * gnu/packages/cran.scm (r-globaloptions): Update to 0.1.2. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f12868e6eb..29b52c74de 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1967,15 +1967,17 @@ ellipses, circles, cylinders, arrows, ...") (define-public r-globaloptions (package (name "r-globaloptions") - (version "0.1.1") + (version "0.1.2") (source (origin (method url-fetch) (uri (cran-uri "GlobalOptions" version)) (sha256 - (base32 "0x89hfz80avq4zcskxl71i4zi0mgniqqxfrvz050aa2189wfyja2")))) + (base32 "0gkm77w6db9ajyncy1xdcivplap06a51zi99m009kylccschd2a7")))) (properties `((upstream-name . "GlobalOptions"))) (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/jokergoo/GlobalOptions") (synopsis "Generate functions to get or set global options") (description -- cgit v1.2.3 From d828ed59a3b187e8c4a1a5fad78b801a83153c2c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:04:21 +0200 Subject: gnu: r-getoptlong: Update to 1.0.0. * gnu/packages/cran.scm (r-getoptlong): Update to 1.0.0. [propagated-inputs]: Add r-crayon. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 29b52c74de..f0a8e2cf3f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2094,21 +2094,24 @@ compare different dendrograms to one another.") (define-public r-getoptlong (package (name "r-getoptlong") - (version "0.1.8") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "GetoptLong" version)) (sha256 (base32 - "1l8xkvyl152bsyvxazsvx2sm1vkygn75x0lsg3sbg7xp6drdn3kc")))) + "1fswgy5j4xaipqs7nk7nzrl66vrchhxrk0w7hcsbyij3sxgn3z9j")))) (properties `((upstream-name . "GetoptLong"))) (build-system r-build-system) (inputs `(("perl" ,perl))) (propagated-inputs - `(("r-globaloptions" ,r-globaloptions) + `(("r-crayon" ,r-crayon) + ("r-globaloptions" ,r-globaloptions) ("r-rjson" ,r-rjson))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/jokergoo/GetoptLong") (synopsis "Parsing command-line arguments and variable interpolation") (description -- cgit v1.2.3 From ac5dbcfd496cd351a80d54c2c5afe8687bc3ce30 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:04:46 +0200 Subject: gnu: r-ggally: Update to 2.0.0. * gnu/packages/cran.scm (r-ggally): Update to 2.0.0. [propagated-inputs]: Add r-lifecycle and r-scales. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f0a8e2cf3f..6d04f4bd63 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2257,14 +2257,14 @@ package also provides a C++ API, that works with or without Rcpp.") (define-public r-ggally (package (name "r-ggally") - (version "1.5.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (cran-uri "GGally" version)) (sha256 (base32 - "082s321zspg5al6acigwrhg4fsrmkkk5caabg662qbcy8v6n34h6")))) + "1gkmpzh1yvwvypkw0nwqv3gsf6za3220wig3rfv8g23kss60rl1s")))) (properties `((upstream-name . "GGally"))) (build-system r-build-system) (inputs @@ -2272,11 +2272,13 @@ package also provides a C++ API, that works with or without Rcpp.") (propagated-inputs `(("r-ggplot2" ,r-ggplot2) ("r-gtable" ,r-gtable) + ("r-lifecycle" ,r-lifecycle) ("r-plyr" ,r-plyr) ("r-progress" ,r-progress) ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-reshape" ,r-reshape) - ("r-rlang" ,r-rlang))) + ("r-rlang" ,r-rlang) + ("r-scales" ,r-scales))) (home-page "https://ggobi.github.io/ggally") (synopsis "Extension to ggplot2") (description -- cgit v1.2.3 From 6aa54116c6dc97738b1872ab279e347ee7931cd6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:05:09 +0200 Subject: gnu: r-sp: Update to 1.4-2. * gnu/packages/cran.scm (r-sp): Update to 1.4-2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6d04f4bd63..bab2c5d86f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2313,13 +2313,13 @@ most popular ones.") (define-public r-sp (package (name "r-sp") - (version "1.4-1") + (version "1.4-2") (source (origin (method url-fetch) (uri (cran-uri "sp" version)) (sha256 - (base32 "0fbh865r4py89g6ln8bslig2vbxxwa642p5k5g02rskyhajg35lg")))) + (base32 "02jxsd30apzjbdbssirysq70d4svdwzn931jhxr0ladl72g9bqvk")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From e88411168c1a2543d771ddd9f384153f8894aa1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:05:20 +0200 Subject: gnu: r-fitdistrplus: Update to 1.1-1. * gnu/packages/cran.scm (r-fitdistrplus): Update to 1.1-1. [propagated-inputs]: Remove r-npsurv. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bab2c5d86f..eba0b36f8b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2672,19 +2672,20 @@ functions from LINPACK.") (define-public r-fitdistrplus (package (name "r-fitdistrplus") - (version "1.0-14") + (version "1.1-1") (source (origin (method url-fetch) (uri (cran-uri "fitdistrplus" version)) (sha256 (base32 - "10q08wsv8v3w7797jdvvv60bgrf1bi6438wf0jcqv81ays82a245")))) + "1rnfnwmxa495fql7q0h9018cnwygwhj8gfh6ryz1vbf474570vjl")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass) - ("r-npsurv" ,r-npsurv) ("r-survival" ,r-survival))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "http://riskassessment.r-forge.r-project.org") (synopsis "Fitting a parametric distribution from data") (description -- cgit v1.2.3 From b69ff7ac56e5dd6b3bcce024ad7c092469a4daa9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:05:43 +0200 Subject: gnu: r-squarem: Update to 2020.3. * gnu/packages/cran.scm (r-squarem): Update to 2020.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index eba0b36f8b..ce7ae364a7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2814,14 +2814,14 @@ contexts.") (define-public r-squarem (package (name "r-squarem") - (version "2020.2") + (version "2020.3") (source (origin (method url-fetch) (uri (cran-uri "SQUAREM" version)) (sha256 (base32 - "1j6sa93xjvynnzx9jx79a3fysbykmbqyknknsqif5bcha6xp6cvf")))) + "17l05i87vwvcsk79fbg52zrx04zdlwiiyl3ga8qafs7mqx0j976q")))) (properties `((upstream-name . "SQUAREM"))) (build-system r-build-system) (home-page "https://coah.jhu.edu/people/Faculty_personal_Pages/Varadhan.html") -- cgit v1.2.3 From ac04a9ec0453b6bbb9debdd338496eb7bbd3752c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:05:52 +0200 Subject: gnu: r-jomo: Update to 2.7-1. * gnu/packages/cran.scm (r-jomo): Update to 2.7-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ce7ae364a7..cba03b348d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3468,14 +3468,14 @@ Laplace approximation and adaptive Gauss-Hermite quadrature.") (define-public r-jomo (package (name "r-jomo") - (version "2.6-10") + (version "2.7-1") (source (origin (method url-fetch) (uri (cran-uri "jomo" version)) (sha256 (base32 - "1k9l4290g350zbw1pjs871q9bxj3j2h1dilxpp06v4wy4n7d8qs0")))) + "0cdy9m4ylarkk9d0v1s61k2d877l4bbxly8a4jwhfy43fdvskz1w")))) (build-system r-build-system) (propagated-inputs `(("r-lme4" ,r-lme4) -- cgit v1.2.3 From 6446ef1ce4a99aceb3d4ecd74c7455cb985071a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:06:02 +0200 Subject: gnu: r-mice: Update to 3.9.0. * gnu/packages/cran.scm (r-mice): Update to 3.9.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cba03b348d..18df62e70b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3541,14 +3541,14 @@ analysis of multiply imputed data sets.") (define-public r-mice (package (name "r-mice") - (version "3.8.0") + (version "3.9.0") (source (origin (method url-fetch) (uri (cran-uri "mice" version)) (sha256 (base32 - "1ibybvigqkkla4xwhqs2w4m6c68alfcdsljx99nn4p92rzb1ig04")))) + "1wycbc2iqp68gfzvqx1gsn5n1k1h4bg79dy8m5msqf226hy83ncn")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) -- cgit v1.2.3 From 9cd9132b10ed666281369637a6b9cee0bd6ad472 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:06:11 +0200 Subject: gnu: r-xfun: Update to 0.14. * gnu/packages/cran.scm (r-xfun): Update to 0.14. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 18df62e70b..fe52c97366 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4188,13 +4188,13 @@ iVAT).") (define-public r-xfun (package (name "r-xfun") - (version "0.13") + (version "0.14") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 - (base32 "03iyqgx9mmdbd3qih70qzijjqcdg7k7ps5r1y6q8praanx9qvnm3")))) + (base32 "183f6d7lr116f90j37a8hfr6ni1x9xkqj79s8lnky1jwr6zj3ha9")))) (build-system r-build-system) ;; knitr itself depends on xfun #; -- cgit v1.2.3 From ba12564e7723d4e63282e2ee737484b37b7a3611 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:06:20 +0200 Subject: gnu: r-vctrs: Update to 0.3.1. * gnu/packages/cran.scm (r-vctrs): Update to 0.3.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fe52c97366..12916b7cb3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4251,14 +4251,14 @@ to variables on the left-hand side of the assignment.") (define-public r-vctrs (package (name "r-vctrs") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (cran-uri "vctrs" version)) (sha256 (base32 - "0ay1fk05mk6cnpfbzqwx6pjxmjk3ipx5xx6k0sbh81r5bqj17vpn")))) + "025si8gqwsj79lna3s0hdzxmymjyzbjq3ddan7n6chah6n3kbrhp")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) -- cgit v1.2.3 From ad0f5067f1bf52f9c84217c4578c77f876385623 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:06:27 +0200 Subject: gnu: r-tinytex: Update to 0.23. * gnu/packages/cran.scm (r-tinytex): Update to 0.23. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 12916b7cb3..d9c57b7b30 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4336,14 +4336,14 @@ terminals.") (define-public r-tinytex (package (name "r-tinytex") - (version "0.22") + (version "0.23") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "0s9f62v3ps5f8903ar6kxlf1z3b4v78vlw1nb05bq55dgj8brg3b")))) + "084jd1m2i3zyxxlls7skq3jxv3b5cgps3yk60q1yzyy9sxslab7m")))) (build-system r-build-system) (propagated-inputs `(("r-xfun" ,r-xfun))) -- cgit v1.2.3 From 734e29b59fecf5c431cab5d66f89a279fb25cc32 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:06:35 +0200 Subject: gnu: r-arules: Update to 1.6-6. * gnu/packages/cran.scm (r-arules): Update to 1.6-6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d9c57b7b30..2803c32dde 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5539,14 +5539,14 @@ evaluated by the @dfn{Akaike Information Criterion} (AIC).") (define-public r-arules (package (name "r-arules") - (version "1.6-5") + (version "1.6-6") (source (origin (method url-fetch) (uri (cran-uri "arules" version)) (sha256 (base32 - "0bcvfn8lvcv74vv9z3kgg7yq5hm7wjqhmzadi55cbm8zxd76g84v")))) + "1pk3jjizn2m5rwi7qkdkbq9f07acgpy0qdzzqmx0agg47cwahlkm")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) -- cgit v1.2.3 From 7775f234532a814e1a69774e3835fe14bbf40e5a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:06:44 +0200 Subject: gnu: r-maptools: Update to 1.0-1. * gnu/packages/cran.scm (r-maptools): Update to 1.0-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2803c32dde..a5e4ff1232 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5718,14 +5718,14 @@ simple method for converting between file types.") (define-public r-maptools (package (name "r-maptools") - (version "0.9-9") + (version "1.0-1") (source (origin (method url-fetch) (uri (cran-uri "maptools" version)) (sha256 (base32 - "0v4llkxk8qs61vq4ykvaim4k23aagdaz0p62ns7zfq02sln3pfk9")))) + "0fs1y3cbymcq4f76wd27h5a7ihdmxii3ca8x29x32xgxhmasni4l")))) (build-system r-build-system) (propagated-inputs `(("r-foreign" ,r-foreign) -- cgit v1.2.3 From f8e5a65a7f33ed0fffb557a2676efa263e7409a0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:06:52 +0200 Subject: gnu: r-later: Update to 1.1.0.1. * gnu/packages/cran.scm (r-later): Update to 1.1.0.1. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a5e4ff1232..b00628851b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5746,19 +5746,21 @@ exchanging spatial objects with other R packages.") (define-public r-later (package (name "r-later") - (version "1.0.0") + (version "1.1.0.1") (source (origin (method url-fetch) (uri (cran-uri "later" version)) (sha256 (base32 - "11xjavj7siz0xv2ffq1ld4bwl35jyrcfpvvs4p3ilpifxx49hyr7")))) + "1k9n2j7zxw9gfclnx8zfqp6w64c5d6apn7g02yhkajkpmszagfki")))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) ("r-rcpp" ,r-rcpp) ("r-rlang" ,r-rlang))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/r-lib/later") (synopsis "Utilities for delaying function execution") (description -- cgit v1.2.3 From 34a0a2412be851c92152ebde6065039923804b05 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:07:10 +0200 Subject: gnu: r-promises: Update to 1.1.1. * gnu/packages/cran.scm (r-promises): Update to 1.1.1. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b00628851b..d2b28811c8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5771,14 +5771,14 @@ time after the current time, after the R execution stack has emptied.") (define-public r-promises (package (name "r-promises") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "promises" version)) (sha256 (base32 - "01l0ydjvvy6afcg5d6pzvk1ikd3djq8n2flv8c831ksn68z0zsn8")))) + "002qkhcn3ri6a3w5fizjvdvrjgvqiw8i7rl9jglcnqik5kmwc61p")))) (build-system r-build-system) (propagated-inputs `(("r-later" ,r-later) @@ -5786,6 +5786,8 @@ time after the current time, after the R execution stack has emptied.") ("r-r6" ,r-r6) ("r-rcpp" ,r-rcpp) ("r-rlang" ,r-rlang))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://rstudio.github.io/promises") (synopsis "Abstractions for promise-based asynchronous programming") (description -- cgit v1.2.3 From 9a8079290289852aae02c420eb07a7d118173f0d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:07:25 +0200 Subject: gnu: r-reticulate: Update to 1.16. * gnu/packages/cran.scm (r-reticulate): Update to 1.16. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d2b28811c8..01c28f7256 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5962,14 +5962,14 @@ obtain a better initial configuration in non-metric MDS.") (define-public r-reticulate (package (name "r-reticulate") - (version "1.15") + (version "1.16") (source (origin (method url-fetch) (uri (cran-uri "reticulate" version)) (sha256 (base32 - "03dmnx9jhxx6vfbv2i5n6sln38kb9zkshz982pg3l9i4jjf3xns7")))) + "0ddx3xrlw55d8d3w7pxap618w2c5pd1n2jw4xsa185s8mf1zifkl")))) (build-system r-build-system) (inputs `(("python" ,python))) (propagated-inputs -- cgit v1.2.3 From ff7d4d56edba0831174a686334f5557fa3fc6dd1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:07:33 +0200 Subject: gnu: r-ellipse: Update to 0.4.2. * gnu/packages/cran.scm (r-ellipse): Update to 0.4.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 01c28f7256..4789eabe24 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6159,14 +6159,14 @@ publication-ready plots.") (define-public r-ellipse (package (name "r-ellipse") - (version "0.4.1") + (version "0.4.2") (source (origin (method url-fetch) (uri (cran-uri "ellipse" version)) (sha256 (base32 - "0g82vc51m3c1k0hnpp2zla6amxxgk2mmkl8ssnsc49jv3599r6hs")))) + "1wm5v7zdv2drgdba7z96jwsx74mqhlq80qgrvdb4vb5r02dcw68p")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/ellipse/") (synopsis "Functions for drawing ellipses and ellipse-like confidence regions") -- cgit v1.2.3 From 79d23a02c6b7ca4a2ea632ce9434a6707af4bda3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:07:42 +0200 Subject: gnu: r-officer: Update to 0.3.11. * gnu/packages/cran.scm (r-officer): Update to 0.3.11. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4789eabe24..9300fe3583 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6461,14 +6461,14 @@ references and Rd files.") (define-public r-officer (package (name "r-officer") - (version "0.3.9") + (version "0.3.11") (source (origin (method url-fetch) (uri (cran-uri "officer" version)) (sha256 (base32 - "0kp8rmab917zimnyc0rz37czf5f044z9naiyq0yxw68i990ikxf7")))) + "0nwasra2kb5wplcim7n57kynwhyg4vsk3fz42mbpm0hig1lzl9pp")))) (build-system r-build-system) (propagated-inputs `(("r-magrittr" ,r-magrittr) -- cgit v1.2.3 From ee19cc9a4b9dc93b836918db55625a6b35f66c64 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:07:50 +0200 Subject: gnu: r-overlap: Update to 0.3.3. * gnu/packages/cran.scm (r-overlap): Update to 0.3.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9300fe3583..572f44304f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6578,14 +6578,14 @@ and tests them.") (define-public r-overlap (package (name "r-overlap") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (cran-uri "overlap" version)) (sha256 (base32 - "1j3m6ir1chdz0si2fhcw6gs7c9h09bv0chz18rpzxsywww6d4rzy")))) + "17cnr4qin1qy0df4k491267acna12gpbbps6w3gi8nccqxfrb1pd")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/overlap/") (synopsis "Estimates of coefficient of overlapping for animal activity patterns") -- cgit v1.2.3 From 2ab00525dfb09635f7ff6ba179d6f4fa804ee61b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:07:59 +0200 Subject: gnu: r-insight: Update to 0.8.5. * gnu/packages/cran.scm (r-insight): Update to 0.8.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 572f44304f..893894d3d8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6645,14 +6645,14 @@ other add-on packages.") (define-public r-insight (package (name "r-insight") - (version "0.8.3") + (version "0.8.5") (source (origin (method url-fetch) (uri (cran-uri "insight" version)) (sha256 (base32 - "0lm5a4r368mq1pwmxjk2xnz25lb9j4v7mdkl1bahk2alklxgb8yj")))) + "0ggczjd112kclknyxxqvjkzwzazfhjwglchafzamk4zb08ww7y7k")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From ffb5225fd1b584080a1a54684424b82c04203962 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:08:08 +0200 Subject: gnu: r-sjlabelled: Update to 1.1.5. * gnu/packages/cran.scm (r-sjlabelled): Update to 1.1.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 893894d3d8..b68dea3cce 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6673,14 +6673,14 @@ information are missing.") (define-public r-sjlabelled (package (name "r-sjlabelled") - (version "1.1.4") + (version "1.1.5") (source (origin (method url-fetch) (uri (cran-uri "sjlabelled" version)) (sha256 (base32 - "00dnrvwf7zbaq07hkh4rx24pvi5bwkl4npf6ycg101s63633dq5m")))) + "0grskmd7wrw31lkf85z6xz0bv246m6grvqkijvqi4q8zkl6p5vb3")))) (build-system r-build-system) (propagated-inputs `(("r-insight" ,r-insight))) -- cgit v1.2.3 From 38ea73aaf2df2ba135d2491504b5c81af3156a32 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:08:15 +0200 Subject: gnu: r-sjmisc: Update to 2.8.5. * gnu/packages/cran.scm (r-sjmisc): Update to 2.8.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b68dea3cce..d0d6e83597 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6699,14 +6699,14 @@ vice versa), or to deal with multiple declared missing values.") (define-public r-sjmisc (package (name "r-sjmisc") - (version "2.8.4") + (version "2.8.5") (source (origin (method url-fetch) (uri (cran-uri "sjmisc" version)) (sha256 (base32 - "1ad7ca71w0v9ja4wb47aygczc987zz1lnjljhh2n497nzrpzzv64")))) + "0xl0s56d13bia89ai619rcr0fzbvc2k8f7hjxik4qp0g4v87zzlk")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) -- cgit v1.2.3 From 400d0c96d0156bb49c6eee7afc874c43706de7cc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:08:26 +0200 Subject: gnu: r-flextable: Update to 0.5.10. * gnu/packages/cran.scm (r-flextable): Update to 0.5.10. [propagated-inputs]: Add r-uuid. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d0d6e83597..dfdf01a6ab 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6779,14 +6779,14 @@ functions.") (define-public r-flextable (package (name "r-flextable") - (version "0.5.9") + (version "0.5.10") (source (origin (method url-fetch) (uri (cran-uri "flextable" version)) (sha256 (base32 - "1rkz0nhwjy1l8sb0kmna5v492n2ydnk7gydswnmf88r8vfyjczhw")))) + "1j7yvjiavar21ywck6nyz0p6bd66fnj99bq8lljdz4rrl3314yb8")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) @@ -6797,6 +6797,7 @@ functions.") ("r-officer" ,r-officer) ("r-rlang" ,r-rlang) ("r-rmarkdown" ,r-rmarkdown) + ("r-uuid" ,r-uuid) ("r-xml2" ,r-xml2))) (home-page "https://davidgohel.github.io/flextable") (synopsis "Functions for tabular reporting") -- cgit v1.2.3 From 4223df8af101bd71d4e60dea8ce891df169010d9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:08:41 +0200 Subject: gnu: r-doby: Update to 4.6.6. * gnu/packages/cran.scm (r-doby): Update to 4.6.6. [propagated-inputs]: Remove r-dplyr and r-plyr. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dfdf01a6ab..17b0614f26 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7023,26 +7023,26 @@ the work.") (define-public r-doby (package (name "r-doby") - (version "4.6.5") + (version "4.6.6") (source (origin (method url-fetch) (uri (cran-uri "doBy" version)) (sha256 (base32 - "1ckazh701b4ilg8bj17ji903538jmb49d997gm49ah5j5jc1x0g7")))) + "0wz1vmsf1545r1m42q88s675ncwvm8figjn7kzbngjn9aqck9qbq")))) (properties `((upstream-name . "doBy"))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) ("r-deriv" ,r-deriv) - ("r-dplyr" ,r-dplyr) ("r-magrittr" ,r-magrittr) ("r-mass" ,r-mass) ("r-matrix" ,r-matrix) - ("r-plyr" ,r-plyr) ("r-pbkrtest" ,r-pbkrtest) ("r-tibble" ,r-tibble))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "http://people.math.aau.dk/~sorenh/software/doBy/") (synopsis "Groupwise statistics, LSmeans, linear contrasts, and utilities") (description -- cgit v1.2.3 From 0220c89e969409b9291bc2c8691d44d3531b5eba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:09:07 +0200 Subject: gnu: r-mosaicdata: Update to 0.18.0. * gnu/packages/cran.scm (r-mosaicdata): Update to 0.18.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 17b0614f26..dae3ac52c0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7485,13 +7485,13 @@ while providing the intuitive capabilities of @code{r-ggplot2}.") (define-public r-mosaicdata (package (name "r-mosaicdata") - (version "0.17.0") + (version "0.18.0") (source (origin (method url-fetch) (uri (cran-uri "mosaicData" version)) (sha256 - (base32 "04z0mdm52mykqsxsinhmsihn181zf6cw321gayk2rjp7lj7mwdq9")))) + (base32 "0cx5dg26ha7nzkdyghkbbd6ikncj60qv1538az77lfgn2jylvkbz")))) (properties `((upstream-name . "mosaicData"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/mosaicData/") -- cgit v1.2.3 From a4a34d3ea8f4386b8e7416468ad43e55da9526cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:09:17 +0200 Subject: gnu: r-emmeans: Update to 1.4.7. * gnu/packages/cran.scm (r-emmeans): Update to 1.4.7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dae3ac52c0..50948185ef 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8515,14 +8515,14 @@ Hothorn, Westfall, 2010, CRC Press).") (define-public r-emmeans (package (name "r-emmeans") - (version "1.4.6") + (version "1.4.7") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "0mxk7ghlv4r6sna4897q1la2xgyn1dw3r9srhm9x4h5l4701avfa")))) + "0jh7l1rzsb2ihbnh4r4388kwm629z17rcapvdws1hnkklhr8j74k")))) (build-system r-build-system) (propagated-inputs `(("r-estimability" ,r-estimability) -- cgit v1.2.3 From 9908ec56cd246ac66d79c3aa2aafe26c5b9c8fd6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:09:25 +0200 Subject: gnu: r-bayesplot: Update to 1.7.2. * gnu/packages/cran.scm (r-bayesplot): Update to 1.7.2. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 50948185ef..baa2938dc1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8613,18 +8613,20 @@ correlation, censored, ordered and multivariate problems.") (define-public r-bayesplot (package (name "r-bayesplot") - (version "1.7.1") + (version "1.7.2") (source (origin (method url-fetch) (uri (cran-uri "bayesplot" version)) (sha256 (base32 - "0sq0ajnm96hmlqf1cv5n2gshh3qdij4n1zbm7qrniz2q6b5aj342")))) + "0aqy4bfjq1fmds0vpacsmqih528cp8wk4v4w0balzkph6zqzpwcl")))) (build-system r-build-system) (inputs `(("pandoc" ,ghc-pandoc) ("pandoc-citeproc" ,ghc-pandoc-citeproc))) + (native-inputs + `(("r-knitr" ,r-knitr))) (propagated-inputs `(("r-dplyr" ,r-dplyr) ("r-ggplot2" ,r-ggplot2) -- cgit v1.2.3 From 4a0fbb779935050ed147069b1f83d175ff4656f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:09:40 +0200 Subject: gnu: r-effectsize: Update to 0.3.1. * gnu/packages/cran.scm (r-effectsize): Update to 0.3.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index baa2938dc1..15b534ff58 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8836,14 +8836,14 @@ results using @code{ggplot2}.") (define-public r-effectsize (package (name "r-effectsize") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (cran-uri "effectsize" version)) (sha256 (base32 - "0kijp4wamkidaxysc11dd4vhvnm4wnbi87871wcbwn27k5b6i5dg")))) + "1n5b5434sd8f1v95bfjwg92v879rkaj8zpm6ldnrg0kgfb0gy6q4")))) (properties `((upstream-name . "effectsize"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From fc1db3fcf55c8128b977c774681e8df8e4be430e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:09:47 +0200 Subject: gnu: r-sjplot: Update to 2.8.4. * gnu/packages/cran.scm (r-sjplot): Update to 2.8.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 15b534ff58..5606d18940 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8863,13 +8863,13 @@ conversion of indices such as Cohen's d, r, odds, etc.") (define-public r-sjplot (package (name "r-sjplot") - (version "2.8.3") + (version "2.8.4") (source (origin (method url-fetch) (uri (cran-uri "sjPlot" version)) (sha256 - (base32 "0ip1rkjlhyf3axlc8qqss1qq1f0xrda890c1jmcbhm98wwjw264f")))) + (base32 "0b7k0mshkk8k26w11xbxkb5v0klhq279zn2xdz83cn8k791xkqyd")))) (properties `((upstream-name . "sjPlot"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From f71791c501a13ae34fd61e9be0590538a88be1b4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:09:54 +0200 Subject: gnu: r-iso: Update to 0.0-18.1. * gnu/packages/cran.scm (r-iso): Update to 0.0-18.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5606d18940..cb9c69a55a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10707,14 +10707,14 @@ the combination of non-negative and non-positive constraints.") (define-public r-iso (package (name "r-iso") - (version "0.0-18") + (version "0.0-18.1") (source (origin (method url-fetch) (uri (cran-uri "Iso" version)) (sha256 (base32 - "014mm5b1f7i6nwlz3kyg1biph0y542kcx5bd13p68cv5a928qzid")))) + "0vy6jdyvp751430sf2f690yhasjr70cpk3p3lnaaxjq3fs5gg99g")))) (properties `((upstream-name . "Iso"))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From d6df7299d33e32c669b78af10da6ed171b0c51b8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:10:01 +0200 Subject: gnu: r-bigrquery: Update to 1.3.1. * gnu/packages/cran.scm (r-bigrquery): Update to 1.3.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cb9c69a55a..269479b813 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10904,14 +10904,14 @@ preparing, executing, and processing HTTP requests.") (define-public r-bigrquery (package (name "r-bigrquery") - (version "1.3.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "bigrquery" version)) (sha256 (base32 - "0j8asipnb4fg4kk3apy37ywqq78ncmqh9wq015xpww2zb9shnbvf")))) + "0mq03sqv5lkyn3dlxvyd6lqqwnryfdaqh05pjvngzp194fxmd9cy")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From 4c96ee1c407070614e7272a30844212fabc3278b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:10:07 +0200 Subject: gnu: r-gmp: Update to 0.6-0. * gnu/packages/cran.scm (r-gmp): Update to 0.6-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 269479b813..c912d0cb48 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10937,14 +10937,14 @@ preparing, executing, and processing HTTP requests.") (define-public r-gmp (package (name "r-gmp") - (version "0.5-13.6") + (version "0.6-0") (source (origin (method url-fetch) (uri (cran-uri "gmp" version)) (sha256 (base32 - "0j2sz2nw41y9306rl1b8hbn0spz7453z5iawcq0bvslyrhc1d9ir")))) + "1c9vpr6j6h5f6dm9l535nscl66rvr8sba5az2kswjhmzwb9xpjxc")))) (build-system r-build-system) (arguments '(#:phases -- cgit v1.2.3 From 52d7306100a0af2b503ef8a6561eb6ec502d1fcd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:10:15 +0200 Subject: gnu: r-cmprsk: Update to 2.2-10. * gnu/packages/cran.scm (r-cmprsk): Update to 2.2-10. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c912d0cb48..cbd565eb0e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11699,13 +11699,13 @@ But it can also be used to do data analysis for small scale data sets.") (define-public r-cmprsk (package (name "r-cmprsk") - (version "2.2-9") + (version "2.2-10") (source (origin (method url-fetch) (uri (cran-uri "cmprsk" version)) (sha256 - (base32 "0xhgfg5b4i9skkaxp7gzkafgg5bqs5q1rp4hpw2jjmykg2nifn99")))) + (base32 "1xnx2zanw548prxsw2zw5cddkkg6kj97jgyzw67achq5mnsvfbg8")))) (build-system r-build-system) (propagated-inputs `(("r-survival" ,r-survival))) -- cgit v1.2.3 From e27fc23b07acbcfaa531d503ed86921a9828e141 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:10:22 +0200 Subject: gnu: r-lavaan: Update to 0.6-6. * gnu/packages/cran.scm (r-lavaan): Update to 0.6-6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cbd565eb0e..31aa07b59f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12601,14 +12601,14 @@ probabilities from a standard bivariate normal CDF.") (define-public r-lavaan (package (name "r-lavaan") - (version "0.6-5") + (version "0.6-6") (source (origin (method url-fetch) (uri (cran-uri "lavaan" version)) (sha256 (base32 - "04kvsh2m6mnzlhv83phr3hjzy4sx1ck6f7dgsm7xb8cs84dnxszy")))) + "0sfv58r2kxinax62bx6j3kkfx07qm16ddwf5qz392q33h9zs009h")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass) -- cgit v1.2.3 From 2de55fbab90e76f6058ae2194c87420d3275ac45 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:10:28 +0200 Subject: gnu: r-picante: Update to 1.8.2. * gnu/packages/cran.scm (r-picante): Update to 1.8.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 31aa07b59f..707f2983fe 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12977,14 +12977,14 @@ return the match results in tidy data frames.") (define-public r-picante (package (name "r-picante") - (version "1.8.1") + (version "1.8.2") (source (origin (method url-fetch) (uri (cran-uri "picante" version)) (sha256 (base32 - "1b16zm8zjjsl181b8krkdcrbcw347kf772c4w7y5332qmfi7jhz0")))) + "19savjzj44b7ifdxcp02ynj22z4n4ikq2aipc74ljzy3yykmqmjn")))) (build-system r-build-system) (propagated-inputs `(("r-ape" ,r-ape) -- cgit v1.2.3 From 5130c454ddd64fa5cddf61a0ea3c36a989164f33 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:10:39 +0200 Subject: gnu: r-lemon: Update to 0.4.5. * gnu/packages/cran.scm (r-lemon): Update to 0.4.5. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 707f2983fe..cabcae43bf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13032,14 +13032,14 @@ can be used with function approximation, eligibility traces (Singh & Sutton, (define-public r-lemon (package (name "r-lemon") - (version "0.4.4") + (version "0.4.5") (source (origin (method url-fetch) (uri (cran-uri "lemon" version)) (sha256 (base32 - "0m9hqwi709j9iwsxn8jh63741jiyr7ppwgqaw2zkv285p3m5wvd5")))) + "1y3ljidhqdakxlya2npj2w0az820g8kw6gl1cfm4f0cxvzgd1ly4")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) @@ -13050,6 +13050,8 @@ can be used with function approximation, eligibility traces (Singh & Sutton, ("r-plyr" ,r-plyr) ("r-rlang" ,r-rlang) ("r-scales" ,r-scales))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/stefanedwards/lemon") (synopsis "Freshen up your ggplot2 plots") (description -- cgit v1.2.3 From d263b2d67b9fb23bbeace2995c61bfa3c65d1ec8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:10:55 +0200 Subject: gnu: r-polspline: Update to 1.1.19. * gnu/packages/cran.scm (r-polspline): Update to 1.1.19. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cabcae43bf..49f1ea4040 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13652,13 +13652,13 @@ either PDF/EPS files.") (define-public r-polspline (package (name "r-polspline") - (version "1.1.18") + (version "1.1.19") (source (origin (method url-fetch) (uri (cran-uri "polspline" version)) (sha256 - (base32 "00h1xg89wncfj2nk68zv7vphfcc68s7k0l5s9511bzxz8khhw9fz")))) + (base32 "0rhzf735hmbqfn2xbgcln4sqx7m9far72g5gq9mghgkw016kqglm")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) (home-page "https://cran.r-project.org/web/packages/polspline/") -- cgit v1.2.3 From 5547b4360f8759e719915887ab3b4e130c0bb292 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:11:05 +0200 Subject: gnu: r-rms: Update to 6.0-0. * gnu/packages/cran.scm (r-rms): Update to 6.0-0. [propagated-inputs]: Add r-cluster, r-digest, and r-mass. --- gnu/packages/cran.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 49f1ea4040..fc831e0dc0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13672,20 +13672,23 @@ lspec, polyclass, and polymars.") (define-public r-rms (package (name "r-rms") - (version "5.1-4") + (version "6.0-0") (source (origin (method url-fetch) (uri (cran-uri "rms" version)) (sha256 - (base32 "19knh1sw0icw6jh9wfb2hq5jf49i2qfvp9myvqm5paa495689x9q")))) + (base32 "0m88m63d19qz03x8v56h4rrblln3d2943spi1v4wxxnbcdk22np9")))) (build-system r-build-system) (propagated-inputs - `(("r-ggplot2" ,r-ggplot2) + `(("r-cluster" ,r-cluster) + ("r-digest" ,r-digest) + ("r-ggplot2" ,r-ggplot2) ("r-hmisc" ,r-hmisc) ("r-htmltable" ,r-htmltable) ("r-htmltools" ,r-htmltools) ("r-lattice" ,r-lattice) + ("r-mass" ,r-mass) ("r-multcomp" ,r-multcomp) ("r-nlme" ,r-nlme) ("r-polspline" ,r-polspline) -- cgit v1.2.3 From a50246f455ea9f41a4623f0c3e1cd616d898fc72 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:11:21 +0200 Subject: gnu: r-bookdown: Update to 0.19. * gnu/packages/cran.scm (r-bookdown): Update to 0.19. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fc831e0dc0..b0185ca4a8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13910,13 +13910,13 @@ SELECT or UPDATE queries to an end-point.") (define-public r-bookdown (package (name "r-bookdown") - (version "0.18") + (version "0.19") (source (origin (method url-fetch) (uri (cran-uri "bookdown" version)) (sha256 (base32 - "1my6g16phx21v5cvfqcnjibh3zcv02xkix347aafd6a7r3hnxpq5")))) + "137l0cyzw9ij2l3zyk3mm1k2db9vhbax6c9y4rydvh4i9gka5vlq")))) (build-system r-build-system) (propagated-inputs `(("r-htmltools" ,r-htmltools) -- cgit v1.2.3 From 93043ba3377eb7c5565ec354a4875413f3a1e92d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:11:30 +0200 Subject: gnu: r-msigdbr: Update to 7.1.1. * gnu/packages/cran.scm (r-msigdbr): Update to 7.1.1. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b0185ca4a8..88fa31891e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14304,20 +14304,22 @@ the XKCD web comic.") (define-public r-msigdbr (package (name "r-msigdbr") - (version "7.0.1") + (version "7.1.1") (source (origin (method url-fetch) (uri (cran-uri "msigdbr" version)) (sha256 (base32 - "19p8z617m3my8la7n1qgb1s2msf940r372im3q30qkbcx3qxg3sd")))) + "0jvi49qa7616s58p0rx66pcw7h12rc8kgcg9225jk7pc3934hnzh")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) ("r-magrittr" ,r-magrittr) ("r-rlang" ,r-rlang) ("r-tibble" ,r-tibble))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/igordot/msigdbr") (synopsis "MSigDB gene sets for multiple organisms") (description -- cgit v1.2.3 From ed7fa0af07f7fa2f395e5c2eb07f9897844525c9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:11:48 +0200 Subject: gnu: r-europepmc: Update to 0.4. * gnu/packages/cran.scm (r-europepmc): Update to 0.4. [propagated-inputs]: Add r-rlang, r-tibble, and r-tidyr. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 88fa31891e..d4a4c5d553 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14546,14 +14546,14 @@ that fills this gap.") (define-public r-europepmc (package (name "r-europepmc") - (version "0.3") + (version "0.4") (source (origin (method url-fetch) (uri (cran-uri "europepmc" version)) (sha256 (base32 - "1ngqs1sqzkbwv98dd5z4cxj8bnz41wyd0g060a2vpqi3s99s4i2h")))) + "174nnyc2mbgqxb5kgqabn1vf71c2mps7ig2bclq4is0f7nb64pym")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) @@ -14562,8 +14562,13 @@ that fills this gap.") ("r-plyr" ,r-plyr) ("r-progress" ,r-progress) ("r-purrr" ,r-purrr) + ("r-rlang" ,r-rlang) + ("r-tibble" ,r-tibble) + ("r-tidyr" ,r-tidyr) ("r-urltools" ,r-urltools) ("r-xml2" ,r-xml2))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/ropensci/europepmc/") (synopsis "R Interface to the Europe PubMed Central RESTful Web Service") (description -- cgit v1.2.3 From 4c4c34a15460d4f8993bf0578a7f4cf104c8ce73 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:12:15 +0200 Subject: gnu: r-ggraph: Update to 2.0.3. * gnu/packages/cran.scm (r-ggraph): Update to 2.0.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d4a4c5d553..20d089d81e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14586,14 +14586,14 @@ databases, including ENA, PDB or ChEMBL are also accessible.") (define-public r-ggraph (package (name "r-ggraph") - (version "2.0.2") + (version "2.0.3") (source (origin (method url-fetch) (uri (cran-uri "ggraph" version)) (sha256 (base32 - "1ckq82hg52vr2wydkqv2wrppgjyvddd6bwqzrngqlm7j71xapjl0")))) + "1pz06j0za4p6dc3fqjzcw8bpym70bmnfcvpv1q34r74rnwzjdyvq")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) -- cgit v1.2.3 From 897ed4a76fd25ad2b04d03c50d25e45be309d36c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:12:24 +0200 Subject: gnu: r-rhpcblasctl: Update to 0.20-137. * gnu/packages/cran.scm (r-rhpcblasctl): Update to 0.20-137. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 20d089d81e..6557c43d5a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15845,14 +15845,14 @@ path of values for the regularization parameter.") (define-public r-rhpcblasctl (package (name "r-rhpcblasctl") - (version "0.20-17") + (version "0.20-137") (source (origin (method url-fetch) (uri (cran-uri "RhpcBLASctl" version)) (sha256 (base32 - "0iwc06blr5sx7rylwczi2jrha8sk8qs0jklflwpidl0zj1jxdggp")))) + "0vv144sgjhf7fazk633i16fc06g9k43syyxj1g34pi9gsgdcn0nv")))) (properties `((upstream-name . "RhpcBLASctl"))) (build-system r-build-system) (home-page "https://prs.ism.ac.jp/~nakama/Rhpc/") -- cgit v1.2.3 From 53bf76c574960659016f792c5f8c71b07fb1962f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:12:30 +0200 Subject: gnu: r-systemfonts: Update to 0.2.3. * gnu/packages/cran.scm (r-systemfonts): Update to 0.2.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6557c43d5a..983504f02c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16116,14 +16116,14 @@ both R code and compiled C/C++/FORTRAN code.") (define-public r-systemfonts (package (name "r-systemfonts") - (version "0.2.1") + (version "0.2.3") (source (origin (method url-fetch) (uri (cran-uri "systemfonts" version)) (sha256 (base32 - "0dna00xai0pw76b4830yy4r5j1hq7f7kla67v0iz39cjm4rq4ygq")))) + "0wf62mfam5zlrck0wrdbyi4hi7pn5j0739rihgp8sj2cjypm2lnb")))) (properties `((upstream-name . "systemfonts"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From dfd0b55f9e5462607efa99beb3c06f8a1d4fd5ec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:12:37 +0200 Subject: gnu: r-parameters: Update to 0.8.0. * gnu/packages/cran.scm (r-parameters): Update to 0.8.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 983504f02c..5baad5cc5e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16262,14 +16262,14 @@ in pipelines.") (define-public r-parameters (package (name "r-parameters") - (version "0.6.1") + (version "0.8.0") (source (origin (method url-fetch) (uri (cran-uri "parameters" version)) (sha256 (base32 - "0mylxkf1y6mk4kf6c57x102sf4c800pfasjcfbf1hnsh6ya0m6dy")))) + "1cmb2hc6f4qdx9aj586zhllckzs6s5sznbqrywvgmhp6a2saaqax")))) (properties `((upstream-name . "parameters"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 7262c1ff183ff1e707de0edc8a8735c916eebfc3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:12:46 +0200 Subject: gnu: r-rgdal: Update to 1.5-10. * gnu/packages/cran.scm (r-rgdal): Update to 1.5-10. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5baad5cc5e..19fefa9845 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16291,13 +16291,13 @@ effect size.") (define-public r-rgdal (package (name "r-rgdal") - (version "1.4-8") + (version "1.5-10") (source (origin (method url-fetch) (uri (cran-uri "rgdal" version)) (sha256 - (base32 "1jd691amf3ghznq5im15gvhl6v6k25klpl75m4ngrqf9xlxaa3as")))) + (base32 "02z7rhpizzmymiqpi90nm15bjdz0411bqlavlk0lhwxb42ilhif6")))) (properties `((upstream-name . "rgdal"))) (build-system r-build-system) (inputs @@ -16307,7 +16307,8 @@ effect size.") (propagated-inputs `(("r-sp" ,r-sp))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("r-knitr" ,r-knitr))) (home-page "http://rgdal.r-forge.r-project.org") (synopsis "Bindings for the Geospatial Data Abstraction Library") (description -- cgit v1.2.3 From b99ed8e6e5ceab44ec86fc8b423f2a7b5f08ccce Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:12:58 +0200 Subject: gnu: r-abcrlda: Update to 1.0.3. * gnu/packages/cran.scm (r-abcrlda): Update to 1.0.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 19fefa9845..c1a8b72953 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16799,14 +16799,14 @@ simulation.") (define-public r-abcrlda (package (name "r-abcrlda") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) (uri (cran-uri "abcrlda" version)) (sha256 (base32 - "0zjdrbg3zx0znqnh0dvmifs9c12b8vjhbaf3nbwab9xh25nsmg75")))) + "04pcdnk2szfpc2ylcw5ds7y895ivy03bycal03kxw7cwylzxasks")))) (properties `((upstream-name . "abcrlda"))) (build-system r-build-system) (home-page "https://ieeexplore.ieee.org/document/8720003/") -- cgit v1.2.3 From 8957a336f7bd5811b97ce98fc20d7c80179a5c78 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:13:06 +0200 Subject: gnu: r-showtextdb: Update to 3.0. * gnu/packages/cran.scm (r-showtextdb): Update to 3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c1a8b72953..167572ccac 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16935,14 +16935,14 @@ into R, in order to support other packages.") (define-public r-showtextdb (package (name "r-showtextdb") - (version "2.0") + (version "3.0") (source (origin (method url-fetch) (uri (cran-uri "showtextdb" version)) (sha256 (base32 - "1qwwj9x2jvadvwn60h75k99c9xi7yhqjsgaakahz5paxgj583bsh")))) + "0hlnc3fhgrdkd46n7hb6id0gg1v0bf8s4679nrr7rchyp455szq2")))) (properties `((upstream-name . "showtextdb"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From bb714ae79fd9d9a9fac3292c64e1bf0faf3534e9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:13:13 +0200 Subject: gnu: r-showtext: Update to 0.8-1. * gnu/packages/cran.scm (r-showtext): Update to 0.8-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 167572ccac..1c379d9ca0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16957,14 +16957,14 @@ package.") (define-public r-showtext (package (name "r-showtext") - (version "0.8") + (version "0.8-1") (source (origin (method url-fetch) (uri (cran-uri "showtext" version)) (sha256 (base32 - "15v90s061iz9i655xin7kqb6ahnski55pgz3329wcz60bnbjb82x")))) + "1n1cd9f4zrv45k5953akclqh1jh7fy122dqkgmbfi5h122v6p2h0")))) (properties `((upstream-name . "showtext"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 30031516d19a16211281e413e5ec28ab79685b86 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:13:19 +0200 Subject: gnu: r-elasticnet: Update to 1.3. * gnu/packages/cran.scm (r-elasticnet): Update to 1.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1c379d9ca0..2b5f1cf849 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17286,14 +17286,14 @@ data.") (define-public r-elasticnet (package (name "r-elasticnet") - (version "1.1.1") + (version "1.3") (source (origin (method url-fetch) (uri (cran-uri "elasticnet" version)) (sha256 (base32 - "0p9dplnsp28z4s2fl6afbwrgd0aj339fak8mmndicmrh7bb7rpmb")))) + "0nxcw06d0cp2mbqzg2fm9yys5xm6xx7bfcfvr0avcs8afkvz29j8")))) (properties `((upstream-name . "elasticnet"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 242fae8edf450e21bdf8417f2b2408e4db4666b2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:13:28 +0200 Subject: gnu: r-seewave: Update to 2.1.6. * gnu/packages/cran.scm (r-seewave): Update to 2.1.6. [inputs]: Add libsndfile. --- gnu/packages/cran.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2b5f1cf849..af653f9eb8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -75,6 +75,7 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) ;libsndfile #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages statistics) @@ -17905,16 +17906,18 @@ transcription, ...") (define-public r-seewave (package (name "r-seewave") - (version "2.1.5") + (version "2.1.6") (source (origin (method url-fetch) (uri (cran-uri "seewave" version)) (sha256 (base32 - "1qg8f5gik9pw6f9mcxqmrc9x3003s8vdm6g01pjjpyc9qaqiz2vi")))) + "123h3q0gps0vy9sikr7gjphnv9m3l4h4mykiydjllmrpaw1s1844")))) (properties `((upstream-name . "seewave"))) (build-system r-build-system) + (inputs + `(("libsndfile" ,libsndfile))) (propagated-inputs `(("r-tuner" ,r-tuner))) (home-page "http://rug.mnhn.fr/seewave") -- cgit v1.2.3 From 8050cce35d5d34c06447d16c8f5a7227acf0364b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:13:40 +0200 Subject: gnu: r-gdina: Update to 2.8.0. * gnu/packages/cran.scm (r-gdina): Update to 2.8.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index af653f9eb8..6df7c7b41f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18309,14 +18309,14 @@ allowed.") (define-public r-gdina (package (name "r-gdina") - (version "2.7.9") + (version "2.8.0") (source (origin (method url-fetch) (uri (cran-uri "GDINA" version)) (sha256 (base32 - "13pmj069r04h38hg61ibyn1ab15zdy9m0qv60vi25ahgsmg6ccvx")))) + "0chxnhp37xfd78gafkgwqrmc0jf3pvpdyrkc438kl0l53fb7dld7")))) (properties `((upstream-name . "GDINA"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8ddf3be097a378241477c3d48ba352d80a6ccbcf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:13:47 +0200 Subject: gnu: r-actuar: Update to 3.0-0. * gnu/packages/cran.scm (r-actuar): Update to 3.0-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6df7c7b41f..e020ff62f2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18667,14 +18667,14 @@ API; see the package vignette for details.") (define-public r-actuar (package (name "r-actuar") - (version "2.3-3") + (version "3.0-0") (source (origin (method url-fetch) (uri (cran-uri "actuar" version)) (sha256 (base32 - "0aw3hlan5y22mdqk1wvnw9ksqhwp4yy5hi0dpv21p7s0hyxhphih")))) + "0dkp1sczldzy7kj70qvh1q59jhsq1brjybmxdz43jnx63y45llpz")))) (properties `((upstream-name . "actuar"))) (build-system r-build-system) (propagated-inputs `(("r-expint" ,r-expint))) -- cgit v1.2.3 From de26ce7265504f17d169f60ac00f1ebaeaf7e2a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:13:54 +0200 Subject: gnu: r-rsvg: Update to 2.1. * gnu/packages/cran.scm (r-rsvg): Update to 2.1. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e020ff62f2..62be117ef4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19407,21 +19407,22 @@ automatically show a loader when the output is (re)calculating.") (define-public r-rsvg (package (name "r-rsvg") - (version "2.0") + (version "2.1") (source (origin (method url-fetch) (uri (cran-uri "rsvg" version)) (sha256 (base32 - "0r066lvyfvhsjjpiad259f1m3qk5w7hxhbyjzhlryzf3fy0hvh29")))) + "0bxnwa9sbzx6jlxrzh3ymjq81vkxil2qx7kk7wp13a0cql7dhxcn")))) (properties `((upstream-name . "rsvg"))) (build-system r-build-system) (inputs `(("librsvg" ,librsvg) ("zlib" ,zlib))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("r-knitr" ,r-knitr))) (home-page "https://github.com/jeroen/rsvg#readme") (synopsis "Render SVG images into PDF, PNG, PostScript, or Bitmap arrays") (description -- cgit v1.2.3 From db4d3b25811e8928674011b1a03e784cd79cf86e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:14:06 +0200 Subject: gnu: r-emplik: Update to 1.1-1. * gnu/packages/cran.scm (r-emplik): Update to 1.1-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 62be117ef4..dc7897d28d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19464,14 +19464,14 @@ OpenMP.") (define-public r-emplik (package (name "r-emplik") - (version "1.0-4.3") + (version "1.1-1") (source (origin (method url-fetch) (uri (cran-uri "emplik" version)) (sha256 (base32 - "1g4hz85bvw29c77zs0ig487z92jjl682vv457x81l077h0psvk7c")))) + "1kw8g8j075bsicdvgkjf4870rfv5c30gvmw6qkkaz3ki22x74w77")))) (properties `((upstream-name . "emplik"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From bd76f9561d639726a96873d4c1b081862ea9eb15 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:14:12 +0200 Subject: gnu: r-sem: Update to 3.1-11. * gnu/packages/cran.scm (r-sem): Update to 3.1-11. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dc7897d28d..fc15b42fc3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20144,14 +20144,14 @@ actuarial models such as pension mathematics.") (define-public r-sem (package (name "r-sem") - (version "3.1-9") + (version "3.1-11") (source (origin (method url-fetch) (uri (cran-uri "sem" version)) (sha256 (base32 - "1f9c6g6pfx66gd2pappcsqh484ah6a0x4z47hpd46rah0817hcsa")))) + "03j3ig6fy34pi6nwfq9w8f5m555lilw5skr1vn6ay4yvjmvavc9k")))) (properties `((upstream-name . "sem"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 3a9a69525597c7560d88869801f3c065f78602e3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:14:18 +0200 Subject: gnu: r-semtools: Update to 0.5-3. * gnu/packages/cran.scm (r-semtools): Update to 0.5-3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fc15b42fc3..ad859de0ed 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20171,14 +20171,14 @@ least squares.") (define-public r-semtools (package (name "r-semtools") - (version "0.5-2") + (version "0.5-3") (source (origin (method url-fetch) (uri (cran-uri "semTools" version)) (sha256 (base32 - "1zj841pszfsikzp82cmh463qyc4xhdrqjqcnhc2r8mcflv12irv6")))) + "0k3w10fnq0l89inhxvnypyrfhlrm921mfn0kwyyfpndvbqizky1d")))) (properties `((upstream-name . "semTools"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From b34ba0649ab8c64b80c8ad53dc182b65ea269a98 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:14:24 +0200 Subject: gnu: r-stanheaders: Update to 2.21.0-5. * gnu/packages/cran.scm (r-stanheaders): Update to 2.21.0-5. [propagated-inputs]: Add r-rcppeigen and r-rcppparallel. --- gnu/packages/cran.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ad859de0ed..3b5ea1d35e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20220,17 +20220,20 @@ perform @dfn{exploratory mediation} (XMed).") (define-public r-stanheaders (package (name "r-stanheaders") - (version "2.19.2") + (version "2.21.0-5") (source (origin (method url-fetch) (uri (cran-uri "StanHeaders" version)) (sha256 (base32 - "0cmk0fzczx7dcywcw1dhm6gfq84qlsx77qrsk4z3bf3dhr4bznam")))) + "1zyph2x47x9a5baj5d79a1lzj7gajirisajvkrcngrjvw8bq7810")))) (properties `((upstream-name . "StanHeaders"))) (build-system r-build-system) (inputs `(("pandoc" ,ghc-pandoc))) + (propagated-inputs + `(("r-rcppeigen" ,r-rcppeigen) + ("r-rcppparallel" ,r-rcppparallel))) (native-inputs `(("gfortran" ,gfortran) ("r-knitr" ,r-knitr))) ; for vignettes -- cgit v1.2.3 From e5884ce4c787eb81d6d58509fffd3e811e5252db Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:14:42 +0200 Subject: gnu: r-openmx: Update to 2.17.4. * gnu/packages/cran.scm (r-openmx): Update to 2.17.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3b5ea1d35e..369c2f8ea1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20291,14 +20291,14 @@ Complete access to optimized C functions is made available with (define-public r-openmx (package (name "r-openmx") - (version "2.17.3") + (version "2.17.4") (source (origin (method url-fetch) (uri (cran-uri "OpenMx" version)) (sha256 (base32 - "1s2pcg281ag3qz2wz8yi826f2d3kj3qg916js7zz0nsrljcyv5bc")))) + "07y4w7xdb63p5kkrj6sdx1kabbsgbbj7nw9hc690jy84r15aryal")))) (properties `((upstream-name . "OpenMx"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 20702ad9a3faa02bf58ed314cc58f75af1b193b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:14:48 +0200 Subject: gnu: r-crochet: Update to 2.3.0. * gnu/packages/cran.scm (r-crochet): Update to 2.3.0. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 369c2f8ea1..8e1325b775 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21241,15 +21241,17 @@ and an overall emphasis on typography.") (define-public r-crochet (package (name "r-crochet") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (cran-uri "crochet" version)) (sha256 (base32 - "1cbv79nyycxk6f8ldcsnn2pvgxqlnrj0qs19nhafnq2clxy863k6")))) + "0zvjaf6cv0nrjb4l4llkr0mmgha7ig31p4ri2rlnqyjlxi5l8hyq")))) (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/agrueneberg/crochet") (synopsis "Implementation Helper for Matrix-Like Types") (description -- cgit v1.2.3 From 67ee20fbd297f4ec3f932714e94b9488310d8c58 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 15:15:00 +0200 Subject: gnu: r-brms: Update to 2.13.0. * gnu/packages/cran.scm (r-brms): Update to 2.13.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8e1325b775..7fa47aee1c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21779,14 +21779,14 @@ included in this package as well.") (define-public r-brms (package (name "r-brms") - (version "2.12.0") + (version "2.13.0") (source (origin (method url-fetch) (uri (cran-uri "brms" version)) (sha256 (base32 - "1699lwkklfhjz7fddawlig552g2zvrc34mqwrzqjgl35r9fm08gs")))) + "0vdncdawxawi16f326qrgy9jjjipmqdjxh741y9p7xdzd4fwaxx3")))) (properties `((upstream-name . "brms"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From cbd9581acc41cd49eb81c2432452cad4de805cbd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Jun 2020 17:02:01 +0200 Subject: gnu: r-with-tests, r-minimal: Update to 4.0.1. * gnu/packages/statistics.scm (r-with-tests, r-minimal): Update to 4.0.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 7e88e1e54a..cd60ce87b0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -184,7 +184,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.") (define r-with-tests (package (name "r-with-tests") - (version "4.0.0") + (version "4.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://cran/src/base/R-" @@ -192,7 +192,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.") version ".tar.gz")) (sha256 (base32 - "0h1995smlyiyhx7gpg9paxsfqrcn6g9bbp5h9r47i6an3clv1gh6")))) + "0ckgpihkih4b44rx48hpg9p6bv0w67j5z3qc8s4giy6qv2j29zlm")))) (build-system gnu-build-system) (arguments `(#:disallowed-references (,tzdata-for-tests) -- cgit v1.2.3 From 03a70e4c190420e87c0b535285caf8f77260d4ff Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 11 Jun 2020 18:24:59 +0200 Subject: packages: 'package-grafts' returns grafts for all the relevant outputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Jakub Kądziołka . * guix/packages.scm (input-graft): Add 'output' parameter and honor it. Add OUTPUT to the cache key. (input-cross-graft): Likewise. (fold-bag-dependencies): Operate on inputs instead of nodes. Turn VISITED into a vhash instead of a set. Pass PROC HEAD and OUTPUT instead of just HEAD. (bag-grafts): Adjust accordingly. * tests/packages.scm ("package-grafts, dependency on several outputs"): New test. --- guix/packages.scm | 81 +++++++++++++++++++++++++----------------------------- tests/packages.scm | 24 ++++++++++++++++ 2 files changed, 62 insertions(+), 43 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 0ccd31a7a9..1e0ec41b76 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1194,39 +1194,39 @@ and return it." (make-weak-key-hash-table 200)) (define (input-graft store system) - "Return a procedure that, given a package with a graft, returns a graft, and -#f otherwise." - (match-lambda - ((? package? package) + "Return a procedure that, given a package with a replacement and an output name, +returns a graft, and #f otherwise." + (match-lambda* + (((? package? package) output) (let ((replacement (package-replacement package))) (and replacement - (cached (=> %graft-cache) package system + (cached (=> %graft-cache) package (cons output system) (let ((orig (package-derivation store package system #:graft? #f)) (new (package-derivation store replacement system #:graft? #t))) (graft (origin orig) - (replacement new))))))) - (x - #f))) + (origin-output output) + (replacement new) + (replacement-output output))))))))) (define (input-cross-graft store target system) "Same as 'input-graft', but for cross-compilation inputs." - (match-lambda - ((? package? package) - (let ((replacement (package-replacement package))) - (and replacement - (let ((orig (package-cross-derivation store package target system - #:graft? #f)) - (new (package-cross-derivation store replacement - target system - #:graft? #t))) - (graft - (origin orig) - (replacement new)))))) - (_ - #f))) + (match-lambda* + (((? package? package) output) + (let ((replacement (package-replacement package))) + (and replacement + (let ((orig (package-cross-derivation store package target system + #:graft? #f)) + (new (package-cross-derivation store replacement + target system + #:graft? #t))) + (graft + (origin orig) + (origin-output output) + (replacement new) + (replacement-output output)))))))) (define* (fold-bag-dependencies proc seed bag #:key (native? #t)) @@ -1243,26 +1243,21 @@ dependencies; otherwise, restrict to target dependencies." (bag-host-inputs bag)))) bag-host-inputs)) - (define nodes - (match (bag-direct-inputs* bag) - (((labels things _ ...) ...) - things))) - - (let loop ((nodes nodes) + (let loop ((inputs (bag-direct-inputs* bag)) (result seed) - (visited (setq))) - (match nodes + (visited vlist-null)) + (match inputs (() result) - (((? package? head) . tail) - (if (set-contains? visited head) - (loop tail result visited) - (let ((inputs (bag-direct-inputs* (package->bag head)))) - (loop (match inputs - (((labels things _ ...) ...) - (append things tail))) - (proc head result) - (set-insert head visited))))) + (((label (? package? head) . rest) . tail) + (let ((output (match rest (() "out") ((output) output))) + (outputs (vhash-foldq* cons '() head visited))) + (if (member output outputs) + (loop tail result visited) + (let ((inputs (bag-direct-inputs* (package->bag head)))) + (loop (append inputs tail) + (proc head output result) + (vhash-consq head output visited)))))) ((head . tail) (loop tail result visited))))) @@ -1279,8 +1274,8 @@ to (see 'graft-derivation'.)" (let ((->graft (input-graft store system))) (parameterize ((%current-system system) (%current-target-system #f)) - (fold-bag-dependencies (lambda (package grafts) - (match (->graft package) + (fold-bag-dependencies (lambda (package output grafts) + (match (->graft package output) (#f grafts) (graft (cons graft grafts)))) '() @@ -1291,8 +1286,8 @@ to (see 'graft-derivation'.)" (let ((->graft (input-cross-graft store target system))) (parameterize ((%current-system system) (%current-target-system target)) - (fold-bag-dependencies (lambda (package grafts) - (match (->graft package) + (fold-bag-dependencies (lambda (package output grafts) + (match (->graft package output) (#f grafts) (graft (cons graft grafts)))) '() diff --git a/tests/packages.scm b/tests/packages.scm index 72e87dbfb7..c7b6f669b5 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -900,6 +900,30 @@ (replacement #f)))) (replacement (package-derivation %store new))))))) +(test-assert "package-grafts, dependency on several outputs" + ;; Make sure we get one graft per output; see . + (letrec* ((p0 (dummy-package "p0" + (version "1.0") + (replacement p0*) + (arguments '(#:implicit-inputs? #f)) + (outputs '("out" "lib")))) + (p0* (package (inherit p0) (version "1.1"))) + (p1 (dummy-package "p1" + (arguments '(#:implicit-inputs? #f)) + (inputs `(("p0" ,p0) + ("p0:lib" ,p0 "lib")))))) + (lset= equal? (pk (package-grafts %store p1)) + (list (graft + (origin (package-derivation %store p0)) + (origin-output "out") + (replacement (package-derivation %store p0*)) + (replacement-output "out")) + (graft + (origin (package-derivation %store p0)) + (origin-output "lib") + (replacement (package-derivation %store p0*)) + (replacement-output "lib")))))) + (test-assert "replacement also grafted" ;; We build a DAG as below, where dotted arrows represent replacements and ;; solid arrows represent dependencies: -- cgit v1.2.3 From ecf92194a55188a9c217d76617378749db063453 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 11 Jun 2020 18:54:15 +0200 Subject: gnu: nghttp2: Replace with version 1.41 [fixes CVE-2020-11080]. * gnu/packages/web.scm (nghttp2-1.41): New variable. (nghttp2)[replacement]: New field. --- gnu/packages/web.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 82174c0033..a04d755a83 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7193,6 +7193,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (package (name "nghttp2") (version "1.40.0") + (replacement nghttp2-1.41) (source (origin (method url-fetch) @@ -7272,6 +7273,20 @@ compressed JSON header blocks. @end itemize\n") (license license:expat))) +(define-public nghttp2-1.41 ;fixes CVE-2020-11080 + (package + (inherit nghttp2) + (version "1.41.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/nghttp2/nghttp2/" + "releases/download/v" version "/" + "nghttp2-" version ".tar.xz")) + (sha256 + (base32 + "1hk77vngjmvvzb5y1gi1aqwf6qywrc7yak08zvzb7x81qs6mphmb")))))) + (define-public hpcguix-web (let ((commit "9de63562b06b4aef3a3afe5ecb18d3c91e57ee74") (revision "5")) -- cgit v1.2.3 From 4908ba058f63488af776f64293f425576ebeed6f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 15:06:48 +0300 Subject: gnu: subversion: Update to 1.14.0. * gnu/packages/version-control.scm (subversion): Update to 1.14.0. [source]: Update source URI. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index bac51e3181..99e1a8ccd1 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1569,14 +1569,14 @@ following features: (define-public subversion (package (name "subversion") - (version "1.10.6") + (version "1.14.0") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/subversion/" + (uri (string-append "mirror://apache/subversion/" "subversion-" version ".tar.bz2")) (sha256 (base32 - "19zc215mhpnm92mlyl5jbv57r5zqp6cavr3s2g9yglp6j4kfgj0q")))) + "00i1f88snlpcnsycpn6r315h6792l5nkr2p5k6kq6yprz4cf5a3b")))) (build-system gnu-build-system) (arguments '(#:parallel-tests? #f ; TODO Seems to cause test failures on -- cgit v1.2.3 From e73a016df2dca6ffc2a5b736c8d507005e9b7126 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 23:13:40 +0300 Subject: gnu: adns: Update to 1.6.0. * gnu/packages/adns.scm (adns): Update to 1.6.0. [source]: Use https. [native-inputs]: Add m4. --- gnu/packages/adns.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm index 5d8c6fdc91..57f34942d5 100644 --- a/gnu/packages/adns.scm +++ b/gnu/packages/adns.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Ludovic Courtès -;;; Copyright © 2015, 2016, 2018 Efraim Flashner +;;; Copyright © 2015, 2016, 2018, 2020 Efraim Flashner ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Marius Bakke ;;; @@ -25,22 +25,23 @@ #:use-module (guix download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (gnu packages m4) #:use-module (gnu packages pkg-config)) (define-public adns (package (name "adns") - (version "1.5.1") + (version "1.6.0") (source (origin (method url-fetch) (uri (list (string-append "mirror://gnu/adns/adns-" version ".tar.gz") (string-append - "http://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-" - version ".tar.gz"))) + "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-" + version ".tar.gz"))) (sha256 (base32 - "1ssfh94ck6kn98nf2yy6743srpgqgd167va5ja3bwx42igqjc42v")))) + "1pi0xl07pav4zm2jrbrfpv43s1r1q1y12awgak8k7q41m5jp4hpv")))) (build-system gnu-build-system) (arguments ;; Make sure the programs under bin/ fine libadns.so. @@ -50,6 +51,8 @@ ;; XXX: Tests expect real name resolution to work. #:tests? #f)) + (native-inputs + `(("m4" ,m4))) (home-page "https://www.gnu.org/software/adns/") (synopsis "Asynchronous DNS client library and utilities") (description -- cgit v1.2.3 From 59feeb96e442bbd3da0bc530067de703f89437da Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 11 Jun 2020 16:06:41 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.227. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.227. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 73d99be48c..8c59533e88 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -424,10 +424,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.226") +(define-public linux-libre-4.4-version "4.4.227") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1dwvm81i62b06jsl38spfn719zrsbwq5z8viwckrpw4ma4w9k0j1"))) + (hash (base32 "196x57w740firg8zchypq4vq6a83ymmwn9amqrscym9zr0pcgm40"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 523d63638a1c0b598d6417b5b56863f91e2c4864 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 11 Jun 2020 16:07:38 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.227. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.227. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8c59533e88..396a5a532c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -416,10 +416,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.226") +(define-public linux-libre-4.9-version "4.9.227") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1jj5ydz5cy87z7hrv54bkyl9739lpzja8580ngjhrip5iwb8q2j6"))) + (hash (base32 "0pqc0wld4s4zjas95xm54mrkk00l9zkc59b6i9gq4km126s8bi1q"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From e5630f5d3cacbb5c27bb27e0160e24b79e08fe75 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 11 Jun 2020 16:08:10 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.184. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.184. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 396a5a532c..7ad9a049e3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -408,10 +408,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.183") +(define-public linux-libre-4.14-version "4.14.184") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "11c0vd2pwplm8wafich4zg2mnp10vvnap987c5jh96w1avpsyra2"))) + (hash (base32 "0h6r06c1d7amkfglsr66ic89p0zxpmk7jkq1ylcbknmkiwkixx9g"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From e37aff92e2c8c30a1eedfe0fe6ae2db0e6949560 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 11 Jun 2020 16:08:48 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.128. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.128. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7ad9a049e3..431f81ecf2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -400,10 +400,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.127") +(define-public linux-libre-4.19-version "4.19.128") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0vsq5vjyh6n8acjnldfs0zny63l12fn2pssb8zbwidc8qmmqibw2"))) + (hash (base32 "0g31ad3wziy4xqna0yvwjcnza3jhd93syjpfvmwh0b4pkj2adar9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 1c02643a06f807175ee6a8418cd824a0ac7ec9a4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 11 Jun 2020 16:11:35 -0400 Subject: gnu: linux-libre@5.6: Remove. Users of linux-libre-5.6 should migrate to version 5.7. * gnu/packages/linux.scm (deblob-scripts-5.6, linux-libre-5.6-version) (linux-libre-5.6-pristine-source, linux-libre-5.6-source) (linux-libre-headers-5.6, linux-libre-arm-generic-5.6) (linux-libre-arm64-generic-5.6): Remove variables. --- gnu/packages/linux.scm | 51 -------------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 431f81ecf2..6b861d5ff6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -199,12 +199,6 @@ defconfig. Return the appropriate make target if applicable, otherwise return (base32 "1c0n39wg6xij4x63ppg0m80kfcffkn3iilm3chyiix09n9g7vb78") (base32 "02is246xaql1br3kizqicrkp982nw4gdwpn7nlzjazvsmyd1hcv2"))) -(define deblob-scripts-5.6 - (linux-libre-deblob-scripts - "5.6.7" - (base32 "196fdbfy1f8zbmnv0ik720snig2bacsh7hfyvgbmlsfk3cil2zgv") - (base32 "1g0bi3c8xzy1vz6w1xbpkb3a26bqn9d1yphcqz2ki4aikra81wid"))) - (define deblob-scripts-5.4 (linux-libre-deblob-scripts "5.4.37" @@ -384,14 +378,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.7))) -(define-public linux-libre-5.6-version "5.6.17") -(define-public linux-libre-5.6-pristine-source - (let ((version linux-libre-5.6-version) - (hash (base32 "17kzalz8z6svv6nwa3dbmf7nyvpb2wwwyabj19vdwf6v05a28fn3"))) - (make-linux-libre-source version - (%upstream-linux-source version hash) - deblob-scripts-5.6))) - (define-public linux-libre-5.4-version "5.4.45") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) @@ -465,15 +451,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (list %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch))) -(define-public linux-libre-5.6-source - (source-with-patches linux-libre-5.6-pristine-source - (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch - ;; Pinebook Pro patch from linux-next, - ;; can be dropped for linux-libre 5.7 - (search-patch - "linux-libre-support-for-Pinebook-Pro.patch")))) - (define-public linux-libre-5.4-source (source-with-patches linux-libre-5.4-pristine-source (list %boot-logo-patch @@ -577,10 +554,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (make-linux-libre-headers* linux-libre-5.7-version linux-libre-5.7-source)) -(define-public linux-libre-headers-5.6 - (make-linux-libre-headers* linux-libre-5.6-version - linux-libre-5.6-source)) - (define-public linux-libre-headers-5.4 (make-linux-libre-headers* linux-libre-5.4-version linux-libre-5.4-source)) @@ -882,18 +855,6 @@ It has been modified to remove all non-free binary blobs.") ("CONFIG_RTC_DRV_RK808" . #t)) %default-extra-linux-options))) -(define-public linux-libre-arm-generic-5.6 - (make-linux-libre* linux-libre-5.6-version - linux-libre-5.6-source - '("armhf-linux") - #:defconfig "multi_v7_defconfig" - #:extra-version "arm-generic" - #:extra-options - (append - `(;; needed to fix the RTC on rockchip platforms - ("CONFIG_RTC_DRV_RK808" . #t)) - %default-extra-linux-options))) - (define-public linux-libre-arm-generic-5.7 (make-linux-libre* linux-libre-5.7-version linux-libre-5.7-source @@ -956,18 +917,6 @@ It has been modified to remove all non-free binary blobs.") ("CONFIG_RTC_DRV_RK808" . #t)) %default-extra-linux-options))) -(define-public linux-libre-arm64-generic-5.6 - (make-linux-libre* linux-libre-5.6-version - linux-libre-5.6-source - '("aarch64-linux") - #:defconfig "defconfig" - #:extra-version "arm64-generic" - #:extra-options - (append - `(;; needed to fix the RTC on rockchip platforms - ("CONFIG_RTC_DRV_RK808" . #t)) - %default-extra-linux-options))) - (define-public linux-libre-arm64-generic-5.7 (make-linux-libre* linux-libre-5.7-version linux-libre-5.7-source -- cgit v1.2.3 From 48f3631b0f68612ede0d96a4d17bba849535ba32 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 11 Jun 2020 16:14:49 -0400 Subject: gnu: linux-libre@5.7: Update to 5.7.2. * gnu/packages/linux.scm (linux-libre-5.7-version): Update to 5.7.128. (linux-libre-5.7-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6b861d5ff6..2ee4edf942 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,10 +370,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) -(define-public linux-libre-5.7-version "5.7.1") +(define-public linux-libre-5.7-version "5.7.2") (define-public linux-libre-5.7-pristine-source (let ((version linux-libre-5.7-version) - (hash (base32 "1vcxrrb2i4366iciw0mfahwbdrzmhrrsr7gi4vdkzznfv2niils0"))) + (hash (base32 "02brxm78n0kg4mh48acvjsr7mpvaqd279ycyaixaflid1s1awrb0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.7))) -- cgit v1.2.3 From 437e64b7d31e198915daac0c5ef9f0915cd2c503 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 11 Jun 2020 16:15:35 -0400 Subject: gnu: linux-libre: Update to 5.4.46. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.46. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2ee4edf942..0d7f60ca82 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -378,10 +378,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.7))) -(define-public linux-libre-5.4-version "5.4.45") +(define-public linux-libre-5.4-version "5.4.46") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0bpy2lb3bqmkaqxzdmssgmhbjsys7d3lyfv4x919q0596jgh6gqh"))) + (hash (base32 "13hvnfdcbcb9a21zizq8d90mc8maxz03zmzsj6iqsjd2y7r4y1rh"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 648ae62112f62bc2106fb36d45c83fda787d3bed Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Tue, 26 May 2020 16:24:44 +0200 Subject: gnu: Add exercism and dependencies. * gnu/packages/education.scm (exercism): New variable. * gnu/packages/patches/exercism-disable-self-update.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/golang.scm (go-github-com-spf13-afero) (go-github-com-spf13-cast) (go-github-com-spf13-cobra) (go-github-com-spf13-jwalterweatherman) (go-github-com-spf13-viper) (go-github-com-fsnotify-fsnotify) (go-github-com-magiconair-properties) (go-github-com-pelletier-go-toml) (go-github-com-subosito-gotenv) (go-gopkg-in-ini-v1) (go-github-com-mitchellh-mapstructure): New variables. --- gnu/local.mk | 1 + gnu/packages/education.scm | 35 +++ gnu/packages/golang.scm | 285 ++++++++++++++++++++- .../patches/exercism-disable-self-update.patch | 79 ++++++ 4 files changed, 398 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/exercism-disable-self-update.patch diff --git a/gnu/local.mk b/gnu/local.mk index 76d6b5deba..de4b2e158f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -904,6 +904,7 @@ dist_patch_DATA = \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ %D%/packages/patches/evolution-data-server-locales.patch \ %D%/packages/patches/evolution-data-server-libical-compat.patch \ + %D%/packages/patches/exercism-disable-self-update.patch \ %D%/packages/patches/exiv2-CVE-2017-14860.patch \ %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch \ %D%/packages/patches/extempore-unbundle-external-dependencies.patch \ diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 0a186736d4..cba061f195 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2020 Robert Smith ;;; Copyright © 2020 Guy Fleury Iteriteka +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,6 +40,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages golang) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages javascript) @@ -68,6 +70,7 @@ #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (guix build-system trivial) @@ -978,3 +981,35 @@ comparison flags, input-output devices, and a set of binary instructions. The package includes a compiler, a virtual machine, a GUI for the virtual machine, and more.") (license license:gpl3+))) + +(define-public exercism + (package + (name "exercism") + (version "3.0.13") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/exercism/cli") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17gvz9a0sn4p36hf4l77bxhhfipf4x998iay31layqwbnzmb4xy7")) + (patches (search-patches "exercism-disable-self-update.patch")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/exercism/cli/exercism" + #:unpack-path "github.com/exercism/cli")) + (inputs + `(("github.com/blang/semver" ,go-github-com-blang-semver) + ("github.com/spf13/cobra" ,go-github-com-spf13-cobra) + ("github.com/spf13/pflag" ,go-github-com-spf13-pflag) + ("github.com/spf13/viper" ,go-github-com-spf13-viper) + ("golang.org/x/net" ,go-golang-org-x-net) + ("golang.org/x/text" ,go-golang-org-x-text))) + (home-page "https://exercism.io") + (synopsis "Mentored learning for programming languages") + (description "Commandline client for exercism.io, a free service providing +mentored learning for programming languages.") + (license license:expat))) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d95e195ba5..a631ad4285 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -17,6 +17,7 @@ ;;; Copyright @ 2019, 2020 Alex Griffin ;;; Copyright © 2019, 2020 Arun Isaac ;;; Copyright © 2020 Jack Hill +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -1179,6 +1180,103 @@ incoming requests with their respective handler.") @code{clockwork.Clock} interface instead.") (license license:asl2.0)))) +(define-public go-github-com-spf13-afero + (package + (name "go-github-com-spf13-afero") + (version "1.2.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spf13/afero") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0j9r65qgd58324m85lkl49vk9dgwd62g7dwvkfcm3k6i9dc555a9")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/spf13/afero")) + (propagated-inputs + `(("golang.org/x/text" ,go-golang-org-x-text))) + (home-page "https://github.com/spf13/afero") + (synopsis "Filesystem abstraction for Go") + (description "Filesystem abstraction for Go") + (license license:asl2.0))) + +(define-public go-github-com-spf13-cast + (package + (name "go-github-com-spf13-cast") + (version "1.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spf13/cast") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lb84788glr0qzrq2ifi36rgvp96qrgywvxrr3ggq5hrbr38hgn1")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/spf13/cast")) + (native-inputs + `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify))) + (home-page "https://github.com/spf13/cast") + (synopsis "Safe and easy casting from one type to another in Go") + (description "Safe and easy casting from one type to another in Go") + (license license:expat))) + +(define-public go-github-com-spf13-cobra + (package + (name "go-github-com-spf13-cobra") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spf13/cobra") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vbppqqhby302a5ayn0296jqr71qkcd4c9am7wzsk6z71fwdsa7h")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/spf13/cobra")) + (propagated-inputs + `(("github.com/spf13/pflag" ,go-github-com-spf13-pflag))) + (home-page "https://github.com/spf13/cobra") + (synopsis "Go library for creating CLI applications") + (description "Cobra is both a library for creating powerful modern CLI +applications as well as a program to generate applications and command files.") + (license license:asl2.0))) + +(define-public go-github-com-spf13-jwalterweatherman + (package + (name "go-github-com-spf13-jwalterweatherman") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spf13/jwalterweatherman") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/spf13/jwalterweatherman")) + (native-inputs + `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify))) + (home-page "https://github.com/spf13/jwalterweatherman") + (synopsis "Go logging library") + (description "Go logging library") + (license license:expat))) + (define-public go-github-com-spf13-pflag (package (name "go-github-com-spf13-pflag") @@ -1191,8 +1289,8 @@ incoming requests with their respective handler.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31")))) + (base32 + "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31")))) (build-system go-build-system) (arguments '(#:import-path "github.com/spf13/pflag")) @@ -1206,6 +1304,143 @@ with the GNU extensions} to the POSIX recommendations for command-line options.") (license license:bsd-3))) +(define-public go-github-com-spf13-viper + (package + (name "go-github-com-spf13-viper") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spf13/viper.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "099n2g7fg6r8hqyszqw2axr775qyhyvwhsykvgw0f0s16ql48h5c")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/spf13/viper")) + (propagated-inputs + `(("github.com/spf13/afero" ,go-github-com-spf13-afero) + ("github.com/spf13/cast" ,go-github-com-spf13-cast) + ("github.com/spf13/pflag" ,go-github-com-spf13-pflag) + ("github.com/spf13/jwalterweatherman" ,go-github-com-spf13-jwalterweatherman) + ("github.com/fsnotify/fsnotify" ,go-github-com-fsnotify-fsnotify) + ("github.com/hashicorp/hcl" ,go-github-com-hashicorp-hcl) + ("github.com/magiconair/properties" ,go-github-com-magiconair-properties) + ("github.com/mitchellh/mapstructure" ,go-github-com-mitchellh-mapstructure) + ("github.com/pelletier/go-toml" ,go-github-com-pelletier-go-toml) + ("github.com/subosito/gotenv" ,go-github-com-subosito-gotenv) + + ("gopkg.in/ini.v1" ,go-gopkg-in-ini-v1) + ("gopkg.in/yaml.v2" ,go-gopkg-in-yaml-v2))) + (native-inputs + `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify))) + (home-page "https://github.com/spf13/viper") + (synopsis "Go configuration with fangs") + (description + "Viper is a complete configuration solution for Go applications including +12-Factor apps. It is designed to work within an application, and can handle +all types of configuration needs and formats.") + (license license:expat))) + +(define-public go-github-com-fsnotify-fsnotify + (package + (name "go-github-com-fsnotify-fsnotify") + (version "1.4.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fsnotify/fsnotify") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1i1r72knpbfwwql9frn9bqc3nhfc2ai5m6qllcyr6wban62lr40x")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/fsnotify/fsnotify")) + (propagated-inputs + `(("golang.org/x/sys" ,go-golang-org-x-sys))) + (home-page "https://github.com/fsnotify/fsnotify") + (synopsis "File system notifications for Go") + (description "File system notifications for Go") + (license license:bsd-3))) + +(define-public go-github-com-magiconair-properties + (package + (name "go-github-com-magiconair-properties") + (version "1.8.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magiconair/properties") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19zqw1x0w0crh8zc84yy82nkcc5yjz72gviaf2xjgfm5a8np7nyb")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/magiconair/properties")) + (home-page "https://github.com/magiconair/properties") + (synopsis "Java properties scanner for Go") + (description "Java properties scanner for Go") + (license license:bsd-2))) + +(define-public go-github-com-pelletier-go-toml + (package + (name "go-github-com-pelletier-go-toml") + (version "1.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pelletier/go-toml") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fxmjm85c9h43lvqz71wr93fcc63bhj82nwby80222xx8ja63g7y")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/pelletier/go-toml")) + (native-inputs + `(("github.com/BurntSushi/toml" ,go-github-com-burntsushi-toml) + ("github.com/davecgh/go-spew" ,go-github-com-davecgh-go-spew) + ("gopkg.in/yaml.v2" ,go-gopkg-in-yaml-v2))) + (home-page "https://github.com/pelletier/go-toml") + (synopsis "Go library for the TOML configuration language") + (description "Go library for the TOML configuration language") + (license license:expat))) + +(define-public go-github-com-subosito-gotenv + (package + (name "go-github-com-subosito-gotenv") + (version "1.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/subosito/gotenv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mav91j7r4arjkpq5zcf9j74f6pww8ic53x43wy7kg3ibw31yjs5")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/subosito/gotenv")) + (native-inputs + `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify))) + (home-page "https://github.com/subosito/gotenv") + (synopsis "Go library for loading environment variables from files") + (description "Go library for loading environment variables from files") + (license license:expat))) + (define-public go-github-com-sirupsen-logrus (package (name "go-github-com-sirupsen-logrus") @@ -1474,6 +1709,30 @@ which satisfies the cron expression.") (description "This package provides a test library for the Go language.") (license license:asl2.0)))) +(define-public go-gopkg-in-ini-v1 + (package + (name "go-gopkg-in-ini-v1") + (version "1.56.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-ini/ini") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0j5z0cngg6mq2f9id083jcdi7k6r2h35714pashv6sdv2q7bmfc5")))) + (build-system go-build-system) + (arguments + '(#:import-path "gopkg.in/ini.v1" + ;; Requires large unpackaged test framework + #:tests? #f)) + (home-page "https://gopkg.in/ini.v1") + (synopsis "Go library for ini files") + (description "Go library for ini files") + (license license:asl2.0))) + (define-public go-gopkg-in-yaml-v2 (package (name "go-gopkg-in-yaml-v2") @@ -2404,6 +2663,28 @@ the current user without cgo. This library does that, enabling cross-compilation.") (license license:expat)))) +(define-public go-github-com-mitchellh-mapstructure + (package + (name "go-github-com-mitchellh-mapstructure") + (version "1.1.2") ;; NOTE: Updating to 1.3.1 breaks tests on viper-1.7.0 + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mitchellh/mapstructure") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/mitchellh/mapstructure")) + (home-page "https://github.com/mitchellh/mapstructure") + (synopsis "Go library for decoding generic map values") + (description "Go library for decoding generic map values") + (license license:expat))) + (define-public go-github-com-multiformats-go-multiaddr (let ((commit "fe1c46f8be5af4aff4db286e08839295bd922efb") (revision "0")) diff --git a/gnu/packages/patches/exercism-disable-self-update.patch b/gnu/packages/patches/exercism-disable-self-update.patch new file mode 100644 index 0000000000..a96cbfbc55 --- /dev/null +++ b/gnu/packages/patches/exercism-disable-self-update.patch @@ -0,0 +1,79 @@ +From bc22f7d43c12c5f79c71b0319666e71f29d61322 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= +Date: Mon, 25 May 2020 18:53:04 +0200 +Subject: [PATCH] Disable self-update. + +Based on a Fedora patch by Elliott Sales de Andrade. +--- + cli/cli.go | 44 +------------------------------------------- + 1 file changed, 1 insertion(+), 43 deletions(-) + +diff --git a/cli/cli.go b/cli/cli.go +index 4312eb0..5f62297 100644 +--- a/cli/cli.go ++++ b/cli/cli.go +@@ -10,13 +10,10 @@ import ( + "io" + "io/ioutil" + "net/http" +- "runtime" + "strings" + "time" + + "github.com/blang/semver" +- "github.com/exercism/cli/debug" +- update "github.com/inconshreveable/go-update" + ) + + var ( +@@ -95,46 +92,7 @@ func (c *CLI) IsUpToDate() (bool, error) { + + // Upgrade allows the user to upgrade to the latest version of the CLI. + func (c *CLI) Upgrade() error { +- var ( +- OS = osMap[runtime.GOOS] +- ARCH = archMap[runtime.GOARCH] +- ) +- +- if OS == "" || ARCH == "" { +- return fmt.Errorf("unable to upgrade: OS %s ARCH %s", OS, ARCH) +- } +- +- buildName := fmt.Sprintf("%s-%s", OS, ARCH) +- if BuildARCH == "arm" { +- if BuildARM == "" { +- return fmt.Errorf("unable to upgrade: arm version not found") +- } +- buildName = fmt.Sprintf("%s-v%s", buildName, BuildARM) +- } +- +- var downloadRC *bytes.Reader +- for _, a := range c.LatestRelease.Assets { +- if strings.Contains(a.Name, buildName) { +- debug.Printf("Downloading %s\n", a.Name) +- var err error +- downloadRC, err = a.download() +- if err != nil { +- return fmt.Errorf("error downloading executable: %s", err) +- } +- break +- } +- } +- if downloadRC == nil { +- return fmt.Errorf("no executable found for %s/%s%s", BuildOS, BuildARCH, BuildARM) +- } +- +- bin, err := extractBinary(downloadRC, OS) +- if err != nil { +- return err +- } +- defer bin.Close() +- +- return update.Apply(bin, update.Options{}) ++ return fmt.Errorf("Please use Guix to update Exercism") + } + + func (c *CLI) fetchLatestRelease() error { +-- +2.26.2 + -- cgit v1.2.3 From b6b95685d0b478698d648f13afd927b1e1700d99 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 11 Jun 2020 23:51:44 +0200 Subject: shepherd: Unblock signals in the child process. Fixes . Reported by Tobias Geerinckx-Rice . This change mirrors changes made in the Shepherd 0.8.1, where signals are blocked in the shepherd process in support of 'signalfd'. The regression was introduced with the switch to 0.8.1 in 3f9c62d1a8b345909adaeb22f454ad22554c55a1: child processes would not receive SIGTERM upon 'herd stop SERVICE'. * gnu/build/shepherd.scm : Autoload (shepherd system). (make-forkexec-constructor/container): Call call to 'sigaction' and 'unblock-signals'. --- gnu/build/shepherd.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/build/shepherd.scm b/gnu/build/shepherd.scm index 14bdf4edb8..47920a7b74 100644 --- a/gnu/build/shepherd.scm +++ b/gnu/build/shepherd.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2017, 2018, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +21,7 @@ #:use-module (gnu build linux-container) #:use-module (guix build utils) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module (ice-9 match) #:export (make-forkexec-constructor/container)) @@ -91,7 +92,10 @@ ;; XXX: Lazy-bind the Shepherd to avoid a compile-time dependency. (module-autoload! (current-module) - '(shepherd service) '(read-pid-file exec-command)) + '(shepherd service) + '(read-pid-file exec-command %precious-signals)) +(module-autoload! (current-module) + '(shepherd system) '(unblock-signals)) (define* (read-pid-file/container pid pid-file #:key (max-delay 5)) "Read PID-FILE in the container namespaces of PID, which exists in a @@ -158,6 +162,14 @@ namespace, in addition to essential bind-mounts such /proc." (let ((pid (run-container container-directory mounts namespaces 1 (lambda () + ;; First restore the default handlers. + (for-each (cut sigaction <> SIG_DFL) + %precious-signals) + + ;; Unblock any signals that have been blocked + ;; by the parent process. + (unblock-signals %precious-signals) + (mkdir-p "/var/run") (clean-up pid-file) -- cgit v1.2.3 From 8a02e45d93c2a825363da282791ac16f15b415e4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 12 Jun 2020 00:03:07 +0200 Subject: shepherd: 'read-pid-file/container' terminates the whole process group. This mirrors a change made in the Shepherd 0.8.0. Previously, upon startup failure, we could have left processes behind. * gnu/build/shepherd.scm (read-pid-file/container): Kill (- PID) instead of PID. --- gnu/build/shepherd.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/build/shepherd.scm b/gnu/build/shepherd.scm index 47920a7b74..fd93e7f3f4 100644 --- a/gnu/build/shepherd.scm +++ b/gnu/build/shepherd.scm @@ -105,7 +105,8 @@ separate mount and PID name space. Return the \"outer\" PID. " (read-pid-file pid-file #:max-delay max-delay))) (#f - (catch-system-error (kill pid SIGTERM)) + ;; Send SIGTERM to the whole process group. + (catch-system-error (kill (- pid) SIGTERM)) #f) ((? integer? container-pid) ;; XXX: When COMMAND is started in a separate PID namespace, its -- cgit v1.2.3 From 9c6ea3cb5617a1928073f41f174765ab14adbaa9 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Thu, 11 Jun 2020 22:33:49 +0200 Subject: gnu: icecat: Fix WebGL support. * gnu/packages/gnuzilla.scm (icecat): Wrap mesa. Signed-off-by: Julien Lepiller --- gnu/packages/gnuzilla.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 1f5deb3302..0a8edcb1e4 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1112,11 +1112,13 @@ from forcing GEXP-PROMISE." (lib (string-append out "/lib")) (gtk (assoc-ref inputs "gtk+")) (gtk-share (string-append gtk "/share")) + (mesa (assoc-ref inputs "mesa")) + (mesa-lib (string-append mesa "/lib")) (pulseaudio (assoc-ref inputs "pulseaudio")) (pulseaudio-lib (string-append pulseaudio "/lib"))) (wrap-program (car (find-files lib "^icecat$")) `("XDG_DATA_DIRS" prefix (,gtk-share)) - `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib))) + `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,mesa-lib))) #t)))))) (home-page "https://www.gnu.org/software/gnuzilla/") (synopsis "Entirely free browser derived from Mozilla Firefox") -- cgit v1.2.3 From 21887021b9acf60157b1b0a39c16f2ec6498021b Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Wed, 10 Jun 2020 00:01:50 -0700 Subject: guix: lint: Support origins in check-patch-file-names. * guix/lint.scm (check-patch-file-names)[starts-with-package-name?]: New procedure, extracted from the existing logic. Using it, add a clause to the match-lambda to handle origin records. --- guix/lint.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index 6271894360..627016fae0 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2018, 2019 Arun Isaac +;;; Copyright © 2020 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -669,13 +670,17 @@ patch could not be found." (or (and=> (package-source package) origin-patches) '())) + (define (starts-with-package-name? file-name) + (and=> (string-contains file-name (package-name package)) + zero?)) + (append (if (every (match-lambda ;patch starts with package name? ((? string? patch) - (and=> (string-contains (basename patch) - (package-name package)) - zero?)) - (_ #f)) ;must be an or something like that. + (starts-with-package-name? (basename patch))) + ((? origin? patch) + (starts-with-package-name? (origin-file-name patch))) + (_ #f)) ;must be some other file-like object patches) '() (list -- cgit v1.2.3 From cd0f1fbd1ab1018c022661fa57ddcb91125dd4ab Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 10 Jun 2020 14:34:24 +0200 Subject: gnu: xf86-input-libinput: Reduce closure size. * gnu/packages/xorg.scm (xf86-input-libinput)[inputs]: Replace libinput by libinput-minimal. --- gnu/packages/xorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9a7b856791..e5fe3e14cf 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2556,7 +2556,7 @@ including most mice, keyboards, tablets and touchscreens.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("libinput" ,libinput) + `(("libinput" ,libinput-minimal) ("xorg-server" ,xorg-server))) (home-page "https://www.x.org/wiki/") (synopsis "Input driver for X server based on libinput") -- cgit v1.2.3 From fdd883509301845ddb4dc90e70e58b469afb5441 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jun 2020 12:55:12 +0200 Subject: gnu: mesa: Replace with 20.0.8. * gnu/packages/gl.scm (mesa-20.0.8): New variable. (mesa)[replacement]: New field. --- gnu/packages/gl.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 8a17f7dd65..828612eee1 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -234,6 +234,13 @@ also known as DXTn or DXTC) for Mesa.") (package (name "mesa") (version "20.0.7") + + ;; Mesa 20.0.5 through 20.0.7 has problems with some graphic drivers, so + ;; we need this newer version. + ;; https://gitlab.freedesktop.org/mesa/mesa/-/issues/2882 + ;; https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4861 + (replacement mesa-20.0.8) + (source (origin (method url-fetch) @@ -439,6 +446,21 @@ device drivers allows Mesa to be used in many different environments ranging from software emulation to complete hardware acceleration for modern GPUs.") (license license:x11))) +;; Replacement package to fix . +(define mesa-20.0.8 + (package + (inherit mesa) + (version "20.0.8") + (source (origin + (inherit (package-source mesa)) + (uri (list (string-append "https://mesa.freedesktop.org/archive/" + "mesa-" version ".tar.xz") + (string-append "ftp://ftp.freedesktop.org/pub/mesa/" + "mesa-" version ".tar.xz"))) + (sha256 + (base32 + "0v0bfh3ay07s6msxmklvwfaif0q02kq2yhy65fdhys49vw8c1w3c")))))) + (define-public mesa-opencl (package (inherit mesa) -- cgit v1.2.3 From 8ea91d05b0fd16a8dd42a53efee9b16991d581b9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jun 2020 12:57:15 +0200 Subject: gnu: mesa: Ensure replacements are inherited in special variants. * gnu/packages/gl.scm (mesa-opencl, mesa-opencl-icd, mesa-headers): Use PACKAGE/INHERIT instead of regular inheritance. --- gnu/packages/gl.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 828612eee1..41fc8ae697 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -462,8 +462,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") "0v0bfh3ay07s6msxmklvwfaif0q02kq2yhy65fdhys49vw8c1w3c")))))) (define-public mesa-opencl - (package - (inherit mesa) + (package/inherit mesa (name "mesa-opencl") (arguments (substitute-keyword-arguments (package-arguments mesa) @@ -477,8 +476,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") ,@(package-native-inputs mesa))))) (define-public mesa-opencl-icd - (package - (inherit mesa-opencl) + (package/inherit mesa-opencl (name "mesa-opencl-icd") (arguments (substitute-keyword-arguments (package-arguments mesa) @@ -487,8 +485,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") ,(delete "-Dgallium-opencl=standalone" flags))))))) (define-public mesa-headers - (package - (inherit mesa) + (package/inherit mesa (name "mesa-headers") (propagated-inputs '()) (inputs '()) -- cgit v1.2.3 From fd1e885236fcec0aec1e3293153524f02b010560 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 11 Jun 2020 15:25:02 +0200 Subject: system: image: Do not produce an HFS tree when building an ISO. Use "mbr_only" mode to make sure that no HFS+ tree are generated. * gnu/system/image.scm (system-image): Set MKRESCUE_SED_MODE to "mbr_only". --- gnu/system/image.scm | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index a0e6bf31f1..6c4573509d 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -538,14 +538,23 @@ image, depending on IMAGE format." #:inputs `(("system" ,os) ("bootcfg" ,bootcfg)))) ((iso9660) - (system-iso9660-image image* - #:bootcfg bootcfg - #:bootloader bootloader - #:register-closures? register-closures? - #:inputs `(("system" ,os) - ("bootcfg" ,bootcfg)) - #:grub-mkrescue-environment - '(("MKRESCUE_SED_MODE" . "mbr_hfs"))))))) + (system-iso9660-image + image* + #:bootcfg bootcfg + #:bootloader bootloader + #:register-closures? register-closures? + #:inputs `(("system" ,os) + ("bootcfg" ,bootcfg)) + ;; Make sure to use a mode that does no imply + ;; HFS+ tree creation that may fail with: + ;; + ;; "libisofs: FAILURE : Too much files to mangle, + ;; cannot guarantee unique file names" + ;; + ;; This happens if some limits are exceeded, see: + ;; https://lists.gnu.org/archive/html/grub-devel/2020-06/msg00048.html + #:grub-mkrescue-environment + '(("MKRESCUE_SED_MODE" . "mbr_only"))))))) (define (find-image file-system-type) "Find and return an image that could match the given FILE-SYSTEM-TYPE. This -- cgit v1.2.3 From 9a01efa262cef9a102823122b2deee9b38402bcc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Jun 2020 18:04:01 +0300 Subject: gnu: Fix apache mirror URIs. * gnu/packages/web.scm (serf)[source]: Remove redundant part of URI. * gnu/packages/java.scm (ant-bootstrap, java-commons-httpclient, java-jakarta-oro)[source]: Same. * gnu/packages/maven.scm (maven-shared-utils, maven-plugin-annotations, maven-wagon-provider-api, maven-artifact)[source]: Same. --- gnu/packages/java.scm | 6 +++--- gnu/packages/maven.scm | 8 ++++---- gnu/packages/web.scm | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 885086fe30..d5bc713c70 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -276,7 +276,7 @@ JNI.") (version "1.8.4") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/" + (uri (string-append "mirror://apache/" "ant/source/apache-ant-" version "-src.tar.bz2")) (sha256 @@ -10832,7 +10832,7 @@ graphs, and pie charts.") (version "3.1") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/httpcomponents/" + (uri (string-append "mirror://apache/httpcomponents/" "commons-httpclient/source/commons-httpclient-" version "-src.tar.gz")) (sha256 @@ -10928,7 +10928,7 @@ inside a Zip archive.") (version "2.0.8") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/jakarta/oro/" + (uri (string-append "mirror://apache/jakarta/oro/" "jakarta-oro-" version ".tar.gz")) (sha256 (base32 diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index a62eb7469e..66c6e3adfa 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -340,7 +340,7 @@ Maven Wagon, for use in Maven."))) (version "3.2.1") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/maven/shared/" + (uri (string-append "mirror://apache/maven/shared/" "maven-shared-utils-" version "-source-release.zip")) (sha256 (base32 @@ -380,7 +380,7 @@ replacement with improvements.") (version "3.5") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/maven/" + (uri (string-append "mirror://apache/maven/" "plugin-tools/maven-plugin-tools-" version "-source-release.zip")) (sha256 (base32 "1ryqhs62j5pas93brhf5dsnvp99hxbvssf681yj5rk3r9h24hqm2")))) @@ -404,7 +404,7 @@ replacement with improvements.") (version "3.1.0") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/maven/wagon/" + (uri (string-append "mirror://apache/maven/wagon/" "wagon-" version "-source-release.zip")) (sha256 (base32 "0r07j6xdzdnrvqnv8ida7dx1m05pznh5qgmcfcfpyvg9nxbj3l1n")))) (build-system ant-build-system) @@ -691,7 +691,7 @@ gets and puts artifacts through HTTP(S) using Apache HttpClient-4.x."))) (version "3.6.1") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/maven/" + (uri (string-append "mirror://apache/maven/" "maven-3/" version "/source/" "apache-maven-" version "-src.tar.gz")) (sha256 (base32 "0grw9zp166ci53rd7qkyy2qmwmik37xhiz1z84jpm0msyvzj2n82")) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a04d755a83..f6a0fc2e44 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1575,7 +1575,7 @@ from streaming URLs. It is a command-line wrapper for the libquvi library.") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/serf/serf-" + (uri (string-append "mirror://apache/serf/serf-" version ".tar.bz2")) (sha256 (base32 "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l")))) -- cgit v1.2.3 From 205a0ecd5b59fc429f08530c3c021c61eb5c36be Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Jun 2020 18:28:36 +0300 Subject: download: Add more apache mirrors. * guix/download.scm (%mirrors): Add more apache mirrors. --- guix/download.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/guix/download.scm b/guix/download.scm index c3dc5a208c..7d6edddbdd 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -141,8 +141,12 @@ "http://www.eu.apache.org/dist/" "http://www.us.apache.org/dist/" "http://apache.belnet.be/" + "http://apache.mirror.iweb.ca/" "http://mirrors.ircam.fr/pub/apache/" + "http://apache.mirrors.ovh.net/ftp.apache.org/dist/" "http://apache-mirror.rbc.ru/pub/apache/" + "ftp://ftp.osuosl.org/pub/apache/" + "http://mirrors.ibiblio.org/apache/" ;; As a last resort, try the archive. "http://archive.apache.org/dist/") -- cgit v1.2.3 From 3bec7a356a3ac6659f8ecbc0f857c0fb69bc263a Mon Sep 17 00:00:00 2001 From: Ryan Desfosses Date: Sun, 31 May 2020 18:48:44 -0400 Subject: gnu: Add emacs-shell-pop. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-shell-pop): New variable Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 946d01cba5..bef4fb905e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -74,6 +74,7 @@ ;;; Copyright © 2020 Ryan Desfosses ;;; Copyright © 2020 Marcin Karpezo ;;; Copyright © 2020 Fredrik Salomonsson +;;; Copyright © 2020 Ryan Desfosses ;;; ;;; This file is part of GNU Guix. ;;; @@ -23155,3 +23156,28 @@ files.") sources. It features syntax highlighting, autocompletion, preview of buffer or region and use of locally installed binaries.") (license license:gpl3+))) + +(define-public emacs-shell-pop + (let ((commit "4b4394037940a890a313d715d203d9ead2d156a6") + (revision "0")) + (package + (name "emacs-shell-pop") + (version (git-version "0.64" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kyagi/shell-pop-el.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0s77n6b9iw1x3dv91ybkpgy3zvqd12si7zw3lg0m2b6j1akrawsg")))) + (build-system emacs-build-system) + (home-page "https://github.com/kyagi/shell-pop-el") + (synopsis "Utility which helps with pop up shell buffer") + (description + "This Emacs utility helps you pop up and pop out shell buffer window +easily. Four pre-set options are: @samp{shell}, @samp{terminal}, +@samp{ansi-term}, and @samp{eshell}. You can also set your custom shell if +you use some other configuration.") + (license license:gpl3+)))) -- cgit v1.2.3 From 70a49ef76b3a72176b75c5d4d63e5324d3f9f767 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 14:55:23 -0500 Subject: gnu: Add libestr. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (libestr): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/c.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 3e227decc9..12a9b56c51 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2019 Andreas Enge ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Marius Bakke +;;; Copyright @ 2020 Katherine Cox-Buday ;;; ;;; This file is part of GNU Guix. ;;; @@ -339,3 +340,36 @@ address space pointers point to, or what locks a function acquires or releases.") (home-page "https://sparse.wiki.kernel.org/index.php/Main_Page") (license license:expat))) + +(define-public libestr + (package + (name "libestr") + (version "0.1.11") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rsyslog/libestr.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ca4rj90c0dn7kqpbcchkflxjw88a7rxcnwbr0gply4a28i01nd8")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; autogen.sh calls configure at the end of the script. + (replace 'bootstrap + (lambda _ (invoke "autoreconf" "-vfi")))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) + ("libtool" ,libtool))) + (home-page "https://github.com/rsyslog/libestr") + (synopsis "Helper functions for handling strings") + (description + "This C library contains some essential string manipulation functions and +more, like escaping special characters.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 0aee6e51b4156430036822ed8dca2f7a84df2258 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 15:24:59 -0500 Subject: gnu: Add libfastjson. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (libfastjson): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/c.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 12a9b56c51..2e62111d44 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -373,3 +373,30 @@ releases.") "This C library contains some essential string manipulation functions and more, like escaping special characters.") (license license:lgpl2.1+))) + +(define-public libfastjson + (package + (name "libfastjson") + (version "0.99.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rsyslog/libfastjson.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qhs0g9slj3p0v2z4s3cnsx44msrlb4k78ljg7714qiziqbrbwyl")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (home-page "https://github.com/rsyslog/libfastjson") + (synopsis "Fast JSON library for C") + (description + "libfastjson is a fork from json-c aiming to provide: a small library +with essential JSON handling functions, sufficiently good JSON support (not +100% standards compliant), and very fast processing.") + (license license:expat))) -- cgit v1.2.3 From 7def5056b631978e246211fabe81e0754c795ebe Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 15:29:08 -0500 Subject: gnu: Add liblogging. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (liblogging): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/c.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 2e62111d44..c107a36c6a 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages pcre) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages autotools) #:use-module (gnu packages gettext) #:use-module (gnu packages pkg-config) @@ -400,3 +401,38 @@ more, like escaping special characters.") with essential JSON handling functions, sufficiently good JSON support (not 100% standards compliant), and very fast processing.") (license license:expat))) + +(define-public liblogging + (package + (name "liblogging") + (version "1.0.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rsyslog/liblogging.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1l32m0y65svf5vxsgw935jnqs6842rcqr56dmzwqvr00yfrjhjkp")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; autogen.sh calls configure at the end of the script. + (replace 'bootstrap + (lambda _ (invoke "autoreconf" "-vfi")))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) + ("libtool" ,libtool) + ;; For rst2man.py + ("python-docutils" ,python-docutils))) + (home-page "https://github.com/rsyslog/liblogging") + (synopsis "Easy to use and lightweight signal-safe logging library") + (description + "Liblogging is an easy to use library for logging. It offers an enhanced +replacement for the syslog() call, but retains its ease of use.") + (license license:bsd-2))) -- cgit v1.2.3 From 52c529ff20b389eb64ac033586e6b1a5c5d82cb5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 10 Jun 2020 14:54:13 +0200 Subject: git-authenticate: Disallow SHA1 (and MD5) signatures. * guix/git-authenticate.scm (commit-signing-key): Add #:disallowed-hash-algorithms and honor it. (authenticate-commit)[recent-commit?]: New variable. Pass #:disallowed-hash-algorithms to 'commit-signing-key'. * tests/git-authenticate.scm ("signed commits, SHA1 signature"): New test. --- guix/git-authenticate.scm | 29 ++++++++++++++++++++++++++--- tests/git-authenticate.scm | 29 +++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index c333717136..0d6f696a0b 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -85,9 +85,11 @@ (signature missing-key-error-signature)) -(define (commit-signing-key repo commit-id keyring) +(define* (commit-signing-key repo commit-id keyring + #:key (disallowed-hash-algorithms '(sha1))) "Return the OpenPGP key that signed COMMIT-ID (an OID). Raise an exception -if the commit is unsigned, has an invalid signature, or if its signing key is +if the commit is unsigned, has an invalid signature, has a signature using one +of the hash algorithms in DISALLOWED-HASH-ALGORITHMS, or if its signing key is not in KEYRING." (let-values (((signature signed-data) (catch 'git-error @@ -103,6 +105,17 @@ not in KEYRING." (oid->string commit-id))))))) (let ((signature (string->openpgp-packet signature))) + (when (memq (openpgp-signature-hash-algorithm signature) + `(,@disallowed-hash-algorithms md5)) + (raise (condition + (&unsigned-commit-error (commit commit-id)) + (&message + (message (format #f (G_ "commit ~a has a ~a signature, \ +which is not permitted") + (oid->string commit-id) + (openpgp-signature-hash-algorithm + signature))))))) + (with-fluids ((%default-port-encoding "UTF-8")) (let-values (((status data) (verify-openpgp-signature signature keyring @@ -198,8 +211,18 @@ not specify anything, fall back to DEFAULT-AUTHORIZATIONS." (define id (commit-id commit)) + (define recent-commit? + (false-if-git-not-found + (tree-entry-bypath (commit-tree commit) ".guix-authorizations"))) + (define signing-key - (commit-signing-key repository id keyring)) + (commit-signing-key repository id keyring + ;; Reject SHA1 signatures unconditionally as suggested + ;; by the authors of "SHA-1 is a Shambles" (2019). + ;; Accept it for "historical" commits (there are such + ;; signatures from April 2020 in the repository). + #:disallowed-hash-algorithms + (if recent-commit? '(sha1) '()))) (unless (member (openpgp-public-key-fingerprint signing-key) (commit-authorized-keys repository commit diff --git a/tests/git-authenticate.scm b/tests/git-authenticate.scm index 84689d628e..97990acaea 100644 --- a/tests/git-authenticate.scm +++ b/tests/git-authenticate.scm @@ -81,6 +81,35 @@ #:keyring-reference "master") 'failed))))) +(unless (which (git-command)) (test-skip 1)) +(test-assert "signed commits, SHA1 signature" + (with-fresh-gnupg-setup (list %ed25519-public-key-file + %ed25519-secret-key-file) + ;; Force use of SHA1 for signatures. + (call-with-output-file (string-append (getenv "GNUPGHOME") "/gpg.conf") + (lambda (port) + (display "digest-algo sha1" port))) + + (with-temporary-git-repository directory + `((add "a.txt" "A") + (add "signer.key" ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (add ".guix-authorizations" + ,(object->string + `(authorizations (version 0) + ((,(key-fingerprint %ed25519-public-key-file) + (name "Charlie")))))) + (commit "first commit" + (signer ,(key-fingerprint %ed25519-public-key-file)))) + (with-repository directory repository + (let ((commit (find-commit repository "first"))) + (guard (c ((unsigned-commit-error? c) + (oid=? (git-authentication-error-commit c) + (commit-id commit)))) + (authenticate-commits repository (list commit) + #:keyring-reference "master") + 'failed)))))) + (unless (gpg+git-available?) (test-skip 1)) (test-assert "signed commits, default authorizations" (with-fresh-gnupg-setup (list %ed25519-public-key-file -- cgit v1.2.3 From 29e4d3ea064f039d60b5f41a1077bc9d4bab322a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 12 Jun 2020 18:52:36 +0200 Subject: gnu: guile-sqlite3: Update to 0.1.1. * gnu/packages/guile.scm (guile-sqlite3): Update to 0.1.1. [source]: Remove 'patches', 'modules', and 'snippet'. * gnu/packages/patches/guile-sqlite3-fix-cross-compilation.patch: Remove. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/guile.scm | 16 ++----- .../guile-sqlite3-fix-cross-compilation.patch | 55 ---------------------- 3 files changed, 3 insertions(+), 69 deletions(-) delete mode 100644 gnu/packages/patches/guile-sqlite3-fix-cross-compilation.patch diff --git a/gnu/local.mk b/gnu/local.mk index de4b2e158f..583274235b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1061,7 +1061,6 @@ dist_patch_DATA = \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-emacs-fix-configure.patch \ - %D%/packages/patches/guile-sqlite3-fix-cross-compilation.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \ %D%/packages/patches/gtk2-theme-paths.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index c2dc7f6d5f..5e9b453ea0 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -633,7 +633,7 @@ Guile's foreign function interface.") (define-public guile-sqlite3 (package (name "guile-sqlite3") - (version "0.1.0") + (version "0.1.1") (home-page "https://notabug.org/guile-sqlite3/guile-sqlite3.git") (source (origin (method git-fetch) @@ -642,18 +642,8 @@ Guile's foreign function interface.") (commit (string-append "v" version)))) (sha256 (base32 - "1nv8j7wk6b5n4p22szyi8lv8fs31rrzxhzz16gyj8r38c1fyp9qp")) - (file-name (string-append name "-" version "-checkout")) - (patches - (search-patches "guile-sqlite3-fix-cross-compilation.patch")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Allow builds with Guile 3.0. - (substitute* "configure.ac" - (("^GUILE_PKG.*") - "GUILE_PKG([3.0 2.2 2.0])\n")) - #t)))) + "0f7lgqkyli8gc2gifrabxnqrqixkpwsridhx9sm2wc7djxdafccb")) + (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) diff --git a/gnu/packages/patches/guile-sqlite3-fix-cross-compilation.patch b/gnu/packages/patches/guile-sqlite3-fix-cross-compilation.patch deleted file mode 100644 index 9ea9a47677..0000000000 --- a/gnu/packages/patches/guile-sqlite3-fix-cross-compilation.patch +++ /dev/null @@ -1,55 +0,0 @@ -From a6e9e62a77ecc5012929613e20da23b2636450a5 Mon Sep 17 00:00:00 2001 -From: Mathieu Othacehe -Date: Mon, 25 Mar 2019 11:00:38 +0100 -Subject: [PATCH] cross compile - ---- - build-aux/guile.am | 2 +- - configure.ac | 19 ++++++++++++------- - 2 files changed, 13 insertions(+), 8 deletions(-) - -diff --git a/build-aux/guile.am b/build-aux/guile.am -index dc1e63f..3126372 100644 ---- a/build-aux/guile.am -+++ b/build-aux/guile.am -@@ -16,4 +16,4 @@ EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES) - GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat - SUFFIXES = .scm .go - .scm.go: -- $(AM_V_GEN)$(top_builddir)/env $(GUILE_TOOLS) compile $(GUILE_WARNINGS) -o "$@" "$<" -+ $(AM_V_GEN)$(top_builddir)/env $(GUILE_TOOLS) compile $(GUILE_TARGET) $(GUILE_WARNINGS) -o "$@" "$<" -diff --git a/configure.ac b/configure.ac -index f648fcb..2d34d0a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,15 +21,20 @@ PKG_CHECK_MODULES([SQLITE], [sqlite3]) - SQLITE_LIBDIR="`"$PKG_CONFIG" sqlite3 --variable libdir`" - AC_SUBST([SQLITE_LIBDIR]) - --AC_MSG_CHECKING([whether '$SQLITE_LIBDIR/libsqlite3' is usable]) --GUILE_CHECK([retval], -- [(dynamic-func \"sqlite3_open_v2\" -+if test "$cross_compiling" = "no"; then -+ AC_MSG_CHECKING([whether '$SQLITE_LIBDIR/libsqlite3' is usable]) -+ GUILE_CHECK([retval], -+ [(dynamic-func \"sqlite3_open_v2\" - (dynamic-link \"$SQLITE_LIBDIR/libsqlite3\"))]) --if test "$retval" != 0; then -- AC_MSG_RESULT([no]) -- AC_MSG_ERROR([failed to load '$SQLITE_LIBDIR/libsqlite3']) -+ if test "$retval" != 0; then -+ AC_MSG_RESULT([no]) -+ AC_MSG_ERROR([failed to load '$SQLITE_LIBDIR/libsqlite3']) -+ else -+ AC_MSG_RESULT([yes]) -+ fi - else -- AC_MSG_RESULT([yes]) -+ GUILE_TARGET="--target=$host_alias" -+ AC_SUBST([GUILE_TARGET]) - fi - - AC_CONFIG_FILES([Makefile sqlite3.scm]) --- -2.17.1 - -- cgit v1.2.3 From db6290af7cea3434a72d98c007cb6f5d0d72b1b1 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 12 Jun 2020 22:26:47 +0100 Subject: lint: check-patch-file-names: Use origin-actual-file-name. This avoids crashes for the patch-file-names checker where a is used for a patch, but without a value for the file-name field. This is currently the case with the bash package. * guix/lint.scm (check-patch-file-names): Change origin-file-name to origin-actual-file-name. --- guix/lint.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/lint.scm b/guix/lint.scm index 627016fae0..82861b8a27 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -679,7 +679,7 @@ patch could not be found." ((? string? patch) (starts-with-package-name? (basename patch))) ((? origin? patch) - (starts-with-package-name? (origin-file-name patch))) + (starts-with-package-name? (origin-actual-file-name patch))) (_ #f)) ;must be some other file-like object patches) '() -- cgit v1.2.3 From a620d22ea827a64ecfaead165e5b78be9861f324 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 12:41:49 +0200 Subject: gnu: r-gprofiler: Move to (gnu packages cran). * gnu/packages/bioinformatics.scm (r-gprofiler): Move this variable from here... * gnu/packages/cran.scm (r-gprofiler): ...to here. --- gnu/packages/bioinformatics.scm | 24 ------------------------ gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 550c0387e9..3cad73a688 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10393,30 +10393,6 @@ views. High-level plots include sequence fragment length, edge-linked interval to data view, mismatch pileup, and several splicing summaries.") (license license:artistic2.0))) -(define-public r-gprofiler - (package - (name "r-gprofiler") - (version "0.7.0") - (source - (origin - (method url-fetch) - (uri (cran-uri "gProfileR" version)) - (sha256 - (base32 - "1h1v0kgpsn04ald2izznh7fr2riwisj5hcgz4k7h3qc931rf0r4k")))) - (properties `((upstream-name . "gProfileR"))) - (build-system r-build-system) - (propagated-inputs - `(("r-plyr" ,r-plyr) - ("r-rcurl" ,r-rcurl))) - (home-page "https://cran.r-project.org/web/packages/gProfileR/") - (synopsis "Interface to the g:Profiler toolkit") - (description - "This package provides tools for functional enrichment analysis, -gene identifier conversion and mapping homologous genes across related -organisms via the @code{g:Profiler} toolkit.") - (license license:gpl2+))) - (define-public r-gqtlbase (package (name "r-gqtlbase") diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7fa47aee1c..7c37f8eb59 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -158,6 +158,30 @@ the system clipboards.") respecting the grammar of its graphics paradigm.") (license license:gpl2+))) +(define-public r-gprofiler + (package + (name "r-gprofiler") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "gProfileR" version)) + (sha256 + (base32 + "1h1v0kgpsn04ald2izznh7fr2riwisj5hcgz4k7h3qc931rf0r4k")))) + (properties `((upstream-name . "gProfileR"))) + (build-system r-build-system) + (propagated-inputs + `(("r-plyr" ,r-plyr) + ("r-rcurl" ,r-rcurl))) + (home-page "https://cran.r-project.org/web/packages/gProfileR/") + (synopsis "Interface to the g:Profiler toolkit") + (description + "This package provides tools for functional enrichment analysis, +gene identifier conversion and mapping homologous genes across related +organisms via the @code{g:Profiler} toolkit.") + (license license:gpl2+))) + (define-public r-oenb (package (name "r-oenb") -- cgit v1.2.3 From 8e518d4802891ea8398aab7259f823c3cc648d64 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 15:49:57 +0200 Subject: guix: Update to Bioconductor 3.11. * guix/build-system/r.scm (bioconductor-uri): Use new URL. * guix/import/cran.scm (%bioconductor-version): Update to 3.11. --- guix/build-system/r.scm | 4 ++-- guix/import/cran.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm index 2d328764b0..c8ec9abd0d 100644 --- a/guix/build-system/r.scm +++ b/guix/build-system/r.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,7 +59,7 @@ release corresponding to NAME and VERSION." "/src/contrib/" name "_" version ".tar.gz") ;; TODO: use %bioconductor-version from (guix import cran) - (string-append "https://bioconductor.org/packages/3.10" + (string-append "https://bioconductor.org/packages/3.11" type-url-part "/src/contrib/Archive/" name "_" version ".tar.gz")))) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index ad66a644ee..b822fbc0ae 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -141,9 +141,9 @@ package definition." (define %cran-url "https://cran.r-project.org/web/packages/") (define %bioconductor-url "https://bioconductor.org/packages/") -;; The latest Bioconductor release is 3.10. Bioconductor packages should be +;; The latest Bioconductor release is 3.11. Bioconductor packages should be ;; updated together. -(define %bioconductor-version "3.10") +(define %bioconductor-version "3.11") (define* (bioconductor-packages-list-url #:optional type) (string-append "https://bioconductor.org/packages/" -- cgit v1.2.3 From f9311eaa7cb7849e9b17162c93b874c74d8fcbbd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 23:52:28 +0200 Subject: gnu: node: Build shared library. * gnu/packages/node.scm (node)[arguments]: Build shared library. --- gnu/packages/node.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index a3cf3c9199..cc81b1f20b 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -74,7 +74,8 @@ #t)))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--shared-cares" + `(#:configure-flags '("--shared" + "--shared-cares" "--shared-http-parser" "--shared-libuv" "--shared-nghttp2" -- cgit v1.2.3 From 45f54b418b23dd1c17b52550b405d8ec15721be2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 15:54:42 +0200 Subject: gnu: Add r-gprofiler2. * gnu/packages/cran.scm (r-gprofiler2): New variable. --- gnu/packages/cran.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7c37f8eb59..9fe33b803b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -182,6 +182,53 @@ gene identifier conversion and mapping homologous genes across related organisms via the @code{g:Profiler} toolkit.") (license license:gpl2+))) +(define-public r-gprofiler2 + (package + (name "r-gprofiler2") + (version "0.1.9") + (source + (origin + (method url-fetch) + (uri (cran-uri "gprofiler2" version)) + (sha256 + (base32 + "112hmmvdwg8xz90w1bsbzc55y4xi9jj4dqy0q4bsgp49x58r92rb")))) + (properties `((upstream-name . "gprofiler2"))) + (build-system r-build-system) + (propagated-inputs + `(("r-crosstalk" ,r-crosstalk) + ("r-dplyr" ,r-dplyr) + ("r-ggplot2" ,r-ggplot2) + ("r-gridextra" ,r-gridextra) + ("r-jsonlite" ,r-jsonlite) + ("r-plotly" ,r-plotly) + ("r-rcurl" ,r-rcurl) + ("r-tidyr" ,r-tidyr) + ("r-viridislite" ,r-viridislite))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://cran.r-project.org/web/packages/gprofiler2/") + (synopsis "Interface to the g:Profiler toolset") + (description + "This package provides a toolset for functional enrichment analysis and +visualization, gene/protein/SNP identifier conversion and mapping orthologous +genes across species via @url{https://biit.cs.ut.ee/gprofiler,g:Profiler}. +The main tools are: + +@enumerate +@item @code{g:GOSt}, functional enrichment analysis and visualization of gene + lists; +@item @code{g:Convert}, gene/protein/transcript identifier conversion across + various namespaces; +@item @code{g:Orth}, orthology search across species; +@item @code{g:SNPense}, mapping SNP rs identifiers to chromosome positions, + genes and variant effects. +@end enumerate + +This package is an R interface corresponding to the 2019 update of +@code{g:Profiler} and provides access to versions @code{e94_eg41_p11} and +higher.") + (license license:gpl2+))) + (define-public r-oenb (package (name "r-oenb") -- cgit v1.2.3 From e6aacef67e3b602d59109d32622709c6eba58519 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 15:54:57 +0200 Subject: gnu: Add r-scatterpie. * gnu/packages/cran.scm (r-scatterpie): New variable. --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9fe33b803b..1a91b63f82 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21924,3 +21924,31 @@ with posterior predictive checks and leave-one-out cross-validation.") and prediction with Aalen-Johansen or simulation in competing risks and multi-state models.") (license license:gpl2+))) + +(define-public r-scatterpie + (package + (name "r-scatterpie") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "scatterpie" version)) + (sha256 + (base32 + "0g5sn0iv6c1q7y51j4gbbbnil5089dgk1w4q94c7h5y3x7wfrzqb")))) + (properties `((upstream-name . "scatterpie"))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggforce" ,r-ggforce) + ("r-ggplot2" ,r-ggplot2) + ("r-rlang" ,r-rlang) + ("r-rvcheck" ,r-rvcheck) + ("r-tidyr" ,r-tidyr))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://cran.r-project.org/web/packages/scatterpie/") + (synopsis "Scatter pie plot") + (description + "This package creates scatterpie plots, especially useful for plotting +pies on a map.") + (license license:artistic2.0))) -- cgit v1.2.3 From 06ceac32e6f55665a0c3b7ecc9d3043713be2fc1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 23:53:02 +0200 Subject: gnu: Add r-v8. * gnu/packages/cran.scm (r-v8): New variable. --- gnu/packages/cran.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1a91b63f82..6ebb424ce2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -72,6 +72,7 @@ #:use-module (gnu packages mpi) #:use-module (gnu packages multiprecision) #:use-module (gnu packages networking) + #:use-module (gnu packages node) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -103,6 +104,52 @@ The package provides functions for point generation, arc length estimation, degree elevation and curve fitting.") (license license:gpl2+))) +(define-public r-v8 + (package + (name "r-v8") + (version "3.1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "V8" version)) + (sha256 + (base32 + "0xdljralgwyivdhx2a7kqf3yv4ijl4rdrz2p7p59lj2x5d2qyanf")))) + (properties `((upstream-name . "V8"))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'find-v8 + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "configure" + (("^PKG_LIBS=.*") + (string-append "PKG_LIBS=" + (assoc-ref inputs "node") + "/lib/libnode.so.64\n"))) + (setenv "INCLUDE_DIR" + (string-append + (assoc-ref inputs "node") + "/include/node")) + (setenv "LIB_DIR" + (string-append + (assoc-ref inputs "node") "/lib")) + #t))))) + (inputs + `(("node" ,node))) + (propagated-inputs + `(("r-curl" ,r-curl) + ("r-jsonlite" ,r-jsonlite) + ("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://jeroen.cran.dev/V8") + (synopsis "Embedded JavaScript and WebAssembly engine for R") + (description + "This package provides an R interface to V8: Google's JavaScript and +WebAssembly engine.") + (license license:expat))) + (define-public r-clipr (package (name "r-clipr") -- cgit v1.2.3 From 67a289e5bd44fce3950a00be2a4b66720e6f8b79 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 23:53:10 +0200 Subject: gnu: Add r-dot. * gnu/packages/cran.scm (r-dot): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6ebb424ce2..300c468ffc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -150,6 +150,30 @@ degree elevation and curve fitting.") WebAssembly engine.") (license license:expat))) +(define-public r-dot + (package + (name "r-dot") + (version "0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "DOT" version)) + (sha256 + (base32 + "0qh5n57cp9c2n5yn59q4wggz82943pwfanp3kx869aba2x3sj30i")))) + (properties `((upstream-name . "DOT"))) + (build-system r-build-system) + (propagated-inputs + `(("r-v8" ,r-v8))) + (home-page "http://haghish.com/dot") + (synopsis "Render and Export DOT Graphs in R") + (description + "This package provides tools to render DOT diagram markup language in R +and also provides the possibility to export the graphs in PostScript and +SVG (Scalable Vector Graphics) formats. In addition, it supports literate +programming packages such as @code{knitr} and @code{rmarkdown}.") + (license license:expat))) + (define-public r-clipr (package (name "r-clipr") -- cgit v1.2.3 From 2226a2a8de5453022b769d7d810db3ee75124d71 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 15:50:49 +0200 Subject: gnu: r-preprocesscore: Update to 1.50.0. * gnu/packages/statistics.scm (r-preprocesscore): Update to 1.50.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index cd60ce87b0..1e7e235136 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4076,14 +4076,14 @@ hierarchical clustering dendrograms.") (define-public r-preprocesscore (package (name "r-preprocesscore") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "preprocessCore" version)) (sha256 (base32 - "0zrb9hx60vppkg0priczdb301nhq5f0dj8lkc8rcc4xrqqr915qm")))) + "0q1406kswylc8zn5k3wyd34p34pfzbhi1ggkfsh30zcjp6adbwjl")))) (properties `((upstream-name . "preprocessCore"))) (build-system r-build-system) -- cgit v1.2.3 From c85e5ac0df746b5b8cbec2b7f6b8f46a6720b98d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 15:51:05 +0200 Subject: gnu: r-rgraphviz: Update to 2.32.0. * gnu/packages/graph.scm (r-rgraphviz): Update to 2.32.0. --- gnu/packages/graph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index a999b1cdfa..dc8f2c64a2 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -181,14 +181,14 @@ model.") (define-public r-rgraphviz (package (name "r-rgraphviz") - (version "2.30.0") + (version "2.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rgraphviz" version)) (sha256 (base32 - "00lrkbgbb4payybckcmazsv8skysgdlglyqbl7yjb37vv3gnfc6c")))) + "1calpvzgcz6v7s4x6bf35kj83sga95zjp7x87p5d3qnbv7q2wz5y")))) (properties `((upstream-name . "Rgraphviz"))) (build-system r-build-system) ;; FIXME: Rgraphviz bundles the sources of an older variant of -- cgit v1.2.3 From 5fdea056c981dc4ecb0594b36c188436a370cad8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 15:55:16 +0200 Subject: gnu: r-genefilter: Update to 1.70.0. * gnu/packages/bioinformatics.scm (r-genefilter): Update to 1.70.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3cad73a688..7b382d00a7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6947,17 +6947,18 @@ information as possible.") (define-public r-genefilter (package (name "r-genefilter") - (version "1.68.0") + (version "1.70.0") (source (origin (method url-fetch) (uri (bioconductor-uri "genefilter" version)) (sha256 (base32 - "1xjr02qhldspjwd6y374wgik18fgywb6408wsz471i8b4ik98ckc")))) + "1sbbrnq6p90fri0ik6aq2zw26kasw63nyiy7xkzrj6vgyq7x258g")))) (build-system r-build-system) (native-inputs - `(("gfortran" ,gfortran))) + `(("gfortran" ,gfortran) + ("r-knitr" ,r-knitr))) (propagated-inputs `(("r-annotate" ,r-annotate) ("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From 3d7de4ed829b264acc26e74bc6d4c758e0249611 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 15:55:57 +0200 Subject: gnu: r-deseq2: Update to 1.28.1. * gnu/packages/bioinformatics.scm (r-deseq2): Update to 1.28.1. [propagated-inputs]: Remove r-hmisc. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7b382d00a7..72f7ee602b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6975,14 +6975,14 @@ high-throughput sequencing experiments.") (define-public r-deseq2 (package (name "r-deseq2") - (version "1.26.0") + (version "1.28.1") (source (origin (method url-fetch) (uri (bioconductor-uri "DESeq2" version)) (sha256 (base32 - "1lmbhznfs8dz9ipd53z4ccwvwxqwzx1ayw56jlrvlsambaj8fash")))) + "0xh12c2skr0bbv893p05gvbismkcnqw8zwh7yz4wmycgajfzg2pp")))) (properties `((upstream-name . "DESeq2"))) (build-system r-build-system) (propagated-inputs @@ -6993,13 +6993,14 @@ high-throughput sequencing experiments.") ("r-geneplotter" ,r-geneplotter) ("r-genomicranges" ,r-genomicranges) ("r-ggplot2" ,r-ggplot2) - ("r-hmisc" ,r-hmisc) ("r-iranges" ,r-iranges) ("r-locfit" ,r-locfit) ("r-rcpp" ,r-rcpp) ("r-rcpparmadillo" ,r-rcpparmadillo) ("r-s4vectors" ,r-s4vectors) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/DESeq2") (synopsis "Differential gene expression analysis") (description -- cgit v1.2.3 From db5addba2ccd15b28d43ddf5414604bd20277430 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 15:56:42 +0200 Subject: gnu: r-dexseq: Update to 1.34.0. * gnu/packages/bioinformatics.scm (r-dexseq): Update to 1.34.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 72f7ee602b..fd073fa327 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7013,14 +7013,14 @@ distribution.") (define-public r-dexseq (package (name "r-dexseq") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DEXSeq" version)) (sha256 (base32 - "0sqqb65ckliif2nmvlvc7w49id59z0nvqcdz5gry8l2mn6azrf6a")))) + "1inyxb89hd5bn0sl7a9qbv9d1g40z4v1s9qwxkcsx5c79fl04n1h")))) (properties `((upstream-name . "DEXSeq"))) (build-system r-build-system) (propagated-inputs @@ -7041,6 +7041,8 @@ distribution.") ("r-statmod" ,r-statmod) ("r-stringr" ,r-stringr) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/DEXSeq") (synopsis "Inference of differential exon usage in RNA-Seq") (description -- cgit v1.2.3 From 397568dbcab09bd571cdc3e09a01f27f98c761f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 15:57:06 +0200 Subject: gnu: r-annotationforge: Update to 1.30.1. * gnu/packages/bioinformatics.scm (r-annotationforge): Update to 1.30.1. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fd073fa327..002115ef47 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7058,14 +7058,14 @@ exploration of the results.") (define-public r-annotationforge (package (name "r-annotationforge") - (version "1.28.0") + (version "1.30.1") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationForge" version)) (sha256 (base32 - "0h2r60v339ajk5r6xq4iwwcpihdvf12fi8255byr2dhglzrd8xl7")))) + "1a2155jxbwc6qr3dcyvp850grhdr7czc7bs3s87ff4sgdl0jp3jw")))) (properties `((upstream-name . "AnnotationForge"))) (build-system r-build-system) @@ -7078,6 +7078,8 @@ exploration of the results.") ("r-rsqlite" ,r-rsqlite) ("r-s4vectors" ,r-s4vectors) ("r-xml" ,r-xml))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/AnnotationForge") (synopsis "Code for building annotation database packages") (description -- cgit v1.2.3 From 7d8b96e24b6f2be6ff90e90067982a00533c613f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 15:59:35 +0200 Subject: gnu: r-rbgl: Update to 1.64.0. * gnu/packages/bioinformatics.scm (r-rbgl): Update to 1.64.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 002115ef47..c8cf536c3d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7090,14 +7090,14 @@ databases. Packages produced are intended to be used with AnnotationDbi.") (define-public r-rbgl (package (name "r-rbgl") - (version "1.62.1") + (version "1.64.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RBGL" version)) (sha256 (base32 - "0ixbkdirf08i400db587r262j52sdwdgk3884nxk5xkbhx2m6vg0")))) + "079599a6xn2i7snfn2vgshkw0c00rrfhj44pvi03ap8id29bkayy")))) (properties `((upstream-name . "RBGL"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From a8613ff861fb821e9d064eccc9ec6232194b1cb0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 15:59:58 +0200 Subject: gnu: r-gseabase: Update to 1.50.1. * gnu/packages/bioinformatics.scm (r-gseabase): Update to 1.50.1. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c8cf536c3d..3a305fea1c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7113,14 +7113,14 @@ the graph algorithms contained in the Boost library.") (define-public r-gseabase (package (name "r-gseabase") - (version "1.48.0") + (version "1.50.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GSEABase" version)) (sha256 (base32 - "0kcb90sxlf19d5dxhdbqk9x62svky4262cccl0wxarbq6gf3bd57")))) + "1k4faj53cwvqijad8cf7fcghzxcv9shlbpl8n73bsncc8k192y2j")))) (properties `((upstream-name . "GSEABase"))) (build-system r-build-system) (propagated-inputs @@ -7130,6 +7130,8 @@ the graph algorithms contained in the Boost library.") ("r-biocgenerics" ,r-biocgenerics) ("r-graph" ,r-graph) ("r-xml" ,r-xml))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/GSEABase") (synopsis "Gene set enrichment data structures and methods") (description -- cgit v1.2.3 From be414286bcb2e209faee8ad89e37b2d252b12433 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:00:17 +0200 Subject: gnu: r-category: Update to 2.54.0. * gnu/packages/bioinformatics.scm (r-category): Update to 2.54.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3a305fea1c..8ffcab9425 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7142,14 +7142,14 @@ Enrichment Analysis} (GSEA).") (define-public r-category (package (name "r-category") - (version "2.52.1") + (version "2.54.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Category" version)) (sha256 (base32 - "0ga0ij9hyzsxa5pavwmv35i8xggia2wygrk4m4z8an0qcvgy3v5g")))) + "1grspdzk5a4vidnxwcd1jmy1vcn494aydsp3vydx235yv7iqac1b")))) (properties `((upstream-name . "Category"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 3d2899dab5d74c7476aeb67c77bc5e30c9f36fbd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:00:34 +0200 Subject: gnu: r-gostats: Update to 2.54.0. * gnu/packages/bioinformatics.scm (r-gostats): Update to 2.54.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8ffcab9425..e6c1ed25d9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7173,14 +7173,14 @@ analysis.") (define-public r-gostats (package (name "r-gostats") - (version "2.52.0") + (version "2.54.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GOstats" version)) (sha256 (base32 - "19f4gxm3sbprqrnwzvskvywv6j4ibm8xkrbgg4h0fvh2b5331nwc")))) + "00q39cyv4l28r6s9gjnd0qhl7h80vmwp4lpmchisqzj44xzyics9")))) (properties `((upstream-name . "GOstats"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 681cca95b328ec478c5f86414900ff748b535647 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:00:48 +0200 Subject: gnu: r-shortread: Update to 1.46.0. * gnu/packages/bioinformatics.scm (r-shortread): Update to 1.46.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e6c1ed25d9..adb6f4fc8f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7204,14 +7204,14 @@ testing and other simple calculations.") (define-public r-shortread (package (name "r-shortread") - (version "1.44.3") + (version "1.46.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ShortRead" version)) (sha256 (base32 - "0ykyrj4g6vc67d5s46sp4659qvar2iavflzhggm79w4p50hxia4s")))) + "0l4kdln69y6yhln0xiv2jmpxg05fjcglln406p43a2bqvk2lr03d")))) (properties `((upstream-name . "ShortRead"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From bb18d11d85031d662a962f091b7a77ea4dd7cff0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:01:24 +0200 Subject: gnu: r-systempiper: Update to 1.22.0. * gnu/packages/bioinformatics.scm (r-systempiper): Update to 1.22.0. [propagated-inputs]: Add r-assertthat, r-magrittr, r-rsvg, r-dot, and r-stringr; remove r-biocgenerics. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index adb6f4fc8f..672deb6eae 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7246,22 +7246,23 @@ ungapped alignment formats.") (define-public r-systempiper (package (name "r-systempiper") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "systemPipeR" version)) (sha256 (base32 - "17r25v9wcglyma2v1c8fka80dm7fx86saxlsb2aprmwi4h3dhb0j")))) + "01ilhlrvy28jfdyxjria4024yryj5zgympgqznw17g3y3az78kk2")))) (properties `((upstream-name . "systemPipeR"))) (build-system r-build-system) (propagated-inputs `(("r-annotate" ,r-annotate) + ("r-assertthat" ,r-assertthat) ("r-batchtools" ,r-batchtools) - ("r-biocgenerics" ,r-biocgenerics) ("r-biostrings" ,r-biostrings) ("r-deseq2" ,r-deseq2) + ("r-dot" ,r-dot) ("r-edger" ,r-edger) ("r-genomicfeatures" ,r-genomicfeatures) ("r-genomicranges" ,r-genomicranges) @@ -7269,13 +7270,18 @@ ungapped alignment formats.") ("r-go-db" ,r-go-db) ("r-gostats" ,r-gostats) ("r-limma" ,r-limma) + ("r-magrittr" ,r-magrittr) ("r-pheatmap" ,r-pheatmap) ("r-rjson" ,r-rjson) ("r-rsamtools" ,r-rsamtools) + ("r-rsvg" ,r-rsvg) ("r-shortread" ,r-shortread) + ("r-stringr" ,r-stringr) ("r-summarizedexperiment" ,r-summarizedexperiment) ("r-yaml" ,r-yaml) ("r-variantannotation" ,r-variantannotation))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/tgirke/systemPipeR") (synopsis "Next generation sequencing workflow and reporting environment") (description -- cgit v1.2.3 From 5de96ae98b5e105fcab886674dfb70cecd804191 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:02:13 +0200 Subject: gnu: r-grohmm: Update to 1.22.0. * gnu/packages/bioinformatics.scm (r-grohmm): Update to 1.22.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 672deb6eae..fb8a1397db 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7299,14 +7299,14 @@ annotation infrastructure.") (define-public r-grohmm (package (name "r-grohmm") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "groHMM" version)) (sha256 (base32 - "0ywr8f6bfhg2ia3n4rmsxr4v1xqmlyhkwh0rvkgh3yqgnbvihndg")))) + "04z9qq1xwdsaxbqhyld37w0ybvzly9pc1hcyrnwdbyjwd7n1fncb")))) (properties `((upstream-name . "groHMM"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 1ca88fb8e92fff4fb7bae9692ef9b91905382abf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:02:29 +0200 Subject: gnu: r-biocviews: Update to 1.56.0. * gnu/packages/bioinformatics.scm (r-biocviews): Update to 1.56.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fb8a1397db..1985304561 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7532,13 +7532,13 @@ BLAST, KEGG, GenBank, MEDLINE and GO.") (define-public r-biocviews (package (name "r-biocviews") - (version "1.54.0") + (version "1.56.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biocViews" version)) (sha256 (base32 - "0yn8jys1900d31haayz0ppqk5y79mwjajwp4alz6pln3dbs70f3g")))) + "1h4cmfbff79v9xrh271dp3rv0877ris06lmkvc39kqzj7yjsh7c2")))) (properties `((upstream-name . "biocViews"))) (build-system r-build-system) -- cgit v1.2.3 From 9f416be83dac4918a93ccbeadf7df0825046dc07 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:02:46 +0200 Subject: gnu: r-biocstyle: Update to 2.16.0. * gnu/packages/bioinformatics.scm (r-biocstyle): Update to 2.16.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1985304561..56d43e3b99 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7560,13 +7560,13 @@ also known as views, in a controlled vocabulary.") (define-public r-biocstyle (package (name "r-biocstyle") - (version "2.14.4") + (version "2.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocStyle" version)) (sha256 (base32 - "1x71in059zql40f4c87bd1gf96r945kdvwbq61jmch9d3d8nwxbb")))) + "07rjl2n4sazdg581zh7w3yykzphgr2gpz41ba4ryqs7347vh9nbf")))) (properties `((upstream-name . "BiocStyle"))) (build-system r-build-system) @@ -7576,6 +7576,8 @@ also known as views, in a controlled vocabulary.") ("r-knitr" ,r-knitr) ("r-rmarkdown" ,r-rmarkdown) ("r-yaml" ,r-yaml))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/BiocStyle") (synopsis "Bioconductor formatting styles") (description "This package provides standard formatting styles for -- cgit v1.2.3 From 1a9de6cfe8652032bc9a468473156c63195e5fe6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:03:06 +0200 Subject: gnu: r-bioccheck: Update to 1.24.0. * gnu/packages/bioinformatics.scm (r-bioccheck): Update to 1.24.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 56d43e3b99..7087dc3ced 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7588,13 +7588,13 @@ functionality.") (define-public r-bioccheck (package (name "r-bioccheck") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocCheck" version)) (sha256 (base32 - "1qnvl5yajgh67ijkq6gdsafri1k5hyw5gzn2ccqk9ymx6i2xd80g")))) + "1p9ys18sn1crxw1iac2jdgqvwpb5hjd9nfxx0qn0ncrv0b550mny")))) (properties `((upstream-name . "BiocCheck"))) (build-system r-build-system) @@ -7626,6 +7626,8 @@ functionality.") ("r-biocmanager" ,r-biocmanager) ("r-biocviews" ,r-biocviews) ("r-stringdist" ,r-stringdist))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/BiocCheck") (synopsis "Executes Bioconductor-specific package checks") (description "This package contains tools to perform additional quality -- cgit v1.2.3 From f189f536be5eed409ab5b860ad42408a1f70966f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:03:23 +0200 Subject: gnu: r-s4vectors: Update to 0.26.1. * gnu/packages/bioinformatics.scm (r-s4vectors): Update to 0.26.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7087dc3ced..6d76345b9b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7637,13 +7637,13 @@ checks on R packages that are to be submitted to the Bioconductor repository.") (define-public r-s4vectors (package (name "r-s4vectors") - (version "0.24.4") + (version "0.26.1") (source (origin (method url-fetch) (uri (bioconductor-uri "S4Vectors" version)) (sha256 (base32 - "1fzs8j2d3wwfzm2fq63ywf68a4dbggyl5l098f148yn4jw7jd3bc")))) + "1ddr3ngyczx332zw9ai1a6h7442lgrbfcj8vrhvbkdkzqwj14xmb")))) (properties `((upstream-name . "S4Vectors"))) (build-system r-build-system) -- cgit v1.2.3 From 8a38b676da585a78317e0fa0551c4b96c0ff3be2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:04:44 +0200 Subject: gnu: r-iranges: Update to 2.22.2. * gnu/packages/bioinformatics.scm (r-iranges): Update to 2.22.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6d76345b9b..662f19e2c8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7664,13 +7664,13 @@ S4Vectors package itself.") (define-public r-iranges (package (name "r-iranges") - (version "2.20.2") + (version "2.22.2") (source (origin (method url-fetch) (uri (bioconductor-uri "IRanges" version)) (sha256 (base32 - "1jhnxb9yacmj2z82b6992gihjvj1a0gnjwbjiagyyx03fqnv23kg")))) + "1y24jw62806wp2afiyj1x6n00gj7d3323klqdypra9q43pg1w49d")))) (properties `((upstream-name . "IRanges"))) (build-system r-build-system) -- cgit v1.2.3 From 506735eea66e3da4e69447dd81ff58057d07c370 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:05:02 +0200 Subject: gnu: r-genomeinfodb: Update to 1.24.0. * gnu/packages/bioinformatics.scm (r-genomeinfodb): Update to 1.24.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 662f19e2c8..46d77546c5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7716,13 +7716,13 @@ ID and species. It is used by functions in the GenomeInfoDb package.") (define-public r-genomeinfodb (package (name "r-genomeinfodb") - (version "1.22.1") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomeInfoDb" version)) (sha256 (base32 - "0phadr67yb4l25x41a9wg4pjy1wbxlk14jhidhz6g5n4z6x45qbm")))) + "0ab92nq7lvhvhgp512qhiiphpby0b17c666qska6p8a636zzmqiv")))) (properties `((upstream-name . "GenomeInfoDb"))) (build-system r-build-system) -- cgit v1.2.3 From c14d59d9ad240f30a10ba274a70d82836598bd18 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:05:29 +0200 Subject: gnu: r-edger: Update to 3.30.3. * gnu/packages/bioinformatics.scm (r-edger): Update to 3.30.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 46d77546c5..455aee019d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7746,13 +7746,13 @@ names in their natural, rather than lexicographic, order.") (define-public r-edger (package (name "r-edger") - (version "3.28.1") + (version "3.30.3") (source (origin (method url-fetch) (uri (bioconductor-uri "edgeR" version)) (sha256 (base32 - "07dv99kl7jfa62nzcq705r56gcpb1hq7p4px48j71y2ddi1rqmr6")))) + "1z9bkg08rgqn3jm2s4ndbj641w33wl8jd3j6m5if6h2nnw6011ic")))) (properties `((upstream-name . "edgeR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From cdd83b2e224a0597e0c0a3102b6ba51d13fb1f3d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:05:56 +0200 Subject: gnu: r-variantannotation: Update to 1.34.0. * gnu/packages/bioinformatics.scm (r-variantannotation): Update to 1.34.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 455aee019d..a77a5f6232 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7774,13 +7774,13 @@ CAGE.") (define-public r-variantannotation (package (name "r-variantannotation") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "VariantAnnotation" version)) (sha256 (base32 - "009s7rzp78s2w6iybizina42qx2w8qv3xwjbkpqphmm451maykgs")))) + "09y6ymwky839nb0y7y93w810hk9mvwqn7595q1276c28dkddiqvw")))) (properties `((upstream-name . "VariantAnnotation"))) (inputs -- cgit v1.2.3 From 49c766d0bbfe1448c24a18df5e76108b6cc131f8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:06:39 +0200 Subject: gnu: r-limma: Update to 3.44.1. * gnu/packages/bioinformatics.scm (r-limma): Update to 3.44.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a77a5f6232..9b09ab1532 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7813,13 +7813,13 @@ coding changes and predict coding outcomes.") (define-public r-limma (package (name "r-limma") - (version "3.42.2") + (version "3.44.1") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "1nd01r7rd7jb5qz84vbgfnyrmgm9wiq7fsdji68537kjgvrzmm9z")))) + "0l6f6lz1rghj8c5s14ljbnmsrwz27fi6a7g42n15n3d3msvflw36")))) (build-system r-build-system) (home-page "http://bioinf.wehi.edu.au/limma") (synopsis "Package for linear models for microarray and RNA-seq data") -- cgit v1.2.3 From e0d40fa275a6726c38ab4c7c903f029439bf8301 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:07:55 +0200 Subject: gnu: r-xvector: Update to 0.28.0. * gnu/packages/bioinformatics.scm (r-xvector): Update to 0.28.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9b09ab1532..c61f310b85 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7832,13 +7832,13 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.") (define-public r-xvector (package (name "r-xvector") - (version "0.26.0") + (version "0.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "XVector" version)) (sha256 (base32 - "0s2gg84yzl5ffkzp6n7kh0jjk1vd90z189f5hkfn18rn67cy2nv7")))) + "11h1hszv4798q1gbx8r6zf8vlaqx4v9ql0lbh2xaxybp66a03pvc")))) (properties `((upstream-name . "XVector"))) (build-system r-build-system) -- cgit v1.2.3 From 087a97f8dfcbe6a93a6d5ab6db03ea222020dafb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:08:48 +0200 Subject: gnu: r-genomicranges: Update to 1.40.0. * gnu/packages/bioinformatics.scm (r-genomicranges): Update to 1.40.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c61f310b85..964eb50df6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7868,13 +7868,13 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.") (define-public r-genomicranges (package (name "r-genomicranges") - (version "1.38.0") + (version "1.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicRanges" version)) (sha256 (base32 - "0xdds6ws7jjdfy4x3mb0qhy43kpxdmifmpw0jdk4wgw999zabb50")))) + "0wn1zr2qq0rpv9z2wialgizn6xzdlcjg1w2kif67n53svz6vk2x1")))) (properties `((upstream-name . "GenomicRanges"))) (build-system r-build-system) @@ -7884,6 +7884,8 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.") ("r-iranges" ,r-iranges) ("r-s4vectors" ,r-s4vectors) ("r-xvector" ,r-xvector))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/GenomicRanges") (synopsis "Representation and manipulation of genomic intervals") (description -- cgit v1.2.3 From 7d91e3bed444a289b204009f2a32619c1683e703 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:09:21 +0200 Subject: gnu: r-biobase: Update to 2.48.0. * gnu/packages/bioinformatics.scm (r-biobase): Update to 2.48.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 964eb50df6..cc5ad9682c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7899,13 +7899,13 @@ manipulating genomic intervals and variables defined along a genome.") (define-public r-biobase (package (name "r-biobase") - (version "2.46.0") + (version "2.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Biobase" version)) (sha256 (base32 - "1gx41083dqlm59vwqdxvc4ny31x91j48mda9n3scg0f2zwasvqgl")))) + "13p3kgnxm7hbn8cy289kbhaiyfa6rxx7l1pbvajwqzbay3cxznqp")))) (properties `((upstream-name . "Biobase"))) (build-system r-build-system) -- cgit v1.2.3 From 920224771fa257c1853e2839cef5e9e83691e049 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:09:43 +0200 Subject: gnu: r-annotationdbi: Update to 1.50.0. * gnu/packages/bioinformatics.scm (r-annotationdbi): Update to 1.50.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cc5ad9682c..e53d73ef9c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7921,13 +7921,13 @@ on Bioconductor or which replace R functions.") (define-public r-annotationdbi (package (name "r-annotationdbi") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationDbi" version)) (sha256 (base32 - "09piz1f0xpbb4amskx4ilby6lfrn27hhwk75il2c4lq6m3hr4w8s")))) + "10gplxal0qphcn29azv0i6hiim9q45lmhzvhhhsnwfhwpgja7p05")))) (properties `((upstream-name . "AnnotationDbi"))) (build-system r-build-system) @@ -7938,6 +7938,8 @@ on Bioconductor or which replace R functions.") ("r-iranges" ,r-iranges) ("r-rsqlite" ,r-rsqlite) ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/AnnotationDbi") (synopsis "Annotation database interface") (description -- cgit v1.2.3 From e87e6cc89d00211dc0a2d06a369b04df7ba005c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:10:11 +0200 Subject: gnu: r-biomart: Update to 2.44.0. * gnu/packages/bioinformatics.scm (r-biomart): Update to 2.44.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e53d73ef9c..3289ee0d2e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7950,13 +7950,13 @@ annotation data packages using SQLite data storage.") (define-public r-biomart (package (name "r-biomart") - (version "2.42.1") + (version "2.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biomaRt" version)) (sha256 (base32 - "0676s8aq9xj2pdrfk28kf5j69fmssn900k4vxrp11ghwjr8z24h7")))) + "0ag26q9283p9mfz4zx8qnx1w7b7ilmsb8wyx737z9cqy9a0i57wj")))) (properties `((upstream-name . "biomaRt"))) (build-system r-build-system) -- cgit v1.2.3 From cb486f16da11a1175e9019ea948f2ed6e2b054f3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:11:51 +0200 Subject: gnu: r-biocparallel: Update to 1.22.0. * gnu/packages/bioinformatics.scm (r-biocparallel): Update to 1.22.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3289ee0d2e..6461e783e8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7987,13 +7987,13 @@ powerful online queries from gene annotation to database mining.") (define-public r-biocparallel (package (name "r-biocparallel") - (version "1.20.1") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocParallel" version)) (sha256 (base32 - "0g0znb4whsvb9hpwx9xaasdi5n4vjqw8cpdyqgrdrjm91rls1h21")))) + "1lsg5xm5j3ly5k60fidzhkgqc9jgscyfkqngjvd9qp6yfzvsb82g")))) (properties `((upstream-name . "BiocParallel"))) (build-system r-build-system) @@ -8001,6 +8001,8 @@ powerful online queries from gene annotation to database mining.") `(("r-futile-logger" ,r-futile-logger) ("r-snow" ,r-snow) ("r-bh" ,r-bh))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/BiocParallel") (synopsis "Bioconductor facilities for parallel evaluation") (description -- cgit v1.2.3 From d3491d4dad7f24df904d94c7a1feb724ea8c4c7f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:12:11 +0200 Subject: gnu: r-biostrings: Update to 2.56.0. * gnu/packages/bioinformatics.scm ( r-biostrings): Update to 2.56.0. [propagated-inputs]: Add r-crayon. --- gnu/packages/bioinformatics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6461e783e8..4aadfbe0dc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8014,18 +8014,19 @@ objects.") (define-public r-biostrings (package (name "r-biostrings") - (version "2.54.0") + (version "2.56.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Biostrings" version)) (sha256 (base32 - "0pq7g2hflx2cjlpwdj6mscw9hnxvlf5y50dxf48lbrf9r3q9kmyp")))) + "0imhfz7dg8b3l5qzipjranqqshdsg2x6zc49drlhn8sc7j40cvi8")))) (properties `((upstream-name . "Biostrings"))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) + ("r-crayon" ,r-crayon) ("r-iranges" ,r-iranges) ("r-s4vectors" ,r-s4vectors) ("r-xvector" ,r-xvector))) -- cgit v1.2.3 From 1f9c87a442d4cd271334a1edae951b93eacf93e4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:12:40 +0200 Subject: gnu: r-rsamtools: Update to 2.4.0. * gnu/packages/bioinformatics.scm (r-rsamtools): Update to 2.4.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4aadfbe0dc..f1ac0a57fa 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8041,13 +8041,13 @@ biological sequences or sets of sequences.") (define-public r-rsamtools (package (name "r-rsamtools") - (version "2.2.3") + (version "2.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsamtools" version)) (sha256 (base32 - "1vj43acawqqkf9yval9fzxarpsf04fmn78m2hq4f083w1k0myhyr")))) + "0z01z0s71f941k7sns46nyabps28c69d6jxx6sppjpc6h4vrw0vq")))) (properties `((upstream-name . "Rsamtools"))) (build-system r-build-system) -- cgit v1.2.3 From 46e103a1b52826428ef4802e350f301c4ee679ce Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:13:01 +0200 Subject: gnu: r-delayedarray: Update to 0.14.0. * gnu/packages/bioinformatics.scm (r-delayedarray): Update to 0.14.0. [propagated-inputs]: Remove r-biocparallel. --- gnu/packages/bioinformatics.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f1ac0a57fa..5a1b8942e3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8086,19 +8086,18 @@ tab-delimited (tabix) files.") (define-public r-delayedarray (package (name "r-delayedarray") - (version "0.12.3") + (version "0.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedArray" version)) (sha256 (base32 - "02i88ll2d7r83nk0wdj28akvsz3jq19g6ixpaahfy3jy5av4byv6")))) + "1lz7a0rrlfv3w44n073mk8pw39z7lfs0njdxp5vpp0rdsmvdf1qk")))) (properties `((upstream-name . "DelayedArray"))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) - ("r-biocparallel" ,r-biocparallel) ("r-s4vectors" ,r-s4vectors) ("r-iranges" ,r-iranges) ("r-matrix" ,r-matrix) -- cgit v1.2.3 From 87c98cf701cc6fc01c298d9e81dd91b9d04a2316 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:13:39 +0200 Subject: gnu: r-summarizedexperiment: Update to 1.18.1. * gnu/packages/bioinformatics.scm (r-summarizedexperiment): Update to 1.18.1. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5a1b8942e3..fd00eeb71a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8119,13 +8119,13 @@ array-like objects like @code{DataFrame} objects (typically with Rle columns), (define-public r-summarizedexperiment (package (name "r-summarizedexperiment") - (version "1.16.1") + (version "1.18.1") (source (origin (method url-fetch) (uri (bioconductor-uri "SummarizedExperiment" version)) (sha256 (base32 - "1z9bdk49dajafkfvv99nv6zyn6v70iyyy2jgdp5w5z8174a2bnn1")))) + "07rc79k5dp0dnf4dvsxif995aa9cgfkf13yf84qnwl64k9pf3c2c")))) (properties `((upstream-name . "SummarizedExperiment"))) (build-system r-build-system) @@ -8138,6 +8138,8 @@ array-like objects like @code{DataFrame} objects (typically with Rle columns), ("r-iranges" ,r-iranges) ("r-matrix" ,r-matrix) ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/SummarizedExperiment") (synopsis "Container for representing genomic ranges by sample") (description -- cgit v1.2.3 From 58613ca1e551ae72eb34b661572c75f00692e84f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:14:00 +0200 Subject: gnu: r-genomicalignments: Update to 1.24.0. * gnu/packages/bioinformatics.scm (r-genomicalignments): Update to 1.24.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fd00eeb71a..f16512dda8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8152,13 +8152,13 @@ samples.") (define-public r-genomicalignments (package (name "r-genomicalignments") - (version "1.22.1") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicAlignments" version)) (sha256 (base32 - "065xvy4pkda0ajvl1b75iski95k1pnbhxwdq7vkfl8v55915vqh6")))) + "0v8k6d7frm5p48cmk4zik78cw9abz4inx0zhl4zrmmx31ifyvk8d")))) (properties `((upstream-name . "GenomicAlignments"))) (build-system r-build-system) -- cgit v1.2.3 From f85794edb8a440b27d9fdf67d5d47d383bf6a1d6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:14:16 +0200 Subject: gnu: r-rtracklayer: Update to 1.48.0. * gnu/packages/bioinformatics.scm (r-rtracklayer): Update to 1.48.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f16512dda8..ef28629412 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8185,13 +8185,13 @@ alignments.") (define-public r-rtracklayer (package (name "r-rtracklayer") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "rtracklayer" version)) (sha256 (base32 - "0lp9xsm8kqrgpwgwj7qaqcv1z6qynbz084grlpwp94zsp2ppf0n6")))) + "1zcgk92sidhy4y7ws9ms4nkkh2hnccfhfh53qgna0kma9jy4v5xf")))) (build-system r-build-system) (arguments `(#:phases -- cgit v1.2.3 From a285314e298c66b8c9a4c640672f86665ee05278 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:14:43 +0200 Subject: gnu: r-genomicfeatures: Update to 1.40.0. * gnu/packages/bioinformatics.scm (r-genomicfeatures): Update to 1.40.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ef28629412..54c5f8c764 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8232,13 +8232,13 @@ as well as query and modify the browser state, such as the current viewport.") (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.38.2") + (version "1.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "0dd226kgks50jdx5w35f3wmg95hy8aibi4kcn8p5kmqp5i8j580b")))) + "09ffsflk2yhhj9ivm028y3qdkvv8idgxpm4il3y9rym7shc8b3f8")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) @@ -8257,6 +8257,8 @@ as well as query and modify the browser state, such as the current viewport.") ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors) ("r-xvector" ,r-xvector))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/GenomicFeatures") (synopsis "Tools for working with transcript centric annotations") (description -- cgit v1.2.3 From 543fd63c2e1f3834c07e139ff30686d7ff486372 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:15:07 +0200 Subject: gnu: r-topgo: Update to 2.40.0. * gnu/packages/bioinformatics.scm (r-topgo): Update to 2.40.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 54c5f8c764..c018b56bea 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8299,13 +8299,13 @@ information about the latest version of the Gene Ontologies.") (define-public r-topgo (package (name "r-topgo") - (version "2.38.1") + (version "2.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "topGO" version)) (sha256 (base32 - "1kw9m2j67895k58lx9msc248pjwblp8clxwgsl01cql7sgi1xzlf")))) + "13rhbvn27sj75fklf1cnjaazacx8yyjlhqlnbp5zk157q6y5cwdr")))) (properties `((upstream-name . "topGO"))) (build-system r-build-system) -- cgit v1.2.3 From d9b23ec47c1fe82ed01b60a992f8aa564f8a731d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:15:33 +0200 Subject: gnu: r-bsgenome: Update to 1.56.0. * gnu/packages/bioinformatics.scm (r-bsgenome): Update to 1.56.0. [propagated-inputs]: Add r-matrixstats. --- gnu/packages/bioinformatics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c018b56bea..ee83a97235 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8332,13 +8332,13 @@ dependencies between GO terms can be implemented and applied.") (define-public r-bsgenome (package (name "r-bsgenome") - (version "1.54.0") + (version "1.56.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BSgenome" version)) (sha256 (base32 - "0nn1b3h4hmnx5whf2cmzmyxdrcf4myj8c38rwr0sw4rc07xfzndy")))) + "1jw8r1qm9fpg2s1cw2y4np243jjxm65j2xdy2785h8fc1b02msf6")))) (properties `((upstream-name . "BSgenome"))) (build-system r-build-system) @@ -8348,6 +8348,7 @@ dependencies between GO terms can be implemented and applied.") ("r-genomeinfodb" ,r-genomeinfodb) ("r-genomicranges" ,r-genomicranges) ("r-iranges" ,r-iranges) + ("r-matrixstats" ,r-matrixstats) ("r-rsamtools" ,r-rsamtools) ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors) -- cgit v1.2.3 From e6df69a84d5cdb3c794443fbbb46a3a50e8e1d2f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:16:03 +0200 Subject: gnu: r-impute: Update to 1.62.0. * gnu/packages/bioinformatics.scm (r-impute): Update to 1.62.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ee83a97235..1c0945ec68 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8363,13 +8363,13 @@ genome data packages and support for efficient SNP representation.") (define-public r-impute (package (name "r-impute") - (version "1.60.0") + (version "1.62.0") (source (origin (method url-fetch) (uri (bioconductor-uri "impute" version)) (sha256 (base32 - "0igz1phjd1j9bg9z4kyy7j8v9bxi9sdwz4df26r51i2vavlbrf4q")))) + "161p6l1cp3wwdynkxwvg0yhrh6yv20brdlplw5w5mavn4hf1nm0h")))) (native-inputs `(("gfortran" ,gfortran))) (build-system r-build-system) -- cgit v1.2.3 From 2d537b5afcb87312b5fb628a563df3108338bed7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:16:22 +0200 Subject: gnu: r-seqpattern: Update to 1.20.0. * gnu/packages/bioinformatics.scm (r-seqpattern): Update to 1.20.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1c0945ec68..eec48141ba 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8383,13 +8383,13 @@ microarray data, using nearest neighbor averaging.") (define-public r-seqpattern (package (name "r-seqpattern") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "seqPattern" version)) (sha256 (base32 - "1gxrq6s2hiyac69idh5r1nbr1s69n0hg4ap2skm4g6857av9pwqf")))) + "0f1yvx2ri1557rzjx08q5bgml1cvkm8hjl8xn1qi4rjs64sy6mci")))) (properties `((upstream-name . "seqPattern"))) (build-system r-build-system) -- cgit v1.2.3 From 837e7634d9d12c405cb286ebb57acc3990c9240e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:16:47 +0200 Subject: gnu: r-genomation: Update to 1.20.0. * gnu/packages/bioinformatics.scm (r-genomation): Update to 1.20.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index eec48141ba..4e67da930b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8410,13 +8410,13 @@ reference point and sorted by a user defined feature.") (define-public r-genomation (package (name "r-genomation") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "genomation" version)) (sha256 (base32 - "1sba928h23b67gr3i4yj1bg655g24l3bcgsf5gvymzrv5idrss1l")))) + "1cy8kqwddiha5jy6nda1al956i4wncbgjkrxwijdb08cmka2sfwh")))) (build-system r-build-system) (propagated-inputs `(("r-biostrings" ,r-biostrings) @@ -8440,6 +8440,8 @@ reference point and sorted by a user defined feature.") ("r-runit" ,r-runit) ("r-s4vectors" ,r-s4vectors) ("r-seqpattern" ,r-seqpattern))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "http://bioinformatics.mdc-berlin.de/genomation/") (synopsis "Summary, annotation and visualization of genomic data") (description -- cgit v1.2.3 From 40ba4e8466a788cb1cd3fab6ac70c7dbd1ac4b4b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:17:08 +0200 Subject: gnu: r-seqlogo: Update to 1.54.3. * gnu/packages/bioinformatics.scm (r-seqlogo): Update to 1.54.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4e67da930b..355fc29df7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8486,14 +8486,14 @@ downloaded from Encode.") (define-public r-seqlogo (package (name "r-seqlogo") - (version "1.52.0") + (version "1.54.3") (source (origin (method url-fetch) (uri (bioconductor-uri "seqLogo" version)) (sha256 (base32 - "0s94aahp8ma1crmp83dz65ifjwrx6wqi3q6005lmbp8yk2x1rkj4")))) + "09kkxir305fv8z2yyihvspkrzclxbw1cx5mvhfkrhl10rap6662j")))) (properties `((upstream-name . "seqLogo"))) (build-system r-build-system) (home-page "https://bioconductor.org/packages/seqLogo") -- cgit v1.2.3 From 239ca0f3bd49d965521bfbc6a9fd3bb827b2049b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:17:32 +0200 Subject: gnu: r-motifrg: Update to 1.31.0. * gnu/packages/bioinformatics.scm (r-motifrg): Update to 1.31.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 355fc29df7..733819b072 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8507,14 +8507,14 @@ Stephens (1990).") (define-public r-motifrg (package (name "r-motifrg") - (version "1.30.0") + (version "1.31.0") (source (origin (method url-fetch) (uri (bioconductor-uri "motifRG" version)) (sha256 (base32 - "0s6wdr036lra9x93r9k8wvicbkgzypjh3jp46h92yacw8d829k0d")))) + "1ml6zyzlk8yjbnfhga2qnw8nl43rankvka0kc1yljxr2b66aqbhn")))) (properties `((upstream-name . "motifRG"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 52ce0d299d0e174ee04c5aeedb1918a9c9c2450c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:17:46 +0200 Subject: gnu: r-zlibbioc: Update to 1.34.0. * gnu/packages/bioinformatics.scm (r-zlibbioc): Update to 1.34.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 733819b072..811f9f500c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8588,13 +8588,13 @@ R/qtl, to better handle high-dimensional data and complex cross designs.") (define-public r-zlibbioc (package (name "r-zlibbioc") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "zlibbioc" version)) (sha256 (base32 - "1xh7qan0w62mzsmanbx9vcj6ygdfhzw1abaxijkq7f4nh5w87idj")))) + "0j1l052jb2cwc1nifxzwknc9csagf4f2d092zs0i95dz0rma89l0")))) (properties `((upstream-name . "zlibbioc"))) (build-system r-build-system) -- cgit v1.2.3 From 8f08457f05ed129bec325f104e78971eb442b2ae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:18:02 +0200 Subject: gnu: r-rhtslib: Update to 1.20.0. * gnu/packages/bioinformatics.scm (r-rhtslib): Update to 1.20.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 811f9f500c..5d84977f81 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8630,14 +8630,14 @@ secondary structure and comparative analysis in R.") (define-public r-rhtslib (package (name "r-rhtslib") - (version "1.18.1") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rhtslib" version)) (sha256 (base32 - "0gkbrmrcg55c9s5166ifljlx0v25rv4ijdyp4wf4c292xd6chy2l")))) + "186r7icrkzrni1c4n33ip7dlsfgys7hnqf0simvxrpl3yhh3ygdi")))) (properties `((upstream-name . "Rhtslib"))) (build-system r-build-system) ;; Without this a temporary directory ends up in the Rhtslib.so binary, @@ -8649,7 +8649,8 @@ secondary structure and comparative analysis in R.") (inputs `(("zlib" ,zlib))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("r-knitr" ,r-knitr))) (home-page "https://github.com/nhayden/Rhtslib") (synopsis "High-throughput sequencing library as an R package") (description -- cgit v1.2.3 From 261d93140625bfb408d0f122cfbbdf44c62c34fd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:18:48 +0200 Subject: gnu: r-bamsignals: Update to 1.20.0. * gnu/packages/bioinformatics.scm (r-bamsignals): Update to 1.20.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5d84977f81..f604daf34b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8662,14 +8662,14 @@ of other R packages who wish to make use of HTSlib.") (define-public r-bamsignals (package (name "r-bamsignals") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bamsignals" version)) (sha256 (base32 - "0699b0pqbs0dvs91yjibcjc90lxj9mg8rcml4a6wchfr9md7n74w")))) + "0p858xxfv79yc8b3lq58zl9f00irvbn3czsd8wdi5040xg42m402")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) @@ -8680,6 +8680,8 @@ of other R packages who wish to make use of HTSlib.") ("r-zlibbioc" ,r-zlibbioc))) (inputs `(("zlib" ,zlib))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/bamsignals") (synopsis "Extract read count signals from bam files") (description -- cgit v1.2.3 From 3c53617efc25e191e0246b6254abd7b6dedc86c0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:19:30 +0200 Subject: gnu: r-rcas: Update to 1.14.0. * gnu/packages/bioinformatics.scm (r-rcas): Update to 1.14.0. [propagated-inputs]: Remove r-annotationdbi, r-biomart, r-dbi, r-knitr, r-motifrg, r-org-hs-eg-db, and r-topgo; add r-bsgenome, r-gprofiler2, r-iranges, and r-ranger. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f604daf34b..6e1c92c88e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8694,24 +8694,22 @@ paired-end data.") (define-public r-rcas (package (name "r-rcas") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RCAS" version)) (sha256 (base32 - "1s3gvvxi1029d1vfwnjh21nnw3mlx08kcwz63891hml9y850cvsn")))) + "0f812pgv3ys1zv4n9sqkgm01hj4cdd0i0h85dqbhkwd94zl6cavl")))) (properties `((upstream-name . "RCAS"))) (build-system r-build-system) (propagated-inputs - `(("r-annotationdbi" ,r-annotationdbi) - ("r-biocgenerics" ,r-biocgenerics) - ("r-biomart" ,r-biomart) + `(("r-biocgenerics" ,r-biocgenerics) ("r-biostrings" ,r-biostrings) + ("r-bsgenome" ,r-bsgenome) ("r-bsgenome-hsapiens-ucsc-hg19" ,r-bsgenome-hsapiens-ucsc-hg19) ("r-cowplot" ,r-cowplot) ("r-data-table" ,r-data-table) - ("r-dbi" ,r-dbi) ("r-dt" ,r-dt) ("r-genomation" ,r-genomation) ("r-genomeinfodb" ,r-genomeinfodb) @@ -8719,20 +8717,21 @@ paired-end data.") ("r-genomicranges" ,r-genomicranges) ("r-ggplot2" ,r-ggplot2) ("r-ggseqlogo" ,r-ggseqlogo) - ("r-knitr" ,r-knitr) - ("r-motifrg" ,r-motifrg) - ("r-org-hs-eg-db" ,r-org-hs-eg-db) + ("r-gprofiler2" ,r-gprofiler2) + ("r-iranges" ,r-iranges) ("r-pbapply" ,r-pbapply) ("r-pheatmap" ,r-pheatmap) ("r-plotly" ,r-plotly) ("r-plotrix" ,r-plotrix) ("r-proxy" ,r-proxy) + ("r-ranger" ,r-ranger) ("r-rsqlite" ,r-rsqlite) ("r-rtracklayer" ,r-rtracklayer) ("r-rmarkdown" ,r-rmarkdown) ("r-s4vectors" ,r-s4vectors) - ("r-topgo" ,r-topgo) ("pandoc" ,ghc-pandoc))) + (native-inputs + `(("r-knitr" ,r-knitr))) (synopsis "RNA-centric annotation system") (description "RCAS aims to be a standalone RNA-centric annotation system that provides -- cgit v1.2.3 From 40a4772f0967601df36f4c6770865d3f39bc6d8b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:20:46 +0200 Subject: gnu: r-mutationalpatterns: Update to 2.0.0. * gnu/packages/bioinformatics.scm (r-mutationalpatterns): Update to 2.0.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6e1c92c88e..595b607b91 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8794,14 +8794,14 @@ library implementing most of the pipeline's features.") (define-public r-mutationalpatterns (package (name "r-mutationalpatterns") - (version "1.12.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MutationalPatterns" version)) (sha256 (base32 - "08715l6swrlccviw7932v5hyrd2x4c6049vy9qnxk0lw3sp1zvsf")))) + "02lyjiabyhmifycksvpcx29a0pb7z9xjw0hgg8n0sd0dy3afqhcm")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) -- cgit v1.2.3 From 876e05bfcec1bcfcd034ea5163cba89e495194e4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:21:02 +0200 Subject: gnu: r-tximport: Update to 1.16.1. * gnu/packages/bioinformatics.scm (r-tximport): Update to 1.16.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 595b607b91..1bb74a21fe 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8899,13 +8899,13 @@ factors bound at the specific regions.") (define-public r-tximport (package (name "r-tximport") - (version "1.14.2") + (version "1.16.1") (source (origin (method url-fetch) (uri (bioconductor-uri "tximport" version)) (sha256 (base32 - "1avy0zhgnszmg0dr9w74yq9ml10kwdrrgcni2wysrd48zzskc1n0")))) + "1x9959lkjl2h869rgd1b30q1idxzjkr1fyqbpndqk3kbi4q2gr40")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From 05716c1b1cecb944d4178f8bb9a3c9c7d4aa176c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:21:15 +0200 Subject: gnu: r-rhdf5: Update to 2.32.0. * gnu/packages/bioinformatics.scm (r-rhdf5): Update to 2.32.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1bb74a21fe..d183116035 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8923,18 +8923,20 @@ of gene-level counts.") (define-public r-rhdf5 (package (name "r-rhdf5") - (version "2.30.1") + (version "2.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "rhdf5" version)) (sha256 (base32 - "18pv74jj4wr1981r92ss10qkgf5g1b09dsbz3im3j70a4l5l0df0")))) + "097znwl95y2vd6asyqxs62m7binwxqmna7ss0302yl3b0s72skcy")))) (build-system r-build-system) (propagated-inputs `(("r-rhdf5lib" ,r-rhdf5lib))) (inputs `(("zlib" ,zlib))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/rhdf5") (synopsis "HDF5 interface to R") (description -- cgit v1.2.3 From 43dec928d2ac71a3a61bf58808590428b53f544e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:21:32 +0200 Subject: gnu: r-annotationfilter: Update to 1.12.0. * gnu/packages/bioinformatics.scm (r-annotationfilter): Update to 1.12.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d183116035..5af486a0fe 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8952,19 +8952,21 @@ the available RAM.") (define-public r-annotationfilter (package (name "r-annotationfilter") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationFilter" version)) (sha256 (base32 - "1l9sxhlvnwn6327vgg02h11ppmqr2zr07ff8wmcng0i1jbqwa8q5")))) + "18kh1xrhpwb48s1qj4f1v8af3jmw49pnbp5afi2myn9894hxg0cs")))) (properties `((upstream-name . "AnnotationFilter"))) (build-system r-build-system) (propagated-inputs `(("r-genomicranges" ,r-genomicranges) ("r-lazyeval" ,r-lazyeval))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/Bioconductor/AnnotationFilter") (synopsis "Facilities for filtering Bioconductor annotation resources") (description -- cgit v1.2.3 From 6a25fb9b6c2e701dd41c8eee81e1c64759bda8e9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:21:58 +0200 Subject: gnu: r-chipseq: Update to 1.38.0. * gnu/packages/bioinformatics.scm (r-chipseq): Update to 1.38.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5af486a0fe..39a25350a1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9299,14 +9299,14 @@ manipulate and analyze genetic variants.") (define-public r-chipseq (package (name "r-chipseq") - (version "1.36.0") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "chipseq" version)) (sha256 (base32 - "1ln6bn08xig3j6ryak1xfkjhvpnlm2vf1czz9hlj6f02299nbs6l")))) + "0lh859s0aq73vac1phcgagf6n000qgq2xsk0bmfr61n5swifml2a")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) -- cgit v1.2.3 From 3475ad075beb191d356f624b5ed68dc3c9ca4673 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:22:14 +0200 Subject: gnu: r-copywriter: Update to 2.20.0. * gnu/packages/bioinformatics.scm (r-copywriter): Update to 2.20.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 39a25350a1..a87c15f0d5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9351,14 +9351,14 @@ GenomicRanges Bioconductor package.") (define-public r-copywriter (package (name "r-copywriter") - (version "2.18.0") + (version "2.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "CopywriteR" version)) (sha256 (base32 - "0llg1zpxg7qnvja5f5w1z1xic0jdg6zc4mfn97h2sm44skxxcyl1")))) + "0c36wpv0rygkbqpf3dwh5xmc3lr7p8lrdzsq2fbbpw04skl6i7m2")))) (properties `((upstream-name . "CopywriteR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From c336d54d5f41f8712a7b6fd2c2b2db7a17787981 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:22:28 +0200 Subject: gnu: r-methylkit: Update to 1.14.2. * gnu/packages/bioinformatics.scm (r-methylkit): Update to 1.14.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a87c15f0d5..b57b11a01a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9391,13 +9391,13 @@ number detection tools.") (define-public r-methylkit (package (name "r-methylkit") - (version "1.12.0") + (version "1.14.2") (source (origin (method url-fetch) (uri (bioconductor-uri "methylKit" version)) (sha256 (base32 - "0klwc0sbmrxj1lxbz16pl39rxjm0pi57gjw547hlgnac1p9fspzy")))) + "1qr13d2712ypbn96ijic2z5adr5dsd61kzscx7shw6vyj360rlm5")))) (properties `((upstream-name . "methylKit"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From d95a1cb10ecd5610b3abc570acf779a0de1ff2ec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:22:43 +0200 Subject: gnu: r-sva: Update to 3.36.0. * gnu/packages/bioinformatics.scm (r-sva): Update to 3.36.0. [propagated-inputs]: Add r-edger. --- gnu/packages/bioinformatics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b57b11a01a..73d95ccd7c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9440,17 +9440,18 @@ TAB-Seq.") (define-public r-sva (package (name "r-sva") - (version "3.34.0") + (version "3.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "sva" version)) (sha256 (base32 - "1bzms6idx30s4nxl610zwa8rjxsyxb5pf3vxsdfmxg8j4pab9gh1")))) + "0xa1lm0k1a6nig90mab6xh4gln88rbs5l1cdr6ik6agg7jhs7ji4")))) (build-system r-build-system) (propagated-inputs - `(("r-genefilter" ,r-genefilter) + `(("r-edger" ,r-edger) + ("r-genefilter" ,r-genefilter) ("r-mgcv" ,r-mgcv) ("r-biocparallel" ,r-biocparallel) ("r-matrixstats" ,r-matrixstats) -- cgit v1.2.3 From 157eb89707740cf06fac366006a2f7479e32c236 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:23:11 +0200 Subject: gnu: r-protgenerics: Update to 1.20.0. * gnu/packages/bioinformatics.scm (r-protgenerics): Update to 1.20.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 73d95ccd7c..5c3d239d2a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9551,14 +9551,14 @@ as allowing spectra with different resolutions.") (define-public r-protgenerics (package (name "r-protgenerics") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ProtGenerics" version)) (sha256 (base32 - "1k1ggjgx2la8b21841a4ngkp6xfxwz0czv7x960r7i1jqif8y48z")))) + "14xzdh7vxss8vmrw91hcwrszdn3ikm71mah8875b2lkrkrfzbl73")))) (properties `((upstream-name . "ProtGenerics"))) (build-system r-build-system) (home-page "https://github.com/lgatto/ProtGenerics") -- cgit v1.2.3 From d93af7d632108846d507ae9860bcf10bfed5092b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:23:36 +0200 Subject: gnu: r-affyio: Update to 1.58.0. * gnu/packages/bioinformatics.scm (r-affyio): Update to 1.58.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5c3d239d2a..720c491a70 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9625,14 +9625,14 @@ previously been used in XCMS.") (define-public r-affyio (package (name "r-affyio") - (version "1.56.0") + (version "1.58.0") (source (origin (method url-fetch) (uri (bioconductor-uri "affyio" version)) (sha256 (base32 - "0sbkadxdlx7qzxc8z8iv90y6j9b2f62mk3i54dijjh56x3hjy3hb")))) + "0j1f61409yq6hmkqrpzamfm7dx35rlq33ccs7wb1qcqx3d3nb75q")))) (build-system r-build-system) (propagated-inputs `(("r-zlibbioc" ,r-zlibbioc))) -- cgit v1.2.3 From 736f6cfe664ba282772de2739c99cb84caac407b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:23:50 +0200 Subject: gnu: r-affy: Update to 1.66.0. * gnu/packages/bioinformatics.scm (r-affy): Update to 1.66.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 720c491a70..b3c77c82c1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9649,14 +9649,14 @@ CDF file formats.") (define-public r-affy (package (name "r-affy") - (version "1.64.0") + (version "1.66.0") (source (origin (method url-fetch) (uri (bioconductor-uri "affy" version)) (sha256 (base32 - "131za66wbaz9y86gvjqcc2yd1f2ngl2b796xw726g75djhdgxgap")))) + "0m6hkyjxmsf80n3anhwh9k26csxczv6v92fkb7klnchdski61pyc")))) (build-system r-build-system) (propagated-inputs `(("r-affyio" ,r-affyio) -- cgit v1.2.3 From 8e0d11d88bcf870035ed7be9c8c2198c4befafa3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:24:04 +0200 Subject: gnu: r-vsn: Update to 3.56.0. * gnu/packages/bioinformatics.scm (r-vsn): Update to 3.56.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b3c77c82c1..2c4d2c4e7c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9677,14 +9677,14 @@ analysis.") (define-public r-vsn (package (name "r-vsn") - (version "3.54.0") + (version "3.56.0") (source (origin (method url-fetch) (uri (bioconductor-uri "vsn" version)) (sha256 (base32 - "1naqzb2m0km8fzr6chf9z71sisrwviy1fdi9b3hn4i8p18b4kqzh")))) + "1k82dikrv1gcync5y1131wg7z1kxv2z2jl4nndg20bixc3398h58")))) (build-system r-build-system) (propagated-inputs `(("r-affy" ,r-affy) -- cgit v1.2.3 From 8eb579883daf01a18d30afa85ba4a4e15342e550 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:24:28 +0200 Subject: gnu: r-mzid: Update to 1.26.0. * gnu/packages/bioinformatics.scm (r-mzid): Update to 1.26.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2c4d2c4e7c..259ea15e35 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9713,14 +9713,14 @@ and specific in detecting differential transcription.") (define-public r-mzid (package (name "r-mzid") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "mzID" version)) (sha256 (base32 - "1glcv096bn6pxlw89dlij1nzpwnjvrbxysvw2gm6qgm7rhxlaxrw")))) + "0y50lzkdamkpz67f6r5whp246qsxpbammjil7g8vjprx0c4jk5n5")))) (properties `((upstream-name . "mzID"))) (build-system r-build-system) (propagated-inputs @@ -9731,6 +9731,8 @@ and specific in detecting differential transcription.") ("r-protgenerics" ,r-protgenerics) ("r-rcpp" ,r-rcpp) ("r-xml" ,r-xml))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/mzID") (synopsis "Parser for mzIdentML files") (description -- cgit v1.2.3 From 7b4fc6ae0abc9a015445f4636c12d3de60aea474 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:25:02 +0200 Subject: gnu: r-pcamethods: Update to 1.80.0. * gnu/packages/bioinformatics.scm (r-pcamethods): Update to 1.80.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 259ea15e35..2d0d0fda6a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9745,14 +9745,14 @@ specific parser.") (define-public r-pcamethods (package (name "r-pcamethods") - (version "1.78.0") + (version "1.80.0") (source (origin (method url-fetch) (uri (bioconductor-uri "pcaMethods" version)) (sha256 (base32 - "1wir67kfjm0m9gf0ki8qmvh45n4gx2k0wfl9pd1hp4g62fbrj1pj")))) + "10cww4jxyynkwxbbsx804nwac31j0hh8dgisygld0q663gaxkgni")))) (properties `((upstream-name . "pcaMethods"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 10a7ee2609a45a316971fcb356a2e48857c7d57b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:25:28 +0200 Subject: gnu: r-msnbase: Update to 2.14.2. * gnu/packages/bioinformatics.scm (r-msnbase): Update to 2.14.2. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2d0d0fda6a..7bfb9f4611 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9775,14 +9775,14 @@ structure (pcaRes) to provide a common interface to the PCA results.") (define-public r-msnbase (package (name "r-msnbase") - (version "2.12.0") + (version "2.14.2") (source (origin (method url-fetch) (uri (bioconductor-uri "MSnbase" version)) (sha256 (base32 - "1z889xkfphqqmv31i8hh5xqyclv660ic26rfck5bjpgk3s2zzwi6")))) + "17vlv9gh41s1hp043b7j1jfqiw52alh1misjzy1kxl0g90rld00l")))) (properties `((upstream-name . "MSnbase"))) (build-system r-build-system) (propagated-inputs @@ -9808,6 +9808,8 @@ structure (pcaRes) to provide a common interface to the PCA results.") ("r-scales" ,r-scales) ("r-vsn" ,r-vsn) ("r-xml" ,r-xml))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/lgatto/MSnbase") (synopsis "Base functions and classes for MS-based proteomics") (description -- cgit v1.2.3 From f6ddf20891cac6fbd79664e8edd8d207656ead3d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:25:49 +0200 Subject: gnu: r-msnid: Update to 1.22.0. * gnu/packages/bioinformatics.scm (r-msnid): Update to 1.22.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7bfb9f4611..0157f85c62 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9820,14 +9820,14 @@ of mass spectrometry based proteomics data.") (define-public r-msnid (package (name "r-msnid") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MSnID" version)) (sha256 (base32 - "0m71f2y12hmwvng45kzz4r4qrgc2jbd7j9gprmw8y5laawpdaifg")))) + "0dwa6j2nqb3223a8g4f453aznjh69wngrpvdi12iy69j1psbbjcc")))) (properties `((upstream-name . "MSnID"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 019bc3673266586506865d8d285a0390a252847d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:26:05 +0200 Subject: gnu: r-aroma-light: Update to 3.18.0. * gnu/packages/bioinformatics.scm (r-aroma-light): Update to 3.18.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0157f85c62..6fab67f569 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9920,14 +9920,14 @@ discovery of differentially expressed genes and markers.") (define-public r-aroma-light (package (name "r-aroma-light") - (version "3.16.0") + (version "3.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "aroma.light" version)) (sha256 (base32 - "0cgdg650j4dl0b45pwaw49ib97dwjazrv9sqzkygrjmcnnfxry8x")))) + "19y5f2minx2pp73zdh43v1qkwpkaxygkl8cwlnwja15i46s0bcyc")))) (properties `((upstream-name . "aroma.light"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From c9059a3b0ea1a3f40df299193a6574f4d4afe377 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:26:22 +0200 Subject: gnu: r-deseq: Update to 1.39.0. * gnu/packages/bioinformatics.scm (r-deseq): Update to 1.39.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6fab67f569..60901b21b8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9947,14 +9947,14 @@ classes.") (define-public r-deseq (package (name "r-deseq") - (version "1.38.0") + (version "1.39.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DESeq" version)) (sha256 (base32 - "14pys93gsl50xmq5pc7pp1g20v3ywlg0yzkkhwb3kiy8573xn9nc")))) + "047hph5aqmjnz1aqprziw0smdn5lf96hmwpnvqrxv1j2yfvcf3h1")))) (properties `((upstream-name . "DESeq"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 15990617eb5d4782f5702b9422108e450cc28ef7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:26:51 +0200 Subject: gnu: r-edaseq: Update to 2.22.0. * gnu/packages/bioinformatics.scm (r-edaseq): Update to 2.22.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 60901b21b8..a110733d9b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9978,14 +9978,14 @@ distribution.") (define-public r-edaseq (package (name "r-edaseq") - (version "2.20.0") + (version "2.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "EDASeq" version)) (sha256 (base32 - "19mgzbv8yxgvw86wpq401l27q55ygawlngl775yavwccz1zbhjnj")))) + "12gzxjh73qshlwvsf92lbrf4bi199kxg2snrkprh1z4yqf7bjfm4")))) (properties `((upstream-name . "EDASeq"))) (build-system r-build-system) (propagated-inputs @@ -10002,6 +10002,8 @@ distribution.") ("r-iranges" ,r-iranges) ("r-rsamtools" ,r-rsamtools) ("r-shortread" ,r-shortread))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/drisso/EDASeq") (synopsis "Exploratory data analysis and normalization for RNA-Seq") (description -- cgit v1.2.3 From 334e8d7b79cef4c66bcbbed70c24c7f04c91583b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:27:10 +0200 Subject: gnu: r-interactivedisplaybase: Update to 1.26.3. * gnu/packages/bioinformatics.scm (r-interactivedisplaybase): Update to 1.26.3. [propagated-inputs]: Add r-dt. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a110733d9b..838fd6ef69 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10019,20 +10019,23 @@ global-scaling and full-quantile normalization.") (define-public r-interactivedisplaybase (package (name "r-interactivedisplaybase") - (version "1.24.0") + (version "1.26.3") (source (origin (method url-fetch) (uri (bioconductor-uri "interactiveDisplayBase" version)) (sha256 (base32 - "0zwf3ma6wf4zypl6bgjp0n72k2hmp0g16gzl4v3y4157rxcbpl0n")))) + "1x5vipqa4pgwpd62c1c58shnlpv3zyzzpf4wdwr00q1swkdb7wv3")))) (properties `((upstream-name . "interactiveDisplayBase"))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) + ("r-dt" ,r-dt) ("r-shiny" ,r-shiny))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/interactiveDisplayBase") (synopsis "Base package for web displays of Bioconductor objects") (description -- cgit v1.2.3 From 5fce232977cffed231b167e9160ded2eafb032dc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:27:49 +0200 Subject: gnu: r-annotationhub: Update to 2.20.0. * gnu/packages/bioinformatics.scm (r-annotationhub): Update to 2.20.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 838fd6ef69..8f5e968b4f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10046,14 +10046,14 @@ Shiny-based display methods for Bioconductor objects.") (define-public r-annotationhub (package (name "r-annotationhub") - (version "2.18.0") + (version "2.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationHub" version)) (sha256 (base32 - "19vj3bk8jz68q84g3j8xs1s9bqz90lbwbciig1h45zvn2zc6087m")))) + "0r4xzf93bm9cpys5cg70wg0b8hxli80hvqwgh4hzbd45yyf5c4wz")))) (properties `((upstream-name . "AnnotationHub"))) (build-system r-build-system) (propagated-inputs @@ -10070,6 +10070,8 @@ Shiny-based display methods for Bioconductor objects.") ("r-rsqlite" ,r-rsqlite) ("r-s4vectors" ,r-s4vectors) ("r-yaml" ,r-yaml))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/AnnotationHub") (synopsis "Client to access AnnotationHub resources") (description -- cgit v1.2.3 From 3422533bd9c6ed493560aeede47b3581968ddace Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:28:09 +0200 Subject: gnu: r-fastseg: Update to 1.34.0. * gnu/packages/bioinformatics.scm (r-fastseg): Update to 1.34.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8f5e968b4f..94b79850e5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10087,14 +10087,14 @@ by the user, helping with quick and reproducible access.") (define-public r-fastseg (package (name "r-fastseg") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "fastseg" version)) (sha256 (base32 - "1cys6frmbizc8bf933mwvvnr31sfya9ahcc0wm66pbd1x3mygkmk")))) + "1d48n245pzmvcpsz93lxb4frqh222gfhpmlvm0sb74skn16way63")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) -- cgit v1.2.3 From d80a6cacaf3f0a994451e1f5e448bdd18a24a210 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:28:22 +0200 Subject: gnu: r-keggrest: Update to 1.28.0. * gnu/packages/bioinformatics.scm (r-keggrest): Update to 1.28.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 94b79850e5..7cba79e114 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10117,20 +10117,22 @@ microarrays or GRanges for sequencing data.") (define-public r-keggrest (package (name "r-keggrest") - (version "1.26.1") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "KEGGREST" version)) (sha256 (base32 - "1cgjvv9n88y3ah21356mh8z2l08vjn42hjy8hcljsibknzc4v247")))) + "0q76w17fya2x0z7mvyhkk5kqh07flldgih13ma44vhcy1bdlm6j1")))) (properties `((upstream-name . "KEGGREST"))) (build-system r-build-system) (propagated-inputs `(("r-biostrings" ,r-biostrings) ("r-httr" ,r-httr) ("r-png" ,r-png))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/KEGGREST") (synopsis "Client-side REST access to KEGG") (description -- cgit v1.2.3 From 817e4c8b68bff216ed94baa3214a2f44115ba7a7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:28:37 +0200 Subject: gnu: r-gage: Update to 2.37.0. * gnu/packages/bioinformatics.scm (r-gage): Update to 2.37.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7cba79e114..1d1853ee06 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10143,14 +10143,14 @@ microarrays or GRanges for sequencing data.") (define-public r-gage (package (name "r-gage") - (version "2.36.0") + (version "2.37.0") (source (origin (method url-fetch) (uri (bioconductor-uri "gage" version)) (sha256 (base32 - "1qxfmg0id19iy3ia8h5nrvk3d1azqb28kl7m08i23654wb6b45c6")))) + "1zfaas4x6g7wiml6cmxa7b4f43az9s0lrw80k6sf7c96hsh1jijr")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From 8323ff337674c9b9b1ae89c3b45cd26be3d110ac Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:28:51 +0200 Subject: gnu: r-genomicfiles: Update to 1.24.0. * gnu/packages/bioinformatics.scm (r-genomicfiles): Update to 1.24.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1d1853ee06..f96ee535d0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10173,14 +10173,14 @@ analysis using other methods.") (define-public r-genomicfiles (package (name "r-genomicfiles") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFiles" version)) (sha256 (base32 - "1x6q827ms2l5lwzha1vsgfrshh35n9f19jq57xagrqlafxgpz86s")))) + "1k3824pzf9fdqvcv6cz2742q3mabpmncrc72hwa21ac8wy1b04n4")))) (properties `((upstream-name . "GenomicFiles"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ca5c92c0c7211278f942e652690b903031668ae5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:29:15 +0200 Subject: gnu: r-complexheatmap: Update to 2.4.2. * gnu/packages/bioinformatics.scm (r-complexheatmap): Update to 2.4.2. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f96ee535d0..6a20a78c71 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10206,14 +10206,14 @@ provide added flexibility for data combination and manipulation.") (define-public r-complexheatmap (package (name "r-complexheatmap") - (version "2.2.0") + (version "2.4.2") (source (origin (method url-fetch) (uri (bioconductor-uri "ComplexHeatmap" version)) (sha256 (base32 - "1pj6a6rmqckk033pkklk6hr4066rzavamy6w194rfdhind90rk0p")))) + "01jxxwxhf9n8baxgja4rb592p5210s4ppd7a5b4xby5aalhzkr0l")))) (properties `((upstream-name . "ComplexHeatmap"))) (build-system r-build-system) @@ -10225,6 +10225,8 @@ provide added flexibility for data combination and manipulation.") ("r-globaloptions" ,r-globaloptions) ("r-png" ,r-png) ("r-rcolorbrewer" ,r-rcolorbrewer))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/jokergoo/ComplexHeatmap") (synopsis "Making Complex Heatmaps") -- cgit v1.2.3 From 7a9e7e4844e937c8486c23abcf55d6612bfe3345 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:29:31 +0200 Subject: gnu: r-dirichletmultinomial: Update to 1.30.0. * gnu/packages/bioinformatics.scm (r-dirichletmultinomial): Update to 1.30.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6a20a78c71..0c4602f342 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10240,14 +10240,14 @@ self-defined annotation graphics.") (define-public r-dirichletmultinomial (package (name "r-dirichletmultinomial") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DirichletMultinomial" version)) (sha256 (base32 - "0knmncmkkf2ypyqfcl5s8nmyyf9nrzkqprzn9w3w8182c0v49r0s")))) + "1m9dsrddrllb2i88qzik1867iv9mggrgdkn0dlp8sq7gl69vmalb")))) (properties `((upstream-name . "DirichletMultinomial"))) (build-system r-build-system) -- cgit v1.2.3 From 39da6fbc4078dba97fa170e5d1543cca6e0e4006 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:29:50 +0200 Subject: gnu: r-ensembldb: Update to 2.12.1. * gnu/packages/bioinformatics.scm (r-ensembldb): Update to 2.12.1. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0c4602f342..76f2b5c031 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10269,14 +10269,14 @@ originally made available by Holmes, Harris, and Quince, 2012, PLoS ONE 7(2): (define-public r-ensembldb (package (name "r-ensembldb") - (version "2.10.2") + (version "2.12.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ensembldb" version)) (sha256 (base32 - "02lnpyp85zchmz404hr5381zmihvq4x9zgxdrbn2afi352vg0vab")))) + "1vvchc04nshxc768fp31rxb603aj3hmq8xlh5qabcwf2c3z9719g")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) @@ -10295,6 +10295,8 @@ originally made available by Holmes, Harris, and Quince, 2012, PLoS ONE 7(2): ("r-rsqlite" ,r-rsqlite) ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/jotsetung/ensembldb") (synopsis "Utilities to create and use Ensembl-based annotation databases") (description -- cgit v1.2.3 From 7c26687871739b6ddaa48ffda700f2a35da0623d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:30:06 +0200 Subject: gnu: r-organismdbi: Update to 1.30.0. * gnu/packages/bioinformatics.scm (r-organismdbi): Update to 1.30.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 76f2b5c031..10bd7e793b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10314,14 +10314,14 @@ chromosome region or transcript models of lincRNA genes.") (define-public r-organismdbi (package (name "r-organismdbi") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "OrganismDbi" version)) (sha256 (base32 - "1bvfyh733mhka9zd00hrzpalgjs255c2blnxyf60ipzk5jg7yllb")))) + "194h5576inq44qr666snzq0ygnc77rk5ljkn9bn8zs6x6gb3cwaw")))) (properties `((upstream-name . "OrganismDbi"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 07518c3a340b629f02219991b30a1c52fa468a13 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:30:22 +0200 Subject: gnu: r-biovizbase: Update to 1.36.0. * gnu/packages/bioinformatics.scm (r-biovizbase): Update to 1.36.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 10bd7e793b..dc1be91b3c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10346,14 +10346,14 @@ the fact that each of these packages implements a select methods.") (define-public r-biovizbase (package (name "r-biovizbase") - (version "1.34.1") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biovizBase" version)) (sha256 (base32 - "04vvj907bgs67w8rb7n1haf80p6cd0qj5fdxw0dwryb455y35vir")))) + "1vq2mxa2jkljgw75zqjdkyml0ppi5dspvwj4cznfhi31cq8ds0qh")))) (properties `((upstream-name . "biovizBase"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 7038aeb2104b3ee03e1bddb65738f14ff34f2d97 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:30:47 +0200 Subject: gnu: r-ggbio: Update to 1.36.0. * gnu/packages/bioinformatics.scm (r-ggbio): Update to 1.36.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index dc1be91b3c..87734a4604 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10388,14 +10388,14 @@ effort and encourages consistency.") (define-public r-ggbio (package (name "r-ggbio") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ggbio" version)) (sha256 (base32 - "13wzwh40anh8l53yp19bg4w5cpxykcaf228dc8cxvjndyib711qb")))) + "11ggnqjq42fi2hm9xlvrrlr2xhy4kglvl1a0mycp1s4v67lxw5h5")))) (build-system r-build-system) (arguments `(#:phases @@ -10435,6 +10435,8 @@ effort and encourages consistency.") ("r-scales" ,r-scales) ("r-summarizedexperiment" ,r-summarizedexperiment) ("r-variantannotation" ,r-variantannotation))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "http://www.tengfei.name/ggbio/") (synopsis "Visualization tools for genomic data") (description -- cgit v1.2.3 From 42d8cd9f97c2dd72c1fd12ddb83816abb85a75bd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:31:06 +0200 Subject: gnu: r-gqtlbase: Update to 1.20.0. * gnu/packages/bioinformatics.scm (r-gqtlbase): Update to 1.20.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 87734a4604..d1e46f6547 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10453,14 +10453,14 @@ interval to data view, mismatch pileup, and several splicing summaries.") (define-public r-gqtlbase (package (name "r-gqtlbase") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "gQTLBase" version)) (sha256 (base32 - "1qr8dqjbmj1mdjbzbnxwzfrm8f02wqfsgic8ws5kv7pmsby63y4x")))) + "06xvzp4fn3qfa46ggg8kxi267gbyd821vvx4040173xkqxpr0g5j")))) (properties `((upstream-name . "gQTLBase"))) (build-system r-build-system) (propagated-inputs @@ -10477,6 +10477,8 @@ interval to data view, mismatch pileup, and several splicing summaries.") ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/gQTLBase") (synopsis "Infrastructure for eQTL, mQTL and similar studies") (description -- cgit v1.2.3 From aab0e28fc1998e9e6407759089e0b746fc50b56a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:31:22 +0200 Subject: gnu: r-snpstats: Update to 1.38.0. * gnu/packages/bioinformatics.scm (r-snpstats): Update to 1.38.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d1e46f6547..666a9d93d2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10490,14 +10490,14 @@ and more.") (define-public r-snpstats (package (name "r-snpstats") - (version "1.36.0") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "snpStats" version)) (sha256 (base32 - "1xq1rjljg70h5mshdza56dis0iv1a20sivs6dav3w5jbdd1l5qkh")))) + "1qv3nqqr30d3n66mawqd9dbl95dl89r4bcjvkc5iassy1yrwr8wq")))) (properties `((upstream-name . "snpStats"))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) -- cgit v1.2.3 From 87772ab4dd75dfdd1b69dcd29088a419cd14bf1b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:31:44 +0200 Subject: gnu: r-erma: Update to 1.4.0. * gnu/packages/bioinformatics.scm (r-erma): Update to 1.4.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 666a9d93d2..97b8bd74b9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10549,14 +10549,14 @@ several related annotation packages.") (define-public r-erma (package (name "r-erma") - (version "1.2.0") + (version "1.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "erma" version)) (sha256 (base32 - "085qsr73p8nyp435f15l4l1jkfd64bfd9gl4z496nfxdnqn95srz")))) + "1ccfbq0r48sr3h8050w8zv8402h7nx09adr0xdyqlg7kwp9vd2l3")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) @@ -10573,6 +10573,8 @@ several related annotation packages.") ("r-s4vectors" ,r-s4vectors) ("r-shiny" ,r-shiny) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/erma") (synopsis "Epigenomic road map adventures") (description -- cgit v1.2.3 From 6caad43c181d8d2fff9884addb778b778074be89 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:32:13 +0200 Subject: gnu: r-ldblock: Update to 1.18.0. * gnu/packages/bioinformatics.scm (r-ldblock): Update to 1.18.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 97b8bd74b9..d6847cb310 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10589,14 +10589,14 @@ by Ernst and Kellis.") (define-public r-ldblock (package (name "r-ldblock") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ldblock" version)) (sha256 (base32 - "0xpigfidmylfawy6vzshqnsw1lzjs4qms8q7zffij6bkvkv7920x")))) + "0plw00n2zfgh029ab41dnydzgv2yxrapjp770147rx9pff4dngrv")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) @@ -10609,6 +10609,8 @@ by Ernst and Kellis.") ("r-rsamtools" ,r-rsamtools) ("r-snpstats" ,r-snpstats) ("r-variantannotation" ,r-variantannotation))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/ldblock") (synopsis "Data structures for linkage disequilibrium measures in populations") (description -- cgit v1.2.3 From a97897bc3dab78c08dbbd1da375f05d706e9431c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:32:36 +0200 Subject: gnu: r-gqtlstats: Update to 1.20.0. * gnu/packages/bioinformatics.scm (r-gqtlstats): Update to 1.20.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d6847cb310..9861970cdb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10623,14 +10623,14 @@ defining LD blocks.") (define-public r-gqtlstats (package (name "r-gqtlstats") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "gQTLstats" version)) (sha256 (base32 - "1dly4p9r4231hf31xg1nzqiyvjbcfjljfmhb88ic1jxwnvniyv2f")))) + "1jjqfpjp93nmxjn757j5mzcax96bzcqdd1gr3rsdxg7ap008l2w7")))) (properties `((upstream-name . "gQTLstats"))) (build-system r-build-system) (propagated-inputs @@ -10664,6 +10664,8 @@ defining LD blocks.") ("r-snpstats" ,r-snpstats) ("r-summarizedexperiment" ,r-summarizedexperiment) ("r-variantannotation" ,r-variantannotation))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/gQTLstats") (synopsis "Computationally efficient analysis for eQTL and allied studies") (description -- cgit v1.2.3 From 522da60b294f6e132bb02313aa39f89eb5f349a7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:33:07 +0200 Subject: gnu: r-gviz: Update to 1.32.0. * gnu/packages/bioinformatics.scm (r-gviz): Update to 1.32.0. [propagated-inputs]: Add r-ensembldb. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9861970cdb..71e670a3a0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10679,14 +10679,14 @@ family of feature/genome hypotheses.") (define-public r-gviz (package (name "r-gviz") - (version "1.30.3") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Gviz" version)) (sha256 (base32 - "0c9i26h5czm60n1bxzmdxxpywcj0sig6wcj913pb41mr83bbgra3")))) + "0cgkp0ciyy2qykqgh3vzp5mx9b4vsvacjh2jnsj3wldiapzlz08a")))) (properties `((upstream-name . "Gviz"))) (build-system r-build-system) (propagated-inputs @@ -10698,6 +10698,7 @@ family of feature/genome hypotheses.") ("r-biovizbase" ,r-biovizbase) ("r-bsgenome" ,r-bsgenome) ("r-digest" ,r-digest) + ("r-ensembldb" ,r-ensembldb) ("r-genomeinfodb" ,r-genomeinfodb) ("r-genomicalignments" ,r-genomicalignments) ("r-genomicfeatures" ,r-genomicfeatures) @@ -10711,6 +10712,8 @@ family of feature/genome hypotheses.") ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors) ("r-xvector" ,r-xvector))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/Gviz") (synopsis "Plotting data and annotation information along genomic coordinates") (description -- cgit v1.2.3 From ddef43a29d95895aabaf15c1140e34af8058f4b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:33:43 +0200 Subject: gnu: r-gwascat: Update to 2.20.1. * gnu/packages/bioinformatics.scm (r-gwascat): Update to 2.20.1. [propagated-inputs]: Remove r-homo-sapiens; add r-ggplot2. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 71e670a3a0..9a99ac10f4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10728,14 +10728,14 @@ with your data.") (define-public r-gwascat (package (name "r-gwascat") - (version "2.18.0") + (version "2.20.1") (source (origin (method url-fetch) (uri (bioconductor-uri "gwascat" version)) (sha256 (base32 - "038vhfsk2vs7inn5di093cmjbb81k7j0af385sg7l01jj70bdqq1")))) + "1cq5cmdrf0a0arr841yvkh6d8drc15p7mif1afr215l1s3y2dwd4")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) @@ -10744,11 +10744,13 @@ with your data.") ("r-genomeinfodb" ,r-genomeinfodb) ("r-genomicfeatures" ,r-genomicfeatures) ("r-genomicranges" ,r-genomicranges) - ("r-homo-sapiens" ,r-homo-sapiens) + ("r-ggplot2" ,r-ggplot2) ("r-iranges" ,r-iranges) ("r-rsamtools" ,r-rsamtools) ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/gwascat") (synopsis "Tools for data in the EMBL-EBI GWAS catalog") (description -- cgit v1.2.3 From a811751f4918a4577513319f7c7e186731cf6564 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:34:11 +0200 Subject: gnu: r-sushi: Update to 1.26.0. * gnu/packages/bioinformatics.scm (r-sushi): Update to 1.26.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9a99ac10f4..9777203f0a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10761,13 +10761,13 @@ EMBL-EBI GWAS catalog.") (define-public r-sushi (package (name "r-sushi") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Sushi" version)) (sha256 (base32 - "15xng21hd09fb234ravrry3b872zg82w8x9lijxab9n96xihcpz5")))) + "17j3d5qjq5nbv99by5mq8rwr0jgh2jyyfn2nwxmwgzlmk3lgi1rb")))) (properties `((upstream-name . "Sushi"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 6be25cc2dbc5c864d68c894bcc9b1f351fe2028a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:34:25 +0200 Subject: gnu: r-fithic: Update to 1.14.0. * gnu/packages/bioinformatics.scm (r-fithic): Update to 1.14.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9777203f0a..d20ba61396 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10783,19 +10783,21 @@ visualizations for publication-quality multi-panel figures.") (define-public r-fithic (package (name "r-fithic") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "FitHiC" version)) (sha256 (base32 - "1irwkwi4afdj395134k31mvx7c2vpdd0rv8zrblnldascdsb04kc")))) + "1dffkdxm08wq4kjd9j2v2625x3p6vbrk33a2zx94pwpgkghr72yp")))) (properties `((upstream-name . "FitHiC"))) (build-system r-build-system) (propagated-inputs `(("r-data-table" ,r-data-table) ("r-fdrtool" ,r-fdrtool) ("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/FitHiC") (synopsis "Confidence estimation for intra-chromosomal contact maps") (description -- cgit v1.2.3 From 46f188d1df34f3cdbc84b60dab420c41b4c119d1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:34:40 +0200 Subject: gnu: r-hitc: Update to 1.32.0. * gnu/packages/bioinformatics.scm (r-hitc): Update to 1.32.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d20ba61396..74df87334f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10809,13 +10809,13 @@ assays such as Hi-C.") (define-public r-hitc (package (name "r-hitc") - (version "1.30.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "HiTC" version)) (sha256 (base32 - "0byahi0fz0dzjyklz8v9whax9ygg7gwb4pl1j3zbl6z8a9qx8pps")))) + "1jx2pfa7sbdz7xi466lz1h5xv126g56z73n0a5l2wrq28k47qaxy")))) (properties `((upstream-name . "HiTC"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From cf907680e893896fd831409f329f06cf593a496c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:34:54 +0200 Subject: gnu: r-hdf5array: Update to 1.16.0. * gnu/packages/bioinformatics.scm (r-hdf5array): Update to 1.16.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 74df87334f..5ef81d20d2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10838,14 +10838,14 @@ provided.") (define-public r-hdf5array (package (name "r-hdf5array") - (version "1.14.4") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "HDF5Array" version)) (sha256 (base32 - "0ib0grhd9zbrn0dkrm4aa7qj7h0y6z1dvyx1ab3w6vczw7xghsfb")))) + "1g848s0qc6i4ipd7y2s5pk8k1xggk2kfy0gnr8wjjs2gq3914aw4")))) (properties `((upstream-name . "HDF5Array"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 87d5444d9f0042b70d1bb865ce584a25977343e6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:35:25 +0200 Subject: gnu: r-rhdf5lib: Update to 1.10.0. * gnu/packages/bioinformatics.scm (r-rhdf5lib): Update to 1.10.0. [source]: Update snippet. [arguments]: Replace ZLIB variables in Makevars. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5ef81d20d2..ff815187c7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10868,19 +10868,22 @@ block processing.") (define-public r-rhdf5lib (package (name "r-rhdf5lib") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rhdf5lib" version)) (sha256 (base32 - "17lhwnm9rqsvbqkvwp0m07vjrk63a4389p2y39zffv8fgznxqzd7")) + "09ylwyk6a8sdrmi1mx7vpycpykqlqylmwa973g6jrcmk0h0qfa4w")) (modules '((guix build utils))) (snippet '(begin ;; Delete bundled binaries - (delete-file-recursively "src/winlib/") + (delete-file-recursively "src/wininclude/") + (delete-file-recursively "src/winlib-4.9.3/") + (delete-file-recursively "src/winlib-8.3.0/") + (delete-file "src/hdf5small_cxx_hl_1.10.6.tar.gz") #t)))) (properties `((upstream-name . "Rhdf5lib"))) (build-system r-build-system) @@ -10916,6 +10919,8 @@ block processing.") "C Compiler: GCC\n")) (rename-file "Makevars.in" "Makevars") (substitute* "Makevars" + (("@ZLIB_LIB@") "-lz") + (("@ZLIB_INCLUDE@") "") (("HDF5_CXX_LIB=.*") (string-append "HDF5_CXX_LIB=" (assoc-ref inputs "hdf5") "/lib/libhdf5_cpp.a\n")) @@ -10941,7 +10946,8 @@ block processing.") (propagated-inputs `(("hdf5" ,hdf5-1.10))) (native-inputs - `(("hdf5-source" ,(package-source hdf5-1.10)))) + `(("hdf5-source" ,(package-source hdf5-1.10)) + ("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/Rhdf5lib") (synopsis "HDF5 library as an R package") (description "This package provides C and C++ HDF5 libraries for use in R -- cgit v1.2.3 From 16dd6bacaafc4f9708d5896918f75abfaee23584 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:36:07 +0200 Subject: gnu: r-beachmat: Update to 2.4.0. * gnu/packages/bioinformatics.scm (r-beachmat): Update to 2.4.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ff815187c7..44d66cd4bb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10957,19 +10957,21 @@ packages.") (define-public r-beachmat (package (name "r-beachmat") - (version "2.2.1") + (version "2.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "beachmat" version)) (sha256 (base32 - "1bpnlw2kdy9yc2vq948k980r0j25ipb80llhvn0j3kxjiwyfgs3i")))) + "1vl6jbf9ia78cm4ikdb8vz04jv4b46zhvg5i006c63a9pzw7zhxi")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) ("r-delayedarray" ,r-delayedarray) ("r-matrix" ,r-matrix))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/beachmat") (synopsis "Compiling Bioconductor to handle each matrix type") (description "This package provides a consistent C++ class interface for a -- cgit v1.2.3 From 9e7acf2f14dff2fc966c3c34a4610892aa697bc1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:36:27 +0200 Subject: gnu: r-singlecellexperiment: Update to 1.10.1. * gnu/packages/bioinformatics.scm (r-singlecellexperiment): Update to 1.10.1. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 44d66cd4bb..935846b921 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10982,14 +10982,14 @@ matrices.") (define-public r-singlecellexperiment (package (name "r-singlecellexperiment") - (version "1.8.0") + (version "1.10.1") (source (origin (method url-fetch) (uri (bioconductor-uri "SingleCellExperiment" version)) (sha256 (base32 - "11pqb3cigi9xbhxq2k3n7z23v1ibd03ws1lcrh5c5ffgb33nlyw5")))) + "092wvk11n7pa234vlwhxm3gdi4k3sbnz1splhxalbdhz3jf02zfp")))) (properties `((upstream-name . "SingleCellExperiment"))) (build-system r-build-system) @@ -10997,6 +10997,8 @@ matrices.") `(("r-biocgenerics" ,r-biocgenerics) ("r-s4vectors" ,r-s4vectors) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/SingleCellExperiment") (synopsis "S4 classes for single cell data") (description "This package defines an S4 class for storing data from -- cgit v1.2.3 From 7039b539458b37d2b66c0d06c9ae3d71ef214eee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:37:19 +0200 Subject: gnu: r-scater: Update to 1.16.1. * gnu/packages/bioinformatics.scm (r-scater): Update to 1.16.1. [propagated-inputs]: Add r-rlang. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 935846b921..d92b87c9db 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11011,13 +11011,13 @@ libraries.") (define-public r-scater (package (name "r-scater") - (version "1.14.6") + (version "1.16.1") (source (origin (method url-fetch) (uri (bioconductor-uri "scater" version)) (sha256 (base32 - "0sxd1s8wdlj9926bagq4crjrk1nnmh3j3bhgrw160zfgc3y8pzck")))) + "0pi4mpc3lvskj5biyhc9cskcnz9q2wjmfrz7xdnx8qqd8vpy84g3")))) (build-system r-build-system) (propagated-inputs `(("r-beachmat" ,r-beachmat) @@ -11031,10 +11031,13 @@ libraries.") ("r-ggplot2" ,r-ggplot2) ("r-matrix" ,r-matrix) ("r-rcpp" ,r-rcpp) + ("r-rlang" ,r-rlang) ("r-s4vectors" ,r-s4vectors) ("r-singlecellexperiment" ,r-singlecellexperiment) ("r-summarizedexperiment" ,r-summarizedexperiment) ("r-viridis" ,r-viridis))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/davismcc/scater") (synopsis "Single-cell analysis toolkit for gene expression data in R") (description "This package provides a collection of tools for doing -- cgit v1.2.3 From 47c7670c430b6b3b3a749d6391969badc8da3b52 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:38:14 +0200 Subject: gnu: r-scran: Update to 1.16.0. * gnu/packages/bioinformatics.scm (r-scran): Update to 1.16.0. [propagated-inputs]: Add r-iranges. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d92b87c9db..533374b569 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11048,14 +11048,14 @@ quality control.") (define-public r-scran (package (name "r-scran") - (version "1.14.6") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "scran" version)) (sha256 (base32 - "1y8wlgk5zbv7c7gcp0ahfpbh9lifab7y3zwf0093fzaw7vr1y6cr")))) + "1gm4ys4aq8h1pn45k1rxk384wjyf55izivw8kgxbrflj6j4xvvsv")))) (build-system r-build-system) (propagated-inputs `(("r-beachmat" ,r-beachmat) @@ -11069,6 +11069,7 @@ quality control.") ("r-dqrng" ,r-dqrng) ("r-edger" ,r-edger) ("r-igraph" ,r-igraph) + ("r-iranges" ,r-iranges) ("r-limma" ,r-limma) ("r-matrix" ,r-matrix) ("r-rcpp" ,r-rcpp) @@ -11077,6 +11078,8 @@ quality control.") ("r-singlecellexperiment" ,r-singlecellexperiment) ("r-statmod" ,r-statmod) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/scran") (synopsis "Methods for single-cell RNA-Seq data analysis") (description "This package implements a variety of low-level analyses of -- cgit v1.2.3 From a3b55161c719f47dc4c1e3f4391e938931bf6a4d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:38:40 +0200 Subject: gnu: r-delayedmatrixstats: Update to 1.10.0. * gnu/packages/bioinformatics.scm (r-delayedmatrixstats): Update to 1.10.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 533374b569..405cb9b724 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11091,14 +11091,14 @@ variable and significantly correlated genes.") (define-public r-delayedmatrixstats (package (name "r-delayedmatrixstats") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedMatrixStats" version)) (sha256 (base32 - "0mv2rl6a6l404piabcazxz1s6ars016pxhjf5v40hhr6y1r0wbqy")))) + "0i6gw8058gw9yajya3w9qq6l3p634fq9sv8dh8ifigxz0k9b98r6")))) (properties `((upstream-name . "DelayedMatrixStats"))) (build-system r-build-system) @@ -11110,6 +11110,8 @@ variable and significantly correlated genes.") ("r-matrix" ,r-matrix) ("r-matrixstats" ,r-matrixstats) ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/PeteHaitch/DelayedMatrixStats") (synopsis "Functions that apply to rows and columns of DelayedMatrix objects") (description -- cgit v1.2.3 From 725eea00da271dcd78f048345ffffaf8d7dd1649 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:39:16 +0200 Subject: gnu: r-ideoviz: Update to 1.24.0. * gnu/packages/bioconductor.scm (r-ideoviz): Update to 1.24.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index b4be8aee15..cb6ee06f48 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -745,13 +745,13 @@ annotations.") (define-public r-ideoviz (package (name "r-ideoviz") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "IdeoViz" version)) (sha256 (base32 - "0rsz6dawrx5qdrypxs2hgihmx3kbpdg1y73h876yxccgdlabvzil")))) + "1ndj14qhpgidjb4qsga80ghqzz1x8kvy2gy1bvvgwlkfxa62rn50")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) -- cgit v1.2.3 From 751fa8ff71e1e9ae6d54c4d3930f22815cc2c1d1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:40:05 +0200 Subject: gnu: r-coverageview: Update to 1.26.0. * gnu/packages/bioconductor.scm (r-coverageview): Update to 1.26.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index cb6ee06f48..170202fa08 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1072,13 +1072,13 @@ package @code{affy}.") (define-public r-coverageview (package (name "r-coverageview") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "CoverageView" version)) (sha256 (base32 - "0s47svs7xnr9jkylq0dxidqrigihdddiprcl0951vjr4w7kmb5nf")))) + "1fcz7pkffz5l3jdxb9glji2zdmr6nx67h6vfpr2yi8n3slg2hrrj")))) (build-system r-build-system) (propagated-inputs `(("r-s4vectors" ,r-s4vectors) -- cgit v1.2.3 From 1ab0380db933ec856a4046b8260f30d7ff023910 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:40:28 +0200 Subject: gnu: r-cummerbund: Update to 2.30.0. * gnu/packages/bioconductor.scm (r-cummerbund): Update to 2.30.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 170202fa08..c359f328a9 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1099,13 +1099,13 @@ how the coverage distributed across the genome.") (define-public r-cummerbund (package (name "r-cummerbund") - (version "2.28.0") + (version "2.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "cummeRbund" version)) (sha256 (base32 - "1fjc3bcclm4gsvw4nq6cv3a1kbrldvrxbkyfb9306708si1n4dwk")))) + "1av7yfxcq1wwbqfqcz7caiz5kf6kg5wq9qcg5v6yccihclzwvxjc")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) -- cgit v1.2.3 From bc217e4c0ccd148d755c72f5fe9fa6cfd2cdc225 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:42:01 +0200 Subject: gnu: r-biocversion: Update to 3.11.1. * gnu/packages/bioconductor.scm (r-biocversion): Update to 3.11.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c359f328a9..ed24817cc0 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1165,14 +1165,14 @@ across the entire multi-'omics experiment.") (define-public r-biocversion (package (name "r-biocversion") - (version "3.10.1") + (version "3.11.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocVersion" version)) (sha256 (base32 - "0mfqjqfvrwwglldq3g7nbic5hf3nwzv02nbfxnl2cfvf9gznlh5f")))) + "1rrzx3dqds0jlj1bmjc744wiamb2hssbh3jfxz1s9jp4cvnwrpmz")))) (properties `((upstream-name . "BiocVersion"))) (build-system r-build-system) (home-page "https://bioconductor.org/packages/BiocVersion/") -- cgit v1.2.3 From 2e15c16f1e1eab46fdf0c78b8b26a3e43e1955dc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Jun 2020 16:49:42 +0200 Subject: gnu: r-biocgenerics: Update to 0.34.0. * gnu/packages/bioconductor.scm (r-biocgenerics): Update to 0.34.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ed24817cc0..d84050d18e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1185,13 +1185,13 @@ of Bioconductor.") (define-public r-biocgenerics (package (name "r-biocgenerics") - (version "0.32.0") + (version "0.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocGenerics" version)) (sha256 (base32 - "1np8y442zyakm4axpinbw1qsgc6wd3zjsnirbhc8lcii4ky9j0rn")))) + "15nvqyh2gx5zkn1krbs5c4rhw5642bijdfsf2rgic70gzr05cksk")))) (properties `((upstream-name . "BiocGenerics"))) (build-system r-build-system) -- cgit v1.2.3 From 66aeb1b46d8cae985439a86a63e15bfe36f86045 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:04:46 +0200 Subject: gnu: r-affycomp: Update to 1.64.0. * gnu/packages/bioconductor.scm (r-affycomp): Update to 1.64.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d84050d18e..1bfb5f90b3 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1205,14 +1205,14 @@ packages.") (define-public r-affycomp (package (name "r-affycomp") - (version "1.62.0") + (version "1.64.0") (source (origin (method url-fetch) (uri (bioconductor-uri "affycomp" version)) (sha256 (base32 - "0cl7c3m2lz2w8g2k7z7wjd0dyj0dkssvms99qpg8a1v3hx1xs6js")))) + "0zg8dshas5b2ny4pnxxxqihnr4l20666ivrgglb939a23mplgps0")))) (properties `((upstream-name . "affycomp"))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase))) -- cgit v1.2.3 From 251c18f1edde9a0ef4443d42210e390cca4198d0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:06:51 +0200 Subject: gnu: r-affycompatible: Update to 1.48.0. * gnu/packages/bioconductor.scm (r-affycompatible): Update to 1.48.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1bfb5f90b3..80ef90807c 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1226,14 +1226,14 @@ measures for Affymetrix Oligonucleotide Arrays.") (define-public r-affycompatible (package (name "r-affycompatible") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AffyCompatible" version)) (sha256 (base32 - "10ahrdlifp1i7rd58zb10w75y5bnigs7xp5gv4fhb5y7p7dvb0ks")))) + "0394sr4spafhfypjsafwjr0y0zsgv52ajdcyvsmkdk7375898lqd")))) (properties `((upstream-name . "AffyCompatible"))) (build-system r-build-system) -- cgit v1.2.3 From 36d4ca410d49e7fbff0c138c0a1290327edf7fba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:07:07 +0200 Subject: gnu: r-affycontam: Update to 1.46.0. * gnu/packages/bioconductor.scm (r-affycontam): Update to 1.46.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 80ef90807c..fb3ca28f8e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1254,14 +1254,14 @@ Command Console} (AGCC)-compatible sample annotation files.") (define-public r-affycontam (package (name "r-affycontam") - (version "1.44.0") + (version "1.46.0") (source (origin (method url-fetch) (uri (bioconductor-uri "affyContam" version)) (sha256 (base32 - "0yd1prgv5zfkg22ski73mvg96qknwz8v6ji6s4qy8p4wrqyj7b7l")))) + "1dh5c3blk2dl9kg13y6snplnx61x2f9hvp5lc7jmg25xk916517i")))) (properties `((upstream-name . "affyContam"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From fa6106978176a8937dabd54c7df437cddcafa2cb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:07:29 +0200 Subject: gnu: r-affycoretools: Update to 1.60.1. * gnu/packages/bioconductor.scm (r-affycoretools): Update to 1.60.1. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index fb3ca28f8e..127f1dffb2 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1279,14 +1279,14 @@ problems in CEL-level data to help evaluate performance of quality metrics.") (define-public r-affycoretools (package (name "r-affycoretools") - (version "1.58.4") + (version "1.60.1") (source (origin (method url-fetch) (uri (bioconductor-uri "affycoretools" version)) (sha256 (base32 - "1p283ysib04qzaayxmrpsmk5bq0jdq2rlky180jrlskpyg6risfw")))) + "0cnb54b3kmg9rnycvaz949bdali9n98qzrw7gwka6abmg1lv232s")))) (properties `((upstream-name . "affycoretools"))) (build-system r-build-system) (propagated-inputs @@ -1309,6 +1309,8 @@ problems in CEL-level data to help evaluate performance of quality metrics.") ("r-rsqlite" ,r-rsqlite) ("r-s4vectors" ,r-s4vectors) ("r-xtable" ,r-xtable))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/affycoretools/") (synopsis "Functions for analyses with Affymetrix GeneChips") (description -- cgit v1.2.3 From acaf8a234217dd4114cc9d71cd12c63dd2010bfa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:08:07 +0200 Subject: gnu: r-affxparser: Update to 1.60.0. * gnu/packages/bioconductor.scm (r-affxparser): Update to 1.60.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 127f1dffb2..8342006f9d 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1321,14 +1321,14 @@ to streamline the more common analyses that a Biostatistician might see.") (define-public r-affxparser (package (name "r-affxparser") - (version "1.58.0") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "affxparser" version)) (sha256 (base32 - "03h4lxr48p84f6i7zb2rm10ma3k4d1nmvdw5yhxcmzqbmd12lk40")))) + "0d4hq1w0a3dm4bg9qsv7wqrbv2y7b9gllxfmnqs9n2nnwmvgi8yq")))) (properties `((upstream-name . "affxparser"))) (build-system r-build-system) (home-page "https://github.com/HenrikBengtsson/affxparser") -- cgit v1.2.3 From c2f4ad96f509c0dbc230b0e12a17f905c0df1942 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:08:17 +0200 Subject: gnu: r-annotate: Update to 1.66.0. * gnu/packages/bioconductor.scm (r-annotate): Update to 1.66.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8342006f9d..a1ebb922f7 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1349,14 +1349,14 @@ structure.") (define-public r-annotate (package (name "r-annotate") - (version "1.64.0") + (version "1.66.0") (source (origin (method url-fetch) (uri (bioconductor-uri "annotate" version)) (sha256 (base32 - "0rcmdy6hs6m4d6wxgi52c0bhdsbf2sm9f155qbcb05sn0nh8pxwy")))) + "1ivszqknryq6n5a85z8zj12fvgcs6zz3zlza8q08pl6cs4m5rm4w")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From 07bea01092d231a01e0457a9bff0a7327d655ebd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:08:26 +0200 Subject: gnu: r-hpar: Update to 1.30.0. * gnu/packages/bioconductor.scm (r-hpar): Update to 1.30.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a1ebb922f7..0f394af1ab 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1376,15 +1376,17 @@ microarrays.") (define-public r-hpar (package (name "r-hpar") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "hpar" version)) (sha256 (base32 - "1yhay1ryrgj9cqa1x136cw40ca93afyvg0sarm30jsbj8nc1rm5m")))) + "1jq0qw7wq3426cp004divywjm3ryixkykcmwlhrri13agz6rx3r9")))) (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/hpar/") (synopsis "Human Protein Atlas in R") (description "This package provides a simple interface to and data from -- cgit v1.2.3 From 7f34dd58e9ba1075cbdc32c1fd8d0b7064a799ef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:08:40 +0200 Subject: gnu: r-regioner: Update to 1.20.0. * gnu/packages/bioconductor.scm (r-regioner): Update to 1.20.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0f394af1ab..379c04b802 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1396,14 +1396,14 @@ the Human Protein Atlas project.") (define-public r-regioner (package (name "r-regioner") - (version "1.18.1") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "regioneR" version)) (sha256 (base32 - "0if7r6njz3ahm545383z5mzmzw8fdvw80a9lfz160j5pcgpx2dq9")))) + "10i21gxv0n7lrflhj5ja672xjizy1i4y4iq3pmjgbf0dpy1lxsih")))) (properties `((upstream-name . "regioneR"))) (build-system r-build-system) (propagated-inputs @@ -1415,6 +1415,8 @@ the Human Protein Atlas project.") ("r-memoise" ,r-memoise) ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/regioneR/") (synopsis "Association analysis of genomic regions") (description "This package offers a statistical framework based on -- cgit v1.2.3 From 7f94cf018409b247ce8ea07895fba8be9910377d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:08:59 +0200 Subject: gnu: r-reportingtools: Update to 2.28.0. * gnu/packages/bioconductor.scm (r-reportingtools): Update to 2.28.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 379c04b802..cfd6528582 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1427,14 +1427,14 @@ region sets and other genomic features.") (define-public r-reportingtools (package (name "r-reportingtools") - (version "2.26.0") + (version "2.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ReportingTools" version)) (sha256 (base32 - "0wmi2219wydyzc07rz3azsrksa7wiacfh9pr5x2fsmj9f0w3n15w")))) + "1ig1h224silbdbdr0j9j9sysp9l9dzpcsjzn8jp57h3gh4pdqbfx")))) (properties `((upstream-name . "ReportingTools"))) (build-system r-build-system) @@ -1458,6 +1458,8 @@ region sets and other genomic features.") ("r-pfam-db" ,r-pfam-db) ("r-r-utils" ,r-r-utils) ("r-xml" ,r-xml))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/ReportingTools/") (synopsis "Tools for making reports in various formats") (description -- cgit v1.2.3 From 53e42019374911359fc04b39cdc564eb594a2726 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:09:06 +0200 Subject: gnu: r-geneplotter: Update to 1.66.0. * gnu/packages/bioconductor.scm (r-geneplotter): Update to 1.66.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index cfd6528582..3298df4267 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1477,14 +1477,14 @@ browser.") (define-public r-geneplotter (package (name "r-geneplotter") - (version "1.64.0") + (version "1.66.0") (source (origin (method url-fetch) (uri (bioconductor-uri "geneplotter" version)) (sha256 (base32 - "1k6780fn1kkghpm1prhhsyw621441a3bmnqfl9ns0zbc1zdq39nx")))) + "1y494da1llmrvn3qm7akwgwjazvpffabi8llw3fbday14cay1br5")))) (build-system r-build-system) (propagated-inputs `(("r-annotate" ,r-annotate) -- cgit v1.2.3 From b628842f7ea1f21da2d32bd4bc57aee92cdf9fa9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:09:12 +0200 Subject: gnu: r-oligoclasses: Update to 1.50.0. * gnu/packages/bioconductor.scm (r-oligoclasses): Update to 1.50.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3298df4267..cdc909ab56 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1502,14 +1502,14 @@ browser.") (define-public r-oligoclasses (package (name "r-oligoclasses") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "oligoClasses" version)) (sha256 (base32 - "02m1m3dkiyywalphw3i5n6y3bs8zp24xh59v9cz6jgjpah811skf")))) + "05jy9qz3ir4maxackr1xqlfi1czhy1qd22wwibjdhfh5dp534cpn")))) (properties `((upstream-name . "oligoClasses"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ace82f805f0fd6ef69bf7ccb0c0dafd7574e2d81 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:11:52 +0200 Subject: gnu: r-oligo: Update to 1.52.0. * gnu/packages/bioconductor.scm (r-oligo): Update to 1.52.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index cdc909ab56..bea038a973 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1537,14 +1537,14 @@ packages.") (define-public r-oligo (package (name "r-oligo") - (version "1.50.0") + (version "1.52.0") (source (origin (method url-fetch) (uri (bioconductor-uri "oligo" version)) (sha256 (base32 - "01icfyy82f9k0m7ngrppz1ckq3wpq7zp6kgf8ppc55j6582c5jh3")))) + "102szyiicws4c6l3k282236ml1m1vl9zmars4q1kdjfnvsyclfc4")))) (properties `((upstream-name . "oligo"))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) @@ -1560,6 +1560,8 @@ packages.") ("r-preprocesscore" ,r-preprocesscore) ("r-rsqlite" ,r-rsqlite) ("r-zlibbioc" ,r-zlibbioc))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/oligo/") (synopsis "Preprocessing tools for oligonucleotide arrays") (description -- cgit v1.2.3 From f9a247590e55154a3f2f2802fdc8d0de955a3a62 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:11:57 +0200 Subject: gnu: r-qvalue: Update to 2.20.0. * gnu/packages/bioconductor.scm (r-qvalue): Update to 2.20.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index bea038a973..e5f71ebf13 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1573,18 +1573,20 @@ Affymetrix (CEL files) and NimbleGen arrays (XYS files).") (define-public r-qvalue (package (name "r-qvalue") - (version "2.18.0") + (version "2.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "qvalue" version)) (sha256 (base32 - "0njnidyncm3g3712mnp77cs4kghn596ss1pz6fhp1cr0wxcayp6j")))) + "1hndmdr9niagbr4ry0vbhffvjzjg9im27kdbn0sa774k6r5b4z3f")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) ("r-reshape2" ,r-reshape2))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "http://github.com/jdstorey/qvalue") (synopsis "Q-value estimation for false discovery rate control") (description -- cgit v1.2.3 From b47b649ae510151039ad79e23d70a86d4cd3d920 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:12:04 +0200 Subject: gnu: r-diffbind: Update to 2.16.0. * gnu/packages/bioconductor.scm (r-diffbind): Update to 2.16.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e5f71ebf13..0e682ad36a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1604,14 +1604,14 @@ problems in genomics, brain imaging, astrophysics, and data mining.") (define-public r-diffbind (package (name "r-diffbind") - (version "2.14.0") + (version "2.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DiffBind" version)) (sha256 (base32 - "1729wyi2l4480yrkp5wg3ryirrmlk0j3njqs1qyckq3c8bjk12h2")))) + "1mwqgljya1c7r2dfrdds3nswn9bn1l3ak1wavbpv4lbv3nkmykn5")))) (properties `((upstream-name . "DiffBind"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 8cadf253c3b928f9deabcd97ae605a8c0bea855c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:12:11 +0200 Subject: gnu: r-multtest: Update to 2.44.0. * gnu/packages/bioconductor.scm (r-multtest): Update to 2.44.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0e682ad36a..0f5de23352 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1682,14 +1682,14 @@ processing to visualization and annotation.") (define-public r-multtest (package (name "r-multtest") - (version "2.42.0") + (version "2.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "multtest" version)) (sha256 (base32 - "0qna9lx76ldsfy8qf5xmhl4ymqfkj29m1gdqhph06s470c8mwari")))) + "12li7nzzygm3sjfx472095irqpawixk48d0k591wlnrms6sxchx2")))) (build-system r-build-system) (propagated-inputs `(("r-survival" ,r-survival) -- cgit v1.2.3 From 7d37c6d914ff055d0cba6eb75be41a7e27d8d5d7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:12:15 +0200 Subject: gnu: r-graph: Update to 1.66.0. * gnu/packages/bioconductor.scm (r-graph): Update to 1.66.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0f5de23352..2adf1a7d6f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1720,13 +1720,13 @@ expressed genes in DNA microarray experiments.") (define-public r-graph (package (name "r-graph") - (version "1.64.0") + (version "1.66.0") (source (origin (method url-fetch) (uri (bioconductor-uri "graph" version)) (sha256 (base32 - "1ivf59k7k552m7zd8g3wwazd71dq3xmgmhcq435738i02h0fqnyc")))) + "15v0nx9gzpszmdn5lil1s1y8qfmsirlznh56wcyqq4sxwjbyjn9g")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics))) -- cgit v1.2.3 From dc24de46ad72bedf6f2ab32d03da791e606ee8a1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:12:20 +0200 Subject: gnu: r-chippeakanno: Update to 3.22.2. * gnu/packages/bioconductor.scm (r-chippeakanno): Update to 3.22.2. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2adf1a7d6f..ddbde55b18 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1791,14 +1791,14 @@ determining dependencies between variables, code improvement suggestions.") (define-public r-chippeakanno (package (name "r-chippeakanno") - (version "3.20.1") + (version "3.22.2") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPpeakAnno" version)) (sha256 (base32 - "0kmfha4vprbi0z6n7v9w28xfrqcx5qad7yfr0b316j5aj8v9f4hc")))) + "199mlg0gwjy39afyk0ah6lzcm759bzxla4hgcajj0ay9jiibjqpa")))) (properties `((upstream-name . "ChIPpeakAnno"))) (build-system r-build-system) (propagated-inputs @@ -1831,6 +1831,8 @@ determining dependencies between variables, code improvement suggestions.") ("r-seqinr" ,r-seqinr) ("r-summarizedexperiment" ,r-summarizedexperiment) ("r-venndiagram" ,r-venndiagram))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/ChIPpeakAnno") (synopsis "Peaks annotation from ChIP-seq and ChIP-chip experiments") (description -- cgit v1.2.3 From 49d589e530db5941dbe97fef16566b4ac3d88a45 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:12:26 +0200 Subject: gnu: r-marray: Update to 1.66.0. * gnu/packages/bioconductor.scm (r-marray): Update to 1.66.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ddbde55b18..25851cbe82 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1849,12 +1849,12 @@ enrichedGO (addGeneIDs).") (define-public r-marray (package (name "r-marray") - (version "1.64.0") + (version "1.66.0") (source (origin (method url-fetch) (uri (bioconductor-uri "marray" version)) (sha256 - (base32 "1mbs9rk279hnm9yz34za3xz3hb88ll1d0abw4m2pgjgbh4kkhdrl")))) + (base32 "1sym3nis5qzg05b2in83xr019mvz8czy8qvispc0hzsq42yng6kd")))) (build-system r-build-system) (propagated-inputs `(("r-limma" ,r-limma))) -- cgit v1.2.3 From bd93ec4cf07f0ffda542701896722b4d20ef8bf1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:12:31 +0200 Subject: gnu: r-cghbase: Update to 1.48.0. * gnu/packages/bioconductor.scm (r-cghbase): Update to 1.48.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 25851cbe82..8f2fda5d6e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1868,12 +1868,12 @@ normalization and quality checking.") (define-public r-cghbase (package (name "r-cghbase") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "CGHbase" version)) (sha256 - (base32 "0136pk6pfwpiiy9vca4pgg4wh74jfb5ssglpdszzhamljpvg765x")))) + (base32 "0gfqqa9rs5hid53ihlky88qndgrwxxz0s6j7s505f660dd5nzlkf")))) (properties `((upstream-name . "CGHbase"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From de4a352e8ae1b6b210e5434519905b42b79494e3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:12:37 +0200 Subject: gnu: r-cghcall: Update to 2.50.0. * gnu/packages/bioconductor.scm (r-cghcall): Update to 2.50.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8f2fda5d6e..fefcd2011a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1888,12 +1888,12 @@ the @code{arrayCGH} packages.") (define-public r-cghcall (package (name "r-cghcall") - (version "2.48.0") + (version "2.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "CGHcall" version)) (sha256 - (base32 "1x8pz7zhw2nabik1vgdhlivndqvil3s7vnl5070k493v6gza0p3s")))) + (base32 "1dz6sag8khl18vkb97b5w6fk6k9s7s9xxnc467dd3bmhmajlmrrg")))) (properties `((upstream-name . "CGHcall"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From f4ef5645956e51ce467f44fc2d84b8f9ac1b059b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:12:42 +0200 Subject: gnu: r-qdnaseq: Update to 1.24.0. * gnu/packages/bioconductor.scm (r-qdnaseq): Update to 1.24.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index fefcd2011a..cad20c7d73 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1911,12 +1911,12 @@ the @code{arrayCGH} packages.") (define-public r-qdnaseq (package (name "r-qdnaseq") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "QDNAseq" version)) (sha256 - (base32 "0xcqdpv9a47zpxx0q9sif5y4s1yzx3pig0kywy961kh5xgl5bcrq")))) + (base32 "1ji9pl2r1idyj3qzggj7qd2kqx31i6b3igwk2hqjb8qzkyb37p86")))) (properties `((upstream-name . "QDNAseq"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 9834c36724b6ba1276e78145dd74145549f25b67 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:12:50 +0200 Subject: gnu: r-bayseq: Update to 2.22.0. * gnu/packages/bioconductor.scm (r-bayseq): Update to 2.22.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index cad20c7d73..fde9ae7470 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1944,14 +1944,14 @@ respectively.") (define-public r-bayseq (package (name "r-bayseq") - (version "2.20.0") + (version "2.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "baySeq" version)) (sha256 (base32 - "040s1d3756spyzblkyx2vcy7bn3vf87mhsp3is35yxkj55n3myjk")))) + "1x0d34pqv9s15nmmxsfbw0ycxbf5348mi30ahycarjkjsyzycymj")))) (properties `((upstream-name . "baySeq"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ef1d3231c3a95d9fd34056532785af20181f7a4d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:12:55 +0200 Subject: gnu: r-chipcomp: Update to 1.18.0. * gnu/packages/bioconductor.scm (r-chipcomp): Update to 1.18.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index fde9ae7470..ab2fd73a3c 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1970,14 +1970,14 @@ more complex hypotheses) via empirical Bayesian methods.") (define-public r-chipcomp (package (name "r-chipcomp") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPComp" version)) (sha256 (base32 - "0wk0vvg6dk9wk60lzbadrnqar75dppvyr4hiwrhv9rhhah2mg2mg")))) + "0780kj9vbzdhf2jkfb1my8m58pcdwk6jqw6zfng82g46jias98cp")))) (properties `((upstream-name . "ChIPComp"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 7aae05a95302cadd1fe2b6e8fd7bb9c762859078 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:13:01 +0200 Subject: gnu: r-riboprofiling: Update to 1.18.0. * gnu/packages/bioconductor.scm (r-riboprofiling): Update to 1.18.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ab2fd73a3c..d879e71fa2 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2004,14 +2004,14 @@ datasets.") (define-public r-riboprofiling (package (name "r-riboprofiling") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RiboProfiling" version)) (sha256 (base32 - "0nfzyiq7cd6fs5agzl1zyfg8s631wi7kjngiyvd3vxlhi8wsjicx")))) + "0s30m96dbbrzbywz3wai5ar0nsshb16lq101nyl20w1bk7sk2bha")))) (properties `((upstream-name . "RiboProfiling"))) (build-system r-build-system) (propagated-inputs @@ -2031,6 +2031,8 @@ datasets.") ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors) ("r-sqldf" ,r-sqldf))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/RiboProfiling/") (synopsis "Ribosome profiling data analysis") (description "Starting with a BAM file, this package provides the -- cgit v1.2.3 From 6b78a91b755afb65c21dcc24e6ac7014ea785f6e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:13:05 +0200 Subject: gnu: r-riboseqr: Update to 1.22.0. * gnu/packages/bioconductor.scm (r-riboseqr): Update to 1.22.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d879e71fa2..4da10c284f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2045,14 +2045,14 @@ assessment, principal component analysis on codon coverage.") (define-public r-riboseqr (package (name "r-riboseqr") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "riboSeqR" version)) (sha256 (base32 - "1jr7h64hyhyf9gf15lah6iqwyljfc8mraf9kya4lql6lcjjkjiqm")))) + "04a4dkmacd6xy55m84amxa0fspbc4kgg9r9k7bc3wrxswk77ccxk")))) (properties `((upstream-name . "riboSeqR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 861a903f14a2d142eb1cad33052e640a60e8139f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:13:11 +0200 Subject: gnu: r-interactionset: Update to 1.16.0. * gnu/packages/bioconductor.scm (r-interactionset): Update to 1.16.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 4da10c284f..4486695d69 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2073,14 +2073,14 @@ parsing of genetic sequencing data from ribosome profiling experiments.") (define-public r-interactionset (package (name "r-interactionset") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "InteractionSet" version)) (sha256 (base32 - "0n2l95h56x5g68p10cap8p4x3a6vaph2hjlk09vmi3j48lrzb2kh")))) + "1nsivm9j0mzkfhwqsa2y9gxxdbaplg4z8vn5dfvls3nrihnqpk4v")))) (properties `((upstream-name . "InteractionSet"))) (build-system r-build-system) @@ -2093,6 +2093,8 @@ parsing of genetic sequencing data from ribosome profiling experiments.") ("r-rcpp" ,r-rcpp) ("r-s4vectors" ,r-s4vectors) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/InteractionSet") (synopsis "Base classes for storing genomic interaction data") (description -- cgit v1.2.3 From 76dd036e16f16c575d3b64882f11baadff2bf1f6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:13:16 +0200 Subject: gnu: r-genomicinteractions: Update to 1.22.0. * gnu/packages/bioconductor.scm (r-genomicinteractions): Update to 1.22.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 4486695d69..12dd0a98e7 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2107,14 +2107,14 @@ experiments.") (define-public r-genomicinteractions (package (name "r-genomicinteractions") - (version "1.20.3") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicInteractions" version)) (sha256 (base32 - "01ps97cs29qvzy5piq2l2k0yyr56rmg5cycfiqhbbvqpjrfvy60g")))) + "0fg66v31nfajb40da6gxpigm2z11ywkdijs7npvc1mr62ynx9qmy")))) (properties `((upstream-name . "GenomicInteractions"))) (build-system r-build-system) -- cgit v1.2.3 From c7be592fb41cf1fda82aa9573e28d3106e215171 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:13:24 +0200 Subject: gnu: r-ctc: Update to 1.62.0. * gnu/packages/bioconductor.scm (r-ctc): Update to 1.62.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 12dd0a98e7..6dda950fb9 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2148,14 +2148,14 @@ information and producing various plots and statistics.") (define-public r-ctc (package (name "r-ctc") - (version "1.60.0") + (version "1.62.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ctc" version)) (sha256 (base32 - "0wh27izkyr1j26nznisw654mb5c94xpwjjkx7r6bhwg9ihxxcl6d")))) + "0lv126xj092hps3f3dsv7hasdyy26wcx8npl9idq2l4h9addk6v6")))) (build-system r-build-system) (propagated-inputs `(("r-amap" ,r-amap))) (home-page "https://bioconductor.org/packages/ctc/") -- cgit v1.2.3 From 7fbd97745b62b3a147038489e4a81055b1f7191a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:13:37 +0200 Subject: gnu: r-goseq: Update to 1.40.0. * gnu/packages/bioconductor.scm (r-goseq): Update to 1.40.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6dda950fb9..8825aa4cb6 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2168,14 +2168,14 @@ trees and clusters to other programs.") (define-public r-goseq (package (name "r-goseq") - (version "1.38.0") + (version "1.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "goseq" version)) (sha256 (base32 - "11ypa41qv1nx3cncxlwlbhdxqlwq95rb9byv2z3crrf9nfp24byv")))) + "1iyri4rrchzsn8p6wjxr4k30d3cqx3km5mnd9hkfm5d0s7fjzlym")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From a6251d6e8bc288ff7ff48e7f6961df80486fbe6a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:13:43 +0200 Subject: gnu: r-glimma: Update to 1.16.0. * gnu/packages/bioconductor.scm (r-glimma): Update to 1.16.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8825aa4cb6..1bdfbeea62 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2194,20 +2194,22 @@ defined categories which are over/under represented in RNA-seq data.") (define-public r-glimma (package (name "r-glimma") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Glimma" version)) (sha256 (base32 - "1rjrqgl96iz4b3xqpc174wgz7bqmc8gbm9ljag0y27kz29fwng8r")))) + "1bxfgwjqb9p400a5a5q6p17kcnl3ddz090llihkfih9kyxii9n4y")))) (properties `((upstream-name . "Glimma"))) (build-system r-build-system) (propagated-inputs `(("r-edger" ,r-edger) ("r-jsonlite" ,r-jsonlite) ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/Shians/Glimma") (synopsis "Interactive HTML graphics") (description -- cgit v1.2.3 From ee73dea61b0c3992e0feedad9f036fde0b9120cb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:13:47 +0200 Subject: gnu: r-rots: Update to 1.16.0. * gnu/packages/bioconductor.scm (r-rots): Update to 1.16.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1bdfbeea62..0540628ae9 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2223,14 +2223,14 @@ information.") (define-public r-rots (package (name "r-rots") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ROTS" version)) (sha256 (base32 - "08mwlb0lpprys2b7vif8aj5bnprmn09mm79zz158gbhrv9j9d1qm")))) + "1mqhi1rfiw7mhiyify7vm3w17p7sc76wjda3ak6690hrc3gsm3cm")))) (properties `((upstream-name . "ROTS"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 46a973bc2443cfedb7afda24b42a54bb334c8c8a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:13:52 +0200 Subject: gnu: r-plgem: Update to 1.60.0. * gnu/packages/bioconductor.scm (r-plgem): Update to 1.60.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0540628ae9..acc489b8b3 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2247,14 +2247,14 @@ in omics data.") (define-public r-plgem (package (name "r-plgem") - (version "1.58.0") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "plgem" version)) (sha256 (base32 - "0fkyvcw2qxp4g527s9rzia45yapi0r6gbij7svisil8rbgfdp45v")))) + "1fs5nbjnrm7x23y7d9krq56r1kzxka40ca1rs6sq70mn6syhj90a")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) -- cgit v1.2.3 From 437bc4dda9a6bba75372d281e38bcead8dfb3998 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:13:59 +0200 Subject: gnu: r-inspect: Update to 1.18.0. * gnu/packages/bioconductor.scm (r-inspect): Update to 1.18.0. [propagated-inputs]: Add r-rtracklayer. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index acc489b8b3..cfe73f20bf 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2272,14 +2272,14 @@ genes or proteins in these datasets.") (define-public r-inspect (package (name "r-inspect") - (version "1.16.3") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "INSPEcT" version)) (sha256 (base32 - "0y4gpvrbmcipdnyz9lz9ywn0317xnpcriiisqvxygin05vgcpilp")))) + "1yyglkdc3ww2jzswhcxk9g1imydfm39krl87as5l9fbm7mv3vd4z")))) (properties `((upstream-name . "INSPEcT"))) (build-system r-build-system) (propagated-inputs @@ -2299,11 +2299,14 @@ genes or proteins in these datasets.") ("r-proc" ,r-proc) ("r-rootsolve" ,r-rootsolve) ("r-rsamtools" ,r-rsamtools) + ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors) ("r-shiny" ,r-shiny) ("r-summarizedexperiment" ,r-summarizedexperiment) ("r-txdb-mmusculus-ucsc-mm9-knowngene" ,r-txdb-mmusculus-ucsc-mm9-knowngene))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/INSPEcT") (synopsis "Analysis of 4sU-seq and RNA-seq time-course data") (description -- cgit v1.2.3 From 14f40ae830cd87578ab8440860f2e77dd8aac126 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:22:59 +0200 Subject: gnu: r-dnabarcodes: Update to 1.18.0. * gnu/packages/bioconductor.scm (r-dnabarcodes): Update to 1.18.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index cfe73f20bf..63b216a63d 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2319,20 +2319,22 @@ modeling the rates that determines changes in mature mRNA levels.") (define-public r-dnabarcodes (package (name "r-dnabarcodes") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DNABarcodes" version)) (sha256 (base32 - "0r2r9qc2qvf7rfl1h5ynvv3xd7n444zbc697s85qxqdpr4sxqmfd")))) + "03y39hjpkb05fnawy3k797bph1iydi1blmpgyy4244zjgk6rs5x7")))) (properties `((upstream-name . "DNABarcodes"))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) ("r-matrix" ,r-matrix) ("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/DNABarcodes") (synopsis "Create and analyze DNA barcodes") (description -- cgit v1.2.3 From ae0fcaa6fd5d9856798d42e20077386bc5c87541 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:23:12 +0200 Subject: gnu: r-ruvseq: Update to 1.22.0. * gnu/packages/bioconductor.scm (r-ruvseq): Update to 1.22.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 63b216a63d..66d3b52ba5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2348,14 +2348,14 @@ demultiplexed, i.e. assigned to their original reference barcode.") (define-public r-ruvseq (package (name "r-ruvseq") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RUVSeq" version)) (sha256 (base32 - "1ipbbzpngx988lsmwqv7vbmqm65m43xvsmipayfppkrr6jipzxrj")))) + "0yqs9xgyzw3cwb4l7zjl1cjgbsjp05qrqnwyvh7q81wdp7x5p55x")))) (properties `((upstream-name . "RUVSeq"))) (build-system r-build-system) (propagated-inputs @@ -2363,6 +2363,8 @@ demultiplexed, i.e. assigned to their original reference barcode.") ("r-edaseq" ,r-edaseq) ("r-edger" ,r-edger) ("r-mass" ,r-mass))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/drisso/RUVSeq") (synopsis "Remove unwanted variation from RNA-Seq data") (description -- cgit v1.2.3 From f5864c11a417055df6473f23aa780df306dc9448 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:23:19 +0200 Subject: gnu: r-biocneighbors: Update to 1.6.0. * gnu/packages/bioconductor.scm (r-biocneighbors): Update to 1.6.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 66d3b52ba5..6a5f082680 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2376,14 +2376,14 @@ samples.") (define-public r-biocneighbors (package (name "r-biocneighbors") - (version "1.4.2") + (version "1.6.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocNeighbors" version)) (sha256 (base32 - "1bx7i5pifj8w89fnhfgcfgcar2ik2ad8wqs2rix7yks90vz185i6")))) + "14cyyrwxi82xm5wy6bb1176zg322ll67wjrw9vvi4fhfs1k4wqxy")))) (properties `((upstream-name . "BiocNeighbors"))) (build-system r-build-system) (propagated-inputs @@ -2393,6 +2393,8 @@ samples.") ("r-rcppannoy" ,r-rcppannoy) ("r-rcpphnsw" ,r-rcpphnsw) ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/BiocNeighbors") (synopsis "Nearest Neighbor Detection for Bioconductor packages") (description -- cgit v1.2.3 From a8351d467cf58348aaa35e159ce5e7afaa0d8e2b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:23:26 +0200 Subject: gnu: r-biocsingular: Update to 1.4.0. * gnu/packages/bioconductor.scm (r-biocsingular): Update to 1.4.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6a5f082680..8915b3fc97 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2409,14 +2409,14 @@ achieved for all methods using the BiocParallel framework.") (define-public r-biocsingular (package (name "r-biocsingular") - (version "1.2.2") + (version "1.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocSingular" version)) (sha256 (base32 - "1282fdwxrpga87y8xflr0sl8ajwawgn2i9i65my8mbg5vrixs407")))) + "0368a9xj4cvicqkxmhh12ln46q9gnxla70s1dqrxxfn3b6k525ih")))) (properties `((upstream-name . "BiocSingular"))) (build-system r-build-system) (propagated-inputs @@ -2429,6 +2429,8 @@ achieved for all methods using the BiocParallel framework.") ("r-rcpp" ,r-rcpp) ("r-rsvd" ,r-rsvd) ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/LTLA/BiocSingular") (synopsis "Singular value decomposition for Bioconductor packages") (description -- cgit v1.2.3 From 265b64507521ca04b31da42ed165e800d5c444ca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:23:34 +0200 Subject: gnu: r-destiny: Update to 3.2.0. * gnu/packages/bioconductor.scm (r-destiny): Update to 3.2.0. [propagated-inputs]: Add r-nbconvertr. --- gnu/packages/bioconductor.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8915b3fc97..6e196c1c87 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2443,14 +2443,14 @@ possible, parallelization is achieved using the BiocParallel framework.") (define-public r-destiny (package (name "r-destiny") - (version "3.0.1") + (version "3.2.0") (source (origin (method url-fetch) (uri (bioconductor-uri "destiny" version)) (sha256 (base32 - "1hzg53p1cz21bvnfyyz40bpvjhg89zi3rahlqf0c4w85iwc1i4vi")))) + "0ik5vwxz9cci3glwgb5ff03sfyr4sjcp8ckfymlgmlm6fz8cp21n")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) @@ -2461,6 +2461,7 @@ possible, parallelization is achieved using the BiocParallel framework.") ("r-irlba" ,r-irlba) ("r-knn-covertree" ,r-knn-covertree) ("r-matrix" ,r-matrix) + ("r-nbconvertr" ,r-nbconvertr) ("r-pcamethods" ,r-pcamethods) ("r-proxy" ,r-proxy) ("r-rcpp" ,r-rcpp) -- cgit v1.2.3 From 784d1670b7802649adc437af9d51f9080db4a8da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:27:58 +0200 Subject: gnu: r-savr: Update to 1.26.0. * gnu/packages/bioconductor.scm (r-savr): Update to 1.26.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6e196c1c87..06bf2a8b9d 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2488,14 +2488,14 @@ maps.") (define-public r-savr (package (name "r-savr") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "savR" version)) (sha256 (base32 - "1lsnqjl6qxbj0wai05qb2wrxrhxq5iarv2livmvwiwv70iigqygf")))) + "17jdnr47ivblfspr4b32z9fds1fqiiwsi2z6r524g1v4944p8w5a")))) (properties `((upstream-name . "savR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 9697afb10e15249f35cb33abbf5ee2cc93611b6e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:28:05 +0200 Subject: gnu: r-chipexoqual: Update to 1.12.0. * gnu/packages/bioconductor.scm (r-chipexoqual): Update to 1.12.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 06bf2a8b9d..5a1a9215b9 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2514,14 +2514,14 @@ Viewer (SAV) files, access data, and generate QC plots.") (define-public r-chipexoqual (package (name "r-chipexoqual") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPexoQual" version)) (sha256 (base32 - "044n6kn16qczpdhp0w0z5x8xpr0rfs9s8q70rafgnvj7a2q1xdd0")))) + "02rsf1rvm0p6dn18zq2a4hpvpd9m2i5rziyi4zm8j43qvs8xhafp")))) (properties `((upstream-name . "ChIPexoQual"))) (build-system r-build-system) (propagated-inputs @@ -2542,6 +2542,8 @@ Viewer (SAV) files, access data, and generate QC plots.") ("r-s4vectors" ,r-s4vectors) ("r-scales" ,r-scales) ("r-viridis" ,r-viridis))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/keleslab/ChIPexoQual") (synopsis "Quality control pipeline for ChIP-exo/nexus data") (description -- cgit v1.2.3 From 866939b76d50d81bf9264649f2e65f4d25df01c6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:28:10 +0200 Subject: gnu: r-copynumber: Update to 1.28.0. * gnu/packages/bioconductor.scm (r-copynumber): Update to 1.28.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 5a1a9215b9..24f30df41b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2554,13 +2554,13 @@ sequencing data.") (define-public r-copynumber (package (name "r-copynumber") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "copynumber" version)) (sha256 (base32 - "0r6r1adj20x3ckm0dlipxlf1rzngr92xsxxpy81mqxf4jpmyr8gj")))) + "1b7v6xijpi2mir49cf83gpadhxm5pnbs6d8q8qga7y06hn9jx6my")))) (build-system r-build-system) (propagated-inputs `(("r-s4vectors" ,r-s4vectors) -- cgit v1.2.3 From 6a7cfd5f1fe8329291bbff2abd57e1e5744a3984 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:28:15 +0200 Subject: gnu: r-dnacopy: Update to 1.62.0. * gnu/packages/bioconductor.scm (r-dnacopy): Update to 1.62.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 24f30df41b..ec3a7cc55e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2577,14 +2577,14 @@ penalized least squares regression method.") (define-public r-dnacopy (package (name "r-dnacopy") - (version "1.60.0") + (version "1.62.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DNAcopy" version)) (sha256 (base32 - "119z5lqhhw9ppg6s4dvbxk1kxf3wc55ibpm9b88c91s04yd7m9yw")))) + "0jg8lr83drzfs5h73c7mk7x99vj99a2p2s1sqjc4gicn927xvhza")))) (properties `((upstream-name . "DNAcopy"))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 1e37caca523dae739d72bee4d5130a29f1979653 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:28:28 +0200 Subject: gnu: r-ebseq: Update to 1.28.0. * gnu/packages/bioconductor.scm (r-ebseq): Update to 1.28.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ec3a7cc55e..1988de309c 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2677,14 +2677,14 @@ and regression inferences from RNA-sequencing data.") (define-public r-ebseq (package (name "r-ebseq") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "EBSeq" version)) (sha256 (base32 - "0ay1vcccpc29r3vinlnwp9256345bfb346kg2y11kib4bnrabjb6")))) + "0s9r1xxpfm5794ipjm5a5c8gfxicc6arma6f74aaz8zi5y5q9x5f")))) (properties `((upstream-name . "EBSeq"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 6e2dc9e3858eb6a99cb599f6f9785c62fe867438 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:28:45 +0200 Subject: gnu: r-karyoploter: Update to 1.14.0. * gnu/packages/bioconductor.scm (r-karyoploter): Update to 1.14.0. [propagated-inputs]: Add r-genomicfeatures. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1988de309c..3884b72738 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2701,29 +2701,32 @@ gene and isoform level using RNA-seq data") (define-public r-karyoploter (package (name "r-karyoploter") - (version "1.12.4") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "karyoploteR" version)) (sha256 (base32 - "03jmfgmw35hrgn3pc5lq6pblzhfx9fp4l6dx50rp303lr7kjxp9v")))) + "0h0gk4xd95k5phy6qcsv7j931d7gk3p24i2fg4mz5dsk110lpifs")))) (build-system r-build-system) (propagated-inputs - `(("r-regioner" ,r-regioner) + `(("r-annotationdbi" ,r-annotationdbi) + ("r-bamsignals" ,r-bamsignals) + ("r-bezier" ,r-bezier) + ("r-biovizbase" ,r-biovizbase) + ("r-digest" ,r-digest) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicfeatures" ,r-genomicfeatures) ("r-genomicranges" ,r-genomicranges) ("r-iranges" ,r-iranges) - ("r-rsamtools" ,r-rsamtools) ("r-memoise" ,r-memoise) + ("r-regioner" ,r-regioner) + ("r-rsamtools" ,r-rsamtools) ("r-rtracklayer" ,r-rtracklayer) - ("r-genomeinfodb" ,r-genomeinfodb) ("r-s4vectors" ,r-s4vectors) - ("r-biovizbase" ,r-biovizbase) - ("r-digest" ,r-digest) - ("r-bezier" ,r-bezier) - ("r-bamsignals" ,r-bamsignals) - ("r-annotationdbi" ,r-annotationdbi) ("r-variantannotation" ,r-variantannotation))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/karyoploteR/") (synopsis "Plot customizable linear genomes displaying arbitrary data") (description "This package creates karyotype plots of arbitrary genomes and -- cgit v1.2.3 From 0653b8b082da530b8b0d2d023416bda2ddd01ef3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:29:56 +0200 Subject: gnu: r-lpsymphony: Update to 1.16.0. * gnu/packages/bioconductor.scm (r-lpsymphony): Update to 1.16.0. [inputs]: Remove gfortran. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3884b72738..861345e84e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2739,20 +2739,20 @@ coordinates.") (define-public r-lpsymphony (package (name "r-lpsymphony") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "lpsymphony" version)) (sha256 (base32 - "0j5j9kggh3l61vp6hpnqf45d5kzifksaj0sqhvs1zahmx2c1gfdv")))) + "072ikmd267n18hrj7dip4dp1vb5dinj82p3h95n2jaf04h9hwfn4")))) (build-system r-build-system) (inputs - `(("gfortran" ,gfortran) - ("zlib" ,zlib))) + `(("zlib" ,zlib))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("r-knitr" ,r-knitr))) (home-page "https://r-forge.r-project.org/projects/rsymphony") (synopsis "Symphony integer linear programming solver in R") (description -- cgit v1.2.3 From 359a084aa33a6d92230309f6f7f8d97ef2d703f5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:30:08 +0200 Subject: gnu: r-ihw: Update to 1.16.0. * gnu/packages/bioconductor.scm (r-ihw): Update to 1.16.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 861345e84e..a8d75d126b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2769,14 +2769,14 @@ to install interface to SYMPHONY.") (define-public r-ihw (package (name "r-ihw") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "IHW" version)) (sha256 (base32 - "0rnw7r9pylpj3a5graavcpiqv2v67rv2a4dlcynkf4ihpxs4bg8x")))) + "169ir0k1gygdh1wybwa0drdxnhrdrlyzzy0rkygi7jsirn69m74j")))) (properties `((upstream-name . "IHW"))) (build-system r-build-system) (propagated-inputs @@ -2784,6 +2784,8 @@ to install interface to SYMPHONY.") ("r-fdrtool" ,r-fdrtool) ("r-lpsymphony" ,r-lpsymphony) ("r-slam" ,r-slam))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/IHW") (synopsis "Independent hypothesis weighting") (description -- cgit v1.2.3 From ee1e8fee8939c3f9d18e5f6c9ded0941a2cd4339 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:30:15 +0200 Subject: gnu: r-icobra: Update to 1.16.0. * gnu/packages/bioconductor.scm (r-icobra): Update to 1.16.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a8d75d126b..aa83e0c48d 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2801,14 +2801,14 @@ independent of the p-value under the null hypothesis.") (define-public r-icobra (package (name "r-icobra") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "iCOBRA" version)) (sha256 (base32 - "1l0yr2grpwmr3pc5h50p1j4nxyb1ddmc55l7rhxpp4igh4fq1avz")))) + "0cvklagby3i221dlhyb51cciv0b3ch4a8z0wpm67q5n6n3k0cil1")))) (properties `((upstream-name . "iCOBRA"))) (build-system r-build-system) (propagated-inputs @@ -2823,6 +2823,8 @@ independent of the p-value under the null hypothesis.") ("r-shinybs" ,r-shinybs) ("r-shinydashboard" ,r-shinydashboard) ("r-upsetr" ,r-upsetr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/iCOBRA") (synopsis "Comparison and visualization of ranking and assignment methods") (description -- cgit v1.2.3 From 97cba97aa14adb63f1479cabc127ddfc5b3a50ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:30:21 +0200 Subject: gnu: r-mast: Update to 1.14.0. * gnu/packages/bioconductor.scm (r-mast): Update to 1.14.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index aa83e0c48d..66865ffff2 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2837,14 +2837,14 @@ interactive exploration of results.") (define-public r-mast (package (name "r-mast") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MAST" version)) (sha256 (base32 - "1l78rrwkzyswpj6pgc9z8290fqrk4akba76invkkazpyh91r8gga")))) + "12d0q2fbq9d5jgyccmfv0cghv282s0j86wjfbnjpdf73fdrp6brr")))) (properties `((upstream-name . "MAST"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From d1f3c37134d01650426a5ae277c0f5c2bef313e5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:30:28 +0200 Subject: gnu: r-monocle: Update to 2.16.0. * gnu/packages/bioconductor.scm (r-monocle): Update to 2.16.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 66865ffff2..16eaf3eab0 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2872,14 +2872,14 @@ single cell assay data.") (define-public r-monocle (package (name "r-monocle") - (version "2.14.0") + (version "2.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "monocle" version)) (sha256 (base32 - "18b9y592q48mbcp5w095qs1kaklq64v6dcnlpqhv3rwxvywygsz2")))) + "1vziidavlyhixmx6j7lf29qx8xcjwrc9q3x2f63gcff41q3jf9xd")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) @@ -2912,6 +2912,8 @@ single cell assay data.") ("r-tibble" ,r-tibble) ("r-vgam" ,r-vgam) ("r-viridis" ,r-viridis))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/monocle") (synopsis "Clustering, differential expression, and trajectory analysis for single-cell RNA-Seq") (description -- cgit v1.2.3 From 22c084ba9d8dae780732066de2fa8292c048f848 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:46:27 +0200 Subject: gnu: r-noiseq: Update to 2.31.0. * gnu/packages/bioconductor.scm (r-noiseq): Update to 2.31.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 16eaf3eab0..3473a688e2 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2991,14 +2991,14 @@ qPCR data, but could be used with other types as well.") (define-public r-noiseq (package (name "r-noiseq") - (version "2.30.0") + (version "2.31.0") (source (origin (method url-fetch) (uri (bioconductor-uri "NOISeq" version)) (sha256 (base32 - "1a8p66hhnwmay0rjabwq7356wr93yn33nqgr9rr7whpp9nls1hg4")))) + "0lg3za0km6v9l6dxigbxx6nsx9y6m3dyzh9srngi53s8387vhj33")))) (properties `((upstream-name . "NOISeq"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ce9e19bc9baa0f16f126bc97fdd8d55b5e1ee83e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:46:38 +0200 Subject: gnu: r-scdd: Update to 1.12.0. * gnu/packages/bioconductor.scm (r-scdd): Update to 1.12.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3473a688e2..25b0c08c40 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3018,14 +3018,14 @@ assumptions.") (define-public r-scdd (package (name "r-scdd") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "scDD" version)) (sha256 (base32 - "0nk0qq664zs7dnlcamdkrrhvll01p7f96jj3igbxxlzj3dvr58w4")))) + "19q01jksxpv4p26wp2c6faa4fffkjnqlbcds2x955pk35jkqknxx")))) (properties `((upstream-name . "scDD"))) (build-system r-build-system) (propagated-inputs @@ -3040,6 +3040,8 @@ assumptions.") ("r-scran" ,r-scran) ("r-singlecellexperiment" ,r-singlecellexperiment) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/kdkorthauer/scDD") (synopsis "Mixture modeling of single-cell RNA-seq data") (description -- cgit v1.2.3 From 3fc1e03949bbdfe52009916022a6a7803cf8a1ff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:46:44 +0200 Subject: gnu: r-scone: Update to 1.12.0. * gnu/packages/bioconductor.scm (r-scone): Update to 1.12.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 25b0c08c40..06ccde8910 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3056,14 +3056,14 @@ distributions.") (define-public r-scone (package (name "r-scone") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "scone" version)) (sha256 (base32 - "1hfsbnix0y9ad6bj0d8q2aw13pb3vjcaa0dfwxxapzl90zwbsjhp")))) + "12hcmbpncm0l1yxhm3sgkqqfri7s5qc46ikv5qcj8pw5a42rkx3g")))) (build-system r-build-system) (propagated-inputs `(("r-aroma-light" ,r-aroma-light) @@ -3085,6 +3085,8 @@ distributions.") ("r-rhdf5" ,r-rhdf5) ("r-ruvseq" ,r-ruvseq) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/scone") (synopsis "Single cell overview of normalized expression data") (description -- cgit v1.2.3 From 159e427c9f9315e9632bf3ddecfe5fea47cc8e38 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:46:49 +0200 Subject: gnu: r-geoquery: Update to 2.56.0. * gnu/packages/bioconductor.scm (r-geoquery): Update to 2.56.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 06ccde8910..36c972534f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3098,14 +3098,14 @@ high-throughput analyses.") (define-public r-geoquery (package (name "r-geoquery") - (version "2.54.1") + (version "2.56.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GEOquery" version)) (sha256 (base32 - "0j8mlldy7dc38fx5zwj6z6l4b9bhvrn8sil3z8asnd4ic7w9ifx5")))) + "0sap1dsa3k3qpv5z5y3cimxyhbm8qai87gqn3g1w3hwlcqsss92m")))) (properties `((upstream-name . "GEOquery"))) (build-system r-build-system) (propagated-inputs @@ -3117,6 +3117,8 @@ high-throughput analyses.") ("r-readr" ,r-readr) ("r-tidyr" ,r-tidyr) ("r-xml2" ,r-xml2))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/seandavi/GEOquery/") (synopsis "Get data from NCBI Gene Expression Omnibus (GEO)") (description -- cgit v1.2.3 From d784a4784f1d17aa782f3a085088f2369b500ff8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:46:54 +0200 Subject: gnu: r-illuminaio: Update to 0.30.0. * gnu/packages/bioconductor.scm (r-illuminaio): Update to 0.30.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 36c972534f..2247d6663e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3131,14 +3131,14 @@ the bridge between GEO and BioConductor.") (define-public r-illuminaio (package (name "r-illuminaio") - (version "0.28.0") + (version "0.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "illuminaio" version)) (sha256 (base32 - "1psza8jq6h8fv2rm91ah67dgjlnj1l80yracwgdl1agd0ycv90sh")))) + "0i587r1v5aa25w0jm1zvh7spc1gqmvza49i2kv00g1qzj8whq67c")))) (build-system r-build-system) (propagated-inputs `(("r-base64" ,r-base64))) -- cgit v1.2.3 From debaa0f3ba7b55a09758465cf4e70f4c2d1bcd5b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:46:58 +0200 Subject: gnu: r-siggenes: Update to 1.62.0. * gnu/packages/bioconductor.scm (r-siggenes): Update to 1.62.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2247d6663e..7e2f2d0293 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3152,14 +3152,14 @@ files, including IDAT.") (define-public r-siggenes (package (name "r-siggenes") - (version "1.60.0") + (version "1.62.0") (source (origin (method url-fetch) (uri (bioconductor-uri "siggenes" version)) (sha256 (base32 - "03lmq3hqprwps4miynl2vhqi3v4als5vqmz4lb19lk5a4zja72b4")))) + "0i4y1hgq1ljxkf6sypb6c8yp412a8q5v5z68cx1zrgxnccvp0mfy")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) -- cgit v1.2.3 From e3fbcb28a49d1948c8ca309d3588b7a99e77004d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:47:02 +0200 Subject: gnu: r-bumphunter: Update to 1.30.0. * gnu/packages/bioconductor.scm (r-bumphunter): Update to 1.30.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7e2f2d0293..c5acbcd1cf 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3178,14 +3178,14 @@ Bayes Analyses of Microarrays} (EBAM).") (define-public r-bumphunter (package (name "r-bumphunter") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bumphunter" version)) (sha256 (base32 - "1p3gwb954zns61d1pwgkplxnvgk2lixrl93kkkf439wa3vlgsnjv")))) + "04y6spdx89j3bsq2xniqd3sbfmakwc0klbpzjlp1q2xs9kywr4dq")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) -- cgit v1.2.3 From 83e6ffdac140b32189205ae015197fc74bbb9c32 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:47:09 +0200 Subject: gnu: r-minfi: Update to 1.34.0. * gnu/packages/bioconductor.scm (r-minfi): Update to 1.34.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c5acbcd1cf..696364603d 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3212,14 +3212,14 @@ studies.") (define-public r-minfi (package (name "r-minfi") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "minfi" version)) (sha256 (base32 - "177isdvcq2476xybvfbh7x11qsj5nzckgh3b6p156wlx9ap9dvl3")))) + "0bl1sk9syy770d5wqa0k1y0wrs5x8sbj13px1v03v3693pdj081w")))) (build-system r-build-system) (propagated-inputs `(("r-beanplot" ,r-beanplot) @@ -3251,6 +3251,8 @@ studies.") ("r-s4vectors" ,r-s4vectors) ("r-siggenes" ,r-siggenes) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/hansenlab/minfi") (synopsis "Analyze Illumina Infinium DNA methylation arrays") (description -- cgit v1.2.3 From 5f25d5f80d9c9f210ce2006d82a18ec69d7b3ba3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:47:13 +0200 Subject: gnu: r-methylumi: Update to 2.34.0. * gnu/packages/bioconductor.scm (r-methylumi): Update to 2.34.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 696364603d..5daf401fc6 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3263,14 +3263,14 @@ methylation arrays.") (define-public r-methylumi (package (name "r-methylumi") - (version "2.32.0") + (version "2.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "methylumi" version)) (sha256 (base32 - "0zd4h6n37v3z0mas69z2xsf5s0naih828987m8v0g9hhq4f6hf5w")))) + "0phb2dyndnk9rv79nx246cn1sc9wbzdqqbgl6402knc7dgh799wr")))) (build-system r-build-system) (propagated-inputs `(("r-annotate" ,r-annotate) @@ -3291,6 +3291,8 @@ methylation arrays.") ("r-s4vectors" ,r-s4vectors) ("r-scales" ,r-scales) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/methylumi") (synopsis "Handle Illumina methylation data") (description -- cgit v1.2.3 From ae1c51a1c1976554b3bf45e8f8f8041705cc8de1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:47:17 +0200 Subject: gnu: r-lumi: Update to 2.40.0. * gnu/packages/bioconductor.scm (r-lumi): Update to 2.40.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 5daf401fc6..c908f8754f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3309,14 +3309,14 @@ and Infinium HD arrays are also included.") (define-public r-lumi (package (name "r-lumi") - (version "2.38.0") + (version "2.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "lumi" version)) (sha256 (base32 - "0lgrqbdvp7ykcafc0bpnbcsf396na3jj5c35x9ysf5bpcas23nmm")))) + "196izc4mdh8j4f04fsf8cqm99w1inzpwy34kwvhz6zvxj2ywn1i9")))) (build-system r-build-system) (propagated-inputs `(("r-affy" ,r-affy) -- cgit v1.2.3 From 1465873c6cb76d116b810f063e3a568a1a30346d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:47:22 +0200 Subject: gnu: r-linnorm: Update to 2.12.0. * gnu/packages/bioconductor.scm (r-linnorm): Update to 2.12.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c908f8754f..4b2b1581f9 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3348,14 +3348,14 @@ especially Illumina Infinium methylation microarrays.") (define-public r-linnorm (package (name "r-linnorm") - (version "2.10.0") + (version "2.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Linnorm" version)) (sha256 (base32 - "15mhwiqmp9m65zvrdbr2hhy3x81lf4jbwgjsf75g41if2v2g8x67")))) + "143hdfswp5sda5al1igrm5gyn7a6mp1j7hjm5jsc300335lm3kgp")))) (properties `((upstream-name . "Linnorm"))) (build-system r-build-system) (propagated-inputs @@ -3377,6 +3377,8 @@ especially Illumina Infinium methylation microarrays.") ("r-statmod" ,r-statmod) ("r-vegan" ,r-vegan) ("r-zoo" ,r-zoo))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "http://www.jjwanglab.org/Linnorm/") (synopsis "Linear model and normality based transformation method") (description -- cgit v1.2.3 From 293fb8a147ea5a6e822139cad171659302981759 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:47:29 +0200 Subject: gnu: r-ioniser: Update to 2.12.0. * gnu/packages/bioconductor.scm (r-ioniser): Update to 2.12.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 4b2b1581f9..e0cc7e9070 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3409,14 +3409,14 @@ evaluation of DEG analysis methods.") (define-public r-ioniser (package (name "r-ioniser") - (version "2.10.0") + (version "2.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "IONiseR" version)) (sha256 (base32 - "1c265bzh923i9mw83mjpj0bzbkixbs6sg1h1z51y9xjkakdgg90f")))) + "05fndlblczabva60gn6h0dijqxyn0wknrv8a925fgc4bn415g31w")))) (properties `((upstream-name . "IONiseR"))) (build-system r-build-system) (propagated-inputs @@ -3433,6 +3433,8 @@ evaluation of DEG analysis methods.") ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr) ("r-xvector" ,r-xvector))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/IONiseR/") (synopsis "Quality assessment tools for Oxford Nanopore MinION data") (description -- cgit v1.2.3 From ecb4e16519ebb545fa1be8e2b7479bb850e0b387 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:47:36 +0200 Subject: gnu: r-triform: Update to 1.29.0. * gnu/packages/bioconductor.scm (r-triform): Update to 1.29.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e0cc7e9070..8fc9978d90 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3533,14 +3533,14 @@ published results; and a routine for graphical display.") (define-public r-triform (package (name "r-triform") - (version "1.28.0") + (version "1.29.0") (source (origin (method url-fetch) (uri (bioconductor-uri "triform" version)) (sha256 (base32 - "12qdyrcw2mcawqdw65v0hjaghzlwa10xl6j8458izcrm5k6dlvz9")))) + "089b7f6dwpi9abj0ncswbi4s30k45996zb99sh43avw6jcb6qj60")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) -- cgit v1.2.3 From f2b686f61a3119dca0c7fa4677d2bee3b880928a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:47:39 +0200 Subject: gnu: r-varianttools: Update to 1.30.0. * gnu/packages/bioconductor.scm (r-varianttools): Update to 1.30.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8fc9978d90..b551be6a22 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3557,14 +3557,14 @@ peak definition in combination with known profile characteristics.") (define-public r-varianttools (package (name "r-varianttools") - (version "1.28.1") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "VariantTools" version)) (sha256 (base32 - "1x57shc3slcbnc807ra1nwnjr37sqjh04n2xfwd469m4hkjb0jzh")))) + "0g93rljlmhk1d53z0bgi84i2cn5c3r1dpm8id2pv0nk9ncdh3yxx")))) (properties `((upstream-name . "VariantTools"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 65e0a7b181c52678e2631acbc789eaef802e12dc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:47:45 +0200 Subject: gnu: r-heatplus: Update to 2.34.0. * gnu/packages/bioconductor.scm (r-heatplus): Update to 2.34.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index b551be6a22..e7e567bc68 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3597,14 +3597,14 @@ gmapR.") (define-public r-heatplus (package (name "r-heatplus") - (version "2.32.1") + (version "2.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Heatplus" version)) (sha256 (base32 - "1ldxj2hasg6ysh70sc73mz2v4h3n8gf3lii09c3sqc4wmz5h7rp1")))) + "12nd0h8svx7qydv1shk0gdpvnbixf7qi6zh06881wsmxf5s970rw")))) (properties `((upstream-name . "Heatplus"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 621cd9040635693128ccaeb4ce34f290b90a825b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:47:49 +0200 Subject: gnu: r-gosemsim: Update to 2.14.0. * gnu/packages/bioconductor.scm (r-gosemsim): Update to 2.14.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e7e567bc68..776b077697 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3622,14 +3622,14 @@ information about samples and features can be added to the plot.") (define-public r-gosemsim (package (name "r-gosemsim") - (version "2.12.1") + (version "2.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GOSemSim" version)) (sha256 (base32 - "1r8yx6qw6d6602cp8aspzl3shi1l1zqcrc8fm9d5wg01sw1whs05")))) + "0mg4d8whq90iyl2jjj5dx3kyar17yqn00jvia3b4a8lhmjw8l1hk")))) (properties `((upstream-name . "GOSemSim"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8d30d59adf3e779892333e36315fd82231ba7eb0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:47:53 +0200 Subject: gnu: r-anota: Update to 1.36.0. * gnu/packages/bioconductor.scm (r-anota): Update to 1.36.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 776b077697..7ac5f1354d 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3651,14 +3651,14 @@ sets of GO terms, gene products and gene clusters.") (define-public r-anota (package (name "r-anota") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "anota" version)) (sha256 (base32 - "1bkavzrxy1bjz0bwapwa9i3ysln7gljgziwd8c05fmg2f46j1z6m")))) + "1ind5cyq85l63xpqmg2n9rg805s5amh48iiw05zqr8kih6hlilpm")))) (build-system r-build-system) (propagated-inputs `(("r-multtest" ,r-multtest) -- cgit v1.2.3 From b1d76ad0ca506963bd8e3918ffed478b5b24edcc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:47:57 +0200 Subject: gnu: r-sigpathway: Update to 1.56.0. * gnu/packages/bioconductor.scm (r-sigpathway): Update to 1.56.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7ac5f1354d..b943c96d48 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3682,14 +3682,14 @@ the data set is suitable for such analysis.") (define-public r-sigpathway (package (name "r-sigpathway") - (version "1.54.0") + (version "1.56.0") (source (origin (method url-fetch) (uri (bioconductor-uri "sigPathway" version)) (sha256 (base32 - "057qdkbfldpy6hsysk9mrs1vvsqgyl9yx2s6c2f26jz1pardkbqb")))) + "0a79sdvag80p7xcdz8mp8wiby36yxmappzycfd2rp36v9drjk0h5")))) (properties `((upstream-name . "sigPathway"))) (build-system r-build-system) (home-page "https://www.pnas.org/cgi/doi/10.1073/pnas.0506577102") -- cgit v1.2.3 From 1dec455cb8d5acc84e816539a661344c0feafebc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:48:03 +0200 Subject: gnu: r-fgsea: Update to 1.14.0. * gnu/packages/bioconductor.scm (r-fgsea): Update to 1.14.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index b943c96d48..2703c7763e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3704,14 +3704,14 @@ phenotype of interest.") (define-public r-fgsea (package (name "r-fgsea") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "fgsea" version)) (sha256 (base32 - "0pbq3g515kcbi4wvfx8m09p01h2f8vwsi1qqsyahxz4r1fasz4c1")))) + "0zbjj8al1ps7immxixsn5g8lvbmpmxvqwqbpdgsicxp00gb9bybc")))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) @@ -3722,6 +3722,8 @@ phenotype of interest.") ("r-gridextra" ,r-gridextra) ("r-matrix" ,r-matrix) ("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/ctlab/fgsea/") (synopsis "Fast gene set enrichment analysis") (description -- cgit v1.2.3 From 3a80f1cfaeab014ba646faeb4f44b64a6193efe5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:48:10 +0200 Subject: gnu: r-dose: Update to 3.14.0. * gnu/packages/bioconductor.scm (r-dose): Update to 3.14.0. [propagated-inputs]: Remove r-s4vectors. --- gnu/packages/bioconductor.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2703c7763e..a7a195ff99 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3736,14 +3736,14 @@ to multiple hypothesis correction.") (define-public r-dose (package (name "r-dose") - (version "3.12.0") + (version "3.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DOSE" version)) (sha256 (base32 - "0ss8mr28q0vswxjmhcas0aqag5nl099jbyn5w3ypbbxqwfvf9jj5")))) + "1j0wcg7w2ns3ag9d272cqlg3j62ag2xnc5gfsjl6g2ij5xkvylb8")))) (properties `((upstream-name . "DOSE"))) (build-system r-build-system) (propagated-inputs @@ -3754,8 +3754,7 @@ to multiple hypothesis correction.") ("r-ggplot2" ,r-ggplot2) ("r-gosemsim" ,r-gosemsim) ("r-qvalue" ,r-qvalue) - ("r-reshape2" ,r-reshape2) - ("r-s4vectors" ,r-s4vectors))) + ("r-reshape2" ,r-reshape2))) (native-inputs `(("r-knitr" ,r-knitr))) (home-page "https://guangchuangyu.github.io/software/DOSE/") -- cgit v1.2.3 From 43fb14cedcf563824064f1d04240f0bbc68f267f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:48:30 +0200 Subject: gnu: r-enrichplot: Update to 1.8.1. * gnu/packages/bioconductor.scm (r-enrichplot): Update to 1.8.1. [propagated-inputs]: Add r-plyr and r-scatterpie. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a7a195ff99..dc4d1572ac 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3771,14 +3771,14 @@ data.") (define-public r-enrichplot (package (name "r-enrichplot") - (version "1.6.1") + (version "1.8.1") (source (origin (method url-fetch) (uri (bioconductor-uri "enrichplot" version)) (sha256 (base32 - "0707f5ll58psh7pr001cmmk5di7dprnbry1cy2mw20vn8p24nf3x")))) + "01m3cp717ldfbz5w3yfywvjg6sfjzz7s3vlk7w268lmmcg6g6bz7")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) @@ -3792,9 +3792,13 @@ data.") ("r-gosemsim" ,r-gosemsim) ("r-gridextra" ,r-gridextra) ("r-igraph" ,r-igraph) + ("r-plyr" ,r-plyr) ("r-purrr" ,r-purrr) ("r-rcolorbrewer" ,r-rcolorbrewer) - ("r-reshape2" ,r-reshape2))) + ("r-reshape2" ,r-reshape2) + ("r-scatterpie" ,r-scatterpie))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/GuangchuangYu/enrichplot") (synopsis "Visualization of functional enrichment result") (description -- cgit v1.2.3 From 63c8323ae9b9cf9cd9684a65bfacc05077c65583 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:48:48 +0200 Subject: gnu: r-clusterprofiler: Update to 3.16.0. * gnu/packages/bioconductor.scm (r-clusterprofiler): Update to 3.16.0. [propagated-inputs]: Remove r-ggplot2; add r-downloader and r-dplyr. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index dc4d1572ac..ffc72b1453 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3810,22 +3810,23 @@ All the visualization methods are developed based on ggplot2 graphics.") (define-public r-clusterprofiler (package (name "r-clusterprofiler") - (version "3.14.3") + (version "3.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "clusterProfiler" version)) (sha256 (base32 - "08pd7bmqmyxncj09ilz8yb9sf1pv9ni98y8b93pz2giy7pl407hg")))) + "0m7919gzrd2fddb4kcznwpshhab1ha2yppnkxg11zmh40wcdawyi")))) (properties `((upstream-name . "clusterProfiler"))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) ("r-dose" ,r-dose) + ("r-downloader" ,r-downloader) + ("r-dplyr" ,r-dplyr) ("r-enrichplot" ,r-enrichplot) - ("r-ggplot2" ,r-ggplot2) ("r-go-db" ,r-go-db) ("r-gosemsim" ,r-gosemsim) ("r-magrittr" ,r-magrittr) @@ -3833,6 +3834,8 @@ All the visualization methods are developed based on ggplot2 graphics.") ("r-qvalue" ,r-qvalue) ("r-rvcheck" ,r-rvcheck) ("r-tidyr" ,r-tidyr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://guangchuangyu.github.io/software/clusterProfiler/") (synopsis "Analysis and visualization of functional profiles for gene clusters") (description -- cgit v1.2.3 From 500f7df840882843c42d93415f48e52a8841e370 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:49:51 +0200 Subject: gnu: r-mlinterfaces: Update to 1.68.0. * gnu/packages/bioconductor.scm (r-mlinterfaces): Update to 1.68.0. [propagated-inputs]: Add r-rcpp. --- gnu/packages/bioconductor.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ffc72b1453..651ef26090 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3846,14 +3846,14 @@ profiles (GO and KEGG) of gene and gene clusters.") (define-public r-mlinterfaces (package (name "r-mlinterfaces") - (version "1.66.5") + (version "1.68.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MLInterfaces" version)) (sha256 (base32 - "05bg7qcrv485m03rkyq3qg5hrr1m3y7zx49bipwaivzqm3s1mbw5")))) + "0x3mnvb5a6kri4q5w0wfmx02v79my08zhmkaik9pqlprd7y5wynq")))) (properties `((upstream-name . "MLInterfaces"))) (build-system r-build-system) (propagated-inputs @@ -3871,6 +3871,7 @@ profiles (GO and KEGG) of gene and gene clusters.") ("r-mlbench" ,r-mlbench) ("r-pls" ,r-pls) ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-rcpp" ,r-rcpp) ("r-rpart" ,r-rpart) ("r-sfsmisc" ,r-sfsmisc) ("r-shiny" ,r-shiny) -- cgit v1.2.3 From d200b4dc48606d1ccabfe0cc766617b25318e07b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:49:56 +0200 Subject: gnu: r-annaffy: Update to 1.60.0. * gnu/packages/bioconductor.scm (r-annaffy): Update to 1.60.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 651ef26090..b6be2cc71a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3887,14 +3887,14 @@ data in R and Bioconductor containers.") (define-public r-annaffy (package (name "r-annaffy") - (version "1.58.0") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "annaffy" version)) (sha256 (base32 - "1jrf4bq2wky4ay1jrcy60si6hxdcn4j05w5vgs38yfb92gq77i16")))) + "1rc9fb83by9jfgwfj2zhhbj93v296blwd8jl2rh7jj200mrpznn4")))) (build-system r-build-system) (arguments `(#:phases -- cgit v1.2.3 From 4f2112add967722b3afdb59a42175332a6688b97 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:50:04 +0200 Subject: gnu: r-a4core: Update to 1.36.0. * gnu/packages/bioconductor.scm (r-a4core): Update to 1.36.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index b6be2cc71a..f4daed496f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3923,14 +3923,14 @@ It allows searching of biological metadata using various criteria.") (define-public r-a4core (package (name "r-a4core") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "a4Core" version)) (sha256 (base32 - "0xcs9wl2yrprl4yc0z5s4zrkil3752k9xc1fi8fcx7zab1mm80df")))) + "1hn9lkaib1bx5n52as882f8zwsln8w40sx8hxbrnimjvgfxrbvnp")))) (properties `((upstream-name . "a4Core"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 33c9c8563d376dcfbb2313d9f49faa0d9e5c0342 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:50:08 +0200 Subject: gnu: r-a4classif: Update to 1.36.0. * gnu/packages/bioconductor.scm (r-a4classif): Update to 1.36.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index f4daed496f..a19de799fe 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3946,14 +3946,14 @@ arrays.") (define-public r-a4classif (package (name "r-a4classif") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "a4Classif" version)) (sha256 (base32 - "0gj3hdflfs1ybc2kshl9w1dzy0rfzppfj08hx3wa2chjsm0m9brn")))) + "0bj8m4nprw3maahd1qx9jjdxfip9ihbbpydbzwjxn6dlgw2i8mcr")))) (properties `((upstream-name . "a4Classif"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 6afea4ea934c239db1222ea420065019c3065e4c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:50:12 +0200 Subject: gnu: r-a4preproc: Update to 1.36.0. * gnu/packages/bioconductor.scm (r-a4preproc): Update to 1.36.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a19de799fe..9b7d98b098 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3974,14 +3974,14 @@ Affymetrix arrays.") (define-public r-a4preproc (package (name "r-a4preproc") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "a4Preproc" version)) (sha256 (base32 - "11j5nc33gd6yis1fyagr0y39g21bzkc59kq8b8sd6b3pfc84zrjd")))) + "1hy3jvhdjyjzzmw5wkil3cs26hvqnb056r09x0p2bjg5sc9hh8b8")))) (properties `((upstream-name . "a4Preproc"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From e47f9f48d4ea135dbe05ae21e0dbeb3badee7b7b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:50:18 +0200 Subject: gnu: r-a4reporting: Update to 1.36.0. * gnu/packages/bioconductor.scm (r-a4reporting): Update to 1.36.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 9b7d98b098..7479fed913 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3996,14 +3996,14 @@ is used for preprocessing the arrays.") (define-public r-a4reporting (package (name "r-a4reporting") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "a4Reporting" version)) (sha256 (base32 - "15nd4pa5hkdzkhinvqw5ijdqb7k5gk37v2hmk3jsg2d6m0jqphi5")))) + "1jhlxqwfbgflcyzy9gyxznzcadj9zxchl3lfdlc4ffm0hwz5jl2f")))) (properties `((upstream-name . "a4Reporting"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 2a91c987fdc27738a12c1342388a81d78bae3949 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:50:23 +0200 Subject: gnu: r-a4base: Update to 1.36.0. * gnu/packages/bioconductor.scm (r-a4base): Update to 1.36.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7479fed913..ea9c9dc4fb 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4019,14 +4019,14 @@ provides reporting features.") (define-public r-a4base (package (name "r-a4base") - (version "1.34.1") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "a4Base" version)) (sha256 (base32 - "1a0yk05ikk1hr1vpxynydrb5xb1hj4hdqlh9zd13n83ir89dss83")))) + "0b7fy1wcydb9z43wb1663skswvhivn7ji15g00gqcshwkkiq4x02")))) (properties `((upstream-name . "a4Base"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From b391b1e47cc991a4fef59f2d18796b38e93b99b7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:50:30 +0200 Subject: gnu: r-a4: Update to 1.36.0. * gnu/packages/bioconductor.scm (r-a4): Update to 1.36.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ea9c9dc4fb..3c08cafe61 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4051,14 +4051,14 @@ Affymetrix arrays.") (define-public r-a4 (package (name "r-a4") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "a4" version)) (sha256 (base32 - "14yipy6s2wqr9q0yp09x1mm17npknrhs6yd34i3wrb5id64ywnq4")))) + "1rzxg1h48jnlwqfjyyqzz6i3zlkfzc0i714rfplry7dyni6asgr7")))) (build-system r-build-system) (propagated-inputs `(("r-a4base" ,r-a4base) -- cgit v1.2.3 From 35bcfaefaebbb4824a442ac61ca4bfcd39b7039c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:50:35 +0200 Subject: gnu: r-abseqr: Update to 1.6.0. * gnu/packages/bioconductor.scm (r-abseqr): Update to 1.6.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3c08cafe61..26faea7d9a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4076,14 +4076,14 @@ Affymetrix arrays.") (define-public r-abseqr (package (name "r-abseqr") - (version "1.4.0") + (version "1.6.0") (source (origin (method url-fetch) (uri (bioconductor-uri "abseqR" version)) (sha256 (base32 - "1n9h5qkj4njr1f8fvhg9sj9wxcd7hljnnk8m80zwswzs2n9ivppa")))) + "0pzyfn0jv41rja6l4jbgwgsqy0q1d3kz23m9m6pc67p2a231i9c5")))) (properties `((upstream-name . "abseqR"))) (build-system r-build-system) (inputs @@ -4107,6 +4107,8 @@ Affymetrix arrays.") ("r-stringr" ,r-stringr) ("r-vegan" ,r-vegan) ("r-venndiagram" ,r-venndiagram))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/malhamdoosh/abseqR") (synopsis "Reporting and data analysis for Rep-Seq datasets of antibody libraries") (description -- cgit v1.2.3 From 7450edca0d704daf9c09b037c1d39c33e062ff18 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:50:39 +0200 Subject: gnu: r-bacon: Update to 1.16.0. * gnu/packages/bioconductor.scm (r-bacon): Update to 1.16.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 26faea7d9a..c7599ad41a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4124,14 +4124,14 @@ further downstream analysis on its output.") (define-public r-bacon (package (name "r-bacon") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bacon" version)) (sha256 (base32 - "1q18vm4znl47v56cnvx9y5ygrial2mdjpl8x1043jq00kyygrc86")))) + "066b9vyp8ivnzm9741mb5z763a7z40ar9m8w31yw84fjiv01v3dl")))) (build-system r-build-system) (propagated-inputs `(("r-biocparallel" ,r-biocparallel) -- cgit v1.2.3 From 6d02e171398df4b0fccbb6f04462d4de00f036d7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:50:43 +0200 Subject: gnu: r-rgadem: Update to 2.36.0. * gnu/packages/bioconductor.scm (r-rgadem): Update to 2.36.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c7599ad41a..77cfcf6c1e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4151,14 +4151,14 @@ fitting a three-component normal mixture on z-scores.") (define-public r-rgadem (package (name "r-rgadem") - (version "2.34.1") + (version "2.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "rGADEM" version)) (sha256 (base32 - "12xm4p4qsczf57kip8bvi6pr8sb5gvn11dnbz7lbh6sc03sx3q2h")))) + "14mflbwhhj9f3b05zdlsdjwxmpb120r23fy306qkvxjprdqn4sz8")))) (properties `((upstream-name . "rGADEM"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 352cfa3434966e8ed99cec728f4355992d166c26 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:50:49 +0200 Subject: gnu: r-motiv: Update to 1.43.0. * gnu/packages/bioconductor.scm (r-motiv): Update to 1.43.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 77cfcf6c1e..d906b4d1a5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4177,14 +4177,14 @@ genomic sequence data.") (define-public r-motiv (package (name "r-motiv") - (version "1.42.0") + (version "1.43.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MotIV" version)) (sha256 (base32 - "07k4rw4nhcn4sg43psv1h7qr064gws22m2yyr7x8sy3f1i1c954k")))) + "1yqqymcrnwlpv6h3w80yliv19922g32xqlqszaqjk6zp853qilh6")))) (properties `((upstream-name . "MotIV"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From da6a75fe0032e1485db36aac4762223a0e170e1f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:50:57 +0200 Subject: gnu: r-motifdb: Update to 1.30.0. * gnu/packages/bioconductor.scm (r-motifdb): Update to 1.30.0. [propagated-inputs]: Add r-genomicranges. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d906b4d1a5..c638749a04 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4209,21 +4209,24 @@ distributions, modules and filter motifs.") (define-public r-motifdb (package (name "r-motifdb") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MotifDb" version)) (sha256 - (base32 "0m5apkjlvdq9yhjdyds3hivfnkbm6f059hy2bkjhalrlhd2si2jc")))) + (base32 "0ixmdqp0s0xv9ar85n2wirbbssrzlk8a892wam55jdsf9y8aabkm")))) (properties `((upstream-name . "MotifDb"))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) ("r-biostrings" ,r-biostrings) + ("r-genomicranges" ,r-genomicranges) ("r-iranges" ,r-iranges) ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors) ("r-splitstackshape" ,r-splitstackshape))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://www.bioconductor.org/packages/MotifDb/") (synopsis "Annotated collection of protein-DNA binding sequence motifs") (description "This package provides more than 2000 annotated position -- cgit v1.2.3 From e65783e032f6a97e846493f3119985b6a10dd7b5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:51:07 +0200 Subject: gnu: r-motifbreakr: Update to 2.2.0. * gnu/packages/bioconductor.scm (r-motifbreakr): Update to 2.2.0. [propagated-inputs]: Add r-summarizedexperiment. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c638749a04..b36465ca75 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4236,32 +4236,35 @@ frequency matrices from nine public sources, for multiple organisms.") (define-public r-motifbreakr (package (name "r-motifbreakr") - (version "2.0.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (bioconductor-uri "motifbreakR" version)) (sha256 - (base32 "190z8gj393qdpq5wz7gph96k0l8c1j9wd0p0llscysvk5kr1hf9n")))) + (base32 "09czgmyjcycsvyvadpjddwwvqvxzd0ba3zhczh4mqc09gwa6vhlm")))) (properties `((upstream-name . "motifbreakR"))) (build-system r-build-system) (propagated-inputs - `(("r-grimport" ,r-grimport) - ("r-stringr" ,r-stringr) - ("r-biocgenerics" ,r-biocgenerics) - ("r-s4vectors" ,r-s4vectors) - ("r-iranges" ,r-iranges) - ("r-genomeinfodb" ,r-genomeinfodb) - ("r-genomicranges" ,r-genomicranges) + `(("r-biocgenerics" ,r-biocgenerics) + ("r-biocparallel" ,r-biocparallel) ("r-biostrings" ,r-biostrings) ("r-bsgenome" ,r-bsgenome) - ("r-rtracklayer" ,r-rtracklayer) - ("r-variantannotation" ,r-variantannotation) - ("r-biocparallel" ,r-biocparallel) - ("r-motifstack" ,r-motifstack) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicranges" ,r-genomicranges) + ("r-grimport" ,r-grimport) ("r-gviz" ,r-gviz) + ("r-iranges" ,r-iranges) ("r-matrixstats" ,r-matrixstats) + ("r-motifdb" ,r-motifdb) + ("r-motifstack" ,r-motifstack) + ("r-rtracklayer" ,r-rtracklayer) + ("r-s4vectors" ,r-s4vectors) + ("r-stringr" ,r-stringr) + ("r-summarizedexperiment" ,r-summarizedexperiment) ("r-tfmpvalue" ,r-tfmpvalue) - ("r-motifdb" ,r-motifdb))) + ("r-variantannotation" ,r-variantannotation))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://www.bioconductor.org/packages/motifbreakR/") (synopsis "Predicting disruptiveness of single nucleotide polymorphisms") (description "This package allows biologists to judge in the first place -- cgit v1.2.3 From e6fbaf0cc761aaf2ef2530d5061dfed640d23bc8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:51:23 +0200 Subject: gnu: r-motifstack: Update to 1.32.0. * gnu/packages/bioconductor.scm (r-motifstack): Update to 1.32.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index b36465ca75..17b14a94ae 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4287,14 +4287,14 @@ Bioconductor.") (define-public r-motifstack (package (name "r-motifstack") - (version "1.30.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "motifStack" version)) (sha256 (base32 - "00rafqs1gqlcxlbsdn9qnq9xb7wjphiksb3hsx76viqjbjzi14wg")))) + "008f2mjcyyiz84ilrsldpqwvxy2lp93hjggrq4nrqwi78nyx3ls5")))) (properties `((upstream-name . "motifStack"))) (build-system r-build-system) (propagated-inputs @@ -4306,6 +4306,8 @@ Bioconductor.") ("r-motiv" ,r-motiv) ("r-scales" ,r-scales) ("r-xml" ,r-xml))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/motifStack/") (synopsis "Plot stacked logos for DNA, RNA and amino acid sequences") (description -- cgit v1.2.3 From 785c7596176d03c0d1eb5bed9276406551975393 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:54:17 +0200 Subject: gnu: r-genomicscores: Update to 2.0.0. * gnu/packages/bioconductor.scm (r-genomicscores): Update to 2.0.0. [propagated-inputs]: Remove r-bsgenome; add r-delayedarray, r-hdf5array, and r-rhdf5. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 17b14a94ae..ced77024b2 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4321,14 +4321,14 @@ type and symbol colors.") (define-public r-genomicscores (package (name "r-genomicscores") - (version "1.10.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicScores" version)) (sha256 (base32 - "175iaqv7npa11yw48vmqpgx0qqs3g44c3dsya7ccwd1lg97fznkj")))) + "0si2lgc37mkah4w990q1q2bf8xmshxj7cbx92bcrp0zaipjr96bb")))) (properties `((upstream-name . "GenomicScores"))) (build-system r-build-system) (propagated-inputs @@ -4336,12 +4336,16 @@ type and symbol colors.") ("r-biobase" ,r-biobase) ("r-biocgenerics" ,r-biocgenerics) ("r-biostrings" ,r-biostrings) - ("r-bsgenome" ,r-bsgenome) + ("r-delayedarray" ,r-delayedarray) ("r-genomeinfodb" ,r-genomeinfodb) ("r-genomicranges" ,r-genomicranges) + ("r-hdf5array" ,r-hdf5array) ("r-iranges" ,r-iranges) + ("r-rhdf5" ,r-rhdf5) ("r-s4vectors" ,r-s4vectors) ("r-xml" ,r-xml))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/rcastelo/GenomicScores/") (synopsis "Work with genome-wide position-specific scores") (description -- cgit v1.2.3 From a007de81e58a2b996e8b75d76b363cb3d196b3b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:54:22 +0200 Subject: gnu: r-atacseqqc: Update to 1.12.3. * gnu/packages/bioconductor.scm (r-atacseqqc): Update to 1.12.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ced77024b2..b32527c5e1 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4356,14 +4356,14 @@ position-specific scores within R and Bioconductor.") (define-public r-atacseqqc (package (name "r-atacseqqc") - (version "1.10.4") + (version "1.12.3") (source (origin (method url-fetch) (uri (bioconductor-uri "ATACseqQC" version)) (sha256 (base32 - "1g07ni134cyl3jd9y19afip39kxddfgpm1jjm0rhrm7jgssp24in")))) + "12710c4024pndwwqiiqr6dhrd360z26fc8r3fxhs739gyd0ddk9r")))) (properties `((upstream-name . "ATACseqQC"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 19b39ac579cb4474741aec2ace612e685812f19a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:54:27 +0200 Subject: gnu: r-gofuncr: Update to 1.8.0. * gnu/packages/bioconductor.scm (r-gofuncr): Update to 1.8.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index b32527c5e1..e9746412ed 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4403,14 +4403,14 @@ footprints.") (define-public r-gofuncr (package (name "r-gofuncr") - (version "1.6.1") + (version "1.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GOfuncR" version)) (sha256 (base32 - "1wk7ja6f5il8jx8v05ijzcs9pijp3b953h566ya66xp7dz5jg9rb")))) + "1ixjkqb9wpwqfzxsg0h96c6fa63wrk72sfh6x4pq0kpyrcc0ind1")))) (properties `((upstream-name . "GOfuncR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 6a65ac15373609295f7932a33e43abfdbfa4e973 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:54:37 +0200 Subject: gnu: r-abaenrichment: Update to 1.18.0. * gnu/packages/bioconductor.scm (r-abaenrichment): Update to 1.18.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e9746412ed..7b1b400105 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4452,14 +4452,14 @@ annotations and ontologies.") (define-public r-abaenrichment (package (name "r-abaenrichment") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ABAEnrichment" version)) (sha256 (base32 - "128ik28j8kmdkycffhxajv5h174zdq9sfn2gz6ai90wgkdadbzwp")))) + "09ihbgxrhpcz2q7svldhm710a0yrhiqk9p0q0myv11c2w50ymwkw")))) (properties `((upstream-name . "ABAEnrichment"))) (build-system r-build-system) (propagated-inputs @@ -4469,6 +4469,8 @@ annotations and ontologies.") ("r-gplots" ,r-gplots) ("r-gtools" ,r-gtools) ("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/ABAEnrichment/") (synopsis "Gene expression enrichment in human brain regions") (description -- cgit v1.2.3 From 7866994c03275260293082b95db78359d9b8ad77 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:54:42 +0200 Subject: gnu: r-annotationfuncs: Update to 1.38.0. * gnu/packages/bioconductor.scm (r-annotationfuncs): Update to 1.38.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7b1b400105..e5cb9fcbdb 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4484,14 +4484,14 @@ the brain using an ontology, both provided by the Allen Brain Atlas project.") (define-public r-annotationfuncs (package (name "r-annotationfuncs") - (version "1.36.0") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationFuncs" version)) (sha256 (base32 - "0ws14b1ibqml7w8kj0gi7wdp6wd8dcdpnrmcxldjzsyawf17q0yq")))) + "1yfsxzn7s1nlc3xz2yj39j6hmdfapc9qj9h0cd71gkaxj53ial7d")))) (properties `((upstream-name . "AnnotationFuncs"))) (build-system r-build-system) -- cgit v1.2.3 From 231898d5b91c44cb92fd154948e58788744a03b4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:54:48 +0200 Subject: gnu: r-annotationtools: Update to 1.62.0. * gnu/packages/bioconductor.scm (r-annotationtools): Update to 1.62.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e5cb9fcbdb..d2ccb14ebd 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4509,14 +4509,14 @@ different identifieres using the Biocore Data Team data-packages (e.g. (define-public r-annotationtools (package (name "r-annotationtools") - (version "1.60.0") + (version "1.62.0") (source (origin (method url-fetch) (uri (bioconductor-uri "annotationTools" version)) (sha256 (base32 - "1cq7ayq2swp2ahlphz74nh5mb869rgyyr0kkqy1mxyilk8k2g44i")))) + "1b1yfnknr9vbn4y2mxdfyx57i5jbabhp9pwx8axlg2a7lawkfmdk")))) (properties `((upstream-name . "annotationTools"))) (build-system r-build-system) -- cgit v1.2.3 From 63149388841015e09ee7343bab3f269e65687ad3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:54:55 +0200 Subject: gnu: r-allelicimbalance: Update to 1.26.0. * gnu/packages/bioconductor.scm (r-allelicimbalance): Update to 1.26.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d2ccb14ebd..597346c7ed 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4534,14 +4534,14 @@ text files).") (define-public r-allelicimbalance (package (name "r-allelicimbalance") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AllelicImbalance" version)) (sha256 (base32 - "0vy8w7ii2qljsmq8lr21lygkcrsshc7syyqhadlbxyj3scgi7kyc")))) + "0irn4xdlvazdkv0055f45693y6zvqaz7j3vml5xscnh45ls6vmqr")))) (properties `((upstream-name . "AllelicImbalance"))) (build-system r-build-system) @@ -4565,6 +4565,8 @@ text files).") ("r-seqinr" ,r-seqinr) ("r-summarizedexperiment" ,r-summarizedexperiment) ("r-variantannotation" ,r-variantannotation))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/pappewaio/AllelicImbalance") (synopsis "Investigate allele-specific expression") (description -- cgit v1.2.3 From e059ab2503b0019360aee68af9168f37ce643440 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:55:01 +0200 Subject: gnu: r-aucell: Update to 1.10.0. * gnu/packages/bioconductor.scm (r-aucell): Update to 1.10.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 597346c7ed..41e81736ea 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4577,14 +4577,14 @@ investigation using RNA-seq data.") (define-public r-aucell (package (name "r-aucell") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AUCell" version)) (sha256 (base32 - "1g4mdq8z29fjxrfjng0fb3cvbph49mwds4ijsa2bn2k6f75dnzky")))) + "0fgqkgjhf92vkljkwn44lm8cjvzq1lvk80nk6xhsp5q6s5isbmns")))) (properties `((upstream-name . "AUCell"))) (build-system r-build-system) (propagated-inputs @@ -4596,6 +4596,8 @@ investigation using RNA-seq data.") ("r-s4vectors" ,r-s4vectors) ("r-shiny" ,r-shiny) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/AUCell/") (synopsis "Analysis of gene set activity in single-cell RNA-seq data") (description -- cgit v1.2.3 From 4eccf8e5e54d6ef2c3cdf025528e4c6f063078f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:55:11 +0200 Subject: gnu: r-ebimage: Update to 4.30.0. * gnu/packages/bioconductor.scm (r-ebimage): Update to 4.30.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 41e81736ea..d24ff93b76 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4616,14 +4616,14 @@ needed.") (define-public r-ebimage (package (name "r-ebimage") - (version "4.28.1") + (version "4.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "EBImage" version)) (sha256 (base32 - "0q54q2nw6p1s4nrj1l8qz78m67xcysj2x82zs43my8iv2g9iifgs")))) + "13amrbh545hwk7sygndzyv7wpa0m2y0lzlwj89jm1xm62x577w9v")))) (properties `((upstream-name . "EBImage"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 6e397aad32a7710cd1680be06baa9c4e6daad741 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:55:17 +0200 Subject: gnu: r-yamss: Update to 1.14.0. * gnu/packages/bioconductor.scm (r-yamss): Update to 1.14.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d24ff93b76..41cb7b2cda 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4655,14 +4655,14 @@ visualization with image data.") (define-public r-yamss (package (name "r-yamss") - (version "1.12.1") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "yamss" version)) (sha256 (base32 - "12jr7hbrwhb1gfjadj1024hv80ra22miy46dn40nmsrbklkfn3rw")))) + "00x2lnssgzbmhy5bb2m0f8rq2nsz3lb5xlp2vhkcagza39h3xb0c")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) @@ -4675,6 +4675,8 @@ visualization with image data.") ("r-s4vectors" ,r-s4vectors) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/hansenlab/yamss") (synopsis "Tools for high-throughput metabolomics") (description -- cgit v1.2.3 From a471def062288ab7f127e6117e43952126048211 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:55:22 +0200 Subject: gnu: r-gtrellis: Update to 1.20.1. * gnu/packages/bioconductor.scm (r-gtrellis): Update to 1.20.1. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 41cb7b2cda..6c5003b7a9 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4689,20 +4689,22 @@ analysis.") (define-public r-gtrellis (package (name "r-gtrellis") - (version "1.18.0") + (version "1.20.1") (source (origin (method url-fetch) (uri (bioconductor-uri "gtrellis" version)) (sha256 (base32 - "0mgspmv6p1a2k98jyy2dfl0wpa2vh7bhnjfm2xaqmcsxzmbjhh9z")))) + "1v2l7r945xx4cf9s8m19csj7716n2ayxy05adkl8zqgxk0gxzqm1")))) (build-system r-build-system) (propagated-inputs `(("r-circlize" ,r-circlize) ("r-genomicranges" ,r-genomicranges) ("r-getoptlong" ,r-getoptlong) ("r-iranges" ,r-iranges))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/jokergoo/gtrellis") (synopsis "Genome level Trellis layout") (description -- cgit v1.2.3 From 63c14717e30fefb0bc0c44c9129e74f03673b8d4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:55:27 +0200 Subject: gnu: r-somaticsignatures: Update to 2.24.0. * gnu/packages/bioconductor.scm (r-somaticsignatures): Update to 2.24.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6c5003b7a9..1db98d449e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4718,14 +4718,14 @@ genomic categories and to add self-defined graphics in the plot.") (define-public r-somaticsignatures (package (name "r-somaticsignatures") - (version "2.22.0") + (version "2.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "SomaticSignatures" version)) (sha256 (base32 - "1gvrkahllwz38g3hn9pjlikhfqz19a4qglcqmyrxk7h9ybx5zy5z")))) + "0d34mss73w1jdnmilk060a1fywlfmqbnlir089q9m3q1p3x0j4c1")))) (properties `((upstream-name . "SomaticSignatures"))) (build-system r-build-system) @@ -4743,6 +4743,8 @@ genomic categories and to add self-defined graphics in the plot.") ("r-reshape2" ,r-reshape2) ("r-s4vectors" ,r-s4vectors) ("r-variantannotation" ,r-variantannotation))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/juliangehring/SomaticSignatures") (synopsis "Somatic signatures") (description -- cgit v1.2.3 From 8a5abc62d514299bcd006efd944871755ca2b7d3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:55:32 +0200 Subject: gnu: r-yapsa: Update to 1.14.0. * gnu/packages/bioconductor.scm (r-yapsa): Update to 1.14.0. [propagated-inputs]: Add r-biostrings, r-bsgenome-hsapiens-ucsc-hg19, r-doparallel, r-dplyr, r-ggbeeswarm, r-magrittr, and r-pracma. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1db98d449e..5e72cf8ed6 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4757,33 +4757,42 @@ decomposition algorithms.") (define-public r-yapsa (package (name "r-yapsa") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "YAPSA" version)) (sha256 (base32 - "132x51f8k8zyx6j8jk05x4lr9q1hlblgvr69wkhn0q3f8mhaj926")))) + "06lkf01vl4fyhj82srx8k870fhw76a1han0kp4jglh43b1c19c1k")))) (properties `((upstream-name . "YAPSA"))) (build-system r-build-system) (propagated-inputs - `(("r-circlize" ,r-circlize) + `(("r-biostrings" ,r-biostrings) + ("r-bsgenome-hsapiens-ucsc-hg19" ,r-bsgenome-hsapiens-ucsc-hg19) + ("r-circlize" ,r-circlize) ("r-complexheatmap" ,r-complexheatmap) ("r-corrplot" ,r-corrplot) ("r-dendextend" ,r-dendextend) + ("r-doparallel" ,r-doparallel) + ("r-dplyr" ,r-dplyr) ("r-genomeinfodb" ,r-genomeinfodb) ("r-genomicranges" ,r-genomicranges) ("r-getoptlong" ,r-getoptlong) + ("r-ggbeeswarm" ,r-ggbeeswarm) ("r-ggplot2" ,r-ggplot2) ("r-gridextra" ,r-gridextra) ("r-gtrellis" ,r-gtrellis) ("r-keggrest" ,r-keggrest) ("r-lsei" ,r-lsei) + ("r-magrittr" ,r-magrittr) ("r-pmcmr" ,r-pmcmr) + ("r-pracma" ,r-pracma) ("r-reshape2" ,r-reshape2) ("r-somaticsignatures" ,r-somaticsignatures) ("r-variantannotation" ,r-variantannotation))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/YAPSA/") (synopsis "Yet another package for signature analysis") (description -- cgit v1.2.3 From f0439a17672bb57a00407988ed967fecceb8012b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:56:18 +0200 Subject: gnu: r-gcrma: Update to 2.60.0. * gnu/packages/bioconductor.scm (r-gcrma): Update to 2.60.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 5e72cf8ed6..9be63ea65b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4806,14 +4806,14 @@ provided.") (define-public r-gcrma (package (name "r-gcrma") - (version "2.58.0") + (version "2.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "gcrma" version)) (sha256 (base32 - "0c9sa9ldlcpdcjdan8m4ndnyaisr6wbarq486sl44ikh7wf1csfx")))) + "1klbnygc1i5ac1x00bsk0rjw5h5dn6pn65fa3y9r09q47gpy1c5g")))) (build-system r-build-system) (propagated-inputs `(("r-affy" ,r-affy) -- cgit v1.2.3 From 9ce80f93562ad573a12ba00339c753037bcc66a0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:56:24 +0200 Subject: gnu: r-simpleaffy: Update to 2.64.0. * gnu/packages/bioconductor.scm (r-simpleaffy): Update to 2.64.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 9be63ea65b..516086ab0c 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4842,14 +4842,14 @@ gene-specific bidning is expected.") (define-public r-simpleaffy (package (name "r-simpleaffy") - (version "2.62.0") + (version "2.64.0") (source (origin (method url-fetch) (uri (bioconductor-uri "simpleaffy" version)) (sha256 (base32 - "18bz3pfgp0f7906flrljx97ann8s71pnb8gpw7nah46n8vqc0xcs")))) + "040043spblr8v67lkn3nnxhgfmfh2iwaizph4fnms1ik6qz662x7")))) (build-system r-build-system) (propagated-inputs `(("r-affy" ,r-affy) -- cgit v1.2.3 From 761c9427bc41c525febbcf0e4bb007897fc6ad74 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:56:27 +0200 Subject: gnu: r-yaqcaffy: Update to 1.48.0. * gnu/packages/bioconductor.scm (r-yaqcaffy): Update to 1.48.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 516086ab0c..2fd2d70c03 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4870,14 +4870,14 @@ generating high resolution journal figures.") (define-public r-yaqcaffy (package (name "r-yaqcaffy") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "yaqcaffy" version)) (sha256 (base32 - "0kzzqsf1lfbcmy95w2z0c9qrvp7mbwm50k2l9wvz3xa5wz6xa7gz")))) + "1l0cblh9sfrsil15bjya7d8kkas8bj6klj2w3c4384njdsjsjcf0")))) (build-system r-build-system) (propagated-inputs `(("r-simpleaffy" ,r-simpleaffy))) -- cgit v1.2.3 From 70d90ae76d201f0979114b54312cfdc2e985fc2a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:56:31 +0200 Subject: gnu: r-quantro: Update to 1.22.0. * gnu/packages/bioconductor.scm (r-quantro): Update to 1.22.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2fd2d70c03..404f20b5da 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4892,14 +4892,14 @@ chips with the MAQC reference datasets.") (define-public r-quantro (package (name "r-quantro") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "quantro" version)) (sha256 (base32 - "09f3x1j50ll5hhn3qwys5x06mii3fqsrk6dkvsxai0kdxv9cjz9m")))) + "0ap9cl5z79wg44mnagjsk8py3kngb4f0ddnx85cbnwqkvb769zbz")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) @@ -4909,6 +4909,8 @@ chips with the MAQC reference datasets.") ("r-iterators" ,r-iterators) ("r-minfi" ,r-minfi) ("r-rcolorbrewer" ,r-rcolorbrewer))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/quantro/") (synopsis "Test for when to use quantile normalization") (description -- cgit v1.2.3 From a37a6ffb2db59648a335cb7582bf1df28028c062 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:56:35 +0200 Subject: gnu: r-yarn: Update to 1.14.0. * gnu/packages/bioconductor.scm (r-yarn): Update to 1.14.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 404f20b5da..2357549894 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4925,14 +4925,14 @@ groups.") (define-public r-yarn (package (name "r-yarn") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "yarn" version)) (sha256 (base32 - "0891a10adkhm1zpm7fpcxc2xfxjf9yrpckaz87b2wdjdiwivc4cp")))) + "1xdjwy1gkfg8lhgq4iwwmbi01903qljjs7yd96cvacmvgn8z6qvx")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) @@ -4946,6 +4946,8 @@ groups.") ("r-quantro" ,r-quantro) ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-readr" ,r-readr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/yarn/") (synopsis "Robust multi-condition RNA-Seq preprocessing and normalization") (description -- cgit v1.2.3 From 1ec10e19875e1ada74b8fbf98feebc9cc506e537 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:56:39 +0200 Subject: gnu: r-roar: Update to 1.24.0. * gnu/packages/bioconductor.scm (r-roar): Update to 1.24.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2357549894..abd8f13da6 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4962,14 +4962,14 @@ large RNA-seq experiments.") (define-public r-roar (package (name "r-roar") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "roar" version)) (sha256 (base32 - "1nqw0agx9x8ycdf0gw17fdlnmzpw9x3zig1wcy10xpyhyjdbbi06")))) + "069g887migvk70n0377dqr0fk7wjbz3w0asgk42bwhp8xpjfym6f")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) -- cgit v1.2.3 From bcd06bdbff5fb9c09d91b996f9186b342169a7ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:56:43 +0200 Subject: gnu: r-xbseq: Update to 1.20.0. * gnu/packages/bioconductor.scm (r-xbseq): Update to 1.20.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index abd8f13da6..6608d690c9 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4991,14 +4991,14 @@ sites and alignments obtained from standard RNA-seq experiments.") (define-public r-xbseq (package (name "r-xbseq") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "XBSeq" version)) (sha256 (base32 - "1qr5gvf8jcx6r0ac7d2wmnikswmp3k71lirnw7dyr6fndzrdz9lp")))) + "13br7x1q6dg8daxahskwq24f09wbxr8kyszl1z7dhc26bid2pvy0")))) (properties `((upstream-name . "XBSeq"))) (build-system r-build-system) (propagated-inputs @@ -5011,6 +5011,8 @@ sites and alignments obtained from standard RNA-seq experiments.") ("r-matrixstats" ,r-matrixstats) ("r-pracma" ,r-pracma) ("r-roar" ,r-roar))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/Liuy12/XBSeq") (synopsis "Test for differential expression for RNA-seq data") (description -- cgit v1.2.3 From 11cf2d7bb77d24b453ab795fea894764ed381403 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:56:47 +0200 Subject: gnu: r-massspecwavelet: Update to 1.54.0. * gnu/packages/bioconductor.scm (r-massspecwavelet): Update to 1.54.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6608d690c9..c89489f224 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5030,14 +5030,14 @@ genes.") (define-public r-massspecwavelet (package (name "r-massspecwavelet") - (version "1.52.0") + (version "1.54.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MassSpecWavelet" version)) (sha256 (base32 - "0xnj3ncrwvr2b8msi3g77mgzj0zaksn3lgqdn1abh0ww5wgk83v7")))) + "0nv1r68g7f1rps6sqaccd4n4x0i19wklvyabhp4b03cdk22gl3nq")))) (properties `((upstream-name . "MassSpecWavelet"))) (build-system r-build-system) -- cgit v1.2.3 From ff9f179a0c09dba305ae05007a52efd47a486594 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:56:53 +0200 Subject: gnu: r-xcms: Update to 3.10.1. * gnu/packages/bioconductor.scm (r-xcms): Update to 3.10.1. [propagated-inputs]: Remove r-multtest; add r-summarizedexperiment. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c89489f224..3db0fdcb51 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5054,14 +5054,14 @@ based on @dfn{Continuous Wavelet Transform} (CWT).") (define-public r-xcms (package (name "r-xcms") - (version "3.8.2") + (version "3.10.1") (source (origin (method url-fetch) (uri (bioconductor-uri "xcms" version)) (sha256 (base32 - "0bfl56v3l6k31i11l09nx1yqfjy6z5yragm6k83z4w0mpgk18y7g")))) + "1aa11gy1v7kkamv3hsnvdx715q8f1saw9p664j6wifyjj0hx13kn")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) @@ -5071,14 +5071,16 @@ based on @dfn{Continuous Wavelet Transform} (CWT).") ("r-lattice" ,r-lattice) ("r-massspecwavelet" ,r-massspecwavelet) ("r-msnbase" ,r-msnbase) - ("r-multtest" ,r-multtest) ("r-mzr" ,r-mzr) ("r-plyr" ,r-plyr) ("r-protgenerics" ,r-protgenerics) ("r-rann" ,r-rann) ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-robustbase" ,r-robustbase) - ("r-s4vectors" ,r-s4vectors))) + ("r-s4vectors" ,r-s4vectors) + ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/xcms/") (synopsis "LC/MS and GC/MS mass spectrometry data analysis") (description -- cgit v1.2.3 From 996f07b5911dc5d782f5b5daeaadd3928eed74c1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:57:05 +0200 Subject: gnu: r-wrench: Update to 1.6.0. * gnu/packages/bioconductor.scm (r-wrench): Update to 1.6.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3db0fdcb51..d0f4fa4167 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5093,20 +5093,22 @@ data for high-throughput, untargeted analyte profiling.") (define-public r-wrench (package (name "r-wrench") - (version "1.4.0") + (version "1.6.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Wrench" version)) (sha256 (base32 - "1s8d7jn0dk5zk2fhvsd4sgicypz4c41nzf19nqzcwb9bd6asgrwm")))) + "05dyk3yvbqrzvinv3ig8ad9wffwr14z715cicsbxwxpv5lq84wx6")))) (properties `((upstream-name . "Wrench"))) (build-system r-build-system) (propagated-inputs `(("r-limma" ,r-limma) ("r-locfit" ,r-locfit) ("r-matrixstats" ,r-matrixstats))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/HCBravoLab/Wrench") (synopsis "Wrench normalization for sparse count data") (description -- cgit v1.2.3 From ee0f7460882b08e862f9730a0d4314c2a2b63771 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:57:16 +0200 Subject: gnu: r-wiggleplotr: Update to 1.12.0. * gnu/packages/bioconductor.scm (r-wiggleplotr): Update to 1.12.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d0f4fa4167..85db8d0641 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5119,14 +5119,14 @@ that arising from 16s metagenomic surveys.") (define-public r-wiggleplotr (package (name "r-wiggleplotr") - (version "1.10.1") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "wiggleplotr" version)) (sha256 (base32 - "1pj2bsn5azs18mp5hr4g7c6rnds2y2rjjnak2785kaj7xi8jly4m")))) + "15l8f7ls2mwhsw68sr1k4r19hmdzjriibr5hpnfbanzj5x6yhdjq")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) @@ -5139,6 +5139,8 @@ that arising from 16s metagenomic surveys.") ("r-purrr" ,r-purrr) ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/wiggleplotr/") (synopsis "Make read coverage plots from BigWig files") (description -- cgit v1.2.3 From 08c4d314005e5f402073e76a9e26ca0d15f43611 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:57:20 +0200 Subject: gnu: r-widgettools: Update to 1.66.0. * gnu/packages/bioconductor.scm (r-widgettools): Update to 1.66.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 85db8d0641..92c0849112 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5153,14 +5153,14 @@ visualization of exonic read coverage.") (define-public r-widgettools (package (name "r-widgettools") - (version "1.64.0") + (version "1.66.0") (source (origin (method url-fetch) (uri (bioconductor-uri "widgetTools" version)) (sha256 (base32 - "1nqy3icayacv5mlv5s5xgfli0dqzancs6zpffrl5p237c994nyr5")))) + "0lrdpsgm9r7yfyyj5crvb7px4hrghxhmiic4iissz40slbfyvilx")))) (properties `((upstream-name . "widgetTools"))) (build-system r-build-system) (home-page "https://bioconductor.org/packages/widgetTools/") -- cgit v1.2.3 From 620cc4d976a9c4b8f57ba087538233664b4d869f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:57:24 +0200 Subject: gnu: r-webbioc: Update to 1.60.0. * gnu/packages/bioconductor.scm (r-webbioc): Update to 1.60.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 92c0849112..4a52bbe052 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5174,14 +5174,14 @@ widgets in R.") (define-public r-webbioc (package (name "r-webbioc") - (version "1.58.0") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "webbioc" version)) (sha256 (base32 - "1cwrmvh1l603k6j1r425c4vrqp0zf0x7bgx7y1wnbq4r7yc5sp62")))) + "16376ya5a5x2hwkl1v9y4r7np1drdwm912knnqg2dn90zmrdwr5f")))) (build-system r-build-system) (inputs `(("netpbm" ,netpbm) -- cgit v1.2.3 From 8fdca89b568cce6597cfaaee8f390bc8b8c9c759 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:57:29 +0200 Subject: gnu: r-zfpkm: Update to 1.10.0. * gnu/packages/bioconductor.scm (r-zfpkm): Update to 1.10.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 4a52bbe052..8011ac1720 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5207,14 +5207,14 @@ Currently only Affymetrix oligonucleotide analysis is supported.") (define-public r-zfpkm (package (name "r-zfpkm") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "zFPKM" version)) (sha256 (base32 - "1hg0vc0ns8d4jpddn1v5a5m13a033b0wf1al01pb1lvmx5mzzr2n")))) + "0scszhfqrgzhglz1a6kxfydq9dx8fqx28j3dypp91y5ah2w6mdys")))) (properties `((upstream-name . "zFPKM"))) (build-system r-build-system) (propagated-inputs @@ -5223,6 +5223,8 @@ Currently only Affymetrix oligonucleotide analysis is supported.") ("r-ggplot2" ,r-ggplot2) ("r-summarizedexperiment" ,r-summarizedexperiment) ("r-tidyr" ,r-tidyr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/ronammar/zFPKM/") (synopsis "Functions to facilitate zFPKM transformations") (description -- cgit v1.2.3 From 297854e682d74781a2e878da061efe5a3bc0045b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:57:32 +0200 Subject: gnu: r-rbowtie2: Update to 1.10.0. * gnu/packages/bioconductor.scm (r-rbowtie2): Update to 1.10.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8011ac1720..9d51e0656f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5236,18 +5236,20 @@ This algorithm is based on the publication by Hart et al., 2013 (Pubmed ID (define-public r-rbowtie2 (package (name "r-rbowtie2") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rbowtie2" version)) (sha256 (base32 - "1b7x42n9zisi2w2wwfc0c39j8s9868imyr0ysqgswf6l5mv9ivc5")))) + "1z2dn0q3wcw8b9ibx388kh7p5km16i71sw9miqj3daw7g0v5bxp3")))) (properties `((upstream-name . "Rbowtie2"))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/Rbowtie2/") (synopsis "R wrapper for Bowtie2 and AdapterRemoval") (description -- cgit v1.2.3 From 8e5933a8e4aa791fcd47df046f911641d633c9f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:57:36 +0200 Subject: gnu: r-progeny: Update to 1.10.0. * gnu/packages/bioconductor.scm (r-progeny): Update to 1.10.0. [propagated-inputs]: Add r-dplyr, r-ggplot2, r-ggrepel, r-gridextra, and r-tidyr. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 9d51e0656f..4f01486ecc 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5261,16 +5261,24 @@ rapid adapter trimming, identification, and read merging.") (define-public r-progeny (package (name "r-progeny") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "progeny" version)) (sha256 (base32 - "0j3kxjj7xmmwb29p87n3bw7bl38gcb94jrpw32126a578rf1pfrq")))) + "09rq3nf9zm7w9djmx8xc8j3win3597p2v36zqgkhgkjwq5rkjgsh")))) (build-system r-build-system) - (propagated-inputs `(("r-biobase" ,r-biobase))) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-dplyr" ,r-dplyr) + ("r-ggplot2" ,r-ggplot2) + ("r-ggrepel" ,r-ggrepel) + ("r-gridextra" ,r-gridextra) + ("r-tidyr" ,r-tidyr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/saezlab/progeny") (synopsis "Pathway responsive gene activity inference") (description -- cgit v1.2.3 From 989b7bb62597b712bc84b7504ee4893f85e3e92f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:57:57 +0200 Subject: gnu: r-arrmnormalization: Update to 1.28.0. * gnu/packages/bioconductor.scm (r-arrmnormalization): Update to 1.28.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 4f01486ecc..f17ad0d34b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5291,14 +5291,14 @@ expression\".") (define-public r-arrmnormalization (package (name "r-arrmnormalization") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ARRmNormalization" version)) (sha256 (base32 - "0jj81q454nyh4hr5c56q1hv7i4ynx3rwnvpv08w34a6m77122bi1")))) + "0zhhvr051fmh6g0bqrl525mkf094j1jnc57j201jlzmvdpkydlpv")))) (properties `((upstream-name . "ARRmNormalization"))) (build-system r-build-system) -- cgit v1.2.3 From 173844fc753dff3909c6d4021df6203936e6d31d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:58:01 +0200 Subject: gnu: r-biocfilecache: Update to 1.12.0. * gnu/packages/bioconductor.scm (r-biocfilecache): Update to 1.12.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index f17ad0d34b..bf7c55977a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5314,14 +5314,14 @@ Infinium HumanMethylation 450k assay.") (define-public r-biocfilecache (package (name "r-biocfilecache") - (version "1.10.2") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocFileCache" version)) (sha256 (base32 - "0jivhn95y6zv5ryamqk6nyd4l8nlskq64j362l9ml9qw746v0ja6")))) + "02chrzwccmazi7rdfpyriizhbgxyxlmprlw32w05wk54as6wrxv8")))) (properties `((upstream-name . "BiocFileCache"))) (build-system r-build-system) (propagated-inputs @@ -5332,6 +5332,8 @@ Infinium HumanMethylation 450k assay.") ("r-httr" ,r-httr) ("r-rappdirs" ,r-rappdirs) ("r-rsqlite" ,r-rsqlite))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/BiocFileCache/") (synopsis "Manage files across sessions") (description -- cgit v1.2.3 From ca8d80c90c463a1675bf30885b05006840ac6c95 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:58:05 +0200 Subject: gnu: r-iclusterplus: Update to 1.24.0. * gnu/packages/bioconductor.scm (r-iclusterplus): Update to 1.24.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index bf7c55977a..53f39e9d48 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5346,14 +5346,14 @@ and data files used across sessions.") (define-public r-iclusterplus (package (name "r-iclusterplus") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "iClusterPlus" version)) (sha256 (base32 - "1dzgfzf2x8m62hssvsn1zzag7m444kyxj2vpdxl9nk859dr5pf37")))) + "0j987xvxixdz0wnhgp4kgfcgz5jffrcdhmldrgpgv582qmf4r94w")))) (properties `((upstream-name . "iClusterPlus"))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 568c3929b6bcfdfbc1e937cc2c12d7d318ac63e8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:58:10 +0200 Subject: gnu: r-rbowtie: Update to 1.28.0. * gnu/packages/bioconductor.scm (r-rbowtie): Update to 1.28.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 53f39e9d48..912e987dd4 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5376,18 +5376,20 @@ Gaussian distributions.") (define-public r-rbowtie (package (name "r-rbowtie") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rbowtie" version)) (sha256 (base32 - "0yy31xhdmf6xb21wlhmxxwfqpm0nil39pb2cs3pq5ia758lb88z4")))) + "06y1qp915dlwjdi2fs3344sgya55pcv07f3i61y0cxb0bhbcgvrz")))) (properties `((upstream-name . "Rbowtie"))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/Rbowtie/") (synopsis "R bowtie wrapper") (description -- cgit v1.2.3 From 201902bc0561073d5d2ce5150d0094ab15a40726 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:58:14 +0200 Subject: gnu: r-sgseq: Update to 1.22.0. * gnu/packages/bioconductor.scm (r-sgseq): Update to 1.22.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 912e987dd4..86d2fb6510 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5401,14 +5401,14 @@ alignment tool.") (define-public r-sgseq (package (name "r-sgseq") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "SGSeq" version)) (sha256 (base32 - "0950iv08wd0kjaw55rjn7m6syklvrabwr2zqq74wzyc5afyk2mrw")))) + "11rxx7abjyga2sdcp4x4z3n8xjx6973sckyzmh9ax6r46kwhxq8c")))) (properties `((upstream-name . "SGSeq"))) (build-system r-build-system) (propagated-inputs @@ -5426,6 +5426,8 @@ alignment tool.") ("r-runit" ,r-runit) ("r-s4vectors" ,r-s4vectors) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/SGSeq/") (synopsis "Splice event prediction and quantification from RNA-seq data") (description -- cgit v1.2.3 From 2aff2724efa0f4c0cc68f7efe10ad6a3b4c5598e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:58:23 +0200 Subject: gnu: r-rhisat2: Update to 1.4.0. * gnu/packages/bioconductor.scm (r-rhisat2): Update to 1.4.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 86d2fb6510..5f62429dfa 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5444,14 +5444,14 @@ interpretation.") (define-public r-rhisat2 (package (name "r-rhisat2") - (version "1.2.0") + (version "1.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rhisat2" version)) (sha256 (base32 - "02fn5cm8sj2s9x00505y3iyipn1r3lpvpwpjy2pdxdbpmhb5hy49")))) + "0hhmcdnixkaqx9x9cl2vjaba3ri8m6wkbnbhxjmy51jwqzy2223a")))) (properties `((upstream-name . "Rhisat2"))) (build-system r-build-system) (arguments @@ -5470,6 +5470,8 @@ interpretation.") `(("r-genomicfeatures" ,r-genomicfeatures) ("r-genomicranges" ,r-genomicranges) ("r-sgseq" ,r-sgseq))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/fmicompbio/Rhisat2") (synopsis "R Wrapper for HISAT2 sequence aligner") (description -- cgit v1.2.3 From a84abf434d1fc504b4ec2adb9e7b9a70281c7709 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:58:27 +0200 Subject: gnu: r-quasr: Update to 1.28.0. * gnu/packages/bioconductor.scm (r-quasr): Update to 1.28.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 5f62429dfa..7ab55a1357 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5484,14 +5484,14 @@ index.") (define-public r-quasr (package (name "r-quasr") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "QuasR" version)) (sha256 (base32 - "07m5q7wasapj2984kwy897510flbhvz7x0fgs7q2vm5wjhfzdrgv")))) + "0d87ajaaq8a7xgzl820qx5bvxw86ppab8clqk77sj02rfijnvjn8")))) (properties `((upstream-name . "QuasR"))) (build-system r-build-system) (inputs @@ -5517,6 +5517,8 @@ index.") ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors) ("r-shortread" ,r-shortread))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/QuasR/") (synopsis "Quantify and annotate short reads in R") (description -- cgit v1.2.3 From 1c5360ac3d120aa445d2730fc52de123f0d578dc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:58:32 +0200 Subject: gnu: r-rqc: Update to 1.22.0. * gnu/packages/bioconductor.scm (r-rqc): Update to 1.22.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7ab55a1357..2851a44ffc 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5531,14 +5531,14 @@ quantification of genomic regions of interest.") (define-public r-rqc (package (name "r-rqc") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rqc" version)) (sha256 (base32 - "1nxkrb9kx41g050yz935yrl9pjkakhr8v6whxcvr72gg4r9m2x3m")))) + "1qsm9r6xfsplk8zpf7p0k7fi86l8a74nx963sna8gzig5qgrvnm3")))) (properties `((upstream-name . "Rqc"))) (build-system r-build-system) (propagated-inputs @@ -5560,6 +5560,8 @@ quantification of genomic regions of interest.") ("r-s4vectors" ,r-s4vectors) ("r-shiny" ,r-shiny) ("r-shortread" ,r-shortread))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/labbcb/Rqc") (synopsis "Quality control tool for high-throughput sequencing data") (description -- cgit v1.2.3 From f50609aba50ab917094303e9f7b6e7afe41e260c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:58:36 +0200 Subject: gnu: r-birewire: Update to 3.20.0. * gnu/packages/bioconductor.scm (r-birewire): Update to 3.20.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2851a44ffc..d893587e51 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5574,14 +5574,14 @@ graphics.") (define-public r-birewire (package (name "r-birewire") - (version "3.18.0") + (version "3.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiRewire" version)) (sha256 (base32 - "1074cp422ail72yajn8p0bg26h6zzz07nzypnwfyv86qrpvpdw9q")))) + "0y7jb1abnik2y4ivpyqrgfl77rml6fhz88isd54l646ghslwxj0g")))) (properties `((upstream-name . "BiRewire"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From cb941ca06d62ea894917fa02b47ac2ef9b0d215b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:58:39 +0200 Subject: gnu: r-birta: Update to 1.31.0. * gnu/packages/bioconductor.scm (r-birta): Update to 1.31.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d893587e51..ff2e9d0030 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5603,14 +5603,14 @@ routines to analyse the resulting networks and their natural projections.") (define-public r-birta (package (name "r-birta") - (version "1.30.0") + (version "1.31.0") (source (origin (method url-fetch) (uri (bioconductor-uri "birta" version)) (sha256 (base32 - "1zhlwapdgkz0fpv5bqfxh9aw6ymnmxnnm1r0n0kfzn5izyjavslg")))) + "00a1kcfmcgdbx6wpnhk45wm45bynhry5m93l9hm75j2rwyc4lnca")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) -- cgit v1.2.3 From 905bbb13dae1c8dd87f33c511127c63acb6b0252 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:58:44 +0200 Subject: gnu: r-multidataset: Update to 1.16.0. * gnu/packages/bioconductor.scm (r-multidataset): Update to 1.16.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ff2e9d0030..380adec3d1 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5632,14 +5632,14 @@ Markov-Chain-Monte-Carlo is applied to sample the activity states.") (define-public r-multidataset (package (name "r-multidataset") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MultiDataSet" version)) (sha256 (base32 - "0iw99ymrv3ls023mpmgyagmb5simgsgadpj0k4bnssfaqnklywlj")))) + "0hjnj32m9wwlh2krdpdyl5jk1cakvlgki80z51mabhc62pajzf39")))) (properties `((upstream-name . "MultiDataSet"))) (build-system r-build-system) (propagated-inputs @@ -5653,6 +5653,8 @@ Markov-Chain-Monte-Carlo is applied to sample the activity states.") ("r-qqman" ,r-qqman) ("r-s4vectors" ,r-s4vectors) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/MultiDataSet/") (synopsis "Implementation of MultiDataSet and ResultSet") (description -- cgit v1.2.3 From 77334168cf7de16f7da3bdb5409a68b63cea4198 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:58:48 +0200 Subject: gnu: r-ropls: Update to 1.20.0. * gnu/packages/bioconductor.scm (r-ropls): Update to 1.20.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 380adec3d1..5d5d7693a3 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5669,14 +5669,14 @@ packages.") (define-public r-ropls (package (name "r-ropls") - (version "1.18.8") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ropls" version)) (sha256 (base32 - "033i39r4037nd54jnp5zdn1vpzh61r671vmq0sf8dqrfblhm4w7a")))) + "1drww1mr0nira3qplyga6s3mljpjxshjgbn524kzxi0nrfbcvmnx")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) -- cgit v1.2.3 From 8b6f26e63423a2b7c71236fba88effb723396cbd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:58:52 +0200 Subject: gnu: r-biosigner: Update to 1.16.0. * gnu/packages/bioconductor.scm (r-biosigner): Update to 1.16.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 5d5d7693a3..1f9868c6fd 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5707,14 +5707,14 @@ coefficients).") (define-public r-biosigner (package (name "r-biosigner") - (version "1.14.4") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biosigner" version)) (sha256 (base32 - "0hypk784xcax99mp673md6kvx45chk2nxbqniww7zm9q2hj983hl")))) + "1v760q7hzaybkf2q9230rmr4phi8hglm59qwsjzvncxrhs3dpj06")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) -- cgit v1.2.3 From 5ca991bff953f2e098746fdbc576697fe3e02bc6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:58:58 +0200 Subject: gnu: r-annotatr: Update to 1.14.0. * gnu/packages/bioconductor.scm (r-annotatr): Update to 1.14.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1f9868c6fd..ed28f3afb2 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5740,14 +5740,14 @@ datasets.") (define-public r-annotatr (package (name "r-annotatr") - (version "1.12.1") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "annotatr" version)) (sha256 (base32 - "1bibk3p1q4cavqy11xs6rqqhqdjsq2dd7lf7blwcr27s5ajcd6dj")))) + "0z3ydcybd81w543fw8fiblghndx5m28w8qsphh5vqj726i0nj8cl")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) @@ -5763,6 +5763,8 @@ datasets.") ("r-reshape2" ,r-reshape2) ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/annotatr/") (synopsis "Annotation of genomic regions to genomic annotations") (description -- cgit v1.2.3 From 5d63f69be97dd7ff673acb8928a7f465f881c99b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:59:06 +0200 Subject: gnu: r-rsubread: Update to 2.2.2. * gnu/packages/bioconductor.scm (r-rsubread): Update to 2.2.2. [propagated-inputs]: Add r-matrix. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ed28f3afb2..100b7545ec 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5781,17 +5781,19 @@ annotations.") (define-public r-rsubread (package (name "r-rsubread") - (version "2.0.1") + (version "2.2.2") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsubread" version)) (sha256 (base32 - "0pdkx9mhvzw3a4ff725qvda9bxvs9vh2ppb29cc5jrivgjndv5cy")))) + "1wgilpaw70dwg0zilx5i1pmi4j8wri6wi2ha1d3bapfhlwc6igml")))) (properties `((upstream-name . "Rsubread"))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) + (propagated-inputs + `(("r-matrix" ,r-matrix))) (home-page "https://bioconductor.org/packages/Rsubread/") (synopsis "Subread sequence alignment and counting for R") (description -- cgit v1.2.3 From 6954950f4a92ad55a76e60e9d935863af8c986e6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:59:18 +0200 Subject: gnu: r-flowutils: Update to 1.52.0. * gnu/packages/bioconductor.scm (r-flowutils): Update to 1.52.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 100b7545ec..6d33fb904e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5807,14 +5807,14 @@ and to both short and long sequence reads.") (define-public r-flowutils (package (name "r-flowutils") - (version "1.50.0") + (version "1.52.0") (source (origin (method url-fetch) (uri (bioconductor-uri "flowUtils" version)) (sha256 (base32 - "1xcs19j9p3izvksyy5wzsbicwby0dsa9g2w7gjzwynzgj5dpfr81")))) + "03jj4zyffm9kwzrg4vbsk6clc2v2m95wgalgqwzi31n9a2zyaza4")))) (properties `((upstream-name . "flowUtils"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 0c2573e7f1e1efe778b4e3120adecb80f31b47b8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:59:30 +0200 Subject: gnu: r-consensusclusterplus: Update to 1.52.0. * gnu/packages/bioconductor.scm (r-consensusclusterplus): Update to 1.52.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6d33fb904e..a04e4af819 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5833,14 +5833,14 @@ and to both short and long sequence reads.") (define-public r-consensusclusterplus (package (name "r-consensusclusterplus") - (version "1.50.0") + (version "1.52.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ConsensusClusterPlus" version)) (sha256 (base32 - "0pnh5zy6d3c364xxjdn5zp3kf5afhsxv6yzkdn1qspny0pmqlrp4")))) + "06gq3a95h0km1hzbx1za8q0l7kla3jdzvn6cnfz43ijx4n3dzzcq")))) (properties `((upstream-name . "ConsensusClusterPlus"))) (build-system r-build-system) -- cgit v1.2.3 From 3c73d7c5e4ea4edea62346a71ceee22af6b70ba5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:59:35 +0200 Subject: gnu: r-cytolib: Update to 2.0.3. * gnu/packages/bioconductor.scm (r-cytolib): Update to 2.0.3. [inputs]: Add zlib. [propagated-inputs]: Add r-bh, r-rcpp, r-rcpparmadillo, r-rcppparallel, r-rhdf5lib, and r-rprotobuflib. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a04e4af819..c871265d70 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5858,16 +5858,27 @@ cluster count and membership by stability evidence in unsupervised analysis.") (define-public r-cytolib (package (name "r-cytolib") - (version "1.8.0") + (version "2.0.3") (source (origin (method url-fetch) (uri (bioconductor-uri "cytolib" version)) (sha256 (base32 - "1zk5i09k782lw6297gl3rh0g4fxswr2ang8dgqj7p0814l7h15k9")))) + "123d1wlymq8r8d83as380h1dgw6v4s317acyvp1lsg2cpfp3gslj")))) (properties `((upstream-name . "cytolib"))) (build-system r-build-system) + (inputs + `(("zlib" ,zlib))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (propagated-inputs + `(("r-bh" ,r-bh) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-rcppparallel" ,r-rcppparallel) + ("r-rhdf5lib" ,r-rhdf5lib) + ("r-rprotobuflib" ,r-rprotobuflib))) (home-page "https://bioconductor.org/packages/cytolib/") (synopsis "C++ infrastructure for working with gated cytometry") (description -- cgit v1.2.3 From faff2de0dacb225da1f19a5c2db56bb6698ab358 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 00:59:54 +0200 Subject: gnu: r-flowcore: Update to 2.0.1. * gnu/packages/bioconductor.scm (r-flowcore): Update to 2.0.1. [propagated-inputs]: Add r-rcpparmadillo and r-rprotobuflib. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c871265d70..f97e5d2ae7 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5889,14 +5889,14 @@ interact with gated cytometry data.") (define-public r-flowcore (package (name "r-flowcore") - (version "1.52.1") + (version "2.0.1") (source (origin (method url-fetch) (uri (bioconductor-uri "flowCore" version)) (sha256 (base32 - "08kvxc187iwlixibx1860jcp5g9bsw8abkv06x2qv1w83fas4pp2")))) + "1xalndmfidfzqwlppdanx7cnm4ysznq21ingmykhxni86s42kd8p")))) (properties `((upstream-name . "flowCore"))) (build-system r-build-system) (propagated-inputs @@ -5905,7 +5905,11 @@ interact with gated cytometry data.") ("r-biocgenerics" ,r-biocgenerics) ("r-cytolib" ,r-cytolib) ("r-matrixstats" ,r-matrixstats) - ("r-rcpp" ,r-rcpp))) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-rprotobuflib" ,r-rprotobuflib))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/flowCore") (synopsis "Basic structures for flow cytometry data") (description -- cgit v1.2.3 From 76b163d616617408d4651e7aab523b4eed795d88 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:00:10 +0200 Subject: gnu: r-flowmeans: Update to 1.48.0. * gnu/packages/bioconductor.scm (r-flowmeans): Update to 1.48.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index f97e5d2ae7..1a785516ca 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5920,14 +5920,14 @@ with flow cytometry data.") (define-public r-flowmeans (package (name "r-flowmeans") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "flowMeans" version)) (sha256 (base32 - "1yisrikaafmpb4sig2c5l0wcz4idrs4as7i9x90v6z2v94iq0m8h")))) + "1sv5vpwm3qdhkn1gdrk3n674harjcni91g63sqzfmybiwq8dlym7")))) (properties `((upstream-name . "flowMeans"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 631b12ca71304db90908400a238f4d444c041f2f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:00:15 +0200 Subject: gnu: r-ncdfflow: Update to 2.34.0. * gnu/packages/bioconductor.scm (r-ncdfflow): Update to 2.34.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1a785516ca..ef6ef962ae 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5946,14 +5946,14 @@ change point detection.") (define-public r-ncdfflow (package (name "r-ncdfflow") - (version "2.32.0") + (version "2.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ncdfFlow" version)) (sha256 (base32 - "06lscx6h4rg80ifi90rj7z2497b8w1fjipm3l8s3230rkizhh02i")))) + "0avxn2abh4fk1gkncrxz7jwzgvd90m3m0ly318q0z38cjhsw3j9f")))) (properties `((upstream-name . "ncdfFlow"))) (build-system r-build-system) (inputs @@ -5967,6 +5967,8 @@ change point detection.") ("r-rcpparmadillo" ,r-rcpparmadillo) ("r-rhdf5lib" ,r-rhdf5lib) ("r-zlibbioc" ,r-zlibbioc))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/ncdfFlow/") (synopsis "HDF5 based storage for flow cytometry data") (description -- cgit v1.2.3 From 3407dfa61fc9321e45a11d43945f9585509fac43 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:00:20 +0200 Subject: gnu: r-ggcyto: Update to 1.16.0. * gnu/packages/bioconductor.scm (r-ggcyto): Update to 1.16.0. [propagated-inputs]: Add r-hexbin. --- gnu/packages/bioconductor.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ef6ef962ae..8eb15acaef 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5979,14 +5979,14 @@ manipulation of flow cytometry data.") (define-public r-ggcyto (package (name "r-ggcyto") - (version "1.14.1") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ggcyto" version)) (sha256 (base32 - "16jwdslhmj1nsa28wmaircy15cq7qn8nsyiawinjv711qiqhgw50")))) + "1ih6ggay7jjxnx8blc2sk95g8d40gkim145jllkk8sqwl02g44p0")))) (properties `((upstream-name . "ggcyto"))) (build-system r-build-system) (propagated-inputs @@ -5995,6 +5995,7 @@ manipulation of flow cytometry data.") ("r-flowworkspace" ,r-flowworkspace) ("r-ggplot2" ,r-ggplot2) ("r-gridextra" ,r-gridextra) + ("r-hexbin" ,r-hexbin) ("r-ncdfflow" ,r-ncdfflow) ("r-plyr" ,r-plyr) ("r-rcolorbrewer" ,r-rcolorbrewer) -- cgit v1.2.3 From 062789b87a65e57eb5ff121c2b4728e23c9ac4db Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:00:27 +0200 Subject: gnu: r-flowviz: Update to 1.52.0. * gnu/packages/bioconductor.scm (r-flowviz): Update to 1.52.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8eb15acaef..d5cabc45e9 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6016,14 +6016,14 @@ statistics to the plot.") (define-public r-flowviz (package (name "r-flowviz") - (version "1.50.0") + (version "1.52.0") (source (origin (method url-fetch) (uri (bioconductor-uri "flowViz" version)) (sha256 (base32 - "0ik16bxcfcg3q26ra3055718kskid64aaazcbqsxalca9ppdm4k7")))) + "0f3jfwdmaq9wrgl737blk5gmpc29l9kb6nadqhxpvbjwqsnzx0yq")))) (properties `((upstream-name . "flowViz"))) (build-system r-build-system) (propagated-inputs @@ -6036,6 +6036,8 @@ statistics to the plot.") ("r-latticeextra" ,r-latticeextra) ("r-mass" ,r-mass) ("r-rcolorbrewer" ,r-rcolorbrewer))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/flowViz/") (synopsis "Visualization for flow cytometry") (description -- cgit v1.2.3 From b347d6c32b3f99aad3b107e1ac4937bbbe9d6e30 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:00:35 +0200 Subject: gnu: r-flowclust: Update to 3.26.0. * gnu/packages/bioconductor.scm (r-flowclust): Update to 3.26.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d5cabc45e9..fc9f1717db 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6047,14 +6047,14 @@ statistics to the plot.") (define-public r-flowclust (package (name "r-flowclust") - (version "3.24.0") + (version "3.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "flowClust" version)) (sha256 (base32 - "0k4bgc4mf512njfdfg5ld9l7slgfxyfh766jab87j96zrrgcnj8s")))) + "06mkq9y41jax07x4knhvhzgrkgqdvpvcw604bxdk6bv9wx3ipq5b")))) (properties `((upstream-name . "flowClust"))) (build-system r-build-system) (arguments @@ -6073,7 +6073,8 @@ statistics to the plot.") (inputs `(("gsl" ,gsl))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/flowClust") (synopsis "Clustering for flow cytometry") (description -- cgit v1.2.3 From bafade83c1ce0047e5367da5130ac1556f9831a1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:00:47 +0200 Subject: gnu: r-rprotobuflib: Update to 2.0.0. * gnu/packages/bioconductor.scm (r-rprotobuflib): Update to 2.0.0. [arguments]: Adjust phase "unpack-bundled-sources". [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index fc9f1717db..04c203ac88 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6087,14 +6087,14 @@ model with Box-Cox transformation.") (define-public r-rprotobuflib (package (name "r-rprotobuflib") - (version "1.8.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RProtoBufLib" version)) (sha256 (base32 - "0dlgki21a37bxqh3cf83vl5zqxm86472g8a9plvhrjzzsn3mwnrm")))) + "0kfinf9vzc1i5qxmaw832id557gr1vqdi1m8yiaxz83g37wh8vps")))) (properties `((upstream-name . "RProtoBufLib"))) (build-system r-build-system) (arguments @@ -6103,8 +6103,10 @@ model with Box-Cox transformation.") (add-after 'unpack 'unpack-bundled-sources (lambda _ (with-directory-excursion "src" - (invoke "tar" "xf" "protobuf-2.6.0.tgz")) + (invoke "tar" "xf" "protobuf-3.10.0.tar.gz")) #t))))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/RProtoBufLib/") (synopsis "C++ headers and static libraries of Protocol buffers") (description -- cgit v1.2.3 From a9af09df177bc7bdba0375c7fd57d8369b8a9800 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:01:29 +0200 Subject: gnu: r-flowworkspace: Update to 4.0.3. * gnu/packages/bioconductor.scm (r-flowworkspace): Update to 4.0.3. [propagated-inputs]: Remove r-flowviz, r-gridextra, and r-rcolorbrewer; add r-ggplot2, r-rcpparmadillo, r-rhdf5lib, and r-xml. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 04c203ac88..bce6b4a20e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6117,14 +6117,14 @@ for other R packages to compile and link against.") (define-public r-flowworkspace (package (name "r-flowworkspace") - (version "3.34.1") + (version "4.0.3") (source (origin (method url-fetch) (uri (bioconductor-uri "flowWorkspace" version)) (sha256 (base32 - "1ijbc6z9ljhrw3cqr02smgplhrfg44gzrb1dq4gbrpq3nj4khhpn")))) + "1fi76m6r5x4w390996989rignffdzl11k3prpimpwjd3566c276w")))) (properties `((upstream-name . "flowWorkspace"))) (build-system r-build-system) (propagated-inputs @@ -6136,21 +6136,24 @@ for other R packages to compile and link against.") ("r-digest" ,r-digest) ("r-dplyr" ,r-dplyr) ("r-flowcore" ,r-flowcore) - ("r-flowviz" ,r-flowviz) + ("r-ggplot2" ,r-ggplot2) ("r-graph" ,r-graph) - ("r-gridextra" ,r-gridextra) ("r-lattice" ,r-lattice) ("r-latticeextra" ,r-latticeextra) ("r-matrixstats" ,r-matrixstats) ("r-ncdfflow" ,r-ncdfflow) ("r-rbgl" ,r-rbgl) - ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) ("r-rcppparallel" ,r-rcppparallel) ("r-rgraphviz" ,r-rgraphviz) + ("r-rhdf5lib" ,r-rhdf5lib) ("r-rprotobuflib" ,r-rprotobuflib) ("r-scales" ,r-scales) - ("r-stringr" ,r-stringr))) + ("r-stringr" ,r-stringr) + ("r-xml" ,r-xml))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/flowWorkspace/") (synopsis "Infrastructure for working with cytometry data") (description -- cgit v1.2.3 From 372caae6a966fb7154b86c3775ed9a4c27071c64 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:01:47 +0200 Subject: gnu: r-flowstats: Update to 4.0.0. * gnu/packages/bioconductor.scm (r-flowstats): Update to 4.0.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index bce6b4a20e..ee16052fa4 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6168,14 +6168,14 @@ matches the flowJo analysis.") (define-public r-flowstats (package (name "r-flowstats") - (version "3.44.0") + (version "4.0.0") (source (origin (method url-fetch) (uri (bioconductor-uri "flowStats" version)) (sha256 (base32 - "0pql0lpf90nra7w6z6nd8l9cgjlsg2pxysfravnbzfhl3pjvd96w")))) + "1ygvxvd7y6jp907y0h3hycdwvw1fch16w84g06nk4f4g4kvrzdir")))) (properties `((upstream-name . "flowStats"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8f5e16742dea5a8486302235690edfaecd8f8759 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:01:53 +0200 Subject: gnu: r-opencyto: Update to 2.0.0. * gnu/packages/bioconductor.scm (r-opencyto): Update to 2.0.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ee16052fa4..596fdad033 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6204,14 +6204,14 @@ package.") (define-public r-opencyto (package (name "r-opencyto") - (version "1.24.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (bioconductor-uri "openCyto" version)) (sha256 (base32 - "0h25nhvq1zq624wsgb55wjcgri9rcd2fnqkb31h9jdakr01dw2sb")))) + "10dyd6dddskv70vhpwfbsqdb8pb9i3ka0fgvl1h51wqlckbsj89m")))) (properties `((upstream-name . "openCyto"))) (build-system r-build-system) (propagated-inputs @@ -6236,6 +6236,8 @@ package.") ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-rcpp" ,r-rcpp) ("r-rrcov" ,r-rrcov))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/openCyto") (synopsis "Hierarchical gating pipeline for flow cytometry data") (description -- cgit v1.2.3 From 8d5a83b7c635636bb70a7ae260ffb47d1628b340 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:01:58 +0200 Subject: gnu: r-cytoml: Update to 2.0.0. * gnu/packages/bioconductor.scm (r-cytoml): Update to 2.0.0. [propagated-inputs]: Remove r-ncdfflow; add r-rcpparmadillo, r-rhdf5lib, and r-tibble. --- gnu/packages/bioconductor.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 596fdad033..43e30f8886 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6248,14 +6248,14 @@ sequential way to mimic the manual gating strategy.") (define-public r-cytoml (package (name "r-cytoml") - (version "1.12.1") + (version "2.0.0") (source (origin (method url-fetch) (uri (bioconductor-uri "CytoML" version)) (sha256 (base32 - "0wgi8rwb4spxzd5xvs5amfr5g82ny2nad57j3nmhnhnj1cpirjxz")))) + "0zpq2j4y9i5lls1kj2w4spl8qjp3076idsr2a2rjvy1fykzlp01q")))) (properties `((upstream-name . "CytoML"))) (build-system r-build-system) (inputs @@ -6274,15 +6274,17 @@ sequential way to mimic the manual gating strategy.") ("r-graph" ,r-graph) ("r-jsonlite" ,r-jsonlite) ("r-lattice" ,r-lattice) - ("r-ncdfflow" ,r-ncdfflow) ("r-opencyto" ,r-opencyto) ("r-plyr" ,r-plyr) ("r-rbgl" ,r-rbgl) ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) ("r-rcppparallel" ,r-rcppparallel) ("r-rgraphviz" ,r-rgraphviz) + ("r-rhdf5lib" ,r-rhdf5lib) ("r-rprotobuflib" ,r-rprotobuflib) ("r-runit" ,r-runit) + ("r-tibble" ,r-tibble) ("r-xml" ,r-xml) ("r-yaml" ,r-yaml))) (native-inputs -- cgit v1.2.3 From 32bd0295c8a542489b248ce8164f9edef58a8a87 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:02:13 +0200 Subject: gnu: r-flowsom: Update to 1.20.0. * gnu/packages/bioconductor.scm (r-flowsom): Update to 1.20.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 43e30f8886..d0a631bab0 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6299,14 +6299,14 @@ standard to exchange gated cytometry data with other software platforms.") (define-public r-flowsom (package (name "r-flowsom") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "FlowSOM" version)) (sha256 (base32 - "0265sq4zvj6d6h5ghqj9xzm4b0z9v65kgyl88cgdcpdkzfnfcvd5")))) + "1p17jv4q1dbcc47jpjy9hbcvzpwrx8waq7qpcj778jsyz6z6jh78")))) (properties `((upstream-name . "FlowSOM"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 7bec32fe536ffb1add72d1d07f9096a478a34060 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:02:17 +0200 Subject: gnu: r-mixomics: Update to 6.12.1. * gnu/packages/bioconductor.scm (r-mixomics): Update to 6.12.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d0a631bab0..d9a974bd45 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6329,14 +6329,14 @@ self-organizing map clustering and minimal spanning trees.") (define-public r-mixomics (package (name "r-mixomics") - (version "6.10.9") + (version "6.12.1") (source (origin (method url-fetch) (uri (bioconductor-uri "mixOmics" version)) (sha256 (base32 - "0b457yg8mwqlrn5l344w8qcj8v2ghlj1wdx1ysxbncqvqx7nvgig")))) + "13kq9l5xwhwp30y5gfqfh5f11n63vn8rk195mb2y2mww4cwi6lv4")))) (properties `((upstream-name . "mixOmics"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From af66e35d315325f0565f1277a4bff9624a849bc3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:02:20 +0200 Subject: gnu: r-depecher: Update to 1.4.0. * gnu/packages/bioconductor.scm (r-depecher): Update to 1.4.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d9a974bd45..284ba330df 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6373,14 +6373,14 @@ delete entire rows with missing data.") (define-public r-depecher (package (name "r-depecher") - (version "1.2.2") + (version "1.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DepecheR" version)) (sha256 (base32 - "199j2kw0xnw7y4v1gakm2jgyc7zzlj8xh0570f2yjq55gp1kggbm")))) + "0nmx04qybzf6nhfngmdxwpbbz9x32v34mbnpg8jq7a2cgchzsj9s")))) (properties `((upstream-name . "DepecheR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 93235b1eb332bddf3f0d587c9b0087326fc701f9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:02:26 +0200 Subject: gnu: r-rcistarget: Update to 1.8.0. * gnu/packages/bioconductor.scm (r-rcistarget): Update to 1.8.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 284ba330df..034146e429 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6418,14 +6418,14 @@ data, to only emphasize the data that actually matters.") (define-public r-rcistarget (package (name "r-rcistarget") - (version "1.6.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RcisTarget" version)) (sha256 (base32 - "1nnah7s0jd24fpfyxsf76jas8dm23c3266aps124wdlqsp9q5qjw")))) + "1lvi873dv0vhw53s1pmcilw8qwlywm9p2ybphcl168nzh6w31r4i")))) (properties `((upstream-name . "RcisTarget"))) (build-system r-build-system) (propagated-inputs @@ -6436,6 +6436,8 @@ data, to only emphasize the data that actually matters.") ("r-gseabase" ,r-gseabase) ("r-r-utils" ,r-r-utils) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://aertslab.org/#scenic") (synopsis "Identify transcription factor binding motifs enriched on a gene list") (description -- cgit v1.2.3 From e677c9b501008c3f519ed0c5a35694001a889e0f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:02:30 +0200 Subject: gnu: r-cicero: Update to 1.6.0. * gnu/packages/bioconductor.scm (r-cicero): Update to 1.6.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 034146e429..d0cd4ef728 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6455,14 +6455,14 @@ genes in the gene-set that are ranked above the leading edge).") (define-public r-cicero (package (name "r-cicero") - (version "1.4.4") + (version "1.6.0") (source (origin (method url-fetch) (uri (bioconductor-uri "cicero" version)) (sha256 (base32 - "1ay1g2r0la4grcp1y8vcp211lfwzjf7j819ajzdirsh5dab8whld")))) + "0n78lf5hz6zzl550dbf4imis43pv91zicfff8y4lspckljhz9z75")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From b32808831cac2961741f3ebb7c8176556abda699 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:02:34 +0200 Subject: gnu: r-genie3: Update to 1.10.0. * gnu/packages/bioconductor.scm (r-genie3): Update to 1.10.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d0cd4ef728..c558c16b49 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6565,17 +6565,19 @@ cisTopics and explore the nature and regulatory proteins driving them.") (define-public r-genie3 (package (name "r-genie3") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GENIE3" version)) (sha256 (base32 - "0p67lhgy3lb4nc958s51hx7rvgwhzwfic9xhpsrask40k43spv7l")))) + "1bsm0gxracsyg1wnaw3whvskghfpbgbm9navr8wdmxj2hjp3dqs7")))) (properties `((upstream-name . "GENIE3"))) (build-system r-build-system) (propagated-inputs `(("r-reshape2" ,r-reshape2))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/GENIE3") (synopsis "Gene network inference with ensemble of trees") (description -- cgit v1.2.3 From cad8a5099a257940bb615d87782a9e8054723583 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:02:45 +0200 Subject: gnu: r-roc: Update to 1.64.0. * gnu/packages/bioconductor.scm (r-roc): Update to 1.64.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c558c16b49..49c1f89179 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6588,14 +6588,14 @@ regulatory networks from expression data.") (define-public r-roc (package (name "r-roc") - (version "1.62.0") + (version "1.64.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ROC" version)) (sha256 (base32 - "1aqpyc28czagg3nbybh55vf152nbar61jjw79w04326d97mc3j3y")))) + "0gmx3r77yl5fqrj5j2hamwynbis75qd62q28964kx16z33xfgx89")))) (properties `((upstream-name . "ROC"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 939ace96243ac56e8e7c80487e72ad44f1901433 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:02:50 +0200 Subject: gnu: r-watermelon: Update to 1.32.0. * gnu/packages/bioconductor.scm (r-watermelon): Update to 1.32.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 49c1f89179..e14ce13197 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6636,14 +6636,14 @@ data.") (define-public r-watermelon (package (name "r-watermelon") - (version "1.30.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "wateRmelon" version)) (sha256 (base32 - "0a66fq04yph9dis91lzjk9kh134zy6fj98yklrwf24r1080qngx0")))) + "1c3a6bq3ggmv8kmdfrgiar6nwgircgzjrbgd9z9dqiin7j13gxwn")))) (properties `((upstream-name . "wateRmelon"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From f4954b0b57ed093383eff7f7c142632a51e9acad Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:02:56 +0200 Subject: gnu: r-gdsfmt: Update to 1.24.0. * gnu/packages/bioconductor.scm (r-gdsfmt): Update to 1.24.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e14ce13197..4d6ae76fff 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6673,14 +6673,14 @@ metrics, with methods for objects produced by the @code{methylumi} and (define-public r-gdsfmt (package (name "r-gdsfmt") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "gdsfmt" version)) (sha256 (base32 - "0zc9v62imd0ykz4h30pxa64q0y45qijmkwdk2pd4ncsg8fc2jlz9")) + "00hggma0i15w03xi9jr02v2593jbqkcxyfcvpp7mdzrshn99m9p6")) (modules '((guix build utils))) ;; Remove bundled sources of zlib, lz4, and xz. Don't attempt to build ;; them and link with system libraries instead. @@ -6710,6 +6710,8 @@ metrics, with methods for objects produced by the @code{methylumi} and `(("lz4" ,lz4) ("xz" ,xz) ("zlib" ,zlib))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "http://corearray.sourceforge.net/") (synopsis "R Interface to CoreArray Genomic Data Structure (GDS) Files") -- cgit v1.2.3 From 8112796db1c255a0b6554dfbd2e5a277666a9bf5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:02:59 +0200 Subject: gnu: r-bigmelon: Update to 1.14.0. * gnu/packages/bioconductor.scm (r-bigmelon): Update to 1.14.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 4d6ae76fff..970d4afb67 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6732,14 +6732,14 @@ with multiple R processes supported by the package @code{parallel}.") (define-public r-bigmelon (package (name "r-bigmelon") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bigmelon" version)) (sha256 (base32 - "0sw7rp4p03m1s72b4j06jfb7as3v1n2w2z4ppk8s4f80fb05bcls")))) + "1cryjhbiacm45g097rpqgbva49hs5vdx4y4h5h2v1gw4k78hwb4y")))) (properties `((upstream-name . "bigmelon"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 83b7625caef2a12627ae0dcec80c1816a21b3d29 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:03:03 +0200 Subject: gnu: r-seqbias: Update to 1.36.0. * gnu/packages/bioconductor.scm (r-seqbias): Update to 1.36.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 970d4afb67..bc9e9ee2d0 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6760,14 +6760,14 @@ with multiple R processes supported by the package @code{parallel}.") (define-public r-seqbias (package (name "r-seqbias") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "seqbias" version)) (sha256 (base32 - "19vbdyjblij2533ibmrw1n0rkqfrbflma6cg5b79ghks0mg7z8hq")))) + "0sy2fv98x4qfz9llns28jh1n4bi991jj856y8a5fbzpx7y990lai")))) (properties `((upstream-name . "seqbias"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From efb44ebca40f4fae10909699f1a4e463be171bad Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:03:07 +0200 Subject: gnu: r-reqon: Update to 1.34.0. * gnu/packages/bioconductor.scm (r-reqon): Update to 1.34.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index bc9e9ee2d0..f47ac9e462 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6826,14 +6826,14 @@ injected in that sequence).") (define-public r-reqon (package (name "r-reqon") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ReQON" version)) (sha256 (base32 - "10p6l2zxijqyypdm970jyfqyrnfhaq3nf7cg2q6mgd1srggfa0cx")))) + "06m0hd4aqsxjyzhs8b1zys7lz8289qgwn7jp2dpln1j7cf02q4bz")))) (properties `((upstream-name . "ReQON"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 12b255f213d5944fc2de7c341f3d74d42700b9d2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:03:11 +0200 Subject: gnu: r-wavcluster: Update to 2.22.0. * gnu/packages/bioconductor.scm (r-wavcluster): Update to 2.22.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index f47ac9e462..46c8b01aaf 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6851,14 +6851,14 @@ format.") (define-public r-wavcluster (package (name "r-wavcluster") - (version "2.20.0") + (version "2.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "wavClusteR" version)) (sha256 (base32 - "0vq3xxsvwq86rlya7xc92sc4i6b48sib0pcina3xivg3ky2j3z7y")))) + "0204czqjmkwhd6gznwxzb0vj3dg3aif628g8c30085aa2jljn9bk")))) (properties `((upstream-name . "wavClusteR"))) (build-system r-build-system) (propagated-inputs @@ -6877,6 +6877,8 @@ format.") ("r-seqinr" ,r-seqinr) ("r-stringr" ,r-stringr) ("r-wmtsa" ,r-wmtsa))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/wavClusteR/") (synopsis "Identification of RNA-protein interaction sites in PAR-CLIP data") (description -- cgit v1.2.3 From 49dd504192e73f7f484217032e1eecc6012d98d3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:03:20 +0200 Subject: gnu: r-timeseriesexperiment: Update to 1.6.0. * gnu/packages/bioconductor.scm (r-timeseriesexperiment): Update to 1.6.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 46c8b01aaf..f99a954ae4 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6899,14 +6899,14 @@ procedures that induce nucleotide substitutions (e.g. BisSeq).") (define-public r-timeseriesexperiment (package (name "r-timeseriesexperiment") - (version "1.4.0") + (version "1.6.0") (source (origin (method url-fetch) (uri (bioconductor-uri "TimeSeriesExperiment" version)) (sha256 (base32 - "0xqa6hzknnci20zx2f6mw5cpqx8pq0v6fzf053hh51p1l2ikvgqm")))) + "1k0djvcsyjj1ayncvmi8nlqi3jdn5qp41y3fwsqg1cp0qsvx7zv3")))) (properties `((upstream-name . "TimeSeriesExperiment"))) (build-system r-build-system) @@ -6926,6 +6926,8 @@ procedures that induce nucleotide substitutions (e.g. BisSeq).") ("r-tidyr" ,r-tidyr) ("r-vegan" ,r-vegan) ("r-viridis" ,r-viridis))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/nlhuong/TimeSeriesExperiment/") (synopsis "Analysis for short time-series data") (description -- cgit v1.2.3 From 41f7fe4aa962df2f1e558227c416dec8053f5e53 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:03:23 +0200 Subject: gnu: r-variantfiltering: Update to 1.24.0. * gnu/packages/bioconductor.scm (r-variantfiltering): Update to 1.24.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index f99a954ae4..33531c3f0f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6940,14 +6940,14 @@ provides methods for retrieving enriched pathways.") (define-public r-variantfiltering (package (name "r-variantfiltering") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "VariantFiltering" version)) (sha256 (base32 - "13pgfk2mbffd9smmxnwz7g0jrwng78711053wfzadr107zbyn4r8")))) + "0lsrnybsbm9siyjv4nal6bmprj8ynwgk4n1145f4h52g78wq3br4")))) (properties `((upstream-name . "VariantFiltering"))) (build-system r-build-system) -- cgit v1.2.3 From fbbaf5ae64b0c2d8fa2a22639e5c47bf579bfb9f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:03:28 +0200 Subject: gnu: r-variancepartition: Update to 1.18.0. * gnu/packages/bioconductor.scm (r-variancepartition): Update to 1.18.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 33531c3f0f..854d545fc7 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7046,14 +7046,14 @@ arrays based on fast wavelet-based functional models.") (define-public r-variancepartition (package (name "r-variancepartition") - (version "1.16.1") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "variancePartition" version)) (sha256 (base32 - "02pzsff14j4am2d949mh8xgi0c7k44g09q4lr6nqm08vf92brb6g")))) + "1rn655qq7dshbk1dd41n7y2hfz8498jxd2j4rk7p8hrikd3s32dm")))) (properties `((upstream-name . "variancePartition"))) (build-system r-build-system) @@ -7074,6 +7074,8 @@ arrays based on fast wavelet-based functional models.") ("r-progress" ,r-progress) ("r-reshape2" ,r-reshape2) ("r-scales" ,r-scales))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/variancePartition/") (synopsis "Analyze variation in gene expression experiments") (description -- cgit v1.2.3 From 518050a75b533106610179986bba209ce4c5862a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:03:32 +0200 Subject: gnu: r-htqpcr: Update to 1.42.0. * gnu/packages/bioconductor.scm (r-htqpcr): Update to 1.42.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 854d545fc7..30882cd7b2 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7090,14 +7090,14 @@ measures.") (define-public r-htqpcr (package (name "r-htqpcr") - (version "1.40.0") + (version "1.42.0") (source (origin (method url-fetch) (uri (bioconductor-uri "HTqPCR" version)) (sha256 (base32 - "008iczqaa0wn5nw144vfg3qylg7qa1q963nq9mqhgj3sxlg4rmjx")))) + "08bd5zkjdnz726s03bvvzv03va0xbrr818ipp6737z9g3nk9m81j")))) (properties `((upstream-name . "HTqPCR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From a9148d0686d2db9b87f027583f43dd7e1e90aee5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:03:35 +0200 Subject: gnu: r-unifiedwmwqpcr: Update to 1.24.0. * gnu/packages/bioconductor.scm (r-unifiedwmwqpcr): Update to 1.24.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 30882cd7b2..3adf594462 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7124,14 +7124,14 @@ features (e.g. genes, microRNAs).") (define-public r-unifiedwmwqpcr (package (name "r-unifiedwmwqpcr") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "unifiedWMWqPCR" version)) (sha256 (base32 - "1l6rf7scxxyz4x0m4li54y6905sqj4jrx481zb9h3vqhcfcmn8lj")))) + "1l9gxq3askr3cz2a4bqsw7vjr1agivzvx651cblkygv57x08zf81")))) (properties `((upstream-name . "unifiedWMWqPCR"))) (build-system r-build-system) -- cgit v1.2.3 From 296992be0844deec4645f644bfcb62efea3fe9e8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:03:39 +0200 Subject: gnu: r-bgmix: Update to 1.48.0. * gnu/packages/bioconductor.scm (r-bgmix): Update to 1.48.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3adf594462..0192d6c5e5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7215,14 +7215,14 @@ cellular organization in health and disease.") (define-public r-bgmix (package (name "r-bgmix") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BGmix" version)) (sha256 (base32 - "1bwqqhkh4m3hhpd71grwjrg7n07lzvys4y7aghmw2gw5ibnk5683")))) + "1pfi3hinjn6ymikadgj8dqm59h7mapf01wj86dbbvf8y1xqp8y8n")))) (properties `((upstream-name . "BGmix"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From de91f15a7465dd91cf34b7015d989380b2fef4ab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:03:42 +0200 Subject: gnu: r-bgx: Update to 1.54.0. * gnu/packages/bioconductor.scm (r-bgx): Update to 1.54.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0192d6c5e5..06b2841482 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7237,14 +7237,14 @@ gene expression.") (define-public r-bgx (package (name "r-bgx") - (version "1.52.0") + (version "1.54.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bgx" version)) (sha256 (base32 - "0fiqqv6pin0zhxaw67hzfjccq2qkl9qfqjf10nx2zmpxm2licavm")))) + "0r67a6m5hrnsxgk0f57hl5yaagi2wai2kpfyjjlhrck4rlm1sjcx")))) (properties `((upstream-name . "bgx"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 2415576ecb4608ec4c3d22289309a0e829263f69 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:03:46 +0200 Subject: gnu: r-bhc: Update to 1.40.0. * gnu/packages/bioconductor.scm (r-bhc): Update to 1.40.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 06b2841482..884a448258 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7262,14 +7262,14 @@ Affymetrix GeneChips.") (define-public r-bhc (package (name "r-bhc") - (version "1.38.0") + (version "1.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BHC" version)) (sha256 (base32 - "1bxx3jak8mgvay3j1xd59bb9j86pzl6hh5abxww9x1b7rswmy1jh")))) + "06milqjg2nl3ra47sxi7a2p2d3mbrx3wk168pqgimvs8snldd2xr")))) (properties `((upstream-name . "BHC"))) (build-system r-build-system) (home-page "https://bioconductor.org/packages/BHC/") -- cgit v1.2.3 From 7642517336c39974fb01f65a8276378f90c7d48d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:03:50 +0200 Subject: gnu: r-bicare: Update to 1.46.0. * gnu/packages/bioconductor.scm (r-bicare): Update to 1.46.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 884a448258..dafd7ff627 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7288,14 +7288,14 @@ algorithm which is more efficient for larger data sets.") (define-public r-bicare (package (name "r-bicare") - (version "1.44.0") + (version "1.46.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BicARE" version)) (sha256 (base32 - "1gia5vzmvbk4k1vx3bh9nld1ws9s3c0y11qfbzqhfnfjbd7n8qcs")))) + "0llckbl3l26lf6wgjg7rxs8k1yrk043vvdhnkc6ncg33sydj383y")))) (properties `((upstream-name . "BicARE"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From a54fd4099456891124f19c02cb4ffce201cc0cd6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:03:54 +0200 Subject: gnu: r-bifet: Update to 1.8.0. * gnu/packages/bioconductor.scm (r-bifet): Update to 1.8.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index dafd7ff627..7e13795bd0 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7312,19 +7312,21 @@ results.") (define-public r-bifet (package (name "r-bifet") - (version "1.6.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiFET" version)) (sha256 (base32 - "0ck1d6hxd4f40hfz8p2z5xmjbz79yhrf6fisjka2xzk5v9fm4p4k")))) + "1v2dshs09iy2glzq0vwxmr83x867j844i1ixsfcamvfq33fwbbr5")))) (properties `((upstream-name . "BiFET"))) (build-system r-build-system) (propagated-inputs `(("r-genomicranges" ,r-genomicranges) ("r-poibin" ,r-poibin))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/BiFET") (synopsis "Bias-free footprint enrichment test") (description -- cgit v1.2.3 From d65bdbb2cbe3bfce048fc859d157ca9c998edc5e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:03:59 +0200 Subject: gnu: r-rsbml: Update to 2.46.0. * gnu/packages/bioconductor.scm (r-rsbml): Update to 2.46.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7e13795bd0..a5960deed8 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7342,14 +7342,14 @@ the read count and GC content bias.") (define-public r-rsbml (package (name "r-rsbml") - (version "2.44.0") + (version "2.46.0") (source (origin (method url-fetch) (uri (bioconductor-uri "rsbml" version)) (sha256 (base32 - "1dbp0aaijxn3na26b68ws0v9qzvml61ifb9z4i8pz7q6h48n7lxa")))) + "1i1izznnwzrc6m7s3hblfff466icfvxl2gjdqaln8qfg9v87rslx")))) (properties `((upstream-name . "rsbml"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 0ff724616bba61df9d5908878365996a335c695d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:04:03 +0200 Subject: gnu: r-hypergraph: Update to 1.60.0. * gnu/packages/bioconductor.scm (r-hypergraph): Update to 1.60.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a5960deed8..0ca977a7e1 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7370,14 +7370,14 @@ validating output, provides an S4 SBML DOM, converts SBML to R graph objects.") (define-public r-hypergraph (package (name "r-hypergraph") - (version "1.58.0") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "hypergraph" version)) (sha256 (base32 - "1bixmslxy7r987zw1vf4dg72hfi04lf4vj03n7ygym2g8nfhbh7m")))) + "1iq9b9rzy3ikx8xszsjiv3p8l702n2h2s9w33797wcmkg4apslb7")))) (properties `((upstream-name . "hypergraph"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 3116998610a21bf81d80c5fb9beda611264fb83c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:04:07 +0200 Subject: gnu: r-hyperdraw: Update to 1.40.0. * gnu/packages/bioconductor.scm (r-hyperdraw): Update to 1.40.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0ca977a7e1..0b2d272723 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7392,14 +7392,14 @@ manipulating hypergraphs.") (define-public r-hyperdraw (package (name "r-hyperdraw") - (version "1.38.0") + (version "1.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "hyperdraw" version)) (sha256 (base32 - "0a8h3pb7196qi49ady8ni92m5wqb1hvxw6khk9j63mwj3h7jinbj")))) + "1qzx5sqp7rpspk8g1j34p03ds1vmw0h7hpzb2ijpbvmsja5drzvf")))) (properties `((upstream-name . "hyperdraw"))) (build-system r-build-system) (inputs `(("graphviz" ,graphviz))) -- cgit v1.2.3 From f31edb0191266ae2e8531e4f3cc5a3912b4f2990 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:04:12 +0200 Subject: gnu: r-biggr: Update to 1.24.0. * gnu/packages/bioconductor.scm (r-biggr): Update to 1.24.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0b2d272723..d88cfb332f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7416,14 +7416,14 @@ manipulating hypergraphs.") (define-public r-biggr (package (name "r-biggr") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiGGR" version)) (sha256 (base32 - "1n2ypc84abmhn6br0yi87k7lvjc11k7abzhgvzdabc2ai1qgcqif")))) + "05afi6hsh1dv6lc6l0dfhvvi8k34wyzf1k1jimam7a6pbrhyy5dk")))) (properties `((upstream-name . "BiGGR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From eef9c99cd8ab6b08a9932b9470c16f00c38a13da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:04:17 +0200 Subject: gnu: r-bigmemoryextras: Update to 1.36.0. * gnu/packages/bioconductor.scm (r-bigmemoryextras): Update to 1.36.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d88cfb332f..7b8d767fb5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7446,19 +7446,21 @@ networks and estimated fluxes can be visualized with hypergraphs.") (define-public r-bigmemoryextras (package (name "r-bigmemoryextras") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bigmemoryExtras" version)) (sha256 (base32 - "17dk7c44ikphcrpi8hnxyvlmj30qmj098kc0ihfi69bp9rw1cibq")))) + "053bqcd3p4i7agj43ccjxfz40a1sxrymd49vdpfq8ypslkwk7g0g")))) (properties `((upstream-name . "bigmemoryExtras"))) (build-system r-build-system) (propagated-inputs `(("r-bigmemory" ,r-bigmemory))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/phaverty/bigmemoryExtras") (synopsis "Extension of the bigmemory package") (description -- cgit v1.2.3 From d0badcc180f132b5bf3bfa8074ab609518ded7b4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:04:29 +0200 Subject: gnu: r-bigpint: Update to 1.4.0. * gnu/packages/bioconductor.scm (r-bigpint): Update to 1.4.0. [propagated-inputs]: Add r-delayedarray and r-summarizedexperiment. --- gnu/packages/bioconductor.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7b8d767fb5..59bc53ad02 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7480,18 +7480,19 @@ a file-backed matrix with factor properties.") (define-public r-bigpint (package (name "r-bigpint") - (version "1.2.2") + (version "1.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bigPint" version)) (sha256 (base32 - "1zkakxi1iqavzmjxnkkd02qm5jk28ldcvcdcxaafz748dz6s67fs")))) + "1m92ngkzimcc37byf0ziphrby8wmjd5hfa53gvfphgaakyj9bjg8")))) (properties `((upstream-name . "bigPint"))) (build-system r-build-system) (propagated-inputs - `(("r-dplyr" ,r-dplyr) + `(("r-delayedarray" ,r-delayedarray) + ("r-dplyr" ,r-dplyr) ("r-ggally" ,r-ggally) ("r-ggplot2" ,r-ggplot2) ("r-gridextra" ,r-gridextra) @@ -7506,6 +7507,7 @@ a file-backed matrix with factor properties.") ("r-shinycssloaders" ,r-shinycssloaders) ("r-shinydashboard" ,r-shinydashboard) ("r-stringr" ,r-stringr) + ("r-summarizedexperiment" ,r-summarizedexperiment) ("r-tidyr" ,r-tidyr))) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From 06908a73fca34a7f99cd1f30ce1818f1e71d861b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:04:40 +0200 Subject: gnu: r-chemminer: Update to 3.40.0. * gnu/packages/bioconductor.scm (r-chemminer): Update to 3.40.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 59bc53ad02..65ffc3bfd2 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7523,14 +7523,14 @@ visualizing RNA-sequencing datasets and differentially expressed genes.") (define-public r-chemminer (package (name "r-chemminer") - (version "3.38.0") + (version "3.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ChemmineR" version)) (sha256 (base32 - "1j6vmkhc03dmmkm5wgbcv62pw5dclp49f906xkx1pwg27bdldbga")))) + "0cna5xsqflvhlp2k47asxyv3w4ympmz2wy2cwjyzlal6936fjikf")))) (properties `((upstream-name . "ChemmineR"))) (build-system r-build-system) (propagated-inputs @@ -7547,6 +7547,8 @@ visualizing RNA-sequencing datasets and differentially expressed genes.") ("r-rcurl" ,r-rcurl) ("r-rjson" ,r-rjson) ("r-rsvg" ,r-rsvg))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/girke-lab/ChemmineR") (synopsis "Cheminformatics toolkit for R") (description -- cgit v1.2.3 From c8cbde9ff65041a8b2e4f393465224f4edf53aa0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:04:49 +0200 Subject: gnu: r-bioassayr: Update to 1.26.0. * gnu/packages/bioconductor.scm (r-bioassayr): Update to 1.26.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 65ffc3bfd2..3022408996 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7564,14 +7564,14 @@ structures.") (define-public r-bioassayr (package (name "r-bioassayr") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bioassayR" version)) (sha256 (base32 - "08vxkvxhqnryfbj4dwk3ifb9pn544www9zk2pj9fjbh5xfpwi7zw")))) + "1n0gsnxcl0lplqk8rs5ygxrxpx389ddl6wv3ciyz9g2xry5biyfy")))) (properties `((upstream-name . "bioassayR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From e09ca033f4348bb08b458aaf8b337e6089649dc6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:04:54 +0200 Subject: gnu: r-biobroom: Update to 1.20.0. * gnu/packages/bioconductor.scm (r-biobroom): Update to 1.20.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3022408996..cc2f082f1b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7599,14 +7599,14 @@ available bioactivity data.") (define-public r-biobroom (package (name "r-biobroom") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biobroom" version)) (sha256 (base32 - "1480ycdsh9xdhbpr47vdw5g6m8arqsnp8hc19wwhzm8npxh4qqlb")))) + "06qcrprn58kbrr5kyw1jl6z88b9w9g8xs6rkhrbnz8k7rv373fhf")))) (properties `((upstream-name . "biobroom"))) (build-system r-build-system) (propagated-inputs @@ -7614,6 +7614,8 @@ available bioactivity data.") ("r-broom" ,r-broom) ("r-dplyr" ,r-dplyr) ("r-tidyr" ,r-tidyr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/StoreyLab/biobroom") (synopsis "Turn Bioconductor objects into tidy data frames") (description -- cgit v1.2.3 From 29b17027997c9db7f8900f7b4994ddef83541290 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:04:59 +0200 Subject: gnu: r-graphite: Update to 1.34.0. * gnu/packages/bioconductor.scm (r-graphite): Update to 1.34.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index cc2f082f1b..6b3aad2d61 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7631,14 +7631,14 @@ visualize bioinformatics analyses.") (define-public r-graphite (package (name "r-graphite") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "graphite" version)) (sha256 (base32 - "1r9fk0cpdwm7012pa85dkjcpkml2j89zcznpf4hfdz66anfyyycd")))) + "0rc9cw3picz1y0lwhbzpk03ciij8kij74m15qgzh2ykla7zprb2p")))) (properties `((upstream-name . "graphite"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From affb4ab3519c0fdcb0b7b29dd49c59c6d8b82750 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:05:03 +0200 Subject: gnu: r-reactomepa: Update to 1.32.0. * gnu/packages/bioconductor.scm (r-reactomepa): Update to 1.32.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6b3aad2d61..eea1dfac95 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7658,14 +7658,14 @@ symbols).") (define-public r-reactomepa (package (name "r-reactomepa") - (version "1.30.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ReactomePA" version)) (sha256 (base32 - "1vwc9kj1l4yi7c4f4lnq0i3wl2nrmmhcxyakz8qak122fi92z3j1")))) + "1ngilyn1mihwxs4sh5gk9y829xghdmh277cfw3vfgflz9sgwy21x")))) (properties `((upstream-name . "ReactomePA"))) (build-system r-build-system) (propagated-inputs @@ -7677,6 +7677,8 @@ symbols).") ("r-graphite" ,r-graphite) ("r-igraph" ,r-igraph) ("r-reactome-db" ,r-reactome-db))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://guangchuangyu.github.io/software/ReactomePA") (synopsis "Reactome pathway analysis") (description -- cgit v1.2.3 From a74a427bd8645de1ff1e5f9f5cb12dc9855678f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:05:07 +0200 Subject: gnu: r-ebarrays: Update to 2.52.0. * gnu/packages/bioconductor.scm (r-ebarrays): Update to 2.52.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index eea1dfac95..6f90321f3c 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7690,14 +7690,14 @@ enrichment analysis and several functions for visualization.") (define-public r-ebarrays (package (name "r-ebarrays") - (version "2.50.0") + (version "2.52.0") (source (origin (method url-fetch) (uri (bioconductor-uri "EBarrays" version)) (sha256 (base32 - "063rhsdp8x0f881kslq06zxfp6b2qabrz4vmfrn8a4v3pd3n7s13")))) + "00ld26bld8xgin9zqwxybahvhmqbrvr09jfphg0yr4j4zck6sqgf")))) (properties `((upstream-name . "EBarrays"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8b71b14158ed4f880b86b596f1e97c7666e1a4f5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:05:10 +0200 Subject: gnu: r-bioccasestudies: Update to 1.50.0. * gnu/packages/bioconductor.scm (r-bioccasestudies): Update to 1.50.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6f90321f3c..64c4bedae8 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7714,14 +7714,14 @@ microarray data.") (define-public r-bioccasestudies (package (name "r-bioccasestudies") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocCaseStudies" version)) (sha256 (base32 - "1sg9vxs24zfz3dg9y0qlrdsq43y0pbahbvcfxzlxjzjw80xzxpbd")))) + "0fadck1dk1zavpn9yrcwx6zgfi18fw5xfs8svgzipns6bq41j8ix")))) (properties `((upstream-name . "BiocCaseStudies"))) (build-system r-build-system) -- cgit v1.2.3 From 543c63f2ae97acc0f32b0476f51db553482ac749 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:05:14 +0200 Subject: gnu: r-biocgraph: Update to 1.50.0. * gnu/packages/bioconductor.scm (r-biocgraph): Update to 1.50.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 64c4bedae8..e7d648cdb7 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7736,14 +7736,14 @@ monograph.") (define-public r-biocgraph (package (name "r-biocgraph") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biocGraph" version)) (sha256 (base32 - "1rv2lwiqwg7h7za23n896fs4dpla3xhw6kzwghb6iw5nlm2m61yw")))) + "1372bm4y3czqhpki10pnprxfkfncfcsy59zzvf8wj6q03acaavrj")))) (properties `((upstream-name . "biocGraph"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From b56a3462adcbb2770df3f3612a08b4fe1dcbce41 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:05:21 +0200 Subject: gnu: r-experimenthub: Update to 1.14.0. * gnu/packages/bioconductor.scm (r-experimenthub): Update to 1.14.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e7d648cdb7..d531777b16 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7761,14 +7761,14 @@ different graph related packages produced by Bioconductor.") (define-public r-experimenthub (package (name "r-experimenthub") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ExperimentHub" version)) (sha256 (base32 - "054w2lkyirbmhgia0rp4nk9zzw3zphz6jxg6fc9zlarp90g64z24")))) + "18d6kjfavy5b769gpkblihdkz2nz2hsgyjki8mp1sywi0ik08ncd")))) (properties `((upstream-name . "ExperimentHub"))) (build-system r-build-system) (propagated-inputs @@ -7779,6 +7779,8 @@ different graph related packages produced by Bioconductor.") ("r-curl" ,r-curl) ("r-rappdirs" ,r-rappdirs) ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/ExperimentHub/") (synopsis "Client to access ExperimentHub resources") (description -- cgit v1.2.3 From 4091eae2bce44c7fd4a5d34dbf9771b9268dfde9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:05:26 +0200 Subject: gnu: r-multiassayexperiment: Update to 1.14.0. * gnu/packages/bioconductor.scm (r-multiassayexperiment): Update to 1.14.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d531777b16..e2af1cbd4b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7795,14 +7795,14 @@ access.") (define-public r-multiassayexperiment (package (name "r-multiassayexperiment") - (version "1.12.6") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MultiAssayExperiment" version)) (sha256 (base32 - "174vzlxsyayb5il77cb3zzgszxl3l0wkprc9w6pgz4yv5ix13adi")))) + "0qlfnd86999jqv2nd0ikixi2sfd449dyg3ml4nbs8ycs57c2irgh")))) (properties `((upstream-name . "MultiAssayExperiment"))) (build-system r-build-system) -- cgit v1.2.3 From 1c51821593151d731f715f8afe38bb9ebd1af7ab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:05:32 +0200 Subject: gnu: r-bioconcotk: Update to 1.8.0. * gnu/packages/bioconductor.scm (r-bioconcotk): Update to 1.8.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e2af1cbd4b..da6719dd66 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7830,14 +7830,14 @@ rownames.") (define-public r-bioconcotk (package (name "r-bioconcotk") - (version "1.6.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocOncoTK" version)) (sha256 (base32 - "0rnah6c01a33yb9663jim9iclan61rpcwprb56mykgn1pf5hywbj")))) + "021qzygfwdnd3naz1iqq01zr3zxv3k7wm1lklik24vc7axshxbmk")))) (properties `((upstream-name . "BiocOncoTK"))) (build-system r-build-system) (propagated-inputs @@ -7863,6 +7863,8 @@ rownames.") ("r-scales" ,r-scales) ("r-shiny" ,r-shiny) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/BiocOncoTK") (synopsis "Bioconductor components for general cancer genomics") (description -- cgit v1.2.3 From 132abe5fcc9cf0a0ddae27b37c2062bd20a42c56 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:05:37 +0200 Subject: gnu: r-biocor: Update to 1.12.0. * gnu/packages/bioconductor.scm (r-biocor): Update to 1.12.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index da6719dd66..e90884f619 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7875,20 +7875,22 @@ tools for genome-scale analysis of cancer studies.") (define-public r-biocor (package (name "r-biocor") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BioCor" version)) (sha256 (base32 - "1bjw02rwmz2d715sgpfp08njb15200ch7cmipsf9hd5835ppg1jl")))) + "1xghclfqv8d23g72g8914br5zjx4sz9zihzczwwmpl15lghpnqwy")))) (properties `((upstream-name . "BioCor"))) (build-system r-build-system) (propagated-inputs `(("r-biocparallel" ,r-biocparallel) ("r-gseabase" ,r-gseabase) ("r-matrix" ,r-matrix))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://llrs.github.io/BioCor/") (synopsis "Functional similarities") (description -- cgit v1.2.3 From 1759a13d6eadad2332dee6f4fec5cf123d1f676c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:05:46 +0200 Subject: gnu: r-biocpkgtools: Update to 1.6.0. * gnu/packages/bioconductor.scm (r-biocpkgtools): Update to 1.6.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e90884f619..ccf01f3465 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7904,14 +7904,14 @@ gene selection, testing relationships, and so on.") (define-public r-biocpkgtools (package (name "r-biocpkgtools") - (version "1.4.6") + (version "1.6.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocPkgTools" version)) (sha256 (base32 - "0grwnmncmpqcplbfw3j210m1a8f7mmdizklh4zksg4ic21dpjj1a")))) + "0l5fvi1m4834n4h0iswbap135s9mpaiabw9czzn1r72ssz86vrcr")))) (properties `((upstream-name . "BiocPkgTools"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 723fa00d115f35dc23b147f82656d593840c8a77 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:05:51 +0200 Subject: gnu: r-biocset: Update to 1.2.1. * gnu/packages/bioconductor.scm (r-biocset): Update to 1.2.1. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ccf01f3465..a8a16040a6 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7954,14 +7954,14 @@ analytics on packages.") (define-public r-biocset (package (name "r-biocset") - (version "1.0.1") + (version "1.2.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocSet" version)) (sha256 (base32 - "1xcksnvjflrdarn8xqmgf0n6wbsjkq9jazqwp35i52vqcq4ic1j9")))) + "14dmkc878lskbm001kgjyqmrwnn6s032z4h64f617f1xd9zx9wrj")))) (properties `((upstream-name . "BiocSet"))) (build-system r-build-system) (propagated-inputs @@ -7972,6 +7972,8 @@ analytics on packages.") ("r-rlang" ,r-rlang) ("r-rtracklayer" ,r-rtracklayer) ("r-tibble" ,r-tibble))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/BiocSet") (synopsis -- cgit v1.2.3 From 6a88291d1a75b0c49c5990f544e7992493a3a4b4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:05:55 +0200 Subject: gnu: r-biocworkflowtools: Update to 1.14.0. * gnu/packages/bioconductor.scm (r-biocworkflowtools): Update to 1.14.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a8a16040a6..5912b9d06f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7989,14 +7989,14 @@ accessing web references for elements/sets are also available in BiocSet.") (define-public r-biocworkflowtools (package (name "r-biocworkflowtools") - (version "1.12.1") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocWorkflowTools" version)) (sha256 (base32 - "0z28s572wg9qxv52dmixxz1xf1z3fyp2j7kzk0k32fp628918wr6")))) + "0p9r71ql67sdlgd5pv118lhz8b85pr5y4ijfwzcy8wrr8jwlbddy")))) (properties `((upstream-name . "BiocWorkflowTools"))) (build-system r-build-system) -- cgit v1.2.3 From 6b9e3b92c4730c48232a3740adccbf301cde4ebb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:06:00 +0200 Subject: gnu: r-biodist: Update to 1.60.0. * gnu/packages/bioconductor.scm (r-biodist): Update to 1.60.0. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 5912b9d06f..a6d29e29c4 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8022,14 +8022,14 @@ Rmarkdown and LaTeX documents when authoring a Bioconductor Workflow.") (define-public r-biodist (package (name "r-biodist") - (version "1.58.0") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bioDist" version)) (sha256 (base32 - "0iabw07px3ybdgbbab0vv350051cm4aq8w47rz9dnmzx4kil9h5q")))) + "17bvxk0anvsp29j5nbblvaymf8qgbj3sz4ir2l7wj8kb8jfi19cp")))) (properties `((upstream-name . "bioDist"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 9ae4bd0b77db21d3e352560511d974bcc15df5db Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 01:13:00 +0200 Subject: gnu: r-mzr: Update to 2.22.0. * gnu/packages/bioinformatics.scm (r-mzr): Update to 2.22.0. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 405cb9b724..f60a918d75 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9571,14 +9571,14 @@ proteomics packages.") (define-public r-mzr (package (name "r-mzr") - (version "2.20.0") + (version "2.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "mzR" version)) (sha256 (base32 - "1cwd7phlc5jbx6r6cznyfbdpvcin5fvsaasbbi65zn0s92a80r13")) + "1r8j8yiz5lcan7j4h37sza2kwczl48dxvld3da3ghjjq67cdc2cm")) (modules '((guix build utils))) (snippet '(begin @@ -9600,7 +9600,7 @@ proteomics packages.") #t))))) (inputs `(;; Our default boost package won't work here, unfortunately, even with - ;; mzR version 2.20.0. + ;; mzR version 2.22.0. ("boost" ,boost-for-mysql) ; use this instead of the bundled boost sources ("zlib" ,zlib))) (propagated-inputs @@ -9611,6 +9611,8 @@ proteomics packages.") ("r-rcpp" ,r-rcpp) ("r-rhdf5lib" ,r-rhdf5lib) ("r-zlibbioc" ,r-zlibbioc))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/sneumann/mzR/") (synopsis "Parser for mass spectrometry data files") (description -- cgit v1.2.3 From edbc067138fa417d03cbb204511d8b08b61a3d4d Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 7 May 2020 19:14:07 +0200 Subject: system: bare-hurd.tmpl: Add openssh-sans-x client and service. * gnu/system/examples/bare-hurd.tmpl (%hurd-os)[packages]: Add openssh-sans-x. [services]: Add openssh-service. Add example usage. --- gnu/system/examples/bare-hurd.tmpl | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/gnu/system/examples/bare-hurd.tmpl b/gnu/system/examples/bare-hurd.tmpl index 16f20416aa..414a9379c8 100644 --- a/gnu/system/examples/bare-hurd.tmpl +++ b/gnu/system/examples/bare-hurd.tmpl @@ -5,12 +5,27 @@ ;; To build a disk image for a virtual machine, do ;; -;; ./pre-inst-env guix system disk-image --target=i586-pc-gnu --no-grafts \ +;; ./pre-inst-env guix system disk-image --target=i586-pc-gnu \ ;; gnu/system/examples/bare-hurd.tmpl ;; -;; it boots, but needs activation, more setup and services to be useful. +;; You may run it like so +;; +;; guix environment --ad-hoc qemu -- qemu-system-i386 -enable-kvm -m 512M \ +;; -device rtl8139,netdev=net0 -netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ +;; -snapshot -hda +;; +;; and use it like +;; +;; ssh -p 10022 root@localhost +;; guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' +;; +;; or even (if you use --image-size=3G) +;; +;; guix build hello (use-modules (gnu) (gnu system hurd) (guix utils)) +(use-service-modules ssh) +(use-package-modules ssh) (define %hurd-os (operating-system @@ -25,7 +40,15 @@ %base-file-systems)) (host-name "guixygnu") (timezone "Europe/Amsterdam") - (packages %base-packages/hurd) - (services %base-services/hurd))) + (packages (cons openssh-sans-x %base-packages/hurd)) + (services (cons (service openssh-service-type + (openssh-configuration + (openssh openssh-sans-x) + (use-pam? #f) + (port-number 2222) + (permit-root-login #t) + (allow-empty-passwords? #t) + (password-authentication? #t))) + %base-services/hurd)))) %hurd-os -- cgit v1.2.3 From 60fdd9e3896bcd31e0b6ec29ac46d92aa8558565 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 27 May 2020 09:13:19 +0200 Subject: system: hurd: Remove 'cross-hurd-image' hack. The initial guix build -f gnu/system/hurd.scm hack has been superseded by regular guix system (cross) build. * gnu/system/hurd.scm (compile-manifest, cross-hurd-image): Remove. --- gnu/system/hurd.scm | 177 +--------------------------------------------------- 1 file changed, 3 insertions(+), 174 deletions(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 956682357e..2205def577 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -39,16 +39,15 @@ #:use-module (gnu system) #:use-module (gnu system shadow) #:use-module (gnu system vm) - #:export (cross-hurd-image - %base-packages/hurd + #:export (%base-packages/hurd %base-services/hurd %hurd-default-operating-system %hurd-default-operating-system-kernel)) ;;; Commentary: ;;; -;;; This module provides tools to (cross-)build GNU/Hurd virtual machine -;;; images. +;;; This module provides system-specifics for the GNU/Hurd operating system +;;; and virtual machine. ;;; ;;; Code: @@ -104,173 +103,3 @@ (pam-services '()) (setuid-programs '()) (sudoers-file #f))) - -(define* (cross-hurd-image #:key (hurd hurd) (gnumach gnumach)) - "Return a cross-built GNU/Hurd image." - - (define (cross-built thing) - (with-parameters ((%current-target-system "i586-pc-gnu")) - thing)) - - (define (cross-built-entry entry) - (manifest-entry - (inherit entry) - (item (cross-built (manifest-entry-item entry))) - (dependencies (map cross-built-entry - (manifest-entry-dependencies entry))))) - - (define system-profile - (profile - (content - (map-manifest-entries cross-built-entry - (packages->manifest %base-packages/hurd))))) - - (define grub.cfg - (let ((hurd (cross-built hurd)) - (mach (with-parameters ((%current-system "i686-linux")) - gnumach)) - (libc (cross-libc "i586-pc-gnu"))) - (computed-file "grub.cfg" - #~(call-with-output-file #$output - (lambda (port) - (format port " -set timeout=2 -search.file ~a/boot/gnumach - -menuentry \"GNU\" { - multiboot ~a/boot/gnumach root=device:hd0s1 - module ~a/hurd/ext2fs.static ext2fs \\ - --multiboot-command-line='${kernel-command-line}' \\ - --host-priv-port='${host-port}' \\ - --device-master-port='${device-port}' \\ - --exec-server-task='${exec-task}' -T typed '${root}' \\ - '$(task-create)' '$(task-resume)' - module ~a/lib/ld.so.1 exec ~a/hurd/exec '$(exec-task=task-create)' -}\n" - #+mach #+mach #+hurd - #+libc #+hurd)))))) - - (define fstab - (plain-file "fstab" - "# This file was generated from your Guix configuration. Any changes -# will be lost upon reboot or reconfiguration. - -/dev/hd0s1 / ext2 defaults -")) - - (define passwd - (plain-file "passwd" - "root:x:0:0:root:/root:/bin/sh -guixbuilder:x:1:1:guixbuilder:/var/empty:/bin/no-sh -")) - - (define group - (plain-file "group" - "guixbuild:x:1:guixbuilder -")) - - (define shadow - (plain-file "shadow" - "root::0:0:0:0::: -")) - - (define etc-profile - (plain-file "profile" - "\ -export PS1='\\u@\\h\\$ ' - -GUIX_PROFILE=\"/run/current-system/profile\" -. \"$GUIX_PROFILE/etc/profile\" - -GUIX_PROFILE=\"$HOME/.guix-profile\" -if [ -f \"$GUIX_PROFILE/etc/profile\" ]; then - . \"$GUIX_PROFILE/etc/profile\" -fi\n")) - - (define hurd-directives - `((directory "/servers") - ,@(map (lambda (server) - `(file ,(string-append "/servers/" server))) - '("startup" "exec" "proc" "password" - "default-pager" "crash-dump-core" - "kill" "suspend")) - ("/servers/crash" -> "crash-dump-core") - (directory "/servers/socket") - (file "/servers/socket/1") - (file "/servers/socket/2") - (file "/servers/socket/16") - ("/servers/socket/local" -> "1") - ("/servers/socket/inet" -> "2") - ("/servers/socket/inet6" -> "16") - (directory "/boot") - ("/boot/grub.cfg" -> ,grub.cfg) ;XXX: not strictly needed - ("/hurd" -> ,(file-append (with-parameters ((%current-target-system - "i586-pc-gnu")) - hurd) - "/hurd")) - - ;; TODO: Create those during activation, eventually. - (directory "/root") - (file "/root/.guile" - ,(object->string - '(begin - (use-modules (ice-9 readline) (ice-9 colorized)) - (activate-readline) (activate-colorized)))) - (directory "/run") - (directory "/run/current-system") - ("/run/current-system/profile" -> ,system-profile) - ("/etc/profile" -> ,etc-profile) - ("/etc/fstab" -> ,fstab) - ("/etc/group" -> ,group) - ("/etc/passwd" -> ,passwd) - ("/etc/shadow" -> ,shadow) - (file "/etc/hostname" "guixygnu") - (file "/etc/resolv.conf" - "nameserver 10.0.2.3\n") - ("/etc/services" -> ,(file-append (with-parameters ((%current-target-system - "i586-pc-gnu")) - net-base) - "/etc/services")) - ("/etc/protocols" -> ,(file-append (with-parameters ((%current-target-system - "i586-pc-gnu")) - net-base) - "/etc/protocols")) - ("/etc/motd" -> ,(file-append (with-parameters ((%current-target-system - "i586-pc-gnu")) - hurd) - "/etc/motd")) - ("/etc/login" -> ,(file-append (with-parameters ((%current-target-system - "i586-pc-gnu")) - hurd) - "/etc/login")) - - - ;; XXX can we instead, harmlessly set _PATH_TTYS (from glibc) in runttys.c? - ("/etc/ttys" -> ,(file-append (with-parameters ((%current-target-system - "i586-pc-gnu")) - hurd) - "/etc/ttys")) - ("/bin/sh" -> ,(file-append (with-parameters ((%current-target-system - "i586-pc-gnu")) - bash) - "/bin/sh")))) - - (qemu-image #:file-system-type "ext2" - #:file-system-options '("-o" "hurd") - #:device-nodes 'hurd - #:inputs `(("system" ,system-profile) - ("grub.cfg" ,grub.cfg) - ("fstab" ,fstab) - ("passwd" ,passwd) - ("group" ,group) - ("etc-profile" ,etc-profile) - ("shadow" ,shadow)) - #:copy-inputs? #t - #:os system-profile - #:bootcfg-drv grub.cfg - #:bootloader grub-bootloader - #:register-closures? #f - #:extra-directives hurd-directives)) - -;; Return this thunk so one can type "guix build -f gnu/system/hurd.scm". -cross-hurd-image -- cgit v1.2.3 From 7304cb0a23a11b68d98ee70d911adc7048900536 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sat, 13 Jun 2020 10:04:51 +0200 Subject: services: hurd: Remove deprecated 'hurd-getty-service' wrapper. * gnu/services/hurd.scm (hurd-getty-service): Remove. --- gnu/services/hurd.scm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gnu/services/hurd.scm b/gnu/services/hurd.scm index 1ccf164223..61d92b4bda 100644 --- a/gnu/services/hurd.scm +++ b/gnu/services/hurd.scm @@ -115,9 +115,4 @@ (description "Provide console login using the Hurd @command{getty} program."))) -(define* (hurd-getty-service config) - "Return a service to run the Hurd getty according to @var{config}, which -specifies the tty to run, among other things." - (service hurd-getty-service-type config)) - ;;; hurd.scm ends here -- cgit v1.2.3 From e51175f68631e8eabd00bbbe546999ad3593cb26 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 13 Jun 2020 14:28:11 +0800 Subject: gnu: emacs-debbugs: Update to 0.23. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-debbugs): Update to 0.23. Signed-off-by: 宋文武 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bef4fb905e..af379902a1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4073,14 +4073,14 @@ source code using IPython.") (define-public emacs-debbugs (package (name "emacs-debbugs") - (version "0.22") + (version "0.23") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/debbugs-" version ".tar")) (sha256 (base32 - "05ik9qv539b5c1nzxkk3lk23bqj4vqgmfmd8x367abhb7c9gix2z")))) + "0mcz97b3sddrc68wi8dz95b2rq7ky88pr2i1ghyhy28as16chmz5")))) (build-system emacs-build-system) (arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$"))) (propagated-inputs -- cgit v1.2.3 From 3857aba7ab25c50d64a6d7468d2b5b09bc4f5d60 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 7 Jun 2020 21:20:08 +0100 Subject: gnome: gnome-desktop: Add bubblewrap as an input. This is expected to be available, oddly as libseccomp is available. These changes fix thumbnails for Nautilus. * gnu/packages/gnome.scm (gnome-desktop)[arguments]: Add 'patch-bubblewrap phase. [inputs]: Add bubblewrap. --- gnu/packages/gnome.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e1b21c37db..13769a7c88 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1286,6 +1286,19 @@ offline sources, providing a centralized place for managing your contacts.") (("\"locale\"") (string-append "\"" libc "/bin/locale\""))) #t))) + (add-before 'configure 'patch-bubblewrap + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "libgnome-desktop/gnome-desktop-thumbnail-script.c" + (("\"bwrap\",") + (string-append "\"" (which "bwrap") "\",")) + (("\"--ro-bind\", \"/usr\", \"/usr\",") + (string-append "\"--ro-bind\", \"" + (%store-directory) + "\", \"" + (%store-directory) + "\",")) + (("\"--ro-bind\", \"/etc/ld.so.cache\", \"/etc/ld.so.cache\",") "")) + #t)) (add-before 'check 'pre-check (lambda* (#:key inputs #:allow-other-keys) ;; Tests require a running X server and locales. @@ -1315,6 +1328,7 @@ offline sources, providing a centralized place for managing your contacts.") (inputs `(("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) + ("bubblewrap" ,bubblewrap) ("libxext" ,libxext) ("libxkbfile" ,libxkbfile) ("libxrandr" ,libxrandr))) -- cgit v1.2.3 From 7ca533c7237622d70b423033c4506217d9ce4014 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 11 Jun 2020 22:52:12 +0200 Subject: image: Make 'find-image' non-monadic. * gnu/system/image.scm (find-image): Make non-monadic. Add 'target' parameter. * gnu/tests/install.scm (run-install): Update caller, passing (%current-target-system). * guix/scripts/system.scm (perform-action): Likewise. --- gnu/system/image.scm | 28 +++++++++++++--------------- gnu/tests/install.scm | 9 ++++++--- guix/scripts/system.scm | 4 +++- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 6c4573509d..be8b6e67f7 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Mathieu Othacehe +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -556,20 +557,17 @@ image, depending on IMAGE format." #:grub-mkrescue-environment '(("MKRESCUE_SED_MODE" . "mbr_only"))))))) -(define (find-image file-system-type) - "Find and return an image that could match the given FILE-SYSTEM-TYPE. This -is useful to adapt to interfaces written before the addition of the -record." - (mlet %store-monad ((target (current-target-system))) - (mbegin %store-monad - (return - (match file-system-type - ("iso9660" iso9660-image) - (_ (cond - ((and target - (hurd-triplet? target)) - hurd-disk-image) - (else - efi-disk-image)))))))) +(define (find-image file-system-type target) + "Find and return an image built that could match the given FILE-SYSTEM-TYPE, +built for TARGET. This is useful to adapt to interfaces written before the +addition of the record." + (match file-system-type + ("iso9660" iso9660-image) + (_ (cond + ((and target + (hurd-triplet? target)) + hurd-disk-image) + (else + efi-disk-image))))) ;;; image.scm ends here diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 6bd8c7d3d2..db355b85ca 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2020 Danny Milosavljevic +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -227,15 +228,17 @@ packages defined in installation-os." (mlet* %store-monad ((_ (set-grafting #f)) (system (current-system)) - (target (operating-system-derivation target-os)) - (base-image (find-image - installation-disk-image-file-system-type)) + (target (current-target-system)) + (base-image -> (find-image + installation-disk-image-file-system-type + target)) ;; Since the installation system has no network access, ;; we cheat a little bit by adding TARGET to its GC ;; roots. This way, we know 'guix system init' will ;; succeed. Also add guile-final, which is pulled in ;; through provenance.drv and may not always be present. + (target (operating-system-derivation target-os)) (image -> (system-image (image diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 3d7aa77cb7..6769a602b1 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2019 Mathieu Othacehe ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Christopher Baines +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -801,7 +802,8 @@ static checks." (check-initrd-modules os))) (mlet* %store-monad - ((image (find-image file-system-type)) + ((target (current-target-system)) + (image -> (find-image file-system-type target)) (sys (system-derivation-for-action os image action #:file-system-type file-system-type #:image-size image-size -- cgit v1.2.3 From f292d4719dead6a615187f325fbc0bb0e99d10b4 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 13 Jun 2020 14:01:18 +0200 Subject: image: Add 'target' support. * gnu/image.scm ()[target]: New field, (image-target): new public method. * gnu/system/image.scm (hurd-disk-image): Set "i586-pc-gnu" as image 'target' field, (maybe-with-target): new procedure, (system-image): honor image 'target' field using the above procedure. --- gnu/image.scm | 3 +++ gnu/system/image.scm | 66 +++++++++++++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 26 deletions(-) diff --git a/gnu/image.scm b/gnu/image.scm index 0a92d168e9..19b466527b 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -33,6 +33,7 @@ image image-name image-format + image-target image-size image-operating-system image-partitions @@ -67,6 +68,8 @@ image make-image image? (format image-format) ;symbol + (target image-target + (default #f)) (size image-size ;size in bytes as integer (default 'guess)) (operating-system image-operating-system ; diff --git a/gnu/system/image.scm b/gnu/system/image.scm index be8b6e67f7..97e4bb0e3c 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -104,6 +104,7 @@ (define hurd-disk-image (image (format 'disk-image) + (target "i586-pc-gnu") (partitions (list (partition (size 'guess) @@ -519,6 +520,14 @@ it can be used for bootloading." (type root-file-system-type)) file-systems-to-keep))))) +(define-syntax-rule (maybe-with-target image exp ...) + (let ((target (image-target image))) + (if target + (with-parameters ((%current-target-system target)) + exp ...) + (begin + exp ...)))) + (define* (system-image image) "Return the derivation of IMAGE. It can be a raw disk-image or an ISO9660 image, depending on IMAGE format." @@ -530,32 +539,33 @@ image, depending on IMAGE format." (bootcfg (operating-system-bootcfg os)) (bootloader (bootloader-configuration-bootloader (operating-system-bootloader os)))) - (case (image-format image) - ((disk-image) - (system-disk-image image* - #:bootcfg bootcfg - #:bootloader bootloader - #:register-closures? register-closures? - #:inputs `(("system" ,os) - ("bootcfg" ,bootcfg)))) - ((iso9660) - (system-iso9660-image - image* - #:bootcfg bootcfg - #:bootloader bootloader - #:register-closures? register-closures? - #:inputs `(("system" ,os) - ("bootcfg" ,bootcfg)) - ;; Make sure to use a mode that does no imply - ;; HFS+ tree creation that may fail with: - ;; - ;; "libisofs: FAILURE : Too much files to mangle, - ;; cannot guarantee unique file names" - ;; - ;; This happens if some limits are exceeded, see: - ;; https://lists.gnu.org/archive/html/grub-devel/2020-06/msg00048.html - #:grub-mkrescue-environment - '(("MKRESCUE_SED_MODE" . "mbr_only"))))))) + (maybe-with-target image + (case (image-format image) + ((disk-image) + (system-disk-image image* + #:bootcfg bootcfg + #:bootloader bootloader + #:register-closures? register-closures? + #:inputs `(("system" ,os) + ("bootcfg" ,bootcfg)))) + ((iso9660) + (system-iso9660-image + image* + #:bootcfg bootcfg + #:bootloader bootloader + #:register-closures? register-closures? + #:inputs `(("system" ,os) + ("bootcfg" ,bootcfg)) + ;; Make sure to use a mode that does no imply + ;; HFS+ tree creation that may fail with: + ;; + ;; "libisofs: FAILURE : Too much files to mangle, + ;; cannot guarantee unique file names" + ;; + ;; This happens if some limits are exceeded, see: + ;; https://lists.gnu.org/archive/html/grub-devel/2020-06/msg00048.html + #:grub-mkrescue-environment + '(("MKRESCUE_SED_MODE" . "mbr_only")))))))) (define (find-image file-system-type target) "Find and return an image built that could match the given FILE-SYSTEM-TYPE, @@ -570,4 +580,8 @@ addition of the record." (else efi-disk-image))))) +;;; Local Variables: +;;; eval: (put 'maybe-with-target 'scheme-indent-function 1) +;;; End: + ;;; image.scm ends here -- cgit v1.2.3 From 478d1270ce4029b7fe5bfbb369f8e35c57b32ab2 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 13 Jun 2020 15:05:22 +0200 Subject: install: final: Add some logging. * gnu/installer/final.scm (umount-cow-store): Add some logging. --- gnu/installer/final.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index e06b104d59..a742c2a0cd 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -155,6 +155,8 @@ be much appreciated." ;; restart it. (restart-service 'guix-daemon) + (syslog "Killing cow users.") + ;; Kill all processes started while the cow-store was active (logins ;; on other TTYs for instance). (kill-cow-users tmp-dir) @@ -162,6 +164,7 @@ be much appreciated." ;; Try to umount the store overlay. Some process such as udevd ;; workers might still be active, so do some retries. (let loop ((try 5)) + (syslog "Umount try ~a~%" (- 5 try)) (sleep 1) (let ((umounted? (false-if-exception (umount tmp-dir)))) (if (and (not umounted?) (> try 0)) -- cgit v1.2.3 From 4a04d49c2e8aa52b0e6051c6868c8892d017e61b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 13 Jun 2020 16:55:12 +0200 Subject: image: Remove 'maybe-with-target'. * gnu/system/image.scm (maybe-with-target): Remove, (system-image): adapt accordingly. --- gnu/system/image.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 97e4bb0e3c..1bda25fd7f 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -520,14 +520,6 @@ it can be used for bootloading." (type root-file-system-type)) file-systems-to-keep))))) -(define-syntax-rule (maybe-with-target image exp ...) - (let ((target (image-target image))) - (if target - (with-parameters ((%current-target-system target)) - exp ...) - (begin - exp ...)))) - (define* (system-image image) "Return the derivation of IMAGE. It can be a raw disk-image or an ISO9660 image, depending on IMAGE format." @@ -535,11 +527,12 @@ image, depending on IMAGE format." (let* ((os (operating-system-for-image image)) (image* (image-with-os image os)) + (target (image-target image)) (register-closures? (has-guix-service-type? os)) (bootcfg (operating-system-bootcfg os)) (bootloader (bootloader-configuration-bootloader (operating-system-bootloader os)))) - (maybe-with-target image + (with-parameters ((%current-target-system target)) (case (image-format image) ((disk-image) (system-disk-image image* -- cgit v1.2.3 From bb310a1976198eacdc67e0712e19735cd656b21d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 17:00:15 +0200 Subject: gnu: Add libnode. * gnu/packages/node.scm (libnode): New variable. --- gnu/packages/node.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index cc81b1f20b..3610812688 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -27,6 +27,7 @@ #:use-module (guix packages) #:use-module (guix derivations) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages adns) @@ -198,3 +199,12 @@ devices.") (license expat) (properties '((max-silent-time . 7200) ;2h, needed on ARM (timeout . 21600))))) ;6h + +(define-public libnode + (package + (inherit node) + (name "libnode") + (arguments + (substitute-keyword-arguments (package-arguments node) + ((#:configure-flags flags ''()) + `(cons* "--shared" "--without-npm" ,flags)))))) -- cgit v1.2.3 From e602e7f2714601f75520bab9c49ce9f7dcb74d96 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 17:00:30 +0200 Subject: gnu: r-v8: Use libnode instead of node. * gnu/packages/cran.scm (r-v8)[inputs]: Replace node with libnode. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 300c468ffc..0a502a6063 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -136,7 +136,7 @@ degree elevation and curve fitting.") (assoc-ref inputs "node") "/lib")) #t))))) (inputs - `(("node" ,node))) + `(("node" ,libnode))) (propagated-inputs `(("r-curl" ,r-curl) ("r-jsonlite" ,r-jsonlite) -- cgit v1.2.3 From 2f38e38fb5131858fc76f6fa99c9f99776ff2902 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 17:01:09 +0200 Subject: Revert "gnu: node: Build shared library." This reverts commit f9311eaa7cb7849e9b17162c93b874c74d8fcbbd. Adding "--shared" replaces the executable with the shared library, breaking all users of the nodejs executable. --- gnu/packages/node.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 3610812688..ca226e133f 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -75,8 +75,7 @@ #t)))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--shared" - "--shared-cares" + `(#:configure-flags '("--shared-cares" "--shared-http-parser" "--shared-libuv" "--shared-nghttp2" -- cgit v1.2.3 From 1eec6b0c01700e96ca7acdd5c1651167409de66b Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 13 Jun 2020 17:16:03 +0200 Subject: gnu: guile-sqlite3: Update to 0.1.2. * gnu/packages/guile.scm (guile-sqlite3): Update to 0.1.2. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 5e9b453ea0..34d348c344 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -633,7 +633,7 @@ Guile's foreign function interface.") (define-public guile-sqlite3 (package (name "guile-sqlite3") - (version "0.1.1") + (version "0.1.2") (home-page "https://notabug.org/guile-sqlite3/guile-sqlite3.git") (source (origin (method git-fetch) @@ -642,7 +642,7 @@ Guile's foreign function interface.") (commit (string-append "v" version)))) (sha256 (base32 - "0f7lgqkyli8gc2gifrabxnqrqixkpwsridhx9sm2wc7djxdafccb")) + "1nryy9j3bk34i0alkmc9bmqsm0ayz92k1cdf752mvhyjjn8nr928")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From 221a104248c3248459cbc849f482a429f83ca3d7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 12 Jun 2020 22:53:22 +0200 Subject: gnu: perf: Restore use of dependencies. * gnu/packages/linux.scm (perf)[arguments]: Remove C_INCLUDE_PATH from #:make-flags. It is no longer needed since the switch to C_INCLUDE_PATH in 2073b55e6b964cb8ca15e8c74cb32dac00f05f0d and would prevent dependencies from being found. --- gnu/packages/linux.scm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0d7f60ca82..ff8c277f95 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3711,11 +3711,6 @@ in a digital read-out.") #t))) #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")) - ;; Make sure the kernel headers are treated as system - ;; headers to suppress warnings from those. - (string-append "C_INCLUDE_PATH=" - (assoc-ref %build-inputs "kernel-headers") - "/include") "WERROR=0" ;; By default, 'config/Makefile' uses lib64 on -- cgit v1.2.3 From ff30860b634501f81c346f780d0ab0ff35973f40 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 12 Jun 2020 22:55:52 +0200 Subject: gnu: perf: Set 'CC'. * gnu/packages/linux.scm (perf)[arguments]: Add "CC=gcc" to #:make-flags. This fixes a (harmless?) error message during the 'configure' phase. --- gnu/packages/linux.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ff8c277f95..c3f22acc6d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3711,6 +3711,7 @@ in a digital read-out.") #t))) #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")) + "CC=gcc" "WERROR=0" ;; By default, 'config/Makefile' uses lib64 on -- cgit v1.2.3 From 2c74e870796af28d5f53b533751405f68915b69e Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Fri, 12 Jun 2020 23:41:18 +0200 Subject: gnu: Add meshlab. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (meshlab): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/engineering.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 9d9c67b861..fe3c87edd5 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -105,6 +105,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml) + #:use-module (gnu packages openkinect) #:use-module (gnu packages xorg)) (define-public librecad @@ -2619,3 +2620,60 @@ accessible through a simple API") model files. Its main goal is to simplify the creation of 3DS import and export filters.") (license license:lgpl2.1+))) + +(define-public meshlab + (package + (name "meshlab") + (version "2020.05") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cnr-isti-vclab/meshlab") + (commit (string-append "Meshlab-" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00sim20ka9vjwljixdj4cqd285j21mpaq05ari7nqq2w8yyglp5m")))) + (build-system cmake-build-system) + (inputs + `(("qtbase" ,qtbase) + ("qtscript" ,qtscript) + ("qtxmlpatterns" ,qtxmlpatterns) + ("mesa" ,mesa) + ("glu" ,glu) + ("glew" ,glew) + ("muparser" ,muparser) + ("gmp" ,gmp) + ("eigen" ,eigen) + ("libfreenect" ,libfreenect) + ("lib3ds" ,lib3ds) + ("openctm" ,openctm) + ;; FIXME: Compilation fails with system qhull: + ;; https://github.com/cnr-isti-vclab/meshlab/issues/678 + ;; ("qhull" ,qhull) + )) + (arguments + `(#:tests? #f ; Has no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'go-to-source-dir + (lambda _ (chdir "src") #t)) + (add-after 'install 'move-files + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (string-append (assoc-ref outputs "out") + "/lib"))) + (rename-file + (string-append lib "/meshlab/libmeshlab-common.so") + (string-append lib "/libmeshlab-common.so")) + #t)))))) + (synopsis "3D triangular mesh processing and editing software") + (home-page "https://www.meshlab.net/") + (description "MeshLab is a system for the processing and +editing of unstructured large 3D triangular meshes. It is aimed to help the +processing of the typical not-so-small unstructured models arising in 3D +scanning, providing a set of tools for editing, cleaning, healing, inspecting, +rendering and converting this kind of meshes. These tools include MeshLab +proper, a versatile program with a graphical user interface, and meshlabserver, +a program that can perform mesh processing tasks in batch mode, without a +GUI.") + (license license:gpl3+))) -- cgit v1.2.3 From e8521f0b95bf0cc5a08bca0b8b14e07b18d51a81 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 20:03:42 +0200 Subject: gnu: libnode: Delete unused phase. This is a follow-up to commit bb310a1976198eacdc67e0712e19735cd656b21d. * gnu/packages/node.scm (libnode)[arguments]: Delete phase "patch-npm-shebang". --- gnu/packages/node.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index ca226e133f..1adb2cd07f 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -206,4 +206,7 @@ devices.") (arguments (substitute-keyword-arguments (package-arguments node) ((#:configure-flags flags ''()) - `(cons* "--shared" "--without-npm" ,flags)))))) + `(cons* "--shared" "--without-npm" ,flags)) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (delete 'patch-npm-shebang))))))) -- cgit v1.2.3 From 9bc516bada71e1437d73971584bff5e72e053dbe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 22:35:29 +0200 Subject: gnu: Add r-pcatools. * gnu/packages/bioconductor.scm (r-pcatools): New variable. --- gnu/packages/bioconductor.scm | 46 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a6d29e29c4..406ed2fb14 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8041,3 +8041,49 @@ Rmarkdown and LaTeX documents when authoring a Bioconductor Workflow.") "This package provides a collection of software tools for calculating distance measures.") (license license:artistic2.0))) + +(define-public r-pcatools + (package + (name "r-pcatools") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "PCAtools" version)) + (sha256 + (base32 + "0mnwqrhm1hmhzwrpidf6z207w1ycpm572snvpp5swlg6hnxq6bnc")))) + (properties `((upstream-name . "PCAtools"))) + (build-system r-build-system) + (propagated-inputs + `(("r-beachmat" ,r-beachmat) + ("r-bh" ,r-bh) + ("r-biocparallel" ,r-biocparallel) + ("r-biocsingular" ,r-biocsingular) + ("r-cowplot" ,r-cowplot) + ("r-delayedarray" ,r-delayedarray) + ("r-delayedmatrixstats" ,r-delayedmatrixstats) + ("r-dqrng" ,r-dqrng) + ("r-ggplot2" ,r-ggplot2) + ("r-ggrepel" ,r-ggrepel) + ("r-lattice" ,r-lattice) + ("r-matrix" ,r-matrix) + ("r-rcpp" ,r-rcpp) + ("r-reshape2" ,r-reshape2))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/kevinblighe/PCAtools") + (synopsis "PCAtools: everything Principal Components Analysis") + (description + "@dfn{Principal Component Analysis} (PCA) extracts the fundamental +structure of the data without the need to build any model to represent it. +This \"summary\" of the data is arrived at through a process of reduction that +can transform the large number of variables into a lesser number that are +uncorrelated (i.e. the 'principal components'), while at the same time being +capable of easy interpretation on the original data. PCAtools provides +functions for data exploration via PCA, and allows the user to generate +publication-ready figures. PCA is performed via @code{BiocSingular}; users +can also identify an optimal number of principal components via different +metrics, such as the elbow method and Horn's parallel analysis, which has +relevance for data reduction in single-cell RNA-seq (scRNA-seq) and high +dimensional mass cytometry data.") + (license license:gpl3))) -- cgit v1.2.3 From 1a6d0d8c2dc5b43496372381620151d654e48c09 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 May 2020 13:29:06 +0200 Subject: gnu: perl-net-dns-resolver-programmable: Remove "v" prefix from version string. * gnu/packages/networking.scm (perl-net-dns-resolver-programmable)[version]: Remove "v" prefix. [source](uri): Adjust accordingly. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 11344216aa..feba70878c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1343,13 +1343,13 @@ definitions and structure manipulators for Perl.") (define-public perl-net-dns-resolver-programmable (package (name "perl-net-dns-resolver-programmable") - (version "v0.003") + (version "0.003") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/J/JM/JMEHNLE/net-dns-resolver-programmable/" - "Net-DNS-Resolver-Programmable-" version ".tar.gz")) + "Net-DNS-Resolver-Programmable-v" version ".tar.gz")) (sha256 (base32 "1v3nl2kaj4fs55n1617n53q8sa3mir06898vpy1rq98zjih24h4d")) -- cgit v1.2.3 From 4723766b935a1f8c94f89f2d9c6d3e8cb537967a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jun 2020 14:05:09 +0200 Subject: gnu: ghc-regex-pcre-builtin: Update home page. * gnu/packages/haskell-xyz.scm (ghc-regex-pcre-builtin)[home-page]: Set to the correct home page, not the alternative 'ghc-regex-pcre' library. --- gnu/packages/haskell-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 64c09c9274..815af82500 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10264,7 +10264,7 @@ this problem.") (build-system haskell-build-system) (inputs `(("ghc-regex-base" ,ghc-regex-base))) - (home-page "https://hackage.haskell.org/package/regex-pcre") + (home-page "https://hackage.haskell.org/package/regex-pcre-builtin") (synopsis "Enhancement of the builtin Text.Regex library") (description "This package is an enhancement of the @code{Text.Regex} library, -- cgit v1.2.3 From dd61cd85f1f675d7f7503e7412f3021af6d2cb57 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jun 2020 00:00:03 +0200 Subject: gnu: jucipp: Build with Clang 10. * gnu/packages/text-editors.scm (jucipp)[inputs]: Change from CLANG to CLANG-10. --- gnu/packages/text-editors.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 2edc9820a8..924dc68c03 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -256,7 +256,7 @@ bindings and many of the powerful features of GNU Emacs.") ("ctags" ,universal-ctags) ("gtkmm" ,gtkmm) ("gtksourceviewmm" ,gtksourceviewmm) - ("libclang" ,clang) + ("libclang" ,clang-10) ;XXX: must be the same version as Mesas LLVM ("libgit2" ,libgit2))) (synopsis "Lightweight C++ IDE") (description -- cgit v1.2.3 From 41cb238281886396f77e4cf0be8ddf5b4419d688 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jun 2020 18:58:28 +0200 Subject: gnu: libnet: Update to 1.2. * gnu/packages/networking.scm (libnet): Update to 1.2. [source]: Switch to URL-FETCH. [arguments]: Remove chdir phase. [native-inputs]: Remove AUTOCONF, AUTOMAKE, and LIBTOOL. Add PERL. --- gnu/packages/networking.scm | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index feba70878c..bb4b35d922 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2121,32 +2121,27 @@ interface and a programmable text output for scripting.") (define-public libnet (package (name "libnet") - (version "1.2-rc3") + (version "1.2") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sam-github/libnet") - (commit (string-append "libnet-" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://github.com/libnet/libnet/releases/download" + "/v" version "/libnet-" version ".tar.gz")) (sha256 (base32 - "0cy8w4g5rv963v4p6iq3333kxgdddx2lywp70xf62553a25xhhs4")))) + "19ys9vxk6fg70yzzdxsphfr0rwzgxxhr9b3ykhpg7rfray0qd96a")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir "libnet") #t)) (add-before 'build 'build-doc (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "-C" "doc" "doc" make-flags)))))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("doxygen" ,doxygen))) + `(;; To build the documentation, Doxygen and Perl is required. + ("doxygen" ,doxygen) + ("perl" ,perl))) (home-page "https://sourceforge.net/projects/libnet-dev/") (synopsis "Framework for low-level network packet construction") (description -- cgit v1.2.3 From cce6b76416ebd7cae9ce0c8cceffd51c5ca97e2f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jun 2020 19:00:42 +0200 Subject: gnu: libnet: Update home page. * gnu/packages/networking.scm (libnet)[home-page]: Adjust to current, as referred to from the previous. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index bb4b35d922..11632d4b50 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2142,7 +2142,7 @@ interface and a programmable text output for scripting.") `(;; To build the documentation, Doxygen and Perl is required. ("doxygen" ,doxygen) ("perl" ,perl))) - (home-page "https://sourceforge.net/projects/libnet-dev/") + (home-page "https://github.com/libnet/libnet") (synopsis "Framework for low-level network packet construction") (description "Libnet provides a fairly portable framework for network packet -- cgit v1.2.3 From 29961439aaa8c58faf97333e3e2f08fa2b5bc3ab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jun 2020 19:23:27 +0200 Subject: gnu: check@0.12: Do not inherit replacements from check. * gnu/packages/check.scm (check-0.12): Use INHERIT instead of PACKAGE/INHERIT. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 6ae4273738..f249dbedb0 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -105,8 +105,8 @@ source code editors and IDEs.") ;; Some packages require this older version. Removed once no longer needed. (define-public check-0.12 - (package/inherit - check + (package + (inherit check) (version "0.12.0") (source (origin (method url-fetch) -- cgit v1.2.3 From 401e6ccb121726850242cd4d8d710049bc82fc92 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 23:47:14 +0200 Subject: gnu: alsa-modular-synth: Add patch to fix vocoder build error. * gnu/packages/patches/alsa-modular-synth-fix-vocoder.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/audio.scm (alsa-modular-synth)[source]: Add it. --- gnu/local.mk | 1 + gnu/packages/audio.scm | 4 +- .../patches/alsa-modular-synth-fix-vocoder.patch | 522 +++++++++++++++++++++ 3 files changed, 526 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/alsa-modular-synth-fix-vocoder.patch diff --git a/gnu/local.mk b/gnu/local.mk index aa5b67ab5f..97026151f0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -751,6 +751,7 @@ dist_patch_DATA = \ %D%/packages/patches/akonadi-not-relocatable.patch \ %D%/packages/patches/akonadi-timestamps.patch \ %D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \ + %D%/packages/patches/alsa-modular-synth-fix-vocoder.patch \ %D%/packages/patches/amule-crypto-6.patch \ %D%/packages/patches/anki-mpv-args.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index c8d15a3bb7..7f9720d257 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -175,7 +175,9 @@ implementation of Adaptive Multi Rate Narrowband and Wideband "/" version "/ams-" version ".tar.bz2")) (sha256 (base32 - "1azbrhpfk4nnybr7kgmc7w6al6xnzppg853vas8gmkh185kk11l0")))) + "1azbrhpfk4nnybr7kgmc7w6al6xnzppg853vas8gmkh185kk11l0")) + (patches + (search-patches "alsa-modular-synth-fix-vocoder.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/patches/alsa-modular-synth-fix-vocoder.patch b/gnu/packages/patches/alsa-modular-synth-fix-vocoder.patch new file mode 100644 index 0000000000..33a68a1dd8 --- /dev/null +++ b/gnu/packages/patches/alsa-modular-synth-fix-vocoder.patch @@ -0,0 +1,522 @@ +This patch was taken from Debian. +https://salsa.debian.org/multimedia-team/ams/-/raw/master/debian/patches/0007-Make-vocoder-module-compatible-to-C-11.patch + +From: Guido Scholz +Date: Tue, 6 Nov 2018 21:55:38 +0100 +Subject: Make vocoder module compatible to C++11 + +--- + src/m_vocoder.cpp | 218 +++++++++++++++++++++++++++--------------------------- + src/m_vocoder.h | 31 ++++---- + 2 files changed, 124 insertions(+), 125 deletions(-) + +diff --git a/src/m_vocoder.cpp b/src/m_vocoder.cpp +index 572cf65..371e2cf 100644 +--- a/src/m_vocoder.cpp ++++ b/src/m_vocoder.cpp +@@ -18,10 +18,6 @@ + along with ams. If not, see . + */ + +-#include +-#include +-#include +-#include + #include + #include + #include +@@ -36,16 +32,13 @@ + #include "synthdata.h" + #include "midicheckbox.h" + #include "midislider.h" +-// For FFTW to be happy we must include complex.h before fftw3.h +-#include +-#include + #include "port.h" + #include "m_vocoder.h" + + // Window function - One way to make the FFT behave + // and give more continuous results over edge steps. + +-float M_vocoder::windowcurve (int windowfunc, int len, int elem, float alpha) ++float M_vocoder::windowcurve (int windowfunc, unsigned int len, int elem, float alpha) + { + float out; + out = 1.0; +@@ -98,6 +91,7 @@ float M_vocoder::windowcurve (int windowfunc, int len, int elem, float alpha) + return (out); + } + ++ + M_vocoder::M_vocoder(QWidget* parent, int id) + : Module(M_type_vocoder, id, 5, parent, tr("FFT Vocoder")) + { +@@ -160,6 +154,7 @@ M_vocoder::M_vocoder(QWidget* parent, int id) + modbuf[l1] = (float *)malloc( fftsize * sizeof(float)); + memset( modbuf[l1], 0, fftsize * sizeof(float)); + } ++ + carrbuf = (float **)malloc(synthdata->poly * sizeof(float *)); + for (l1 = 0; l1 < synthdata->poly; l1++) { + carrbuf[l1] = (float *)malloc( fftsize * sizeof(float)); +@@ -175,38 +170,48 @@ M_vocoder::M_vocoder(QWidget* parent, int id) + window[l2] = windowcurve (whichwin, fftsize, l2, 0.25); + + // FFTW setup stuff +- carrinforward = (fftw_complex *) fftw_malloc (sizeof (fftw_complex) +- * fftsize); +- carrinbackward = (fftw_complex *) fftw_malloc (sizeof (fftw_complex) +- * fftsize); +- carroutforward = (fftw_complex *) fftw_malloc (sizeof (fftw_complex) +- * fftsize); +- carroutbackward = (fftw_complex *) fftw_malloc (sizeof (fftw_complex) +- * fftsize); +- modinforward = (fftw_complex *) fftw_malloc (sizeof (fftw_complex) +- * fftsize); +- modinbackward = (fftw_complex *) fftw_malloc (sizeof (fftw_complex) +- * fftsize); +- modoutforward = (fftw_complex *) fftw_malloc (sizeof (fftw_complex) +- * fftsize); +- modoutbackward = (fftw_complex *) fftw_malloc (sizeof (fftw_complex) +- * fftsize); +- fftw_set_timelimit (5.0); +- planmodforward = fftw_plan_dft_1d (fftsize, modinforward, +- modoutforward, FFTW_FORWARD, FFTW_MEASURE); +- planmodbackward = fftw_plan_dft_1d (fftsize, modinbackward, +- modoutbackward, FFTW_BACKWARD, FFTW_MEASURE); +- plancarrforward = fftw_plan_dft_1d (fftsize, carrinforward, +- carroutforward, FFTW_FORWARD, FFTW_MEASURE); +- plancarrbackward = fftw_plan_dft_1d (fftsize, carrinbackward, +- carroutbackward, FFTW_BACKWARD, FFTW_MEASURE); ++ carrinforward.reserve(fftsize); ++ carrinbackward.reserve(fftsize); ++ carroutforward.reserve(fftsize); ++ carroutbackward.reserve(fftsize); ++ modinforward.reserve(fftsize); ++ modinbackward.reserve(fftsize); ++ modoutforward.reserve(fftsize); ++ modoutbackward.reserve(fftsize); ++ ++ fftw_set_timelimit(5.0); ++ ++ planmodforward = fftw_plan_dft_1d(fftsize, ++ reinterpret_cast (modinforward.data()), ++ reinterpret_cast (modoutforward.data()), ++ FFTW_FORWARD, FFTW_MEASURE); ++ ++ planmodbackward = fftw_plan_dft_1d(fftsize, ++ reinterpret_cast (modinbackward.data()), ++ reinterpret_cast (modoutbackward.data()), ++ FFTW_BACKWARD, FFTW_MEASURE); ++ ++ plancarrforward = fftw_plan_dft_1d(fftsize, ++ reinterpret_cast (carrinforward.data()), ++ reinterpret_cast (carroutforward.data()), ++ FFTW_FORWARD, FFTW_MEASURE); ++ ++ plancarrbackward = fftw_plan_dft_1d(fftsize, ++ reinterpret_cast (carrinbackward.data()), ++ reinterpret_cast (carroutbackward.data()), ++ FFTW_BACKWARD, FFTW_MEASURE); + } + ++ + M_vocoder::~M_vocoder() { + +- int l1; ++ // Clean up FFTW stuff. ++ fftw_destroy_plan (plancarrforward); ++ fftw_destroy_plan (plancarrbackward); ++ fftw_destroy_plan (planmodforward); ++ fftw_destroy_plan (planmodbackward); + +- for (l1 = 0; l1 < synthdata->poly; l1++) { ++ for (int l1 = 0; l1 < synthdata->poly; l1++) { + free(modbuf[l1]); + free(carrbuf[l1]); + } +@@ -215,29 +220,14 @@ M_vocoder::~M_vocoder() { + free (window); + free (modmap); + free (armodmap); +- +- //#define FFTW_CLEANUP +-#ifdef FFTW_CLEANUP +- // Clean up FFTW stuff. +- fftw_destroy_plan (plancarrforward); +- fftw_destroy_plan (plancarrbackward); +- fftw_destroy_plan (planmodforward); +- fftw_destroy_plan (planmodbackward); +- fftw_free (carrinforward); +- fftw_free (carrinbackward); +- fftw_free (carroutforward); +- fftw_free (carroutbackward); +- fftw_free (modinforward); +- fftw_free (modinbackward); +- fftw_free (modoutforward); +- fftw_free (modoutbackward); +-#endif + } + ++ + void M_vocoder::generateCycle() { + + int l1; // l1 indexes along polyphony. + unsigned int l2; // l2 indexes along the cycle ++ const std::complex I(0.0, 1.0); + + inModulator = port_M_modulator->getinputdata(); + inPitchShift = port_M_pitchshift->getinputdata(); +@@ -272,7 +262,7 @@ void M_vocoder::generateCycle() { + // Did the user change the FFT windowing function? + if (myFFTWindowFunc != whichwin) { + whichwin = myFFTWindowFunc; +- for (l2 = 0; l2 < (unsigned int) fftsize; l2++) ++ for (l2 = 0; l2 < fftsize; l2++) + window[l2] = windowcurve (whichwin, fftsize, l2, 0.25); + } + +@@ -294,7 +284,7 @@ void M_vocoder::generateCycle() { + } + + // window the input buffer to modinforward +- for (l2 = 0; l2 < (unsigned int)fftsize ; l2++) { ++ for (l2 = 0; l2 < fftsize ; l2++) { + modinforward[l2] = modbuf[l1][l2] * window[l2]; + } + +@@ -310,17 +300,18 @@ void M_vocoder::generateCycle() { + fftw_execute (planmodforward); + + // copy the FFT of the modulator to modinbackward. +- for (l2 = 0; l2 < (unsigned int)fftsize; l2++) +- modinbackward[l2] = modoutforward[l2]; ++ //for (l2 = 0; l2 < fftsize; l2++) ++ // modinbackward[l2] = modoutforward[l2]; ++ modinbackward = modoutforward; + + // Send the FFT of the modulator to the output for giggles + // and get an approximation of the first harmonic too. + float firstharmonicval; + int firstharmonicindex; + firstharmonicval = 0.0; +- firstharmonicindex = 1.0; ++ firstharmonicindex = 1; + for (l2 = 1; l2 < (unsigned int) synthdata->cyclesize; l2++) { +- data[2][l1][l2] = logf(fabs (creal (modoutforward[l2])) + 1.0); ++ data[2][l1][l2] = logf(fabs(modoutforward[l2].real()) + 1.0); + if (data[2][l1][l2] > firstharmonicval) { + firstharmonicindex = l2; + firstharmonicval = data[2][l1][l2] ; +@@ -333,35 +324,38 @@ void M_vocoder::generateCycle() { + + // intermediate frequency-domain munging of modulator + // Frequency (additive, Bode-style) shifting first +- for (l2 = 0; l2 < (unsigned int)fftsize; l2++) +- modinbackward[l2] = 0; ++ for (l2 = 0; l2 < fftsize; l2++) ++ modinbackward[l2] = 0.0; ++ + int lclfrq; +- for (l2 = 0; l2 < (unsigned int)fftsize/2; l2++) { ++ for (l2 = 0; l2 < fftsize/2; l2++) { + // positive frequencies (first half) of the FFT result + lclfrq = l2 + (int)freqshift + vcfreqshift * inFreqShift[l1][0]; + lclfrq = lclfrq > 0 ? lclfrq : 0; +- lclfrq = lclfrq < ((fftsize/2)-1) ? lclfrq : (fftsize/2)-1; ++ lclfrq = lclfrq < (int)((fftsize/2)-1) ? lclfrq : (fftsize/2)-1; + modinbackward [lclfrq] = modoutforward [l2]; + // Negative frequencies (second half of the fft result) +- modinbackward [fftsize - lclfrq] = modoutforward [ fftsize - l2]; ++ modinbackward [fftsize - lclfrq] = modoutforward [fftsize - l2]; + } + +- // Pitchshifting (multiplicative, harmonic-retaining) shifting. +- // Note that we reuse the modoutforward as working space +- for (l2 = 0; l2 < (unsigned int) fftsize; l2++) { +- modoutforward[l2] = modinbackward[l2]; +- }; +- for (l2 = 0; l2 < (unsigned int)fftsize; l2++) +- modinbackward[l2] = 0; ++ // Pitchshifting (multiplicative, harmonic-retaining) shifting. ++ // Note that we reuse the modoutforward as working space ++ //for (l2 = 0; l2 < fftsize; l2++) { ++ // modoutforward[l2] = modinbackward[l2]; ++ //}; ++ modoutforward = modinbackward; ++ ++ for (l2 = 0; l2 < fftsize; l2++) ++ modinbackward[l2] = 0.0; + + float psmod, psfactor; + psmod = (pitchshift + vcpitch * inPitchShift[l1][0]); + psfactor = pow (2.0, psmod); +- for (l2 = 0; l2 < (unsigned int)fftsize/2; l2++) { ++ for (l2 = 0; l2 < fftsize/2; l2++) { + // positive frequencies (first half) of the FFT result + lclfrq = l2 * psfactor; + lclfrq = lclfrq > 0 ? lclfrq : 0; +- lclfrq = lclfrq < ((fftsize/2)-1) ? lclfrq : (fftsize/2)-1; ++ lclfrq = lclfrq < (int)((fftsize/2)-1) ? lclfrq : (fftsize/2)-1; + // Old way to pitch shift: just move the bucket. But this puts + // nulls wherever the energy is split between two buckets with + // a 180 degree phase difference. +@@ -375,12 +369,12 @@ void M_vocoder::generateCycle() { + // Better way: move freq. bin, multiply angle by octave motion. + // + modinbackward[lclfrq] += +- cabs (modoutforward [l2]) +- * cexp (I * ( carg (modoutforward [l2]) ++ std::abs(modoutforward[l2]) ++ * std::exp (I * ( std::arg (modoutforward [l2]) + + (l2 * phaseshift * psfactor))); + modinbackward[fftsize - lclfrq] += +- cabs (modoutforward [ fftsize - l2]) +- * cexp (I * ( carg (modoutforward [ fftsize - l2]) ++ std::abs (modoutforward [ fftsize - l2]) ++ * std::exp (I * ( std::arg (modoutforward [ fftsize - l2]) + + (l2 * phaseshift * psfactor))); + }; + } +@@ -389,9 +383,9 @@ void M_vocoder::generateCycle() { + fftw_execute (planmodbackward); + + // renormalize the time-domain modulator output +- for (l2 = 0; l2 < (unsigned)fftsize; l2++) { +- modoutbackward [l2] = modoutbackward[l2] / float (fftsize) ; +- modoutbackward [l2] = modoutbackward[l2] / window[l2]; ++ for (l2 = 0; l2 < fftsize; l2++) { ++ modoutbackward [l2] = modoutbackward[l2] / (double) fftsize; ++ modoutbackward [l2] = modoutbackward[l2] / (double) window[l2]; + } + + unsigned int i; +@@ -400,13 +394,11 @@ void M_vocoder::generateCycle() { + + + // Splicing the new output to the results +- if (dynsplice == 0.0) +- { ++ if (dynsplice == 0.0) { + // output it as the altered modulator. + for (l2 = 0; l2 < synthdata->cyclesize; l2++) { +- data[0][l1][l2] = creal ( modoutbackward [l2 + +- fftsize/2 - +- synthdata->cyclesize/2 ]); ++ data[0][l1][l2] = ++ modoutbackward[l2 + fftsize/2 - synthdata->cyclesize/2].real(); + } + clomatch_index = fftsize - synthdata->cyclesize; + } +@@ -421,18 +413,21 @@ void M_vocoder::generateCycle() { + float tval, dtval; + int searchstart; + float spliceval, dspliceval; +- searchstart = fftsize/2 - synthdata->cyclesize; +- if (searchstart < 1) searchstart = 1; +- clomatch_index = searchstart; ++ ++ searchstart = fftsize/2 - synthdata->cyclesize; ++ if (searchstart < 1) ++ searchstart = 1; ++ ++ clomatch_index = searchstart; + spliceval = data[0][l1][synthdata->cyclesize - 1]; + dspliceval = spliceval - data[0][l1][synthdata->cyclesize - 2]; +- clov_sofar= fabs(creal(modoutbackward[clomatch_index])-spliceval ); ++ clov_sofar= fabs(modoutbackward[clomatch_index].real()-spliceval); + for (l2 = searchstart; + l2 < (searchstart + synthdata->cyclesize); + l2++) + { +- tval = creal (modoutbackward[l2]); +- dtval = tval - creal (modoutbackward [l2-1]); ++ tval = modoutbackward[l2].real(); ++ dtval = tval - modoutbackward [l2-1].real(); + if ( + ((fabs (tval - spliceval )) < clov_sofar ) + && ((dtval * dspliceval ) >= 0) +@@ -445,15 +440,15 @@ void M_vocoder::generateCycle() { + }; + // fprintf (stderr, "%d %f %f ", + // clomatch_index, clov_sofar, clodv_sofar); +- ++ + // What's our residual error, so that we can splice this + // with minimal "click"? +- residual = + spliceval - creal( modoutbackward[clomatch_index]); ++ residual = + spliceval - modoutbackward[clomatch_index].real(); + + // Move our wave, with the best match so far established, to + // the output buffer area. + for (l2 = 0; l2 < synthdata->cyclesize; l2++) { +- data[0][l1][l2] = creal ( modoutbackward [ clomatch_index + l2]) ++ data[0][l1][l2] = modoutbackward[clomatch_index + l2].real() + + ((1.0 - (float(l2) / float(synthdata->cyclesize))) * residual); + }; + +@@ -466,17 +461,18 @@ void M_vocoder::generateCycle() { + for (l2 = 0; l2 < fftsize - synthdata->cyclesize; l2++) { + carrbuf [l1][l2] = carrbuf [l1][l2 + synthdata->cyclesize]; + } ++ + for (l2 = 0; l2 < synthdata->cyclesize; l2++) { + carrbuf [l1][l2 + fftsize - synthdata->cyclesize] = inCarrier[l1][l2]; + } + +- for (l2 = 0; l2 < unsigned (fftsize); l2++) { ++ for (l2 = 0; l2 < fftsize; l2++) { + carrinforward [l2] = carrbuf [l1][l2] * window[l2]; + } + + fftw_execute (plancarrforward); + +- for (l2 = 0; l2 < (unsigned) fftsize; l2++) { ++ for (l2 = 0; l2 < fftsize; l2++) { + carrinbackward[l2] = carroutforward[l2]; + }; + +@@ -486,34 +482,37 @@ void M_vocoder::generateCycle() { + // Group the modulator into channels, and multipy the channels + // over the carrier. + +- int localchannels; +- localchannels = channels + vcchannels * inChannels[l1][0]; +- if (localchannels < 1) localchannels = 1; +- if (localchannels > fftsize - 1) localchannels = fftsize - 1; +- for (l2 = 0; l2 < (unsigned) fftsize; l2++) { ++ unsigned int localchannels = channels + vcchannels * inChannels[l1][0]; ++ if (localchannels < 1) ++ localchannels = 1; ++ ++ if (localchannels > fftsize - 1) ++ localchannels = fftsize - 1; ++ ++ for (l2 = 0; l2 < fftsize; l2++) { + modmap[l2] = 0; + // initial conditions... + if (l2 == 0) + for (i = 0; i < channels; i++) +- modmap[l2] += cabs (modoutforward[l2 + i]); ++ modmap[l2] += std::abs(modoutforward[l2 + i]); + else + modmap [l2] = modmap[l2 - 1]; + + // add the heads, subtract the tails + i = l2 + channels; +- if (l2 < (unsigned)fftsize - 2) +- modmap[l2] += cabs( modoutforward [i] ); ++ if (l2 < fftsize - 2) ++ modmap[l2] += std::abs(modoutforward[i]); + i = l2 - channels; + if (l2 >= channels) +- modmap[l2] -= cabs( modoutforward [i] ); ++ modmap[l2] -= std::abs(modoutforward[i]); + } + + // Normalize the modmap +- for (l2 = 0; l2 < (unsigned) fftsize; l2++) ++ for (l2 = 0; l2 < fftsize; l2++) + modmap[l2] = modmap[l2] / localchannels; + + // Do attack/release +- for (l2 = 0; l2 < (unsigned) fftsize; l2++) { ++ for (l2 = 0; l2 < fftsize; l2++) { + if (modmap [l2] > armodmap[l2]) + armodmap [l2] += (1 - attack) * (modmap[l2] - armodmap[l2]); + if (modmap [l2] < armodmap[l2]) +@@ -521,8 +520,8 @@ void M_vocoder::generateCycle() { + } + + // multiply the carrier by the modulation map. +- for (l2 = 0; l2 < (unsigned) fftsize; l2++) { +- carrinbackward[l2] = carroutforward[l2] * armodmap[l2]; ++ for (l2 = 0; l2 < fftsize; l2++) { ++ carrinbackward[l2] = carroutforward[l2] * (double) armodmap[l2]; + } + + // reverse transform to final output, and renormalize by 1/fftsize. +@@ -532,8 +531,7 @@ void M_vocoder::generateCycle() { + for (l2 = 0; l2 < synthdata->cyclesize; l2++) { + offset = l2 + (fftsize/2) - (synthdata->cyclesize / 2); + data[1][l1][l2]= +- (creal(carroutbackward[offset]/window[offset])) / (fftsize * 100); ++ (carroutbackward[offset].real()/window[offset]) / (fftsize * 100); + }; + }; + } +- +diff --git a/src/m_vocoder.h b/src/m_vocoder.h +index 38eac58..32c8521 100644 +--- a/src/m_vocoder.h ++++ b/src/m_vocoder.h +@@ -1,4 +1,4 @@ +-/* ++/* + Vocoder - derived from m_delay.cpp + + Copyright (C) 2011 Bill Yerazunis +@@ -22,7 +22,9 @@ + #define M_VOCODER_H + + #include "module.h" +-#include ++ ++#include ++#include + #include + + #define MODULE_VOCODER_WIDTH 105 +@@ -30,7 +32,7 @@ + + class M_vocoder : public Module + { +- Q_OBJECT ++ Q_OBJECT + + float channels, vcchannels; + float attack, release; +@@ -42,21 +44,20 @@ class M_vocoder : public Module + + Port *port_M_modulator, *port_M_pitchshift, *port_M_freqshift, + *port_M_channels, *port_M_carrier; ++ + Port *port_modfft_out, *port_firstharmonic_out, +- *port_altmodulator_out, +- *port_vocoder_out; ++ *port_altmodulator_out, *port_vocoder_out; + +- fftw_plan planmodforward, planmodbackward, ++ fftw_plan planmodforward, planmodbackward, + plancarrforward, plancarrbackward; + +- fftw_complex *carrinforward, *carroutforward, +- *carrinbackward, *carroutbackward, +- *modinforward, *modoutforward, +- *modinbackward, *modoutbackward; ++ std::vector> carrinforward, carroutforward, ++ carrinbackward, carroutbackward, ++ modinforward, modoutforward, ++ modinbackward, modoutbackward; + +- public: +- int fftsize; +- float **inModulator, **inPitchShift, **inFreqShift, ++ unsigned int fftsize; ++ float **inModulator, **inPitchShift, **inFreqShift, + **inChannels, **inCarrier; + // the previous time-based samples, for overlapping + float **modbuf, **carrbuf; +@@ -68,10 +69,10 @@ class M_vocoder : public Module + float *armodmap; + + public: +- float windowcurve (int windowfunc, int len, int elem, float alpha ); ++ float windowcurve (int windowfunc, unsigned int len, int elem, float alpha ); + M_vocoder(QWidget* parent=0, int id = 0); + ~M_vocoder(); + void generateCycle(); + }; +- ++ + #endif -- cgit v1.2.3 From ea7882b2e397633eccf2ec7205404bec30f74312 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jun 2020 23:48:41 +0200 Subject: gnu: alsa-modular-synth: Hide default GCC. * gnu/packages/audio.scm (alsa-modular-synth)[native-inputs]: Distinguish GCC-5. [arguments]: Add build phase "hide-default-gcc". --- gnu/packages/audio.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 7f9720d257..b2ffeffd40 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -185,6 +185,17 @@ implementation of Adaptive Multi Rate Narrowband and Wideband "CXXFLAGS=-std=gnu++11") #:phases (modify-phases %standard-phases + (add-after 'set-paths 'hide-default-gcc + (lambda* (#:key inputs #:allow-other-keys) + (let ((gcc (assoc-ref inputs "gcc"))) + ;; Remove the default GCC from CPLUS_INCLUDE_PATH to prevent + ;; conflicts with the GCC 5 input. + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (delete (string-append gcc "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") #\:)) + ":")) + #t))) ;; Insert an extra space between linker flags. (add-before 'configure 'add-missing-space (lambda _ @@ -205,7 +216,7 @@ implementation of Adaptive Multi Rate Narrowband and Wideband (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools) - ("gcc" ,gcc-5))) + ("gcc@5" ,gcc-5))) (home-page "http://alsamodular.sourceforge.net/") (synopsis "Realtime modular synthesizer and effect processor") (description -- cgit v1.2.3 From 449bac5b4d45bcbaf82f3f4f4fe8d8696d261696 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 17:11:08 +0200 Subject: gnu: rust-serde-bytes: Update to 0.11.5. * gnu/packages/crates-io.scm (rust-serde-bytes): Update to 0.11.5. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f4b0688e8d..12125ef0da 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20380,7 +20380,7 @@ proven statistical guarantees.") (define-public rust-serde-bytes-0.11 (package (name "rust-serde-bytes") - (version "0.11.3") + (version "0.11.5") (source (origin (method url-fetch) @@ -20388,8 +20388,7 @@ proven statistical guarantees.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1bl45kf3c71xclv7wzk5525nswm4bgsnjd3s1s15f4k2a8whfnij")))) + (base32 "1fcb6sw8wkrj4ylm118wkb31hw124nkjnqyhbgqnd8w85zfhgbhn")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 33678aee91d5ff6c7c0eaf8c9c9845430b53e977 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 17:11:47 +0200 Subject: gnu: rust-serde-bytes: Fix typo in synopsis. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/crates-io.scm (rust-serde-bytes)[synopsis]: Remove ‘of’. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 12125ef0da..074d45b947 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20399,8 +20399,7 @@ proven statistical guarantees.") ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-test" ,rust-serde-test-1.0)))) (home-page "https://github.com/serde-rs/bytes") - (synopsis - "Handle of integer arrays and vectors for Serde") + (synopsis "Handle integer arrays and vectors for Serde") (description "Optimized handling of @code{&[u8]} and @code{Vec} for Serde.") (license (list license:expat license:asl2.0)))) -- cgit v1.2.3 From d22dc5f728b08d57a4d82a273301c5e1cd30bdfc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 17:13:14 +0200 Subject: gnu: rust-tokio: Update to 0.2.21. * gnu/packages/crates-io.scm (rust-tokio): Update to 0.2.21. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 074d45b947..30e00b3f48 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23745,14 +23745,14 @@ in Rust.") (define-public rust-tokio-0.2 (package (name "rust-tokio") - (version "0.2.18") + (version "0.2.21") (source (origin (method url-fetch) (uri (crate-uri "tokio" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "04v7rfkrlr8cx30ygy0n45skf6pdbif0zisn9a5xrdnjfb81dvrl")))) + (base32 "0n1dxsjv9fxv3kmr3nh4n8v8pqckwgdlls942msysavhp4kzm6fh")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From ac6f1c777a7cfaa431000c4c9bd4dd690a806018 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 17:13:24 +0200 Subject: gnu: facter: Update to 4.0.26. * gnu/packages/admin.scm (facter): Update to 4.0.26. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1a0e19b19a..9c5ab3be13 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -435,7 +435,7 @@ graphs and can export its output to different formats.") (define-public facter (package (name "facter") - (version "4.0.25") + (version "4.0.26") (source (origin (method git-fetch) (uri (git-reference @@ -444,7 +444,7 @@ graphs and can export its output to different formats.") (file-name (git-file-name name version)) (sha256 (base32 - "04nbk9rn5lfhbivsx68dggsp05czm7mzfr1i7yv6168bl92d233y")))) + "0bab3by926gavbhkvp0in82vim575ybj8z6av3b12jdvla1s9rmz")))) (build-system ruby-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 0c716128d3efc46bbb2dc757dc3d058c9bd62a59 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 17:25:55 +0200 Subject: gnu: gnome-chess: Don't use NAME in source URI. * gnu/packages/games.scm (gnome-chess)[source]: Hard-code NAME. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ddfff4db8d..ed1333dee6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1161,9 +1161,9 @@ destroying an ancient book using a special wand.") (version "3.36.0") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/gnome-chess/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "gnome-chess-" version ".tar.xz")) (sha256 (base32 "1a9fgi749gy1f60vbcyrqqkab9vqs42hji70q73k1xx8rv0agmg0")))) -- cgit v1.2.3 From 8c07da61e74cd26b5467183915fca2ebb68e46b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 17:26:02 +0200 Subject: gnu: gnome-chess: Update to 3.36.1. * gnu/packages/games.scm (gnome-chess): Update to 3.36.1. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ed1333dee6..9398524e47 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1158,7 +1158,7 @@ destroying an ancient book using a special wand.") (define-public gnome-chess (package (name "gnome-chess") - (version "3.36.0") + (version "3.36.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-chess/" @@ -1166,7 +1166,7 @@ destroying an ancient book using a special wand.") "gnome-chess-" version ".tar.xz")) (sha256 (base32 - "1a9fgi749gy1f60vbcyrqqkab9vqs42hji70q73k1xx8rv0agmg0")))) + "165bk8s3nngyqbikggspj4rff5nxxfkfcmgzjb4grmsrgbqwk5di")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From fbbaf04d885e172f86348f64cc2fe99633a9e78d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 17:50:51 +0200 Subject: gnu: libolm: Update to 3.1.5. * gnu/packages/crypto.scm (libolm): Update to 3.1.5. --- gnu/packages/crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 99b23b7b7e..be8f8b9f05 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1063,7 +1063,7 @@ Trusted comments are signed, thus verified, before being displayed.") (define-public libolm (package (name "libolm") - (version "3.1.4") + (version "3.1.5") (source (origin (method git-fetch) (uri (git-reference @@ -1071,7 +1071,7 @@ Trusted comments are signed, thus verified, before being displayed.") (commit version))) (sha256 (base32 - "06s7rw4a9vn35wzz7chxn54mp0sjgbpv2bzz9lq0g4hnzw33cjbi")) + "030g0jmmvhx2dh32k708sz6cdd5q1wz48i4gigh6dclqk10w28lm")) (file-name (git-file-name name version)))) (arguments `(#:phases -- cgit v1.2.3 From 4c9577443f9a646d884e8fad99846e7a37b6b288 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 17:57:38 +0200 Subject: gnu: angband: Update to 4.2.1. * gnu/packages/games.scm (angband): Update to 4.2.1. --- gnu/packages/games.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9398524e47..107115170a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1892,7 +1892,7 @@ that beneath its ruins lay buried an ancient evil.") (define-public angband (package (name "angband") - (version "4.2.0") + (version "4.2.1") (source (origin (method url-fetch) @@ -1900,8 +1900,7 @@ that beneath its ruins lay buried an ancient evil.") (version-major+minor version) "/angband-" version ".tar.gz")) (sha256 - (base32 - "0vdm1ymm28wawp94nl1p5q3lhc0k7cnn2kkvvrkfx962gif4kqfk")) + (base32 "03qdavkj2ik02mqjxmlm5bn17ba3yxb1rirp8ghnxy3bsk4kbmxc")) (modules '((guix build utils))) (snippet ;; So, some of the sounds/graphics/tilesets are under different -- cgit v1.2.3 From d321d35aa9b4a1100335113c23b1eb72850e8074 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 17:57:50 +0200 Subject: gnu: angband: Use HTTPS. * gnu/packages/games.scm (angband)[source, home-page]: Use HTTPS. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 107115170a..5f3ac201e4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1896,7 +1896,7 @@ that beneath its ruins lay buried an ancient evil.") (source (origin (method url-fetch) - (uri (string-append "http://rephial.org/downloads/" + (uri (string-append "https://rephial.org/downloads/" (version-major+minor version) "/angband-" version ".tar.gz")) (sha256 @@ -1933,7 +1933,7 @@ that beneath its ruins lay buried an ancient evil.") `(("autoconf" ,autoconf) ("automake" ,automake))) (inputs `(("ncurses" ,ncurses))) - (home-page "http://rephial.org/") + (home-page "https://rephial.org/") (synopsis "Dungeon exploration roguelike") (description "Angband is a Classic dungeon exploration roguelike. Explore the depths below Angband, seeking riches, fighting monsters, and preparing to -- cgit v1.2.3 From d7822dc6775baaf3ea272ff00e398e12ff071828 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 18:14:40 +0200 Subject: gnu: julius: Update to 1.4.1. * gnu/packages/games.scm (julius): Update to 1.4.1. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5f3ac201e4..dd394cd734 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -979,7 +979,7 @@ automata. The following features are available: (define-public julius (package (name "julius") - (version "1.4.0") + (version "1.4.1") (source (origin (method git-fetch) @@ -988,7 +988,7 @@ automata. The following features are available: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "01rygr592ar530qv1flmaiq8icl0qdxgc8lhkcdyn1g09941z47v")) + (base32 "12hhnhdwgz7hd3hlndbnk15pxggm1375qs0764ija4nl1gbpb110")) ;; Remove unused bundled libraries. (modules '((guix build utils))) (snippet -- cgit v1.2.3 From b4bfd66b9a585370d460ca885f586575c4ae3805 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 18:16:56 +0200 Subject: gnu: ltris: Update to 1.0.20. * gnu/packages/games.scm (ltris): Update to 1.0.20. --- gnu/packages/games.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index dd394cd734..ae585d8fe0 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1315,15 +1315,14 @@ Chess). It is similar to standard chess but this variant is far more complicate (define-public ltris (package (name "ltris") - (version "1.0.19") + (version "1.0.20") (source (origin (method url-fetch) (uri (string-append "http://prdownloads.sourceforge.net/lgames/" "ltris-" version ".tar.gz")) (sha256 - (base32 - "1895wv1fqklrj4apkz47rnkcfhfav7zjknskw6p0886j35vrwslg")))) + (base32 "16zbqsc4amx9g3yjv6054nh4ia09dgfp8k6q4qxpjicl3dw3z0in")))) (build-system gnu-build-system) (arguments '(;; The code in LTris uses traditional GNU semantics for inline functions -- cgit v1.2.3 From e51101ecda83c85b0ed9ca98dc7d9606f00dc0ac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 20:25:54 +0200 Subject: gnu: libtextstyle: Update to 0.20.2. * gnu/packages/gettext.scm (libtextstyle): Update to 0.20.2. --- gnu/packages/gettext.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 202acf25d4..6bee92cac9 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017, 2019 Marius Bakke ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Eric Bavier -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Miguel ;;; ;;; This file is part of GNU Guix. @@ -148,14 +148,14 @@ translated messages from the catalogs. Nearly all GNU packages use Gettext.") (define-public libtextstyle (package (name "libtextstyle") - (version "0.20.1") + (version "0.20.2") (source (origin (inherit (package-source gnu-gettext)) (uri (string-append "mirror://gnu/gettext/gettext-" version ".tar.gz")) (sha256 (base32 - "0p3zwkk27wm2m2ccfqm57nj7vqkmfpn7ja1nf65zmhz8qqs5chb6")))) + "1wc9q3y8rsbd757v985vxqcyqsxs7cxk4x7rzsjmq7d4ij8d1fgc")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static") -- cgit v1.2.3 From ee385c583777427ded250173c4b34aaf219e6ce4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 20:26:12 +0200 Subject: gnu: babl: Update to 0.1.78. * gnu/packages/gimp.scm (babl): Update to 0.1.78. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index b5bb29e010..d19ebcfec2 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -51,7 +51,7 @@ (define-public babl (package (name "babl") - (version "0.1.76") + (version "0.1.78") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/babl/" @@ -65,7 +65,7 @@ "/babl-" version ".tar.xz"))) (sha256 (base32 - "183kj2yq08vvldp8307vq61y2ravcqkyarrhak9w2l30gygp9100")))) + "0fjjfb0pbgimlqi7rk8cqz8pq595b7gw8nrpkxfmixdz6cv4km8p")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From e76d19078853f45b3db92cb47278d7f73a9860c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 20:26:21 +0200 Subject: gnu: gegl: Update to 0.4.24. * gnu/packages/gimp.scm (gegl): Update to 0.4.24. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index d19ebcfec2..e85b27933f 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -90,7 +90,7 @@ provided, as well as a framework to add new color models and data types.") (define-public gegl (package (name "gegl") - (version "0.4.22") + (version "0.4.24") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/gegl/" @@ -104,7 +104,7 @@ provided, as well as a framework to add new color models and data types.") "/gegl-" version ".tar.xz"))) (sha256 (base32 - "0q9cckf90fb82qc5d496fjz459f1xw4j4p3rff1f57yivx0yr20q")))) + "0ji57s7cba94vzy49agn7x47ca61rccm6rif0cb0s6rl4ygljrbp")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 483ce0d3c7e7f1f30c597fc7b2da0424e34cd0d2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 20:26:32 +0200 Subject: gnu: gimp: Update to 2.10.20. * gnu/packages/gimp.scm (gimp): Update to 2.10.20. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index e85b27933f..c52dc7a4d1 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -135,7 +135,7 @@ buffers.") (define-public gimp (package (name "gimp") - (version "2.10.18") + (version "2.10.20") (source (origin (method url-fetch) (uri (string-append "https://download.gimp.org/pub/gimp/v" @@ -143,7 +143,7 @@ buffers.") "/gimp-" version ".tar.bz2")) (sha256 (base32 - "05np26g61fyr72s7qjfrcck8v57r0yswq5ihvqyzvgzfx08y3gv5")))) + "0g3vzh1bjffqx94mfghmwvkhncv71cgah2mnfx17q00s9f3rybz1")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML -- cgit v1.2.3 From c668a8809a0add200b19ec6bef153ab30e55dafc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 20:26:50 +0200 Subject: gnu: cogl: Update to 1.22.8. * gnu/packages/gnome.scm (cogl): Update to 1.22.8. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 213eacecd7..8771c3e2bb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4560,7 +4560,7 @@ throughout GNOME for API documentation).") (define-public cogl (package (name "cogl") - (version "1.22.6") + (version "1.22.8") (source (origin (method url-fetch) @@ -4568,7 +4568,7 @@ throughout GNOME for API documentation).") (version-major+minor version) "/" "cogl-" version ".tar.xz")) (sha256 - (base32 "0x8v4n61q89qy27v824bqswpz6bmn801403w2q3pa1lcwk9ln4vd")))) + (base32 "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")))) ;; NOTE: mutter exports a bundled fork of cogl, so when making changes to ;; cogl, corresponding changes may be appropriate in mutter as well. (build-system gnu-build-system) -- cgit v1.2.3 From 36384fd2f8c99b3114fd196c48df29bd26bea311 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 21:01:40 +0200 Subject: gnu: rclone: Update to 1.52.1. * gnu/packages/sync.scm (rclone): Update to 1.52.1. --- gnu/packages/sync.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index abaf0f7cbc..c4bc5dd82f 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ludovic Courtès ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2019 Clément Lassieur @@ -360,14 +360,14 @@ over the Internet in an HTTP and CDN friendly way; (define-public rclone (package (name "rclone") - (version "1.52.0") + (version "1.52.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/rclone/rclone/releases/download/" "v" version "/rclone-v" version ".tar.gz")) (sha256 - (base32 "06zkxnz0ggv8k4ayv3a8jx6ch0hclgs613wagskklqm15zv0dkdq")))) + (base32 "0lvmm3qpdix4mnip1dfyawsdvzbcdxw0b0zz7xbgmicbfv1vlpx9")))) ;; FIXME: Rclone bundles some libraries Guix already provides. Need to ;; un-bundle them. (build-system go-build-system) -- cgit v1.2.3 From 238e2e457fdbd25798f1eb5d854d70c37e6ad1f8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 21:03:44 +0200 Subject: gnu: xapian: Update to 1.4.16. * gnu/packages/search.scm (xapian): Update to 1.4.16. (python-xapian-bindings)[source]: Update content hash. --- gnu/packages/search.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index a87e1e74b6..be6a626b37 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015, 2016 Eric Bavier ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Adam Massmann ;;; ;;; This file is part of GNU Guix. @@ -49,14 +49,14 @@ (define-public xapian (package (name "xapian") - (version "1.4.15") + (version "1.4.16") ;; Note: When updating Xapian, remember to update xapian-bindings below. (source (origin (method url-fetch) (uri (string-append "https://oligarchy.co.uk/xapian/" version "/xapian-core-" version ".tar.xz")) (sha256 - (base32 "1sjhz6vgql801rdgl6vrsjj0vy1mwlkcxjx6nr7h27m031cyjs5i")))) + (base32 "0w5znrf9l5ahbxwg04358nzv0xsqnk42isah46j3jzpjkzsg4ds9")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) ("util-linux" ,util-linux "lib"))) @@ -94,7 +94,7 @@ rich set of boolean query operators.") "/xapian-bindings-" version ".tar.xz")) (sha256 (base32 - "0364nalvh13c7wzx52mz4gaf8wg1rm17lw75cs8a813rv091ci38")))) + "06v2prlzwgbcsgjpmd7x2qczcp6dn7836h21bq3gmlnd2mnyr4c7")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-python3") -- cgit v1.2.3 From a5d40ee7acd80d0472c64cd697f27045fffa4167 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 21:07:11 +0200 Subject: gnu: python-shellingham: Update to 1.3.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-shellingham): Update to 1.3.2. [arguments]: Add ‘restore-setup.py’ phase. --- gnu/packages/python-xyz.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bf2e7de238..7506f7852f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11749,17 +11749,26 @@ implementation has been adapted, improved, and fixed from Molten.") (define-public python-shellingham (package (name "python-shellingham") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (pypi-uri "shellingham" version)) (sha256 - (base32 - "1q7kws7w4x2hji3g7y0ni9ddk4sd676ylrb3db54gbpys6xj6nwq")))) + (base32 "07kmia2hvd2q7wik89m82hig9mqr2faynvy38vxq5fm0ps11jv2p")))) (build-system python-build-system) - (home-page - "https://github.com/sarugaku/shellingham") + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'restore-setup.py + ;; setup.py will return in the next release. + ;; + (lambda _ + (with-output-to-file "setup.py" + (lambda _ + (display "from setuptools import setup\nsetup()\n"))) + #t))))) + (home-page "https://github.com/sarugaku/shellingham") (synopsis "Tool to detect surrounding shell") (description "Shellingham detects what shell the current Python executable is -- cgit v1.2.3 From de08b5b23fa7bbc972c128ebd343331fcc0a2c22 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 21:36:22 +0200 Subject: gnu: evince: Update to 3.36.5. * gnu/packages/gnome.scm (evince): Update to 3.36.5. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8771c3e2bb..71a7c5812b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1682,7 +1682,7 @@ forgotten when the session ends.") (define-public evince (package (name "evince") - (version "3.36.1") + (version "3.36.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/evince/" @@ -1690,7 +1690,7 @@ forgotten when the session ends.") "evince-" version ".tar.xz")) (sha256 (base32 - "1msbb66lasikpfjpkwsvi7h22hqmk275850ilpdqwbd0b39vzf4c")))) + "0z79jl0j9xq9wgwkfr0d1w1qrdy4447y8shs407n5srr0vixc3bg")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-nautilus" "--enable-introspection") -- cgit v1.2.3 From 69300c0d70a2ad2bc53b32017f7fa9de95ecb100 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 21:36:31 +0200 Subject: gnu: gnome-boxes: Update to 3.36.5. * gnu/packages/gnome.scm (gnome-boxes): Update to 3.36.5. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 71a7c5812b..098abc8f49 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10036,7 +10036,7 @@ integrate seamlessly with the GNOME desktop.") (define-public gnome-boxes (package (name "gnome-boxes") - (version "3.36.4") + (version "3.36.5") (source (origin (method url-fetch) @@ -10044,7 +10044,7 @@ integrate seamlessly with the GNOME desktop.") (version-major+minor version) "/" "gnome-boxes-" version ".tar.xz")) (sha256 - (base32 "16l0mq2ydmywcdya1795mcy8syg4zkmz9ws3pzjcqv5y4m7cjj03")))) + (base32 "1khvyhgd3p41fvvknga1hdl0p1ks4kj4cwsiaw28v1sy6nzclm2c")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 4187e5401fa6074a554cbd24a7092ee8df1829ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Jun 2020 21:36:45 +0200 Subject: gnu: s6-portable-utils: Update to 2.2.2.4. * gnu/packages/skarnet.scm (s6-portable-utils): Update to 2.2.2.4. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 0c381582e8..cef5eb90ee 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -263,7 +263,7 @@ environment."))) (define-public s6-portable-utils (package (name "s6-portable-utils") - (version "2.2.2.3") + (version "2.2.2.4") (source (origin (method url-fetch) @@ -271,7 +271,7 @@ environment."))) "https://skarnet.org/software/s6-portable-utils/s6-portable-utils-" version ".tar.gz")) (sha256 - (base32 "0dniniw8y9das12ic7bd34ra817qzfrql18rczs49sfnkf67c98n")))) + (base32 "0494saavpqfa4v5kib69p186858yjy87hm5qm804a4xvq51wqbwm")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments -- cgit v1.2.3 From b97b8b44ca34d2a6282dd90ab96957d650840dc5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Jun 2020 17:42:32 +0200 Subject: gnu: progress: Fix cross-compilation. * gnu/packages/admin.scm (progress)[arguments]: Use CC-FOR-TARGET and a target-specific pkg-config when cross-compiling. --- gnu/packages/admin.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9c5ab3be13..d34864505a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -231,8 +231,14 @@ usual file attributes can be checked for inconsistencies.") `(("ncurses" ,ncurses))) (arguments `(#:tests? #f ; no test suite - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:make-flags + (let ((target ,(%current-target-system))) + (list ,(string-append "CC=" (cc-for-target)) + (string-append "PKG_CONFIG=" + (if target + (string-append target "-pkg-config") + "pkg-config")) + (string-append "PREFIX=" (assoc-ref %outputs "out")))) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script -- cgit v1.2.3 From b9587aa3c7064c5ba48ca25a01ee71d84284f1b2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Jun 2020 19:03:22 +0200 Subject: gnu: snd: Update to 20.4. * gnu/packages/audio.scm (snd): Update to 20.4. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b2ffeffd40..a9f34599bc 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3586,14 +3586,14 @@ on the ALSA software PCM plugin.") (define-public snd (package (name "snd") - (version "19.9") + (version "20.4") (source (origin (method url-fetch) (uri (string-append "ftp://ccrma-ftp.stanford.edu/pub/Lisp/" "snd-" version ".tar.gz")) (sha256 (base32 - "13s8fahpsjygjdrcwmprcrz23ny3klaj2rh2xzdv3bfs69gxvhys")))) + "0irdizlng2s3akmxdbfxcbd93bbjz9543nh7fisszim6v0ks59d9")))) (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From ae89d96c08d8ca1a561908a942686c0d8f2fa122 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Jun 2020 19:33:02 +0200 Subject: gnu: wesnoth: Update to 1.14.12. * gnu/packages/games.scm (wesnoth): Update to 1.14.12. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ae585d8fe0..d0fb2d6325 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2970,7 +2970,7 @@ falling, themeable graphics and sounds, and replays.") (define-public wesnoth (package (name "wesnoth") - (version "1.14.11") + (version "1.14.12") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/wesnoth/wesnoth-" @@ -2979,7 +2979,7 @@ falling, themeable graphics and sounds, and replays.") "wesnoth-" version ".tar.bz2")) (sha256 (base32 - "1i8mz6gw3qar09bscczhki0g4scj8pl58v85rp0g55r4bcq41l5v")))) + "027bc1363hdgahw7dvd22fvvqd132byxnljfbq6lvlr5ci01q8mk")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no check target -- cgit v1.2.3 From 13d962b9a652de022547aa0503c0ebea8eadbbea Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 7 Jun 2020 12:43:18 -0400 Subject: gnu: starfighter: Update to 2.2. * gnu/packages/games.scm (starfighter): Update to 2.2. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d0fb2d6325..32d7d8d478 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3980,7 +3980,7 @@ tactics.") (define-public starfighter (package (name "starfighter") - (version "2.0.0.3") + (version "2.2") (source (origin (method url-fetch) (uri (string-append @@ -3989,7 +3989,7 @@ tactics.") (version-major+minor version) "-src.tar.gz")) (sha256 (base32 - "13vi5kh9ahws4f52421cbyw0jn7pmbnld358lqfmr6flql7ilj3b")))) + "1ldd9cbvl694ps4sapr8213m3zjrci7gii5x3kjjfalkikmndpd2")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 214ee8274211638dc2cb25b75422b64463118a4c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jun 2020 08:46:13 +0200 Subject: gnu: r-flowworkspace: Update to 4.0.6. * gnu/packages/bioconductor.scm (r-flowworkspace): Update to 4.0.6. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 406ed2fb14..a8ed2707ac 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6117,14 +6117,14 @@ for other R packages to compile and link against.") (define-public r-flowworkspace (package (name "r-flowworkspace") - (version "4.0.3") + (version "4.0.6") (source (origin (method url-fetch) (uri (bioconductor-uri "flowWorkspace" version)) (sha256 (base32 - "1fi76m6r5x4w390996989rignffdzl11k3prpimpwjd3566c276w")))) + "123ny8n3jjgmsnpghk1dafxkwmcyr513gxi8y4h4qszq4s6ai15v")))) (properties `((upstream-name . "flowWorkspace"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From dfe1a36465b11dba7b3404456dc7a7f1838903cf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jun 2020 08:46:13 +0200 Subject: gnu: r-calibrate: Update to 1.7.6. * gnu/packages/cran.scm (r-calibrate): Update to 1.7.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0a502a6063..20a82bf527 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2071,13 +2071,13 @@ is provided.") (define-public r-calibrate (package (name "r-calibrate") - (version "1.7.5") + (version "1.7.6") (source (origin (method url-fetch) (uri (cran-uri "calibrate" version)) (sha256 - (base32 "1s423nr176l2sc66wp7hzgqkv7c2bq8d2bjrrvrrm5qa9y3zdx1k")))) + (base32 "0h91mxf4fy3xk4mavf6cdllglyq5fra8zpz7yvc63n5jigpy2lhd")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass))) -- cgit v1.2.3 From b8ea08feb89c2cec04738fe0467847f595a73179 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jun 2020 08:46:14 +0200 Subject: gnu: r-units: Update to 0.6-7. * gnu/packages/cran.scm (r-units): Update to 0.6-7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 20a82bf527..3d9470160a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13446,14 +13446,14 @@ utilities for sequence data management under the ACNUC system.") (define-public r-units (package (name "r-units") - (version "0.6-6") + (version "0.6-7") (source (origin (method url-fetch) (uri (cran-uri "units" version)) (sha256 (base32 - "11x6xz1fbml28xmrhgn4sii9vfyj3gyfc1dfxahdg9cszdmcgdnh")))) + "1rdpbkiqcabz00fqzzs98v89v4cgvcd4pb00pwxzkq6vmwmscwrz")))) (build-system r-build-system) (inputs `(("udunits" ,udunits))) -- cgit v1.2.3 From cb935a0377b365e1144303641b8a58037b3af62b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jun 2020 08:46:15 +0200 Subject: gnu: r-sf: Update to 0.9-4. * gnu/packages/cran.scm (r-sf): Update to 0.9-4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3d9470160a..bc391d9afd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13578,14 +13578,14 @@ tessellation.") (define-public r-sf (package (name "r-sf") - (version "0.9-3") + (version "0.9-4") (source (origin (method url-fetch) (uri (cran-uri "sf" version)) (sha256 (base32 - "0qh9jxj88rhkwcd95g0l57cdrz5qqjw1b9yysz1hp9cp99485hcx")))) + "1xgmnz01pxvpg2ins1h65mlcrafqihlljcjlag8spq9ii7d5i7mx")))) (build-system r-build-system) (inputs `(("gdal" ,gdal) -- cgit v1.2.3 From d291b454bd402c88eed1464a1dfa058a2f663874 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jun 2020 08:46:15 +0200 Subject: gnu: r-survival: Update to 3.2-3. * gnu/packages/statistics.scm (r-survival): Update to 3.2-3. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 1e7e235136..482eea9178 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -702,14 +702,14 @@ analysis.") (define-public r-survival (package (name "r-survival") - (version "3.1-12") + (version "3.2-3") (source (origin (method url-fetch) (uri (cran-uri "survival" version)) (sha256 (base32 - "07zj3gpwncw89hbiwjb6ih9axv5zwdqnbgz9yw9xzws6nrpdcbmn")))) + "07h76r2y23w889257krlijcw4n4d7ssx92x7i5qb1xyv5gyvl3rx")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) -- cgit v1.2.3 From 8331e2357b67e1b6b2f43ccaf904d7752e124645 Mon Sep 17 00:00:00 2001 From: Ivan Kozlov Date: Sun, 14 Jun 2020 11:48:59 +0200 Subject: gnu: xl2tpd: Add pppd support. * gnu/packages/vpn.scm (xl2tpd)[inputs]: Add "linux-libre-headers" and "ppp", [arguments]: add a 'setup-environment phase to set "PPPD" and "KERNELSRC" variables. Signed-off-by: Mathieu Othacehe --- gnu/packages/vpn.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index a0aff7a32c..4a26ced824 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2020 Ivan Kozlov ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +58,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-web) + #:use-module (gnu packages samba) #:use-module (gnu packages tls) #:use-module (gnu packages xml)) @@ -643,9 +645,20 @@ public keys and can roam across IP addresses.") `(#:make-flags (list (string-append "PREFIX=" %output) "CC=gcc") #:phases (modify-phases %standard-phases - (delete 'configure)) ; no configure script + (delete 'configure) ;no configure script + (add-before 'build 'setup-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CFLAGS" + (string-append "-DPPD=\"" + (assoc-ref inputs "ppp") + "/sbin/pppd\"")) + (setenv "KERNELSRC" + (assoc-ref inputs "linux-libre-headers")) + #t))) #:tests? #f)) ; no tests provided - (inputs `(("libpcap" ,libpcap))) + (inputs `(("libpcap" ,libpcap) + ("linux-libre-headers" ,linux-libre-headers) + ("ppp" ,ppp))) (home-page "https://www.xelerance.com/software/xl2tpd/") (synopsis "Layer 2 Tunnelling Protocol Daemon (RFC 2661)") (description -- cgit v1.2.3 From 25985c69577ce1ec33ffa75c25bd1d71170bc2fa Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Jun 2020 11:07:39 +0200 Subject: gnu: Add perl-hook-lexwrap. * gnu/packages/perl.scm (perl-hook-lexwrap): New variable. --- gnu/packages/perl.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index e7d4ce8392..60a2008636 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2019 Stephen J. Scheck ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Paul Garlick +;;; Copyright © 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -4980,6 +4981,29 @@ merged.") that may contain multiple values per key, inspired by MultiDict of WebOb.") (license (package-license perl)))) +(define-public perl-hook-lexwrap + (package + (name "perl-hook-lexwrap") + (version "0.26") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" + "Hook-LexWrap-" version ".tar.gz")) + (sha256 + (base32 "0bgc6w8zs45n6ksgk0zisn9a2vcr3lmzipkan2a94kzrk1gxq2xn")))) + (build-system perl-build-system) + (home-page + "https://metacpan.org/release/Hook-LexWrap") + (synopsis "Lexically scoped subroutine wrappers") + (description + "Hook::LexWrap allows you to install a pre- or post-wrapper (or +both) around an existing subroutine. Unlike other modules that +provide this capacity (e.g., Hook::PreAndPost and Hook::WrapSub), +Hook::LexWrap implements wrappers in such a way that the standard +caller function works correctly within the wrapped subroutine.") + (license perl-license))) + (define-public perl-importer (package (name "perl-importer") -- cgit v1.2.3 From e72b40af3ea4403d07aa80b93edc790e07074762 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Jun 2020 11:17:42 +0200 Subject: gnu: Add perl-test-object. * gnu/packages/perl-check.scm (perl-test-object): New variable. --- gnu/packages/perl-check.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index ccd9279f3a..ac80edc8da 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2020 Paul Garlick +;;; Copyright © 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -1065,6 +1066,34 @@ usually called epsilon. This module provides such a function for use with @code{Test::More}.") (license asl2.0))) +(define-public perl-test-object + (package + (name "perl-test-object") + (version "0.08") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" + "Test-Object-" version ".tar.gz")) + (sha256 + (base32 "1fyhn558kvla37fb60fzdr6kd2kfcxcmpr8884zk2dvq2ij8j9v5")))) + (build-system perl-build-system) + (home-page "https://metacpan.org/release/Test-Object") + (synopsis "Thoroughly testing objects via registered handlers") + (description + "In situations where you have deep trees of classes, +there is a common situation in which you test a module 4 or 5 subclasses down, +which should follow the correct behaviour of not just the subclass, but of all +the parent classes. + +This should be done to ensure that the implementation of a subclass has not +somehow ``broken'' the object's behaviour in a more general sense. + +Test::Object is a testing package designed to allow you to easily test what +you believe is a valid object against the expected behaviour of all of the +classes in its inheritance tree in one single call.") + (license perl-license))) + (define-public perl-test-output (package (name "perl-test-output") -- cgit v1.2.3 From 689769961124cc75345175e42c46cfd65da57b19 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Jun 2020 11:17:49 +0200 Subject: gnu: Add perl-test-subcalls. * gnu/packages/perl-check.scm (perl-test-subcalls): New variable. --- gnu/packages/perl-check.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index ac80edc8da..0aaae65573 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -1316,6 +1316,33 @@ makes fork(2) safe to use in test cases.") (home-page "https://metacpan.org/release/Test-Simple") (license perl-license))) +(define-public perl-test-subcalls + (package + (name "perl-test-subcalls") + (version "1.10") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" + "Test-SubCalls-" version ".tar.gz")) + (sha256 + (base32 "1hmnv9nkdzyrr6yis0dnkf4lk0hwld3zapiyq7mizrq5barykhfb")))) + (build-system perl-build-system) + (propagated-inputs + `(("perl-hook-lexwrap" ,perl-hook-lexwrap))) + (home-page "https://metacpan.org/release/Test-SubCalls") + (synopsis "Track the number of times subs are called") + (description + "There are a number of different situations (like testing caching +code) where you want to want to do a number of tests, and then verify +that some underlying subroutine deep within the code was called +a specific number of times. + +Test::SubCalls module provides a number of functions for doing testing +in this way in association with your normal Test::More (or similar) +test scripts.") + (license perl-license))) + (define-public perl-test-taint (package (name "perl-test-taint") -- cgit v1.2.3 From f463868898ea4d263635c20b9e7821b9366e41ee Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Jun 2020 11:19:11 +0200 Subject: gnu: Add perl-data-section-simple. * gnu/packages/perl.scm (perl-data-section-simple): New variable. --- gnu/packages/perl.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 60a2008636..f201755870 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2673,6 +2673,27 @@ like split on newlines unless newlines are embedded in quotes.") of data out of your DATA section.") (license (package-license perl)))) +(define-public perl-data-section-simple + (package + (name "perl-data-section-simple") + (version "0.07") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/M/MI/MIYAGAWA/" + "Data-Section-Simple-" version ".tar.gz")) + (sha256 + (base32 "1jx9g5sxcw0i2zkm2z895k422i49kpx0idnnvvvs36lhvgzkac0b")))) + (build-system perl-build-system) + (native-inputs + `(("perl-test-requires" ,perl-test-requires))) + (home-page "https://metacpan.org/release/Data-Section-Simple") + (synopsis "Read data from __DATA__") + (description + "Data::Section::Simple is a simple module to extract data from __DATA__ +section of the file.") + (license perl-license))) + (define-public perl-data-stag (package (name "perl-data-stag") -- cgit v1.2.3 From c158ab306710c260512b75952b591d08441b71da Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Jun 2020 11:20:03 +0200 Subject: gnu: Add perl-tie-simple. * gnu/packages/perl.scm (perl-tie-simple): New variable. --- gnu/packages/perl.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index f201755870..2d4ce0eb45 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -9947,6 +9947,31 @@ operations can also be performed on the IxHash.") by modifying the @code{seek()} and @code{tell()} calls.") (license asl2.0))) +(define-public perl-tie-simple + (package + (name "perl-tie-simple") + (version "1.04") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/H/HA/HANENKAMP/" + "Tie-Simple-" version ".tar.gz")) + (sha256 + (base32 "04lbh07nlxhpp03gl20f9w8hxjb2vzlb7w85y9w6q12i749y5s99")))) + (build-system perl-build-system) + (home-page "https://metacpan.org/release/Tie-Simple") + (synopsis "Variable ties made much easier") + (description + "This module adds the ability to quickly create new types of tie objects +without creating a complete class. It does so in such a way as to try and +make the programmers life easier when it comes to single-use ties that I find +myself wanting to use from time-to-time. + +The Tie::Simple package is actually a front-end to other classes which really +do all the work once tied, but this package does the dwimming to automatically +figure out what you're trying to do.") + (license perl-license))) + (define-public perl-tie-toobject (package (name "perl-tie-toobject") -- cgit v1.2.3 From 5e44ec69d68bf9bacfd7343e6ee78b25de1733fd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Jun 2020 11:22:23 +0200 Subject: gnu: Add perl-text-haml. * gnu/packages/perl.scm (perl-text-haml): New variable. --- gnu/packages/perl.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 2d4ce0eb45..b164796e99 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -9685,6 +9685,30 @@ used to match against text, rather than fetching names from a file system. If you want to do full file globbing use the File::Glob module instead.") (license (package-license perl)))) +(define-public perl-text-haml + (package + (name "perl-text-haml") + (version "0.990118") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/V/VT/VTI/" + "Text-Haml-" version ".tar.gz")) + (sha256 + (base32 "1siq8hgj7s8gwpf3n3h1is5v50rwi6av8lfb19khiyyqz0rp7a57")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build-tiny" ,perl-module-build-tiny))) + (propagated-inputs + `(("perl-data-section-simple" ,perl-data-section-simple) + ("perl-uri" ,perl-uri))) + (home-page "https://metacpan.org/release/Text-Haml") + (synopsis "Haml Perl implementation") + (description + "Text::Haml implements Haml +@url{http://haml.info/docs/yardoc/file.REFERENCE.html} specification.") + (license artistic2.0))) + (define-public perl-text-neattemplate (package (name "perl-text-neattemplate") -- cgit v1.2.3 From cbddff6d703117748d87a110e05a9a82dc725b0b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Jun 2020 11:23:29 +0200 Subject: gnu: Add perl-lingua-en-sentence. * gnu/packages/perl.scm (perl-lingua-en-sentence): New variable. --- gnu/packages/perl.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index b164796e99..782963e2b5 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5723,6 +5723,28 @@ that aims to be compatible with the Uniforum message translations system as implemented for example in GNU gettext.") (license gpl3+))) +(define-public perl-lingua-en-sentence + (package + (name "perl-lingua-en-sentence") + (version "0.31") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/K/KI/KIMRYAN/" + "Lingua-EN-Sentence-" version ".tar.gz")) + (sha256 + (base32 "11hlg92khd2azbxndnffsj9lggbxb3lqfdbwc6asr1c9lxlqddms")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) + (home-page "https://metacpan.org/release/Lingua-EN-Sentence") + (synopsis "Split text into sentences") + (description + "The Lingua::EN::Sentence module contains the function get_sentences, +which splits text into its constituent sentences, based on a regular +expression and a list of abbreviations (built in and given).") + (license perl-license))) + (define-public perl-lingua-translit (package (name "perl-lingua-translit") -- cgit v1.2.3 From 87554eee8b1fc53a97e52df90d21119222cfb8b2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Jun 2020 11:25:25 +0200 Subject: gnu: Add perl-compress-bzip2. * gnu/packages/perl-compression.scm (perl-compress-bzip2): New variable. --- gnu/packages/perl-compression.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/perl-compression.scm b/gnu/packages/perl-compression.scm index bb47a90f8f..2996e56452 100644 --- a/gnu/packages/perl-compression.scm +++ b/gnu/packages/perl-compression.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2017, 2019 Efraim Flashner ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,39 @@ #:use-module (gnu packages perl) #:use-module (gnu packages perl-check)) +(define-public perl-compress-bzip2 + (package + (name "perl-compress-bzip2") + (version "2.26") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/" + "Compress-Bzip2-" version ".tar.gz")) + (sha256 + (base32 "032gbhpjch4yc7r32b0glhi5qn6f1sm35lrnxrvlv9bpyg2z0cji")))) + (build-system perl-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-system-bzip2 + (lambda* (#:key inputs #:allow-other-keys) + (let ((bzip2 (assoc-ref inputs "bzip2"))) + (setenv "BUILD_BZLIB" "0") + (setenv "BZLIB_BIN" (string-append bzip2 "/bin")) + (setenv "BZLIB_INCLUDE" (string-append bzip2 "/include")) + (setenv "BZLIB_LIB" (string-append bzip2 "/lib")) + #t)))))) + (inputs + `(("bzip2" ,bzip2))) + (home-page "https://metacpan.org/release/Compress-Bzip2") + (synopsis "Interface to Bzip2 compression library") + (description + "The Compress::Bzip2 module provides a Perl interface to the Bzip2 +compression library. A relevant subset of the functionality provided by Bzip2 +is available in this module.") + (license license:perl-license))) + (define-public perl-compress-raw-bzip2 (package (name "perl-compress-raw-bzip2") -- cgit v1.2.3 From 3329569bb4442a2ba25becafe01da90f58837b77 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Jun 2020 11:38:31 +0200 Subject: gnu: Add perl-ppi. * gnu/packages/perl.scm (perl-ppi): New variable. --- gnu/packages/perl.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 782963e2b5..1a0f2d4e95 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8272,6 +8272,37 @@ feature is useful when you want to write loggers, servers, and portable applications.") (license (package-license perl)))) +(define-public perl-ppi + (package + (name "perl-ppi") + (version "1.270") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/M/MI/MITHALDU/" + "PPI-" version ".tar.gz")) + (sha256 + (base32 "0mzlz9rxqx93rqgy16jcfxwkplvhzr0f1gvvvwmmvf0vg266jak2")))) + (build-system perl-build-system) + (arguments + `(#:tests? #f)) ;FIXME: some tests fail + (native-inputs + `(("perl-class-inspector" ,perl-class-inspector) + ("perl-test-deep" ,perl-test-deep) + ("perl-test-nowarnings" ,perl-test-nowarnings) + ("perl-test-object" ,perl-test-object) + ("perl-test-subcalls" ,perl-test-subcalls))) + (propagated-inputs + `(("perl-clone" ,perl-clone) + ("perl-io-string" ,perl-io-string) + ("perl-params-util" ,perl-params-util) + ("perl-task-weaken" ,perl-task-weaken))) + (home-page "https://metacpan.org/release/PPI") + (synopsis "Parse, analyze and manipulate Perl (without Perl)") + (description "The PPI module parses, analyzes and manipulates Perl +code.") + (license perl-license))) + (define-public perl-probe-perl (package (name "perl-probe-perl") -- cgit v1.2.3 From 10ed3525a42623178c444628187914998c034a05 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Jun 2020 11:41:47 +0200 Subject: gnu: Add perl-locale-maketext-lexicon. * gnu/packages/perl.scm (perl-locale-maketext-lexicon): New variable. --- gnu/packages/perl.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 1a0f2d4e95..86c9f0eba6 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5567,6 +5567,32 @@ versa.") "Lexical::SealRequireHints prevents leakage of lexical hints") (license (package-license perl)))) +(define-public perl-locale-maketext-lexicon + (package + (name "perl-locale-maketext-lexicon") + (version "1.00") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/D/DR/DRTECH/" + "Locale-Maketext-Lexicon-" version ".tar.gz")) + (sha256 + (base32 "0z6w3m6f3r29ljicdigsyvpa9w9j2m65l4gjxcw0wgwdll26ngxp")))) + (build-system perl-build-system) + (propagated-inputs + `(("perl-html-parser" ,perl-html-parser) + ("perl-lingua-en-sentence" ,perl-lingua-en-sentence) + ("perl-ppi" ,perl-ppi) + ("perl-template-toolkit" ,perl-template-toolkit) + ("perl-text-haml" ,perl-text-haml) + ("perl-yaml" ,perl-yaml))) + (home-page "https://metacpan.org/release/Locale-Maketext-Lexicon") + (synopsis "Use other catalog formats in Maketext") + (description + "This module provides lexicon-handling modules to read from other +localization formats, such as Gettext, Msgcat, and so on.") + (license x11))) + (define-public perl-log-any (package (name "perl-log-any") -- cgit v1.2.3 From e8356966b7c77c5046e4603e33da456119a37f8c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Jun 2020 11:47:10 +0200 Subject: gnu: Add perl-text-patch. * gnu/packages/perl.scm (perl-text-patch): New variable. --- gnu/packages/perl.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 86c9f0eba6..fab366fa8d 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -9813,6 +9813,27 @@ template engine, for when you need speed rather than complex features, yet need more features than simple variable substitution.") (license (package-license perl)))) +(define-public perl-text-patch + (package + (name "perl-text-patch") + (version "1.8") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/C/CA/CADE/" + "Text-Patch-" version ".tar.gz")) + (sha256 + (base32 "1k1xbhxwn9fymqqwnam9pm7hr2p5ikq6dk578qw18gkap9hqxwga")))) + (build-system perl-build-system) + (propagated-inputs + `(("perl-text-diff" ,perl-text-diff))) + (home-page "https://metacpan.org/release/Text-Patch") + (synopsis "Patches text with given patch") + (description "Text::Patch combines source text with given +diff (difference) data. Diff data is produced by Text::Diff module or +by the standard @code{diff} utility.") + (license gpl2+))) + (define-public perl-text-roman (package (name "perl-text-roman") -- cgit v1.2.3 From f810d69b6c8fd72c85a363f2a210e1878f3cb00a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Jun 2020 12:11:45 +0200 Subject: gnu: Use ‘license:’ prefix in (gnu packages perl). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/perl.scm: Import (guix licenses) with a #:prefix and adjust all callers. --- gnu/packages/perl.scm | 266 +++++++++++++++++++++++++------------------------- 1 file changed, 133 insertions(+), 133 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index fab366fa8d..42839f4409 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -45,7 +45,7 @@ (define-module (gnu packages perl) #:use-module (srfi srfi-1) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) @@ -256,7 +256,7 @@ text manipulation and now used for a wide range of tasks including system administration, web development, network programming, GUI development, and more.") (home-page "https://www.perl.org/") - (license gpl1+))) ; or "Artistic" + (license license:gpl1+))) ; or "Artistic" (define-public perl-algorithm-c3 (package @@ -479,7 +479,7 @@ SYS$HASH_PASSWORD password hashing function from VMS (also known as LGI$HPWD) and some associated VMS username and password handling functions. The password hashing function is implemented in XS with a pure Perl backup version for systems that cannot handle XS.") - (license gpl2+))) + (license license:gpl2+))) (define-public perl-authen-passphrase (package @@ -522,7 +522,7 @@ many schemes in use to achieve this effect and the intent of this class is to provide a consistent interface to them all. In addition to the base class, this module also contains implementations of several specific passphrase schemes.") - (license perl-license))) + (license license:perl-license))) (define-public perl-autovivification (package @@ -664,7 +664,7 @@ keywords: @code{@@Scalars, @@Arrays, @@Hashes, @@Filehandles, @@Symbols, @@Functions, @@Barewords, @@TieIOMethods, @@UNIVERSALMethods and @@ExporterSymbols}.") ;; GPLv2 only - (license gpl2))) + (license license:gpl2))) (define-public perl-benchmark-timer (package @@ -690,7 +690,7 @@ trials. It is perfect for when you need more precise information about the running time of portions of your code than the Benchmark module will give you, but don't want to go all out and profile your code.") (home-page "https://metacpan.org/release/Benchmark-Timer") - (license gpl2))) + (license license:gpl2))) (define-public perl-bit-vector (package @@ -715,7 +715,7 @@ matrices, all of arbitrary sizes. The package also includes an object-oriented Perl module for accessing the C library from Perl, and optionally features overloaded operators for maximum ease of use. The C library can nevertheless be used stand-alone, without Perl.") - (license (list (package-license perl) lgpl2.0+)))) + (license (list (package-license perl) license:lgpl2.0+)))) (define-public perl-boolean (package @@ -775,7 +775,7 @@ Agency.") (synopsis "Work with International Standard Book Numbers") (description "This modules provides tools to deal with International Standard Book Numbers, including ISBN-10 and ISBN-13.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-business-issn (package @@ -884,7 +884,7 @@ algorithm to keep the most used entries in the cache.") sent to STDOUT or STDERR, regardless of whether it comes from Perl, from XS code or from an external program. Optionally, output can be teed so that it is captured while being passed through to the original file handles.") - (license asl2.0))) + (license license:asl2.0))) (define-public perl-canary-stability (package @@ -990,7 +990,7 @@ library assert.h.") (synopsis "Convenience wrappers around Carp::Assert") (description "Carp::Assert::More is a set of handy assertion functions for Perl.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-carp-clan (package @@ -1031,7 +1031,7 @@ the Carp.pm module doesn't help.") (synopsis "Read the CDDB entry for an audio CD in your drive") (description "This module can retrieve information from the CDDB.") ;; Either GPLv2 or the "Artistic" license. - (license (list gpl2 artistic2.0)))) + (license (list license:gpl2 license:artistic2.0)))) (define-public circos (package @@ -1126,7 +1126,7 @@ the Carp.pm module doesn't help.") (description "Circos is a program for the generation of publication-quality, circularly composited renditions of genomic data and related annotations.") - (license gpl2+))) + (license license:gpl2+))) (define-public perl-class-accessor (package @@ -1421,7 +1421,7 @@ names, not Class::Name. For that, this module provides \"load_class (synopsis "XS implementation of parts of Class::Load") (description "This module provides an XS implementation for portions of Class::Load.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-class-methodmaker (package @@ -1493,7 +1493,7 @@ with a hook to easily call that original method.") module dynamically generates anonymous classes with specified inheritance. This is useful where an incomplete class requires use of a mixin in order to become instantiable.") - (license perl-license))) + (license license:perl-license))) (define-public perl-class-singleton (package @@ -1532,7 +1532,7 @@ little other than manage the instantiation of a single object.") (synopsis "Minimalist class construction") (description "This module offers a minimalist class construction kit. It uses no non-core modules for any recent Perl.") - (license asl2.0))) + (license license:asl2.0))) (define-public perl-class-unload (package @@ -1623,7 +1623,7 @@ objects.") (description "This @code{Clone::Choose} module checks several different modules which provide a @code{clone()} function and selects an appropriate one.") - (license perl-license))) + (license license:perl-license))) (define-public perl-clone-pp (package @@ -1692,7 +1692,7 @@ library. It support scalar, array, and hash data structures just like its C/C++ counterpart. It reduces the effort required to implement a configuration file parser in your Perl programme and allows sharing configuration files between languages.") - (license bsd-3))) + (license license:bsd-3))) (define-public perl-config-grammar (package @@ -1827,7 +1827,7 @@ options.") (description "This module handles parsing, modifying and creating configuration files of the style used by the Git version control system.") - (license perl-license))) + (license license:perl-license))) (define-public perl-config-ini (package @@ -1901,7 +1901,7 @@ the caller.") mail, as short-lined, 7-bit, semi-compressed data streams. Ths module provides a means of converting those data streams back into into binary data.") - (license perl-license))) + (license license:perl-license))) (define-public perl-cpan-changes (package @@ -1922,7 +1922,7 @@ data.") (description "@code{CPAN::Changes} helps users programmatically read and write @file{Changes} files that conform to a common specification.") - (license perl-license))) + (license license:perl-license))) (define-public perl-cpan-distnameinfo (package @@ -1944,7 +1944,7 @@ data.") (description "@code{CPAN::DistnameInfo} uses heuristics to extract the distribution name and version from filenames.") - (license perl-license))) + (license license:perl-license))) (define-public perl-cpan-meta-check (package @@ -2010,7 +2010,7 @@ the cryptographic Cipher Block Chaining (CBC) mode. In combination with a block cipher such as @code{Crypt::Rijndael} you can encrypt and decrypt messages of arbitrarily long length. The encrypted messages are compatible with the encryption format used by SSLeay.") - (license perl-license))) + (license license:perl-license))) (define-public perl-crypt-des (package @@ -2034,7 +2034,7 @@ are compatible with the encryption format used by SSLeay.") the DES cryptography algorithm. The module implements the @code{Crypt::CBC} interface which has blocksize, keysize, encrypt and decrypt functions.") - (license bsd-3))) + (license license:bsd-3))) (define-public perl-crypt-eksblowfish (package @@ -2068,7 +2068,7 @@ Cost and salt parameters together define a cipher family. Within each family, the key determines the encryption function. This distribution also includes an implementation of @code{bcrypt}, the Unix crypt() password hashing algorithm based on Eksblowfish.") - (license perl-license))) + (license license:perl-license))) (define-public perl-crypt-mysql (package @@ -2095,7 +2095,7 @@ password hashing algorithm based on Eksblowfish.") function. The module does not depend on an interface to the MySQL database server. This enables the comparison of encrypted passwords without the need for a real MySQL environment.") - (license perl-license))) + (license license:perl-license))) (define-public perl-crypt-passwdmd5 (package @@ -2119,7 +2119,7 @@ without the need for a real MySQL environment.") crypt()-compatible interfaces to the MD5-based crypt() function found in various *nixes. It is based on the implementation found on FreeBSD 2.2.[56]-RELEASE.") - (license perl-license))) + (license license:perl-license))) (define-public perl-crypt-randpasswd (package @@ -2173,7 +2173,7 @@ supported encryption modes are: @item @code{MODE_ECB}---Electronic cookbook mode @item @code{MODE_OFB}---Output feedback @end itemize") - (license gpl3))) + (license license:gpl3))) (define-public perl-crypt-rc4 (package @@ -2216,7 +2216,7 @@ Unix @code{crypt} function. For those who need to construct non-standard variants of @code{crypt}, the various building blocks used in @code{crypt} are also supplied separately.") ;; Files in the 'fcrypt' directory are covered by a BSD licence. - (license (list perl-license bsd-3)))) + (license (list license:perl-license license:bsd-3)))) (define-public perl-cwd-guard (package @@ -2277,7 +2277,7 @@ It returns to the previous working directory when the object is destroyed.") (description "Chaolin Zhang's Perl Library (czplib) contains assorted functions and data structures for processing and analysing genomic and bioinformatics data.") - (license gpl3+))) + (license license:gpl3+))) (define-public perl-data (package @@ -2368,7 +2368,7 @@ on the Internet, and cryptographic fake entropy. The Data::Entropy::Algorithms module contains a collection of fundamental algorithms that use entropy. There are random number generators and functions to shuffle arrays.") - (license perl-license))) + (license license:perl-license))) (define-public perl-data-integer (package @@ -2395,7 +2395,7 @@ data type. A native integer is one of the types of datum that can appear in the numeric part of a Perl scalar. This module supplies constants describing the native integer type. Both signed and unsigned representations are handled.") - (license perl-license))) + (license license:perl-license))) (define-public perl-data-uniqid (package @@ -2456,7 +2456,7 @@ code that, when \"eval\"ed, produces a deep copy of the original arguments.") @code{Data::Dumper} writes out their contents in Perl syntax. The references can also be objects. The content of each variable is output in a single Perl statement. It handles self-referential structures correctly.") - (license perl-license))) + (license license:perl-license))) (define-public perl-data-dumper-concise (package @@ -2503,7 +2503,7 @@ types of datum that can appear in the numeric part of a Perl scalar. This module supplies constants describing the native floating point type, classification functions and functions to manipulate floating point values at a low level.") - (license perl-license))) + (license license:perl-license))) (define-public perl-data-optlist (package @@ -2594,7 +2594,7 @@ The maths behind this is unfortunately fiddly, hence this module.") @item @code{Data::Perl::Bool} @item @code{Data::Perl::Code} @end itemize") - (license perl-license))) + (license license:perl-license))) (define-public perl-data-printer (package @@ -2692,7 +2692,7 @@ of data out of your DATA section.") (description "Data::Section::Simple is a simple module to extract data from __DATA__ section of the file.") - (license perl-license))) + (license license:perl-license))) (define-public perl-data-stag (package @@ -2845,7 +2845,7 @@ applicable).") (synopsis "XS wrapper for Date::Calc") (description "Date::Calc::XS is an XS wrapper and C library plug-in for Date::Calc.") - (license (list (package-license perl) lgpl2.0+)))) + (license (list (package-license perl) license:lgpl2.0+)))) (define-public perl-date-manip (package @@ -2891,7 +2891,7 @@ module may be used to create simple date objects. It handles validation, interval arithmetic, and day-of-week calculation. It does not deal with hours, minutes, seconds, and time zones.") ;; Can be used with either license. - (license (list (package-license perl) gpl2+)))) + (license (list (package-license perl) license:gpl2+)))) (define-public perl-datetime (package @@ -2921,7 +2921,7 @@ hours, minutes, seconds, and time zones.") (description "DateTime is a class for the representation of date/time combinations. It represents the Gregorian calendar, extended backwards in time before its creation (in 1582).") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-datetime-calendar-julian (package @@ -3043,7 +3043,7 @@ or \"every day\". You can also create more complicated recurrences, such as string formats of dates and times are simple and just require a basic regular expression to extract the relevant information. Builder provides a simple way to do this without writing reams of structural code.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-datetime-format-flexible (package @@ -3127,7 +3127,7 @@ order to create the appropriate objects.") (synopsis "Parse ISO8601 date and time formats") (description "@code{DateTime::Format::ISO8601} is a DateTime extension that parses almost all ISO8601 date and time formats.") - (license perl-license))) + (license license:perl-license))) (define-public perl-datetime-format-natural (package @@ -3187,7 +3187,7 @@ parsing logic.") function that is the reverse of `strftime(3)`, for `DateTime`. While `strftime` takes a `DateTime` and a pattern and returns a string, `strptime` takes a string and a pattern and returns the `DateTime` object associated.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-datetime-locale (package @@ -3373,7 +3373,7 @@ annotation to a Perl subroutine, resulting in resolvable calls to that subroutine being mutated at compile time by arbitrary C code. This module makes @code{cv_set_call_checker} and several supporting functions available.") - (license perl-license))) + (license license:perl-license))) (define-public perl-devel-caller (package @@ -3437,7 +3437,7 @@ particular command is available.") C library and its headers are available. You can also check for the presence of particular functions in a library, or even that those functions return particular results.") - (license perl-license))) + (license license:perl-license))) (define-public perl-devel-checkcompiler (package @@ -3482,7 +3482,7 @@ you can tell it to compile a C source file with optional linker flags.") "@code{Devel::Cycle} This is a tool for finding circular references in objects and other types of references. Because of Perl's reference-count based memory management, circular references will cause memory leaks.") - (license perl-license))) + (license license:perl-license))) (define-public perl-devel-globaldestruction (package @@ -3545,7 +3545,7 @@ files/modules are installed or not).") (description "This module provides a basic way to discover if a piece of perl code is allocating perl data and not releasing them again.") - (license perl-license))) + (license license:perl-license))) (define-public perl-devel-lexalias (package @@ -3639,7 +3639,7 @@ arbitrary parameters.") Devel::StackTrace and Devel::StackTrace::Frame. These objects encapsulate the information that can be retrieved via Perl's caller() function, as well as providing a simple interface to this data.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-devel-stacktrace-ashtml (package @@ -3702,7 +3702,7 @@ each stack frame.") (description "The @code{Digest::CRC} module calculates CRC sums of all sorts. It contains wrapper functions with the correct parameters for CRC-CCITT, CRC-16 and CRC-32.") - (license public-domain))) + (license license:public-domain))) (define-public perl-digest-hmac (package @@ -3744,7 +3744,7 @@ RSA Data Security Inc.@: MD4 Message Digest algorithm from within Perl programs. The algorithm takes as input a message of arbitrary length and produces as output a 128-bit \"fingerprint\" or \"message digest\" of the input. MD4 is described in RFC 1320.") - (license perl-license))) + (license license:perl-license))) (define-public perl-digest-md5 (package @@ -3840,7 +3840,7 @@ modules separately and deal with them after the module is done installing.") dynamic loading as used by Perl. Some details of dynamic loading are very platform-dependent, so correct use of these functions requires the programmer to be mindfulof the space of platform variations.") - (license perl-license))) + (license license:perl-license))) (define-public perl-encode-detect (package @@ -3861,7 +3861,7 @@ the programmer to be mindfulof the space of platform variations.") (synopsis "Detect the encoding of data") (description "This package provides a class @code{Encode::Detect} to detect the encoding of data.") - (license mpl1.1))) + (license license:mpl1.1))) (define-public perl-encode-eucjpascii (package @@ -3925,7 +3925,7 @@ also known as JIS 2000.") part of Perl by default, including \"BIG5-1984\", \"BIG5-2003\", \"BIG5PLUS\", \"BIG5EXT\", \"CCCII\", \"EUC-TW\", \"CNS11643-*\", \"GB18030\", and \"UNISYS\".") - (license expat))) + (license license:expat))) (define-public perl-env-path (package @@ -4243,7 +4243,7 @@ handle Perl/XS typemap files, and their submodules.") @command{pkg-config} utility, intended for use in the @file{Makefile.PL} of perl extensions which bind libraries that @command{pkg-config} knows. It is really just boilerplate code that you would have written yourself.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public perl-extutils-typemaps-default (package @@ -4324,7 +4324,7 @@ interface XS for C++; it is a thin layer over plain XS.") (synopsis "Watch for changes to files") (description "This module provides a class to monitor a directory for changes made to any file.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-file-configdir (package @@ -4512,7 +4512,7 @@ working directory. When the object is destroyed, the destructor calls @code{chdir} to revert to the original working directory. By storing the object in a lexical variable with a limited scope, this happens automatically at the end of the scope.") - (license asl2.0))) + (license license:asl2.0))) (define-public perl-file-list (package @@ -4566,7 +4566,7 @@ It is intended for processing log and other similar text files which typically have their newest entries appended to them. By default files are assumed to be plain text and have a line ending appropriate to the OS. But you can set the input record separator string on a per file basis.") - (license perl-license))) + (license license:perl-license))) (define-public perl-file-remove (package @@ -4803,7 +4803,7 @@ notifications of changes to a given file system path. It uses inotify2 on Linux, fsevents on OS X, @code{kqueue} on FreeBSD, and @code{FindFirstChangeNotification} on Windows if they're installed, and falls back to a full directory scan if none of these are available.") - (license perl-license))) + (license license:perl-license))) (define-public perl-getopt-long (package @@ -4831,7 +4831,7 @@ single letters, and are introduced with a double dash \"--\". Support for bundling of command line options, as was the case with the more traditional single-letter approach, is provided but not enabled by default.") ;; Can be used with either license. - (license (list (package-license perl) gpl2+)))) + (license (list (package-license perl) license:gpl2+)))) (define-public perl-getopt-long-descriptive (package @@ -5023,7 +5023,7 @@ both) around an existing subroutine. Unlike other modules that provide this capacity (e.g., Hook::PreAndPost and Hook::WrapSub), Hook::LexWrap implements wrappers in such a way that the standard caller function works correctly within the wrapped subroutine.") - (license perl-license))) + (license license:perl-license))) (define-public perl-importer (package @@ -5091,7 +5091,7 @@ compilation. Import::Into provides global methods to make this painless.") (description "The inc::latest module helps bootstrap configure-time dependencies for CPAN distributions. These dependencies get bundled into the inc directory within a distribution and are used by Makefile.PL or Build.PL.") - (license asl2.0))) + (license license:asl2.0))) (define-public perl-indirect (package @@ -5192,7 +5192,7 @@ It also goes a bit into Perl C internals.") a single nifty object oriented interface to greatly simplify your everyday Perl IO idioms. It exports a single function called io, which returns a new @code{IO::All} object. And that object can do it all!") - (license perl-license))) + (license license:perl-license))) (define-public perl-io-captureoutput (package @@ -5400,7 +5400,7 @@ Perlish API and none of the bloat and rarely used features of IPC::Run.") (home-page "https://metacpan.org/release/IPC-Run3") ;; "You may use this module under the terms of the BSD, Artistic, or GPL ;; licenses, any version." - (license (list bsd-3 gpl3+)))) + (license (list license:bsd-3 license:gpl3+)))) (define-public perl-ipc-sharelite (package @@ -5591,7 +5591,7 @@ versa.") (description "This module provides lexicon-handling modules to read from other localization formats, such as Gettext, Msgcat, and so on.") - (license x11))) + (license license:x11))) (define-public perl-log-any (package @@ -5747,7 +5747,7 @@ one: logging, exceptions, and translations.") (description "This package is an internationalization library for Perl that aims to be compatible with the Uniforum message translations system as implemented for example in GNU gettext.") - (license gpl3+))) + (license license:gpl3+))) (define-public perl-lingua-en-sentence (package @@ -5769,7 +5769,7 @@ implemented for example in GNU gettext.") "The Lingua::EN::Sentence module contains the function get_sentences, which splits text into its constituent sentences, based on a regular expression and a list of abbreviations (built in and given).") - (license perl-license))) + (license license:perl-license))) (define-public perl-lingua-translit (package @@ -5896,7 +5896,7 @@ functionality on lists which is not going to go into List::Util.") (description "@code{List::MoreUtils::XS} provides some trivial but commonly needed functionality on lists which is not going to go into @code{List::Util}.") - (license asl2.0))) + (license license:asl2.0))) (define-public perl-list-someutils (package @@ -5973,7 +5973,7 @@ Build a Mail::Internet object, and then send it out using Mail::Mailer. @item Mail::Util \"Smart functions\" you should not depend on. @end table") - (license perl-license))) + (license license:perl-license))) (define-public perl-mail-sendmail (package @@ -5996,7 +5996,7 @@ Build a Mail::Internet object, and then send it out using Mail::Mailer. (description "Mail::Sendmail is a pure perl module that provides a simple means to send email from a perl script. The module only requires Perl5 and a network connection.") - (license perl-license))) + (license license:perl-license))) (define-public perl-math-bezier (package @@ -6016,7 +6016,7 @@ requires Perl5 and a network connection.") (description "This module implements the algorithm for the solution of Bezier curves as presented by Robert D Miller in Graphics Gems V, \"Quick and Simple Bezier Curve Drawing\".") - (license perl-license))) + (license license:perl-license))) (define-public perl-math-round (package @@ -6035,7 +6035,7 @@ Bezier Curve Drawing\".") (synopsis "Perl extension for rounding numbers") (description "@code{Math::Round} provides functions to round numbers, both positive and negative, in various ways.") - (license perl-license))) + (license license:perl-license))) (define-public perl-math-vecstat (package @@ -6074,7 +6074,7 @@ operated on.") (synopsis "Make functions faster by trading space for time") (description "This package transparently speeds up functions by caching return values, trading space for time.") - (license perl-license))) + (license license:perl-license))) (define-public perl-memoize-expirelru (package @@ -6143,7 +6143,7 @@ MIME messages on Internet.") "MIME-tools is a collection of Perl5 MIME:: modules for parsing, decoding, and generating single- or multipart (even nested multipart) MIME messages.") - (license perl-license))) + (license license:perl-license))) (define-public perl-mime-types (package @@ -6367,7 +6367,7 @@ several underlying implementations for a module. This can be used to provide XS and pure Perl implementations of a module, or it could be used to load an implementation for a given OS or any other case of needing to provide multiple implementations.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-module-install (package @@ -6435,7 +6435,7 @@ use in @code{Module::Inspector}. It can load a @file{MANIFEST} file that comes in a Perl distribution tarball, examine the contents, and perform some simple tasks. It can also load the @file{MANIFEST.SKIP} file and check that.") - (license perl-license))) + (license license:perl-license))) (define-public perl-module-pluggable (package @@ -6770,7 +6770,7 @@ namespace::autoclean to operate without blowing away your overloads. After using MooseX::MarkAsMethods your overloads will be recognized by Class::MOP as being methods, and class extension as well as composition from roles with overloads will \"just work\".") - (license lgpl2.1))) + (license license:lgpl2.1))) (define-public perl-moosex-methodattributes (package @@ -6954,7 +6954,7 @@ where plain Moose::Roles would lose the overloading.") changes the default naming policy for the loading class so that accessors are separated into get and set methods. The get methods have the same name as the accessor, while set methods are prefixed with \"_set_\".") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-moosex-strictconstructor (package @@ -6980,7 +6980,7 @@ accessor, while set methods are prefixed with \"_set_\".") (description "Simply loading this module makes your constructors \"strict\". If your constructor is called with an attribute init argument that your class does not declare, then it calls Moose->throw_error().") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-moosex-traits-pluggable (package @@ -7154,7 +7154,7 @@ constraint with coercion to load the class.") (synopsis "Using Moo and MooX:: packages the most lazy way") (description "Contains the MooX and MooX::Role packages.") - (license perl-license))) + (license license:perl-license))) (define-public perl-moox-cmd (package @@ -7279,7 +7279,7 @@ installing configuration files or for finding any piece of settings.") "@code{MooX::HandlesVia} is an extension of Moo's @code{handles} attribute functionality. It provides a means of proxying functionality from an external class to the given attribute.") - (license perl-license))) + (license license:perl-license))) (define-public perl-moox-late (package @@ -7316,7 +7316,7 @@ an external class to the given attribute.") Currently Hash, Array and Code are supported. This feature requires MooX::HandlesVia. @end enumerate") - (license perl-license))) + (license license:perl-license))) (define-public perl-moox-options (package @@ -7396,7 +7396,7 @@ generate a command line tool.") "Loading @code{MooX::StrictConstructor} makes your constructors \"strict\". If your constructor is called with an attribute init argument that your class does not declare, then it dies.") - (license perl-license))) + (license license:perl-license))) (define-public perl-moox-types-mooselike (package @@ -7498,7 +7498,7 @@ of data.") (description "@code{Mozilla::CA} provides a copy of Mozilla's bundle of Certificate Authority certificates in a form that can be consumed by modules and libraries based on OpenSSL.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public perl-multidimensional (package @@ -7624,7 +7624,7 @@ power and flexibility of perl. The module does not implement the functionality of a RIB (Routing Information Base) nor does it modify the kernel routing table of the host system. However, such operations could be implemented using the API provided by the module.") - (license perl-license))) + (license license:perl-license))) (define-public perl-net-dns-native (package @@ -7647,7 +7647,7 @@ designed to be used with event loops. Names are resolved by your system's native @code{getaddrinfo(3)} implementation, called in a separate thread to avoid blocking the entire application. Threading overhead is limited by using system threads instead of Perl threads.") - (license perl-license))) + (license license:perl-license))) (define-public perl-net-idn-encode (package @@ -7674,7 +7674,7 @@ names today (letter-digit-hyphen, /[A-Z0-9-]/i). Use this module if you just want to convert domain names (or email addresses), using whatever IDNA standard is the best choice at the moment.") - (license perl-license))) + (license license:perl-license))) (define-public perl-net-statsd (package @@ -7739,7 +7739,7 @@ output formats may include thousands separators - characters inserted between each group of three characters counting right to left from the decimal point. The characters used for the decimal point and the thousands separator come from the locale information or can be specified by the user.") - (license perl-license))) + (license license:perl-license))) (define-public perl-number-range (package @@ -7854,7 +7854,7 @@ instance, not by name.") (synopsis "Manage deprecation warnings for your distribution") (description "This module allows you to manage a set of deprecations for one or more modules.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-package-stash (package @@ -7984,7 +7984,7 @@ for arguments of the types handled by the classification functions. Enforcement of more complex types may be built using the classification functions, or it may be more convenient to use a module designed for the more complex job, such as @code{Params::Validate}") - (license perl-license))) + (license license:perl-license))) (define-public perl-params-util (package @@ -8030,7 +8030,7 @@ checking parameters easier.") (synopsis "Validate method/function parameters") (description "The Params::Validate module allows you to validate method or function call parameters to an arbitrary level of specificity.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-params-validationcompiler (package @@ -8061,7 +8061,7 @@ parameter checking subroutine. It can handle named or positional parameters, and can return the parameters as key/value pairs or a list of values. In addition to type checks, it also supports parameter defaults, optional parameters, and extra \"slurpy\" parameters.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-par-dist (package @@ -8134,7 +8134,7 @@ directory specifications in a cross-platform manner.") (synopsis "Tools for working with directory and file names") (description "This package provides functions to work with directory and file names.") - (license perl-license))) + (license license:perl-license))) (define-public perl-path-tiny (package @@ -8159,7 +8159,7 @@ file names.") (synopsis "File path utility") (description "This module provides a small, fast utility for working with file paths.") - (license asl2.0))) + (license license:asl2.0))) (define-public perl-pdf-api2 (package @@ -8183,7 +8183,7 @@ with file paths.") (synopsis "Facilitates the creation and modification of PDF files") (description "This Perl module facilitates the creation and modification of PDF files.") - (license lgpl2.1))) + (license license:lgpl2.1))) (define-public perl-perlio-utf8_strict (package @@ -8327,7 +8327,7 @@ applications.") (synopsis "Parse, analyze and manipulate Perl (without Perl)") (description "The PPI module parses, analyzes and manipulates Perl code.") - (license perl-license))) + (license license:perl-license))) (define-public perl-probe-perl (package @@ -8416,7 +8416,7 @@ variables that should not be changed.") @code{Ref::Util}, which provides several functions to help identify references in a more convenient way than the usual approach of examining the return value of @code{ref}.") - (license x11))) + (license license:x11))) (define-public perl-regexp-common (package @@ -8440,7 +8440,7 @@ offensive language, lists of any pattern, IPv4 addresses, URIs, and Zip codes.") (home-page "https://metacpan.org/release/Regexp-Common") ;; Quad-licensed: Perl Artistic, Perl Artistic 2.0, X11, and BSD. - (license (list (package-license perl) x11 bsd-3)))) + (license (list (package-license perl) license:x11 license:bsd-3)))) (define-public perl-regexp-util (package @@ -8547,7 +8547,7 @@ strings it is necessary to understand these implementation details. This module provides functions to classify a string by encoding and to encode a string in a desired way. The module is implemented in XS, with a pure Perl backup version for systems that cannot handle XS.") - (license perl-license))) + (license license:perl-license))) (define-public perl-scope-guard (package @@ -8608,7 +8608,7 @@ collector.") (synopsis "Manage sets of integers") (description "@code{Set::IntSpan} manages sets of integers. It is optimized for sets that have long runs of consecutive integers.") - (license perl-license))) + (license license:perl-license))) (define-public perl-set-object (package @@ -8629,7 +8629,7 @@ optimized for sets that have long runs of consecutive integers.") (synopsis "Unordered collections of Perl Objects") (description "Set::Object provides efficient sets, unordered collections of Perl objects without duplicates for scalars and references.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-set-scalar (package @@ -8722,7 +8722,7 @@ magically make the Perl interpreter start checking a value's type on assignment to a variable. In fact, there's no built-in way to apply a type to a variable at all. Instead, you can explicitly check a value against a type, and optionally coerce values to that type.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-spiffy (package @@ -8766,7 +8766,7 @@ other OO languages like Python, Ruby, Java and Perl 6.") (synopsis "Collection of very basic statistics modules") (description "This package provides basic statistics functions like @code{median()}, @code{mean()}, @code{variance()} and @code{stddev()}.") - (license lgpl2.0))) + (license license:lgpl2.0))) (define-public perl-stream-buffered (package @@ -8895,7 +8895,7 @@ removing double-quotes, and truncating to fit within a desired length.") "@code{String::Formatter} is a tool for building sprintf-like formatting routines. It supports named or positional formatting, custom conversions, fixed string interpolation, and simple width-matching.") - (license gpl2))) + (license license:gpl2))) (define-public perl-string-rewriteprefix (package @@ -9161,7 +9161,7 @@ the superclass---at least conditionally and temporarily. This module provides nicer equivalents to the native Perl syntax for calling superclasses, along with a universal @code{super} method to determine a class' own superclass, and better support for run-time mix-ins and roles.") - (license perl-license))) + (license license:perl-license))) (define-public perl-svg (package @@ -9293,7 +9293,7 @@ of a system.") "Sys::Syscall allows one to use epoll and sendfile system calls from Perl. Support is mostly Linux-only for now, but other syscalls/OSes are planned for the future.") - (license perl-license))) + (license license:perl-license))) (define-public perl-task-weaken (package @@ -9371,7 +9371,7 @@ documents: HTML, XML, POD, PostScript, LaTeX, and so on.") (synopsis "Profiling for Template Toolkit") (description "Template::Timer provides inline profiling of the template processing in Perl code.") - (license (list gpl3 artistic2.0)))) + (license (list license:gpl3 license:artistic2.0)))) (define-public perl-template-tiny (package @@ -9397,7 +9397,7 @@ functionality from Template Toolkit in as few lines of code as possible. It is intended for use in light-usage, low-memory, or low-cpu templating situations, where you may need to upgrade to the full feature set in the future, or if you want the retain the familiarity of TT-style templates.") - (license perl-license))) + (license license:perl-license))) (define-public perl-term-encoding (package @@ -9633,7 +9633,7 @@ into tables.") (synopsis "Align text") (description "Text::Aligner exports a single function, align(), which is used to justify strings to various alignment styles.") - (license x11))) + (license license:x11))) (define-public perl-text-balanced (package @@ -9741,7 +9741,7 @@ generally slower on larger files.") (description "This package provides functions to format text in various ways like centering, paragraphing, and converting tabs to spaces and spaces to tabs.") - (license perl-license))) + (license license:perl-license))) (define-public perl-text-glob (package @@ -9786,7 +9786,7 @@ you want to do full file globbing use the File::Glob module instead.") (description "Text::Haml implements Haml @url{http://haml.info/docs/yardoc/file.REFERENCE.html} specification.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-text-neattemplate (package @@ -9832,7 +9832,7 @@ yet need more features than simple variable substitution.") (description "Text::Patch combines source text with given diff (difference) data. Diff data is produced by Text::Diff module or by the standard @code{diff} utility.") - (license gpl2+))) + (license license:gpl2+))) (define-public perl-text-roman (package @@ -9870,7 +9870,7 @@ algorism to indicate multiplication by 1000.") (home-page "https://metacpan.org/release/Text-SimpleTable") (synopsis "Simple ASCII tables") (description "Text::SimpleTable draws simple ASCII tables.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-text-table (package @@ -9892,7 +9892,7 @@ algorism to indicate multiplication by 1000.") (home-page "https://metacpan.org/release/Text-Table") (synopsis "Organize Data in Tables") (description "Text::Table renders plaintext tables.") - (license x11))) + (license license:x11))) (define-public perl-text-template (package @@ -9921,7 +9921,7 @@ algorism to indicate multiplication by 1000.") filling in templates generally. A template is a piece of text that has little Perl programs embedded in it here and there. When you fill in a template, you evaluate the little programs and replace them with their values.") - (license perl-license))) + (license license:perl-license))) (define-public perl-text-unidecode (package @@ -9960,7 +9960,7 @@ system.") (home-page "https://metacpan.org/release/threads") (synopsis "Perl interpreter-based threads") (description "This module exposes interpreter threads to the Perl level.") - (license perl-license))) + (license license:perl-license))) (define-public perl-throwable (package @@ -10005,7 +10005,7 @@ as exceptions to standard program flow.") reformats Perl scripts to make them easier to read. The formatting can be controlled with command line parameters. The default parameter settings approximately follow the suggestions in the Perl Style Guide.") - (license gpl2+))) + (license license:gpl2+))) (define-public perl-tie-cycle (package @@ -10069,7 +10069,7 @@ operations can also be performed on the IxHash.") (description "This modules provides a file handle that hides the beginning of a file, by modifying the @code{seek()} and @code{tell()} calls.") - (license asl2.0))) + (license license:asl2.0))) (define-public perl-tie-simple (package @@ -10094,7 +10094,7 @@ myself wanting to use from time-to-time. The Tie::Simple package is actually a front-end to other classes which really do all the work once tied, but this package does the dwimming to automatically figure out what you're trying to do.") - (license perl-license))) + (license license:perl-license))) (define-public perl-tie-toobject (package @@ -10180,7 +10180,7 @@ duration strings like \"2 minutes\" and \"3 seconds\" to seconds.") (description "This package implements @code{usleep}, @code{ualarm}, and @code{gettimeofday} for Perl, as well as wrappers to implement @code{time}, @code{sleep}, and @code{alarm} that know about non-integral seconds.") - (license perl-license))) + (license license:perl-license))) (define-public perl-time-local (package @@ -10223,7 +10223,7 @@ the system epoch.") functions with implementations that return objects. It does so in a backwards-compatible manner, so that using these functions as documented will still work as expected.") - (license perl-license))) + (license license:perl-license))) (define-public perl-timedate (package @@ -10330,7 +10330,7 @@ Tree::Simple::Visitor::* objects.") (description "This module provides bare bones try/catch/finally statements that are designed to minimize common mistakes with eval blocks, and nothing else.") - (license x11))) + (license license:x11))) (define-public perl-type-tie (package @@ -10410,7 +10410,7 @@ be used with Moose, Mouse and Moo (or none of the above).") provide faster, C-based implementations of some type constraints. This package has only core dependencies, and does not depend on @code{Type::Tiny}, so other data validation frameworks might also consider using it.") - (license perl-license))) + (license license:perl-license))) (define-public perl-types-path-tiny (package @@ -10435,7 +10435,7 @@ so other data validation frameworks might also consider using it.") etc. It handles two important types of coercion: coercing objects with overloaded stringification, and coercing to absolute paths. It also can check to ensure that files or directories exist.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-types-serialiser (package @@ -10515,7 +10515,7 @@ common serialisation formats such as JSON or CBOR.") Unicode data.") ;; The file Unicode/Collate/allkeys.txt is released under the Expat ;; license. - (license (list (package-license perl) expat)))) + (license (list (package-license perl) license:expat)))) (define-public perl-unicode-linebreak (package @@ -10674,7 +10674,7 @@ that there is exactly one document element, and that there are not duplicate attribute names.") ;; Redistribution and use in source and compiled forms, with or without ;; modification, are permitted under any circumstances. No warranty. - (license public-domain))) + (license license:public-domain))) (define-public perl-xs-object-magic (package @@ -10739,7 +10739,7 @@ on the YAML 1.0 specification.") (description "@code{YAML::XS} is a Perl XS binding to libyaml which offers Perl the best YAML support to date.") - (license perl-license))) + (license license:perl-license))) (define-public perl-yaml-tiny (package @@ -10789,7 +10789,7 @@ and memory overhead.") (description "@code{Parse::RecDescent} can incrementally generate top-down recursive-descent text parsers from simple yacc-like grammar specifications.") - (license perl-license))) + (license license:perl-license))) (define-public perl-parse-yapp (package @@ -11005,7 +11005,7 @@ such that being individual extensions would be wasteful.") "Object-oriented File::Find replacement in Perl") (description "File::Find::Object is an object-oriented File::Find replacement in Perl.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-file-find-object-rule (package @@ -11066,7 +11066,7 @@ object's options and steps, and then adds the new step, returning the new object. In this manner, an object can be grown, step by step, by chaining method calls. Furthermore, a partial sequence can be created and held, and used as the head of many different sequences.") - (license perl-license))) + (license license:perl-license))) (define-public perl-font-ttf (package @@ -11090,7 +11090,7 @@ font hacking. It supports reading, processing and writing of the following tables: GDEF, GPOS, GSUB, LTSH, OS/2, PCLT, bsln, cmap, cvt, fdsc, feat, fpgm, glyf, hdmx, head, hhea, hmtx, kern, loca, maxp, mort, name, post, prep, prop, vhea, vmtx and the reading and writing of all other table types.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-libtime-parsedate (package @@ -11131,7 +11131,7 @@ prop, vhea, vmtx and the reading and writing of all other table types.") ;; "License hereby granted for anyone to use, modify or redistribute this ;; module at their own risk. Please feed useful changes back to ;; cpan@dave.sharnoff.org." - (license (non-copyleft "http://metadata.ftp-master.debian.org/\ + (license (license:non-copyleft "http://metadata.ftp-master.debian.org/\ changelogs/main/libt/libtime-parsedate-perl/\ libtime-parsedate-perl_2015.103-2_copyright")))) @@ -11160,7 +11160,7 @@ time periods allows you to test for conditions like \"Monday to Friday, 9am till 5pm\" and \"on the second Tuesday of the month\" and \"between 4pm and 4:15pm\" and \"in the first half of each minute\" and \"in January of 1998\".") - (license perl-license))) + (license license:perl-license))) (define-public perl-path-iterator-rule (package @@ -11209,7 +11209,7 @@ A summary of features for comparison to other file finding modules: As a convenience, the PIR module is an empty subclass of this one that is less arduous to type for one-liners.") - (license asl2.0))) + (license license:asl2.0))) (define-public perl-pod-constants (package @@ -11235,7 +11235,7 @@ Pod::Constants uses Pod::Parser to do the parsing of the source file. It has to open the source file it is called from, and does so directly either by lookup in %INC or by assuming it is $0 if the caller is @code{main} (or it can't find %INC{caller()}).") - (license artistic2.0))) + (license license:artistic2.0))) (define-public perl-regexp-pattern (package @@ -11281,4 +11281,4 @@ regexp patterns in modules.") (synopsis "Parse Lisp S-Expressions into Perl data structures") (description "Data::SExpression parses Lisp S-Expressions into Perl data structures.") - (license perl-license))) + (license license:perl-license))) -- cgit v1.2.3 From c37dc30e61c56de1815750e52186c6de5be38ee9 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 11 Jun 2020 23:08:45 +0200 Subject: gnu: busybox: Make build reproducible. * gnu/packages/busybox.scm (busybox)[arguments]<#:phases>[disable-timestamps]: New phase. --- gnu/packages/busybox.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index e3431aa31b..0d692c6586 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -45,6 +45,10 @@ (arguments '(#:phases (modify-phases %standard-phases + (add-before 'configure 'disable-timestamps + (lambda _ + (setenv "KCONFIG_NOTIMESTAMP" "1") + #t)) (add-before 'configure 'disable-taskset ;; This feature fails its tests in the build environment, ;; was default 'n' until after 1.26.2. -- cgit v1.2.3 From 4fdf3a2e6ef0d635e79aaf912c6997d2cd978835 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 14 Jun 2020 13:03:05 +0200 Subject: gnu: busybox: Update to 1.31.1. * gnu/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch: New file * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/busybox.scm (busybox): Update to 1.31.1. [source]: Use patch. [arguments]<#:phases>[check]: Fix test. --- gnu/local.mk | 1 + gnu/packages/busybox.scm | 10 +++- .../busybox-1.31.1-fix-build-with-glibc-2.31.patch | 68 ++++++++++++++++++++++ 3 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch diff --git a/gnu/local.mk b/gnu/local.mk index 97026151f0..37bcc88ef5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -805,6 +805,7 @@ dist_patch_DATA = \ %D%/packages/patches/bitcoin-core-python-compat.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ + %D%/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-sqlite.patch \ diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 0d692c6586..305a61f40b 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -32,7 +32,7 @@ (define-public busybox (package (name "busybox") - (version "1.29.3") + (version "1.31.1") (source (origin (method url-fetch) (uri (string-append @@ -40,7 +40,10 @@ version ".tar.bz2")) (sha256 (base32 - "1dzg45vgy2w1xcd3p6h8d76ykhabbvk1h0lf8yb24ikrwlv8cr4p")))) + "1659aabzp8w4hayr4z8kcpbk2z1q2wqhw7i1yb0l72b45ykl1yfh")) + (patches + (search-patches + "busybox-1.31.1-fix-build-with-glibc-2.31.patch")))) (build-system gnu-build-system) (arguments '(#:phases @@ -79,6 +82,9 @@ (substitute* "testsuite/date/date-works-1" (("/bin/date") (which "date"))) + (substitute* "testsuite/start-stop-daemon.tests" + (("/bin/false") (which "false"))) + ;; The pidof tests assume that pid 1 is called "init" but that is not ;; true in guix build environment (substitute* "testsuite/pidof.tests" diff --git a/gnu/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch b/gnu/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch new file mode 100644 index 0000000000..1518df067f --- /dev/null +++ b/gnu/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch @@ -0,0 +1,68 @@ +See: https://bugs.gentoo.org/708350 +Author: Patrick McLean +Date: 2020-02-06 23:06:22 +0000 +diff --git a/coreutils/date.c b/coreutils/date.c +index 3414d38ae..4ade6abb4 100644 +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, char **argv) + time(&ts.tv_sec); + #endif + } ++#if !ENABLE_FEATURE_DATE_NANO ++ ts.tv_nsec = 0; ++#endif + localtime_r(&ts.tv_sec, &tm_time); + + /* If date string is given, update tm_time, and maybe set date */ +@@ -301,9 +304,10 @@ int date_main(int argc UNUSED_PARAM, char **argv) + if (date_str[0] != '@') + tm_time.tm_isdst = -1; + ts.tv_sec = validate_tm_time(date_str, &tm_time); ++ ts.tv_nsec = 0; + + /* if setting time, set it */ +- if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) { ++ if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) { + bb_perror_msg("can't set date"); + } + } +diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c +index 87cf59b3d..dc40d9155 100644 +--- a/libbb/missing_syscalls.c ++++ b/libbb/missing_syscalls.c +@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid) + return syscall(__NR_getsid, pid); + } + +-int stime(const time_t *t) +-{ +- struct timeval tv; +- tv.tv_sec = *t; +- tv.tv_usec = 0; +- return settimeofday(&tv, NULL); +-} +- + int sethostname(const char *name, size_t len) + { + return syscall(__NR_sethostname, name, len); +diff --git a/util-linux/rdate.c b/util-linux/rdate.c +index 70f829e7f..878375d78 100644 +--- a/util-linux/rdate.c ++++ b/util-linux/rdate.c +@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv) + if (!(flags & 2)) { /* no -p (-s may be present) */ + if (time(NULL) == remote_time) + bb_error_msg("current time matches remote time"); +- else +- if (stime(&remote_time) < 0) ++ else { ++ struct timespec ts; ++ ts.tv_sec = remote_time; ++ ts.tv_nsec = 0; ++ if (clock_settime(CLOCK_REALTIME, &ts) < 0) + bb_perror_msg_and_die("can't set time of day"); ++ } + } + + if (flags != 1) /* not lone -s */ -- cgit v1.2.3 From cc62eab16314a1c925eb49a4e459ee0a0a36608e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 11 Jun 2020 22:23:59 +0200 Subject: gnu: Add bbswitch-module. * gnu/packages/linux.scm (bbswitch-module): New variable. --- gnu/packages/linux.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 20c17144a3..f2b35e33c5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1087,6 +1087,29 @@ network adapters.") between the CDemu userspace daemon and linux kernel.") (license license:gpl2+))) +(define-public bbswitch-module + (package + (name "bbswitch-module") + (version "0.8") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Bumblebee-Project/bbswitch") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1glch4j0x1dzlp2yrb67v2r5jg9609jb6p8m251y78m74advqw0l")))) + (build-system linux-module-build-system) + (arguments + ;; No tests. + `(#:tests? #f)) + (home-page "https://github.com/Bumblebee-Project/bbswitch") + (synopsis "Kernel module that disables discrete Nvidia graphics cards") + (description "The bbswitch module provides a way to toggle the Nvidia +graphics card on Optimus laptops.") + (license license:gpl2))) + (define-public ddcci-driver-linux (package (name "ddcci-driver-linux") -- cgit v1.2.3 From 0526185ebb3b2c4d7cdb74256b5b4262c71c1433 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Jun 2020 15:52:39 +0300 Subject: gnu: kdeconnect: Update to 20.04.1. * gnu/packages/kde.scm (kdeconnect): Update to 20.04.1. [source]: Update source URI. [arguments]: Adjust configure flags. --- gnu/packages/kde.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index fb14a64988..cba00b2882 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -567,20 +567,20 @@ different notification systems.") (define-public kdeconnect (package (name "kdeconnect") - (version "1.4") + (version "20.04.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/kdeconnect/" - version "/kdeconnect-kde-" + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/kdeconnect-kde-" version ".tar.xz")) (sha256 (base32 - "06i6spspqpl79x6z2bfvbgd08b3h1pyx5j1xjhd8ifyrm52pkvna")))) + "1knhpjdbffw858dfd9kml91a02fkc0rcjydfavcyr79j9x8mv3bq")))) (build-system qt-build-system) (arguments `(#:configure-flags '("-DBUILD_TESTING=ON" - "-DLIBEXEC_INSTALL_DIR=libexec") + "-DKDE_INSTALL_LIBEXECDIR=libexec") #:phases (modify-phases %standard-phases (add-after 'set-paths 'extend-CPLUS_INCLUDE_PATH (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From 4f6e6c0442368ac3fd7e95f1fc264671d9182c00 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Wed, 27 May 2020 15:36:28 +0200 Subject: gnu: zsh: Set default '$fpath'. * gnu/packages/shells.scm (zsh)[arguments]: Add configure-flags 'disable-site-dir' and 'enable-additional-fpath'. --- gnu/packages/shells.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 562748da4a..8f251bb850 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -441,8 +441,16 @@ history mechanism, job control and a C-like syntax.") (base32 "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w")))) (build-system gnu-build-system) - (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre" - "--enable-maildir-support") + (arguments `(#:configure-flags + `("--with-tcsetpgrp" + "--enable-pcre" + "--enable-maildir-support" + ;; share/zsh/site-functions isn't populated + "--disable-site-fndir" + ,(string-append + "--enable-additional-fpath=" + "/usr/local/share/zsh/site-functions," ; for foreign OS + "/run/current-system/profile/share/zsh/site-functions")) #:phases (modify-phases %standard-phases (add-before 'configure 'fix-sh -- cgit v1.2.3 From e66f243e929bbd94e62e77cfa6a63dfd001ebe07 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 14 Jun 2020 11:46:17 +0200 Subject: ui: Set 'LESS' environment variable unconditionally. Fixes . Reported by Lars-Dominik Braun . * guix/ui.scm (call-with-paginated-output-port): Remove (getenv "LESS") call. --- guix/ui.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index 98b30445c8..7690f48660 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1562,9 +1562,9 @@ zero means that PACKAGE does not match any of REGEXPS." (if (isatty?* (current-output-port)) ;; Set 'LESS' so that 'less' exits if everything fits on the screen (F), ;; lets ANSI escapes through (r), does not send the termcap - ;; initialization string (X). - (let ((pager (with-environment-variables `(("LESS" - ,(or (getenv "LESS") "FrX"))) + ;; initialization string (X). Set it unconditionally because some + ;; distros set it to something that doesn't work here. + (let ((pager (with-environment-variables `(("LESS" "FrX")) (open-pipe* OPEN_WRITE (or (getenv "GUIX_PAGER") (getenv "PAGER") "less"))))) -- cgit v1.2.3 From 20d9034cc5bdfd0acec24b7589859cc77f5e9164 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 14 Jun 2020 12:08:57 +0200 Subject: doc: Mention 'guix lint -c derivation'. * doc/guix.texi (Invoking guix lint): Mention the 'derivation' checker. --- doc/guix.texi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 15e077a41c..aeeea7896e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9953,6 +9953,10 @@ Parse the @code{source} URL to determine if a tarball from GitHub is autogenerated or if it is a release tarball. Unfortunately GitHub's autogenerated tarballs are sometimes regenerated. +@item derivation +Check that the derivation of the given packages can be successfully +computed for all the supported systems (@pxref{Derivations}). + @item archival @cindex Software Heritage, source code archive @cindex archival of source code, Software Heritage -- cgit v1.2.3 From 9acac9f9c6452cd76a21e52c7e5a33e8384b82b4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 14 Jun 2020 14:51:02 +0200 Subject: profiles: Fix pathological performance of 'manifest-transitive-entries'. For packages with lots of propagated inputs, 'manifest-transitive-entries', as called from 'check-for-collisions', would exhibit pathological behavior. For example, "guix install cl-ana" wouldn't complete in 1mn; now, it's down to 20s. The issue was that manifest entries would never be 'equal?' due to the delayed field in . * guix/profiles.scm (manifest-transitive-entries): Use a vhash instead of a set. Use 'manifest-entry=?' instead of 'equal?' when checking for equality. --- guix/profiles.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index 25ff146bdf..6064820b9a 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -41,7 +41,6 @@ #:use-module (guix modules) #:use-module (guix monads) #:use-module (guix store) - #:use-module (guix sets) #:use-module (ice-9 vlist) #:use-module (ice-9 match) #:use-module (ice-9 regex) @@ -260,17 +259,17 @@ field." recursively." (let loop ((entries (manifest-entries manifest)) (result '()) - (visited (set))) ;compare with 'equal?' + (visited vlist-null)) ;compare with 'manifest-entry=?' (match entries (() (reverse result)) ((head . tail) - (if (set-contains? visited head) + (if (vhash-assoc head visited manifest-entry=?) (loop tail result visited) (loop (append (manifest-entry-dependencies head) tail) (cons head result) - (set-insert head visited))))))) + (vhash-cons head #t visited))))))) (define (profile-manifest profile) "Return the PROFILE's manifest." -- cgit v1.2.3 From 993023a28e52c87647fb78a5aa94a524f42ceb71 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 14 Jun 2020 15:06:53 +0200 Subject: lint: Add 'check-for-collisions' checker. Suggested by Edouard Klein . * guix/profiles.scm (check-for-collisions): Export. * guix/lint.scm (check-profile-collisions): New procedure. (%local-checkers): Add 'profile-collisions' checker. * tests/lint.scm ("profile-collisions: no warnings") ("profile-collisions: propagated inputs collide") ("profile-collisions: propagated inputs collide, store items"): New tests. * doc/guix.texi (Invoking guix lint): Document it. --- doc/guix.texi | 7 +++++++ guix/lint.scm | 40 ++++++++++++++++++++++++++++++++++++++++ guix/profiles.scm | 1 + tests/lint.scm | 30 ++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index aeeea7896e..333dd703de 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9957,6 +9957,13 @@ autogenerated tarballs are sometimes regenerated. Check that the derivation of the given packages can be successfully computed for all the supported systems (@pxref{Derivations}). +@item profile-collisions +Check whether installing the given packages in a profile would lead to +collisions. Collisions occur when several packages with the same name +but a different version or a different store file name are propagated. +@xref{package Reference, @code{propagated-inputs}}, for more information +on propagated inputs. + @item archival @cindex Software Heritage, source code archive @cindex archival of source code, Software Heritage diff --git a/guix/lint.scm b/guix/lint.scm index 82861b8a27..fa507546f5 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -41,6 +41,8 @@ #:use-module (guix upstream) #:use-module (guix utils) #:use-module (guix memoization) + #:use-module (guix profiles) + #:use-module (guix monads) #:use-module (guix scripts) #:use-module ((guix ui) #:select (texi->plain-text fill-paragraph)) #:use-module (guix gnu-maintenance) @@ -84,6 +86,7 @@ check-for-updates check-formatting check-archival + check-profile-collisions lint-warning lint-warning? @@ -970,6 +973,38 @@ descriptions maintained upstream." (with-store store (check-with-store store)))) +(define* (check-profile-collisions package #:key store) + "Check for collisions that would occur when installing PACKAGE as a result +of the propagated inputs it pulls in." + (define (do-check store) + (guard (c ((profile-collision-error? c) + (let ((first (profile-collision-error-entry c)) + (second (profile-collision-error-conflict c))) + (define format + (if (string=? (manifest-entry-version first) + (manifest-entry-version second)) + manifest-entry-item + (lambda (entry) + (string-append (manifest-entry-name entry) "@" + (manifest-entry-version entry))))) + + (list (make-warning package + (G_ "propagated inputs ~a and ~a collide") + (list (format first) + (format second))))))) + ;; Disable grafts to avoid building PACKAGE and its dependencies. + (parameterize ((%graft? #f)) + (run-with-store store + (mbegin %store-monad + (check-for-collisions (packages->manifest (list package)) + (%current-system)) + (return '())))))) + + (if store + (do-check store) + (with-store store + (do-check store)))) + (define (check-license package) "Warn about type errors of the 'license' field of PACKAGE." (match (package-license package) @@ -1349,6 +1384,11 @@ or a list thereof") (description "Report failure to compile a package to a derivation") (check check-derivation) (requires-store? #t)) + (lint-checker + (name 'profile-collisions) + (description "Report collisions that would occur due to propagated inputs") + (check check-profile-collisions) + (requires-store? #t)) (lint-checker (name 'patch-file-names) (description "Validate file names and availability of patches") diff --git a/guix/profiles.scm b/guix/profiles.scm index 6064820b9a..9df63c97e9 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -104,6 +104,7 @@ manifest-installed? manifest-matching-entries manifest-search-paths + check-for-collisions manifest-transaction manifest-transaction? diff --git a/tests/lint.scm b/tests/lint.scm index 4ce45b4a70..9d3c349fc5 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -353,6 +353,36 @@ (((and (? lint-warning?) first-warning) others ...) (lint-warning-message first-warning)))) +(test-equal "profile-collisions: no warnings" + '() + (check-profile-collisions (dummy-package "x"))) + +(test-equal "profile-collisions: propagated inputs collide" + "propagated inputs p0@1 and p0@2 collide" + (let* ((p0 (dummy-package "p0" (version "1"))) + (p0* (dummy-package "p0" (version "2"))) + (p1 (dummy-package "p1" (propagated-inputs `(("p0" ,p0))))) + (p2 (dummy-package "p2" (propagated-inputs `(("p1" ,p1))))) + (p3 (dummy-package "p3" (propagated-inputs `(("p0" ,p0*))))) + (p4 (dummy-package "p4" (propagated-inputs + `(("p2" ,p2) ("p3", p3)))))) + (single-lint-warning-message + (check-profile-collisions p4)))) + +(test-assert "profile-collisions: propagated inputs collide, store items" + (string-match-or-error + "propagated inputs /[[:graph:]]+-p0-1 and /[[:graph:]]+-p0-1 collide" + (let* ((p0 (dummy-package "p0" (version "1"))) + (p0* (dummy-package "p0" (version "1") + (inputs `(("x" ,(dummy-package "x")))))) + (p1 (dummy-package "p1" (propagated-inputs `(("p0" ,p0))))) + (p2 (dummy-package "p2" (propagated-inputs `(("p1" ,p1))))) + (p3 (dummy-package "p3" (propagated-inputs `(("p0" ,p0*))))) + (p4 (dummy-package "p4" (propagated-inputs + `(("p2" ,p2) ("p3", p3)))))) + (single-lint-warning-message + (check-profile-collisions p4))))) + (test-equal "license: invalid license" "invalid license field" (single-lint-warning-message -- cgit v1.2.3 From 2199b1db5c890fb236ebff269aa810d7c86140da Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sun, 14 Jun 2020 08:35:36 -0500 Subject: gnu: python-socksipychain: Update to 2.1.2. * gnu/packages/python-xyz.scm (python-socksipychain): Update to 2.1.2. --- gnu/packages/python-xyz.scm | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7506f7852f..7e0a738d51 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4991,33 +4991,30 @@ as the original project seems to have been abandoned circa 2007.") (package-with-python2 python-socksipy-branch)) (define-public python-socksipychain - (let ((commit "eb5ee8741ce006ac0c5c3e2e83204062c348c155") - (revision "1") - (version "2.1.1")) - (package - (name "python-socksipychain") - (version (git-version version revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pagekite/PySocksipyChain.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0fpphn6xnpm7qk8a914s4abycsbq9w6qkci07my632v0fylnm5n7")))) - (build-system python-build-system) - (arguments - `(#:tests? #f)) ; Tests try to access the network. - (home-page "http://pagekite.net/wiki/Floss/PySocksipyChain/") - (synopsis "Python SOCKS module with chained proxies support") - (description - "SocksiPyChain is a modified version of the SocksiPy SOCKS module, which + (package + (name "python-socksipychain") + (version "2.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pagekite/PySocksipyChain.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02pp994qmiivkdx4y6az5q80l6rzy8g6d2ipvp7kns7lsxvmc2y7")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; Tests try to access the network. + (home-page "http://pagekite.net/wiki/Floss/PySocksipyChain/") + (synopsis "Python SOCKS module with chained proxies support") + (description + "SocksiPyChain is a modified version of the SocksiPy SOCKS module, which adds support for arbitrary chaining of proxy servers and various modes of TLS/SSL encryption. It was developed for use in PageKite, and also includes a simple netcat replacement with chaining support.") - (license license:bsd-3)))) + (license license:bsd-3))) (define-public python-pycodestyle (package -- cgit v1.2.3 From 3010035b40af0b277b1b00493d61115287e1751c Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sun, 14 Jun 2020 08:36:31 -0500 Subject: gnu: pagekite: Update to 1.5.2.200603. * gnu/packages/networking.scm (pagekite): Update to 1.5.2.200603. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 11632d4b50..75017c060c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2932,7 +2932,7 @@ module @code{batman-adv}, for Layer 2.") (define-public pagekite (package (name "pagekite") - (version "1.5.0.200327") + (version "1.5.2.200603") (source (origin (method git-fetch) @@ -2941,7 +2941,7 @@ module @code{batman-adv}, for Layer 2.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1vw7kjwxqd3qvm7kpxgjzl6797y0i1f16yfkfad84qpx2ij0gvdm")))) + (base32 "08rcyr54dssnpand6y26f8x9cjmd91hr44my08kxw70s5iqiwizv")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 1a2e3d940f7fdee70f845c7901426464f445ea61 Mon Sep 17 00:00:00 2001 From: Reza Alizadeh Majd Date: Sun, 14 Jun 2020 17:51:38 +0430 Subject: gnu: c-toxcore: Update to 0.2.12. * gnu/packages/messaging.scm (c-toxcore): Update to 0.2.12. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e9c6c94cef..6ee21a42e7 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Reza Alizadeh Majd ;;; ;;; This file is part of GNU Guix. ;;; @@ -1031,7 +1032,7 @@ and prevent message loss.") (define-public c-toxcore (package (name "c-toxcore") - (version "0.2.9") + (version "0.2.12") (source (origin (method git-fetch) @@ -1041,7 +1042,7 @@ and prevent message loss.") (file-name (git-file-name name version)) (sha256 (base32 - "0aljr9hqybla6p61af6fdkv0x8gph7c2wacqqa9hq2z9w0p4fs5j")))) + "0a6sqpm00d2rn0nviqfz4gh9ck1wzci6rxgmqmcyryl5ca19ffvp")))) (arguments `(#:tests? #f)) ; FIXME: Testsuite seems to stay stuck on test 3. Disable ; for now. -- cgit v1.2.3 From bd89d898c10bc64652bdce9be904902c4b973f5d Mon Sep 17 00:00:00 2001 From: Reza Alizadeh Majd Date: Sun, 14 Jun 2020 17:52:34 +0430 Subject: gnu: qtox: Update to 1.17.2. * gnu/packages/messaging.scm (qtox): Update to 1.17.2. [arguments]: Add phase to disable network tests. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 6ee21a42e7..59e7900029 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1121,14 +1121,14 @@ instant messenger with audio and video chat capabilities.") (define-public qtox (package (name "qtox") - (version "1.16.3") + (version "1.17.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/qTox/qTox/archive/v" version ".tar.gz")) (sha256 (base32 - "10n3cgw9xaqin9la8wpd8v83bkjmimicgbyp5ninsdgsrgky4hmq")) + "1b3a6d0k4780fwimi8l7mdbk280nilhhdmls17klapnfsp30zdi3")) (file-name (string-append name "-" version ".tar.gz")))) (build-system cmake-build-system) (arguments @@ -1141,6 +1141,13 @@ instant messenger with audio and video chat capabilities.") (("__TIME__") "\"\"") (("TIMESTAMP") "\"\"")) #t)) + (add-after 'unpack 'disable-network-tests + (lambda _ + ;; These tests require network access. + (substitute* "cmake/Testing.cmake" + (("auto_test\\(core core\\)") "# auto_test(core core)") + (("auto_test\\(net bsu\\)") "# auto_test(net bsu)")) + #t)) ;; Ensure that icons are found at runtime. (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From e88745a655b220b4047f7db5175c828ef9c33e11 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Jun 2020 16:46:00 +0300 Subject: gnu: qtox: Don't use unstable tarball. * gnu/packages/messaging.scm (tox)[source]: Don't use autogenerated tarball. --- gnu/packages/messaging.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 59e7900029..c20e48cb6d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus -;;; Copyright © 2015, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur @@ -1123,12 +1123,13 @@ instant messenger with audio and video chat capabilities.") (name "qtox") (version "1.17.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/qTox/qTox/archive/v" - version ".tar.gz")) + (method url-fetch/tarbomb) + (uri (string-append "https://github.com/qTox/qTox/releases" + "/download/v" version + "/v" version ".tar.gz")) (sha256 (base32 - "1b3a6d0k4780fwimi8l7mdbk280nilhhdmls17klapnfsp30zdi3")) + "0fmr3a0apil3rl32247qv2pqslp3knpbj5vhprdq0ixsvifrlhmh")) (file-name (string-append name "-" version ".tar.gz")))) (build-system cmake-build-system) (arguments -- cgit v1.2.3