diff options
Diffstat (limited to 'gnu/packages/package-management.scm')
| -rw-r--r-- | gnu/packages/package-management.scm | 87 |
1 files changed, 76 insertions, 11 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6a51e7eb9b..27e5e6aa15 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +37,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages package-management) + #:use-module (gnu artwork) #:use-module (gnu packages) #:use-module (gnu packages acl) #:use-module (gnu packages attr) @@ -69,6 +71,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages hurd) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages less) #:use-module (gnu packages libedit) #:use-module (gnu packages linux) @@ -84,6 +87,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -104,6 +108,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system python) + #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) @@ -585,6 +590,64 @@ out) and returning a package that uses that as its 'source'." #:recursive? #t #:select? (force select?)))))))) +(define-public guix-icons + (package + (inherit guix) + (name "guix-icons") + (version "0.1") + (source %artwork-repository) + (build-system trivial-build-system) + (native-inputs + `(("imagemagick" ,imagemagick))) + (inputs + '()) + (arguments + `(#:modules ((guix build utils) + (gnu build svg)) + #:builder + ,(with-extensions (list guile-rsvg guile-cairo) + #~(begin + (use-modules (guix build utils) + (gnu build svg)) + (let* ((logo (string-append #$source "/logo/Guix.svg")) + (logo-white + (string-append #$source + "/logo/Guix-horizontal-white.svg")) + (theme "hicolor") + (category "apps") + (sizes '(16 24 32 48 64 72 96 128 256 512 1024)) + (icons + (string-append #$output "/share/icons/" theme)) + (scalable-dir + (string-append icons "/scalable/" category))) + (setenv "XDG_CACHE_HOME" (getcwd)) + + ;; Create the scalable icon files. + (mkdir-p scalable-dir) + (copy-file logo + (string-append scalable-dir "/guix-icon.svg")) + (copy-file logo-white + (string-append scalable-dir + "/guix-white-icon.svg")) + + ;; Create the fixed dimensions icon files. + (for-each + (lambda (size) + (let* ((dimension + (format #f "~ax~a" size size)) + (file + (string-append icons "/" dimension "/" category + "/guix-icon.png"))) + (mkdir-p (dirname file)) + (svg->png logo file + #:width size + #:height size))) + sizes)))))) + (synopsis "GNU Guix icons") + (description "This package contains GNU Guix icons organized according to +the Icon Theme Specification. They can be used by applications querying the +GTK icon cache for instance."))) + ;;; ;;; Other tools. @@ -980,7 +1043,7 @@ written entirely in Python.") (define-public conan (package (name "conan") - (version "1.40.2") + (version "1.42.0") (source (origin (method git-fetch) ;no tests in PyPI archive @@ -990,7 +1053,7 @@ written entirely in Python.") (file-name (git-file-name name version)) (sha256 (base32 - "0hp8qs54l4cw043f1kycjwgdr7f388lsyxqcbzfaayr6xg1d3dw0")))) + "153npvj81m1c33gfcv2nry7xhyikxnhjns7lvs525f1x20ck6asg")))) (build-system python-build-system) (arguments `(#:phases @@ -999,7 +1062,9 @@ written entirely in Python.") (lambda _ (substitute* "conans/requirements.txt" (("node-semver==0.6.1") - "node-semver>=0.6.1")))) + "node-semver>=0.6.1") + (("Jinja2>=2.9, <3") + "Jinja2>=2.9")))) (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (let ((coreutils (assoc-ref inputs "coreutils"))) @@ -1104,9 +1169,9 @@ written entirely in Python.") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("cmake" ,cmake) ;requires cmake >= 3.17 + ("cmake" ,cmake) ("git" ,git-minimal) - ("meson" ,meson-0.55) + ("meson" ,meson) ("ninja",ninja) ("pkg-config" ,pkg-config) ("python-bottle" ,python-bottle) @@ -1463,7 +1528,7 @@ for packaging and deployment of cross-compiled Windows applications.") (define-public libostree (package (name "libostree") - (version "2021.3") + (version "2021.6") (source (origin (method url-fetch) @@ -1471,7 +1536,7 @@ for packaging and deployment of cross-compiled Windows applications.") "https://github.com/ostreedev/ostree/releases/download/v" (version-major+minor version) "/libostree-" version ".tar.xz")) (sha256 - (base32 "1cyhr3s7xsgnsais5m4cjwdwcq46naf25r1k042c4n1y1jgs798g")))) + (base32 "0cgmnjf4mr4wn4fliq6ncs0q9qwblrlizjfhx57p7m332g5k21p8")))) (build-system gnu-build-system) (arguments '(#:phases @@ -1503,7 +1568,7 @@ for packaging and deployment of cross-compiled Windows applications.") ("glib" ,glib) ("gpgme" ,gpgme) ("libarchive" ,libarchive) - ("libsoup" ,libsoup) + ("libsoup" ,libsoup-minimal-2) ; needs libsoup-2.4 ("util-linux" ,util-linux))) (home-page "https://ostree.readthedocs.io/en/latest/") (synopsis "Operating system and container binary deployment and upgrades") @@ -1548,8 +1613,8 @@ the boot loader configuration.") (add-after 'unpack 'fix-tests (lambda* (#:key inputs #:allow-other-keys) (copy-recursively - (string-append (assoc-ref inputs "glibc-utf8-locales") - "/lib/locale/") "/tmp/locale") + (search-input-directory inputs "lib/locale") + "/tmp/locale") (for-each make-file-writable (find-files "/tmp")) (substitute* "tests/make-test-runtime.sh" (("cp `which.*") "echo guix\n") @@ -1605,7 +1670,7 @@ cp -r /tmp/locale/*/en_US.*"))) ("libarchive" ,libarchive) ("libostree" ,libostree) ("libseccomp" ,libseccomp) - ("libsoup" ,libsoup) + ("libsoup" ,libsoup-minimal-2) ("libxau" ,libxau) ("libxml2" ,libxml2) ("p11-kit-next" ,p11-kit-next) |