From 9aa674151adeee5a2d77e3033ebb183a698be983 Mon Sep 17 00:00:00 2001 From: Sergiu Ivanov Date: Mon, 16 Jan 2023 23:41:14 +0100 Subject: gnu: volctl: Make the synopsis line shorter. * gnu/packages/gtk.scm (volctl): Make the synopsis line shorter. Signed-off-by: Maxim Cournoyer --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index de82b9e55f..ea22d0e930 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2978,7 +2978,7 @@ user interaction (e.g. measuring distances).") (propagated-inputs (list python-click python-pycairo python-pygobject python-pyyaml)) (home-page "https://buzz.github.io/volctl/") - (synopsis "Per-application volume control and on-screen display for graphical desktops") + (synopsis "Per-application volume control and on-screen display") (description "Volctl is a PulseAudio-enabled tray icon volume control and OSD applet for graphical desktops. It's not meant to be an replacement for a full-featured mixer application. If you're looking for that check out the -- cgit 1.4.1 From 356e33641a35f32a87f7c2eb20666d848dd7e44f Mon Sep 17 00:00:00 2001 From: Sergiu Ivanov Date: Sun, 15 Jan 2023 23:23:44 +0100 Subject: gnu: volctl: Update to 0.9.3. Fixes . * gnu/packages/gtk.scm (volctl): Update to 0.9.3. [arguments]: Update substitutions in patch-path phase and delete trailing #t. [inputs]: Delete pulseaudio. Move gtk+ to... [propagated-inputs] ... here. Signed-off-by: Maxim Cournoyer Modified-by: Maxim Cournoyer --- gnu/packages/gtk.scm | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ea22d0e930..5024455368 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2022 Benjamin Slade ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2022 Petr Hodina +;;; Copyright © 2023 Sergiu Ivanov ;;; ;;; This file is part of GNU Guix. ;;; @@ -67,6 +68,7 @@ #:use-module (guix build-system waf) #:use-module (gnu packages) #: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) @@ -2949,7 +2951,7 @@ user interaction (e.g. measuring distances).") (define-public volctl (package (name "volctl") - (version "0.8.2") + (version "0.9.3") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/buzz/volctl") @@ -2957,26 +2959,26 @@ user interaction (e.g. measuring distances).") (file-name (git-file-name name version)) (sha256 (base32 - "1cx27j83pz2qffnzb85fbl1x6pp3irv1kbw7g1hri7kaw6ky4xiz")))) + "0fz80w3ywq54jn4v31frfdj01s5g9lz6v9cd7hpg3kirca0zisln")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-path (lambda* (#:key inputs #:allow-other-keys) - (let ((pulse (assoc-ref inputs "pulseaudio")) - (xfixes (assoc-ref inputs "libxfixes"))) - (substitute* "volctl/lib/xwrappers.py" - (("libXfixes.so") - (string-append xfixes "/lib/libXfixes.so"))) - (substitute* "volctl/lib/pulseaudio.py" - (("libpulse.so.0") - (string-append pulse "/lib/libpulse.so.0"))) - #t)))))) + (substitute* "volctl/xwrappers.py" + (("libXfixes.so") + (string-append (search-input-file inputs + "/lib/libXfixes.so"))))))))) (inputs - (list gtk+ libxfixes pulseaudio)) + (list libxfixes)) (propagated-inputs - (list python-click python-pycairo python-pygobject python-pyyaml)) + (list python-click + python-pycairo + python-pygobject + python-pyyaml + python-pulsectl + gtk+)) (home-page "https://buzz.github.io/volctl/") (synopsis "Per-application volume control and on-screen display") (description "Volctl is a PulseAudio-enabled tray icon volume control and -- cgit 1.4.1 From 44f43603d369d2df06942ecf90f983e850b87f43 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Wed, 1 Feb 2023 10:36:00 +0100 Subject: gnu: Rename 'git-minimal/fixed' to 'git-minimal/pinned'. * gnu/packages/version-control.scm: Rename variable 'git-minimal/fixed' to 'git-minimal/pinned', add depreciation. * gnu/packages/erlang.scm (erlang-erlware-commons)[native-inputs]: Replace 'git-minimal/fixed' with 'git-minimal/pinned'. (rebar3-git-vsn)[inputs]: Likewise. * gnu/packages/gnome.scm (gnome-photos)[native-inputs]: Likewise. * gnu/packages/gtk.scm (graphene)[native-inputs]: Likewise. * gnu/packages/haskell.scm (ghc-8.8, ghc-8.10)[native-inputs]: Likewise. * gnu/packages/julia-xyz.scm (julia-documenter)[native-inputs]: Likewise. * gnu/packages/ocaml.scm (opam, ocamlformat)[native-inputs]: Likewise. * gnu/packages/python-xyz.scm (python-check-manifest)[native-inputs]: Likewise. (python-scikit-build)[native-inputs]: Likewise. Signed-off-by: Liliana Marie Prikler --- gnu/packages/erlang.scm | 4 ++-- gnu/packages/gnome.scm | 2 +- gnu/packages/gtk.scm | 2 +- gnu/packages/haskell.scm | 4 ++-- gnu/packages/julia-xyz.scm | 2 +- gnu/packages/ocaml.scm | 4 ++-- gnu/packages/python-xyz.scm | 4 ++-- gnu/packages/version-control.scm | 7 ++++++- 8 files changed, 17 insertions(+), 12 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index cfada5a619..dc9a932aec 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -376,7 +376,7 @@ Markdown.") (propagated-inputs (list erlang-cf)) (native-inputs - (list git-minimal/fixed)) ;; Required for tests + (list git-minimal/pinned)) ;; Required for tests (arguments `(#:phases (modify-phases %standard-phases @@ -701,7 +701,7 @@ applications as a dependent libraries.") (base32 "1dfz56034pa25axly9vqdzv3phkn8ll0qwrkws96pbgcprhky1hx")))) (build-system rebar-build-system) (inputs - (list git-minimal/fixed)) + (list git-minimal/pinned)) (arguments `(;; Running the tests require binary artifact (tar-file containing ;; samples git repos) TODO: remove these from the source diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4f2d716fb2..6a4d3182b2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -909,7 +909,7 @@ tomorrow, the rest of the week and for special occasions.") (list dbus desktop-file-utils gettext-minimal - git-minimal/fixed + git-minimal/pinned `(,glib "bin") gobject-introspection gsettings-desktop-schemas diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5024455368..f575194c73 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2519,7 +2519,7 @@ Parcellite and adds bugfixes and features.") '("-Dintrospection=false") '())))) (native-inputs - `(("git" ,git-minimal/fixed) + `(("git" ,git-minimal/pinned) ("gobject-introspection" ,gobject-introspection) ("mutest" ,mutest) ("pkg-config" ,pkg-config))) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 91610a1f2e..4eb13f76d7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1143,7 +1143,7 @@ interactive environment for the functional language Haskell.") (sha256 (base32 "0c55pj2820q26rikhpf636sn4mjgqsxjrl94vsywrh79dxp3k14z")))) - ("git" ,git-minimal/fixed) ; invoked during tests + ("git" ,git-minimal/pinned) ; invoked during tests ,@(filter (match-lambda (("ghc-bootstrap" . _) #f) (("ghc-testsuite" . _) #f) @@ -1195,7 +1195,7 @@ interactive environment for the functional language Haskell.") (sha256 (base32 "1zl25gg6bpx5601k8h3cqnns1xfc0nqgwnh8jvn2s65ra3f2g1nz")))) - ("git" ,git-minimal/fixed) ; invoked during tests + ("git" ,git-minimal/pinned) ; invoked during tests ,@(filter (match-lambda (("ghc-bootstrap" . _) #f) (("ghc-testsuite" . _) #f) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 414aba03f0..b831b41db2 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1614,7 +1614,7 @@ valuable enough at this time.") (inputs (list python-wrapper)) (native-inputs - (list git-minimal/fixed ;needed for the "Utilities" test + (list git-minimal/pinned ;needed for the "Utilities" test julia-documentermarkdown julia-documentertools)) (home-page "https://juliadocs.github.io/Documenter.jl") diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3458c87818..0cc92c3e85 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -938,7 +938,7 @@ name = Guix Builder") ("ocaml-cppo" ,ocaml-cppo) ;; For tests. - ("git" ,git-minimal/fixed) + ("git" ,git-minimal/pinned) ("openssl" ,openssl) ("python" ,python-wrapper) ("rsync" ,rsync) @@ -8656,7 +8656,7 @@ defined in OCaml 4.12.0.") ocaml-uuseg ocaml-uutf)) (native-inputs - (list git-minimal/fixed ;for tests + (list git-minimal/pinned ;for tests ocaml-alcotest ocaml-ocp-indent ocaml-bisect-ppx)) (home-page "https://github.com/ocaml-ppx/ocamlformat") (synopsis "Auto-formatter for OCaml code") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b7975c2db4..1cad8e54d8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25933,7 +25933,7 @@ also be usable with other GSSAPI mechanisms.") (invoke "git" "config" "--global" "protocol.file.allow" "always")))))) (native-inputs - (list git-minimal/fixed python-pytest)) + (list git-minimal/pinned python-pytest)) (propagated-inputs (list python-pypa-build python-setuptools python-tomli)) (home-page "https://github.com/mgedmin/check-manifest") @@ -28578,7 +28578,7 @@ and frame grabber interface.") (native-inputs (list cmake-minimal gfortran - git-minimal/fixed ;for tests + git-minimal/pinned ;for tests ninja python-coverage python-cython diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 78a89cfd5b..12e21336ce 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -67,6 +67,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (guix packages) + #:use-module (guix deprecation) #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) @@ -670,7 +671,11 @@ everything from small to very large projects with speed and efficiency.") perl zlib)))) -(define-public git-minimal/fixed +;;; The symbol git-minimal/fixed should be used when git-minimal needs fixes +;;; (security or else) and this deprecation could be removed. +(define-deprecated/public-alias git-minimal/fixed git-minimal/pinned) + +(define-public git-minimal/pinned ;; Version that rarely changes, depended on by Graphene/GTK+. (package/inherit git-minimal (version "2.33.1") -- cgit 1.4.1