Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2022-08-28 15:43:30 +02:00
commit dedbaa3a69
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
27 changed files with 472 additions and 151 deletions

View file

@ -1210,7 +1210,8 @@ dist_patch_DATA = \
%D%/packages/patches/gnome-online-miners-tracker-3.patch \ %D%/packages/patches/gnome-online-miners-tracker-3.patch \
%D%/packages/patches/gnome-screenshot-meson-0.60.patch \ %D%/packages/patches/gnome-screenshot-meson-0.60.patch \
%D%/packages/patches/gnome-settings-daemon-gc.patch \ %D%/packages/patches/gnome-settings-daemon-gc.patch \
%D%/packages/patches/gnome-session-support-elogind.patch \ %D%/packages/patches/gnome-session-support-elogind.patch \
%D%/packages/patches/gnome-shell-polkit-autocleanup.patch \
%D%/packages/patches/gnome-todo-libportal.patch \ %D%/packages/patches/gnome-todo-libportal.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \
%D%/packages/patches/gnupg-CVE-2022-34903.patch \ %D%/packages/patches/gnupg-CVE-2022-34903.patch \
@ -1799,6 +1800,7 @@ dist_patch_DATA = \
%D%/packages/patches/sbcl-png-fix-sbcl-compatibility.patch \ %D%/packages/patches/sbcl-png-fix-sbcl-compatibility.patch \
%D%/packages/patches/scalapack-gcc-10-compilation.patch \ %D%/packages/patches/scalapack-gcc-10-compilation.patch \
%D%/packages/patches/scheme48-tests.patch \ %D%/packages/patches/scheme48-tests.patch \
%D%/packages/patches/scons-test-environment.patch \
%D%/packages/patches/scotch-build-parallelism.patch \ %D%/packages/patches/scotch-build-parallelism.patch \
%D%/packages/patches/scotch-integer-declarations.patch \ %D%/packages/patches/scotch-integer-declarations.patch \
%D%/packages/patches/screen-hurd-path-max.patch \ %D%/packages/patches/screen-hurd-path-max.patch \

View file

@ -1723,12 +1723,12 @@ (define-public realmd
(substitute* "Makefile" (substitute* "Makefile"
((".*/service/realmd-.*") ""))))))) ((".*/service/realmd-.*") "")))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) (list autoconf
("automake" ,automake) automake
("glib-bin" ,glib "bin") `(,glib "bin")
("intltool" ,intltool) intltool
("pkg-config" ,pkg-config) pkg-config
("python" ,python))) python))
(inputs (inputs
(list glib mit-krb5 openldap polkit)) (list glib mit-krb5 openldap polkit))
(synopsis "DBus service for network authentication") (synopsis "DBus service for network authentication")

View file

@ -135,6 +135,11 @@ (define-public libatomic-ops
(base32 (base32
"0glzah695wsf6c27hs5wwlw4mnq1vfivdshz1rb8pq7w4mp5dazh")))) "0glzah695wsf6c27hs5wwlw4mnq1vfivdshz1rb8pq7w4mp5dazh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(,@(if (target-riscv64?)
`(#:configure-flags
(list "CFLAGS_EXTRA=-latomic"))
'())))
(outputs '("out" "debug")) (outputs '("out" "debug"))
(synopsis "Accessing hardware atomic memory update operations") (synopsis "Accessing hardware atomic memory update operations")
(description (description

View file

@ -3,7 +3,7 @@
;;; Copyright © 2016, 2017, 2018, 2020, 2021 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016, 2017, 2018, 2020, 2021 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020, 2021, 2022 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2019, 2020, 2021, 2022 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2020 Peter Lo <peterloleungyau@gmail.com> ;;; Copyright © 2020 Peter Lo <peterloleungyau@gmail.com>
@ -2756,13 +2756,13 @@ (define-public r-infercnv
(define-public r-iranges (define-public r-iranges
(package (package
(name "r-iranges") (name "r-iranges")
(version "2.30.0") (version "2.30.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "IRanges" version)) (uri (bioconductor-uri "IRanges" version))
(sha256 (sha256
(base32 (base32
"0hfx5n0b4pqrrc1w2dik596803ly8ffnxfs768iy5l5kr8wwyc8k")))) "1r01c9lczkchgd9hbxxd6wrd5avhy52mfqjck7l9avjq1jimvzv3"))))
(properties (properties
`((upstream-name . "IRanges"))) `((upstream-name . "IRanges")))
(build-system r-build-system) (build-system r-build-system)
@ -4328,13 +4328,13 @@ (define-public r-genomation
(define-public r-genomeinfodb (define-public r-genomeinfodb
(package (package
(name "r-genomeinfodb") (name "r-genomeinfodb")
(version "1.32.2") (version "1.32.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "GenomeInfoDb" version)) (uri (bioconductor-uri "GenomeInfoDb" version))
(sha256 (sha256
(base32 (base32
"1n37bwb2fqmdgqbn19rgsd2qn8vbdhv6khdwjr7v12bwabcbx9xh")))) "17nwcq2ivj3bdibdywfyjq4n6z0djispbh9ahqa55sp31ksq41xh"))))
(properties (properties
`((upstream-name . "GenomeInfoDb"))) `((upstream-name . "GenomeInfoDb")))
(build-system r-build-system) (build-system r-build-system)

View file

@ -34,6 +34,7 @@ (define-module (gnu packages build-tools)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
@ -53,6 +54,7 @@ (define-module (gnu packages build-tools)
#:use-module (gnu packages pretty-print) #:use-module (gnu packages pretty-print)
#:use-module (gnu packages protobuf) #:use-module (gnu packages protobuf)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-crypto) #:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
@ -384,6 +386,105 @@ (define-public premake5
scripted definition of a software project and outputs @file{Makefile}s or scripted definition of a software project and outputs @file{Makefile}s or
other lower-level build files."))) other lower-level build files.")))
(define-public scons
(package
(name "scons")
(version "4.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/SCons/scons")
(commit version)))
(file-name (git-file-name name version))
(patches (search-patches "scons-test-environment.patch"))
(sha256
(base32
"1czswx1fj2j48rspkrvarkr43k0vii9rsmz054c9yby1dq362fgr"))))
(build-system python-build-system)
(arguments
(list
#:modules (append %python-build-system-modules
'((ice-9 ftw) (srfi srfi-26)))
#:phases
#~(modify-phases (@ (guix build python-build-system) %standard-phases)
(add-after 'unpack 'adjust-hard-coded-paths
(lambda _
(substitute* "SCons/Script/Main.py"
(("/usr/share/scons")
(string-append #$output "/share/scons")))))
(add-before 'build 'bootstrap
(lambda _
;; XXX: Otherwise setup.py bdist_wheel fails.
(setenv "PYTHONPATH" (getenv "GUIX_PYTHONPATH"))
(invoke "python" "scripts/scons.py")))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "python" "runtest.py" "--all" "--unit-only"))))
(add-after 'install 'move-manuals
(lambda _
;; XXX: For some reason manuals get installed to the top-level
;; #$output directory.
(with-directory-excursion #$output
(let ((man1 (string-append #$output "/share/man/man1"))
(stray-manuals (scandir "."
(cut string-suffix? ".1" <>))))
(mkdir-p man1)
(for-each (lambda (manual)
(link manual (string-append man1 "/" manual))
(delete-file manual))
stray-manuals))))))))
(native-inputs
;; TODO: Add 'fop' when available in Guix to generate manuals.
(list python-wheel
;;For tests.
python-psutil))
(home-page "https://scons.org/")
(synopsis "Software construction tool written in Python")
(description
"SCons is a software construction tool. Think of SCons as an improved,
cross-platform substitute for the classic Make utility with integrated
functionality similar to autoconf/automake and compiler caches such as ccache.
In short, SCons is an easier, more reliable and faster way to build
software.")
(license license:x11)))
(define-public scons-3
(package
(inherit scons)
(version "3.0.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/SCons/scons")
(commit version)))
(file-name (git-file-name "scons" version))
(sha256
(base32
"1xy8jrwz87y589ihcld4hv7wn122sjbz914xn8h50ww77wbhk8hn"))))
(arguments
`(#:use-setuptools? #f ; still relies on distutils
#:tests? #f ; no 'python setup.py test' command
#:phases
(modify-phases %standard-phases
(add-before 'build 'bootstrap
(lambda _
(substitute* "src/engine/SCons/compat/__init__.py"
(("sys.modules\\[new\\] = imp.load_module\\(old, \\*imp.find_module\\(old\\)\\)")
"sys.modules[new] = __import__(old)"))
(substitute* "src/engine/SCons/Platform/__init__.py"
(("mod = imp.load_module\\(full_name, file, path, desc\\)")
"mod = __import__(full_name)"))
(invoke "python" "bootstrap.py" "build/scons" "DEVELOPER=guix")
(chdir "build/scons")
#t)))))
(native-inputs '())))
(define-public scons-python2
(package
(inherit (package-with-python2 scons-3))
(name "scons-python2")))
(define-public tup (define-public tup
(package (package
(name "tup") (name "tup")

View file

@ -25,12 +25,12 @@ (define-module (gnu packages direct-connect)
#:use-module (guix download) #:use-module (guix download)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages version-control)) #:use-module (gnu packages version-control))

View file

@ -45,6 +45,7 @@ (define-module (gnu packages disk)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages c) #:use-module (gnu packages c)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)

View file

@ -579,7 +579,7 @@ (define-public openboard
(define-public fet (define-public fet
(package (package
(name "fet") (name "fet")
(version "6.5.3") (version "6.5.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -588,7 +588,7 @@ (define-public fet
(list (string-append directory base) (list (string-append directory base)
(string-append directory "old/" base)))) (string-append directory "old/" base))))
(sha256 (sha256
(base32 "030njv53azzw6fn2d5mkxn7hyvyb45yss2y49wxb8bgj3ayv1rgp")))) (base32 "08j5i3dlp290fz142ljn68j8ssi5f3kabs0dd75ig33kms30hjs7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list

View file

@ -16,7 +16,7 @@
;;; Copyright © 2016, 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016, 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2016, 2017, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2016-2022 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2017, 2018, 2019, 2020, 2022 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017, 2018, 2019, 2020, 2022 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022 Clément Lassieur <clement@lassieur.org>
@ -1993,6 +1993,41 @@ (define-public emacs-ahg
Distributed @acronym{Source Control Management, SCM} system.") Distributed @acronym{Source Control Management, SCM} system.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-alarm-clock
(package
(name "emacs-alarm-clock")
(version "1.0.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/wlemuel/alarm-clock")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"11afq6lnlqdzbll015fx3031bslwfaz5362qgk2ipgqlk872559h"))))
(build-system emacs-build-system)
(arguments
(list #:include #~(cons "alarm.mp3" %default-include)
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'configure
(lambda* (#:key inputs #:allow-other-keys)
(let ((mpg123 (search-input-file inputs "/bin/mpg123"))
(notify-send
(search-input-file inputs "/bin/notify-send")))
(substitute* "alarm-clock.el"
(("\"mpg123\"") (string-append "\"" mpg123 "\""))
(("notify-send") notify-send))))))))
(inputs
(list libnotify mpg123))
(propagated-inputs
(list emacs-f))
(home-page "https://github.com/wlemuel/alarm-clock")
(synopsis "Alarm clock for Emacs")
(description "Alarm Clock provides an alarm clock for Emacs.")
(license license:gpl3+)))
(define-public emacs-anaphora (define-public emacs-anaphora
(package (package
(name "emacs-anaphora") (name "emacs-anaphora")
@ -2922,14 +2957,14 @@ (define-public emacs-async
(define-public emacs-auctex (define-public emacs-auctex
(package (package
(name "emacs-auctex") (name "emacs-auctex")
(version "13.1.3") (version "13.1.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/" (uri (string-append "https://elpa.gnu.org/packages/"
"auctex-" version ".tar")) "auctex-" version ".tar"))
(sha256 (sha256
(base32 "0v9rxwz6ngnwrgvzgdki861s136gq30lqhy2gcd9q0a36gb6zhwk")))) (base32 "1r9qysnfdbiblq3c95rgsh7vgy3k4qabnj0vicqhdkca0cl2b2bj"))))
(build-system emacs-build-system) (build-system emacs-build-system)
;; We use 'emacs' because AUCTeX requires dbus at compile time ;; We use 'emacs' because AUCTeX requires dbus at compile time
;; ('emacs-minimal' does not provide dbus). ;; ('emacs-minimal' does not provide dbus).
@ -6611,14 +6646,14 @@ (define-public emacs-sudo-edit
(define-public emacs-subed (define-public emacs-subed
(package (package
(name "emacs-subed") (name "emacs-subed")
(version "1.0.3") (version "1.0.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://elpa.nongnu.org/nongnu/subed-" (uri (string-append "https://elpa.nongnu.org/nongnu/subed-"
version ".tar")) version ".tar"))
(sha256 (sha256
(base32 (base32
"0wibakmp1lhfyr6sifb7f3jcqp2s5sy0z37ad9n1n9rhj5q8yhzg")))) "0js48yar8xgj3wjmlkv3k5208q1zvv74sg4lhk6asiy4cq3pqjia"))))
(arguments (arguments
(list (list
#:tests? #t #:tests? #t
@ -9232,6 +9267,31 @@ (define-public emacs-consult-notmuch
and present results either as single emails or full trees.") and present results either as single emails or full trees.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-consult-org-roam
(let* ((commit "9572c5bc194a583dc9e86ea7d2751959d86b5c78")
(revision "0"))
(package
(name "emacs-consult-org-roam")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jgru/consult-org-roam")
(commit commit)))
(sha256
(base32
"0c2hjd2gw77h77487fzdqfybg0ricsvlnwwfxai9baawz37bcn7q"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-consult emacs-org-roam))
(home-page "https://github.com/jgru/consult-org-roam")
(synopsis "Consult integration for Org Roam")
(description
"This is a set of functions to use Org Roam with Consult. This
packages replaces Org Roam's own completing read functions with equivalent
versions utilizing Consult's internal API.")
(license license:gpl3+))))
(define-public emacs-consult-eglot (define-public emacs-consult-eglot
(package (package
(name "emacs-consult-eglot") (name "emacs-consult-eglot")
@ -10272,8 +10332,8 @@ (define-public emacs-lispyville
(define-public emacs-lpy (define-public emacs-lpy
;; There is no proper release/tag. ;; There is no proper release/tag.
(let ((commit "076ce9acb68f6ac1b39127b634a91ffd865d13d8") (let ((commit "ce78a4613458790cc785c1687af7eed8f0d8d66c")
(revision "4")) (revision "5"))
(package (package
(name "emacs-lpy") (name "emacs-lpy")
(version (git-version "0.1.0" revision commit)) (version (git-version "0.1.0" revision commit))
@ -10285,7 +10345,7 @@ (define-public emacs-lpy
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"10sab50wmr3zn7jgzx93201ymhmacqacn3m2qllsqkfw2gpsi6dn")) "1vxrjy6k030hcbclblgcaaw7h6k17kl3n9zla08527525c0gma01"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(propagated-inputs (propagated-inputs
(list emacs-zoutline emacs-lispy)) (list emacs-zoutline emacs-lispy))
@ -12148,7 +12208,7 @@ (define-public emacs-helm-make
(define-public emacs-cider (define-public emacs-cider
(package (package
(name "emacs-cider") (name "emacs-cider")
(version "1.4.1") (version "1.5.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -12157,11 +12217,19 @@ (define-public emacs-cider
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "08635ln514nrglx6qyhaq1x7y7lw4mcd659ba8zs071yjiariarm")))) (base32 "1ih902n8p3pl1apprprkyrlnrp2dxli86y5k09zahy9mglfz2z5n"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
'(#:exclude ;don't exclude 'cider-test.el' '(#:exclude ;don't exclude 'cider-test.el'
'("^\\.dir-locals\\.el$" "^test/"))) '("^\\.dir-locals\\.el$" "^test/")
#:phases
;; XXX: file "test/cider-tests.el" contains a bogus "/bin/command"
;; string, and `patch-el-files' phase chokes on it (even though the
;; file is excluded from installation). Remove the phase altogether
;; since there is no "/bin/executable" to replace in the code base
;; anyway.
(modify-phases %standard-phases
(delete 'patch-el-files))))
(propagated-inputs (propagated-inputs
(list emacs-clojure-mode (list emacs-clojure-mode
emacs-parseedn emacs-parseedn
@ -13224,7 +13292,7 @@ (define-public emacs-org
(define-public emacs-org-contrib (define-public emacs-org-contrib
(package (package
(name "emacs-org-contrib") (name "emacs-org-contrib")
(version "0.3") (version "0.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -13233,16 +13301,7 @@ (define-public emacs-org-contrib
(commit (string-append "release_" version)))) (commit (string-append "release_" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "17aca4mc3gbdh6nhlcaa5ymh1yy76nwysrvy9sfcqkzvd5lgagzc")) (base32 "06b1rpywj596nnnap6pj6fnmcq8fcc4i30zv7qsvs3ryxciw01fb"))))
;; XXX: ob-sclang.el is packaged separately to avoid the dependency on
;; SuperCollider and qtwebengine-5. This will be unnecessary in 0.4+
;; release as the file is going to be removed from the repository.
;; XXX: org-contacts.el is now maintained in a separate repository and
;; will soon be removed from org-contrib
(modules '((guix build utils)))
(snippet '(begin (delete-file "lisp/ob-sclang.el")
(delete-file "lisp/org-contacts.el")))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -13253,8 +13312,7 @@ (define-public emacs-org-contrib
(native-inputs (native-inputs
(list emacs-cider)) (list emacs-cider))
(propagated-inputs (propagated-inputs
(list emacs-arduino-mode ;XXX: remove after 0.4+ release. (list emacs-org))
emacs-org))
(home-page "https://git.sr.ht/~bzg/org-contrib") (home-page "https://git.sr.ht/~bzg/org-contrib")
(synopsis "Unmaintained add-ons for Org mode") (synopsis "Unmaintained add-ons for Org mode")
(description (description
@ -13858,6 +13916,27 @@ (define-public emacs-gn-mode
are common in Chromium-derived projects.") are common in Chromium-derived projects.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public emacs-drag-stuff
(package
(name "emacs-drag-stuff")
(version "0.3.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rejeep/drag-stuff")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1jrr59iazih3imkl9ja1lbni9v3xv6b8gmqs015g2mxhlql35jka"))))
(build-system emacs-build-system)
(home-page "https://github.com/rejeep/drag-stuff")
(synopsis "Drag stuff around in Emacs")
(description
"Drag Stuff is a minor mode for Emacs that makes it possible to drag
stuff (words, region, lines) around in Emacs.")
(license license:gpl3+)))
(define-public emacs-bazel (define-public emacs-bazel
;; From 2021-11-21. ;; From 2021-11-21.
;; No releases available. ;; No releases available.
@ -16844,7 +16923,7 @@ (define-public emacs-taxy
(define-public emacs-taxy-magit-section (define-public emacs-taxy-magit-section
(package (package
(name "emacs-taxy-magit-section") (name "emacs-taxy-magit-section")
(version "0.9.1") (version "0.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -16852,7 +16931,7 @@ (define-public emacs-taxy-magit-section
".tar")) ".tar"))
(sha256 (sha256
(base32 (base32
"0ybkz5nqjdrg2z9bfd07xg4k49hrl26vsrwz2vqpfbsqqg5vr4pr")))) "1g58nvpb04ldhn5qnjw2q5idrv6vhlfa0qmb46cvis6bkz46cxkw"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (list emacs-magit emacs-taxy)) (propagated-inputs (list emacs-magit emacs-taxy))
(home-page "https://github.com/alphapapa/taxy.el") (home-page "https://github.com/alphapapa/taxy.el")
@ -24370,37 +24449,27 @@ (define-public emacs-frame-purpose
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-arduino-mode (define-public emacs-arduino-mode
(let ((commit "23ae47c9f28f559e70b790b471f20310e163a39b") (let ((commit "652c6a328fa8f2db06534d5f231c6b6933be3edc")
(revision "1")) ;no release yet (revision "0"))
(package (package
(name "emacs-arduino-mode") (name "emacs-arduino-mode")
(version (git-version "0" revision commit)) (version (git-version "1.3.0" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/stardiviner/arduino-mode") (url "https://repo.or.cz/arduino-mode")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 "08vnbz9gpah1l93fzfd87aawrhcnh2v1kyfxgsn88pdwg8awz8rx")) (base32 "16izwrk1dfsa14kylfhsxdwkx76g0jdk0znl1z7cypxh5q9ijy1x"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
;; Emacs complains that "defmethod" and "defgeneric" are obsolete
;; macros when compiling. Substitute them with the recommended
;; macros "cl-defmethod" and "cl-defgeneric", respectively.
(add-after 'unpack 'fix-obsolete
(lambda _
(substitute* "ede-arduino.el"
(("defmethod") "cl-defmethod")
(("defgeneric") "cl-defgeneric")))))))
(inputs (inputs
(list emacs-flycheck emacs-spinner)) (list emacs-flycheck emacs-spinner))
(synopsis "Emacs major mode for editing Arduino sketches") (synopsis "Emacs major mode for editing Arduino sketches")
(description "Emacs major mode for editing Arduino sketches.") (description "This package provides an Emacs major mode for editing
(home-page "https://github.com/stardiviner/arduino-mode") Arduino sketches and Org Babel support.")
(home-page "https://repo.or.cz/arduino-mode")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-annalist (define-public emacs-annalist
@ -30311,6 +30380,28 @@ (define-public emacs-ddskk-nicola
conversion program}, a Japanese input method on Emacs. This package adds conversion program}, a Japanese input method on Emacs. This package adds
support for the Nicola keyboard layout to it."))) support for the Nicola keyboard layout to it.")))
(define-public emacs-tamil99
(package
(name "emacs-tamil99")
(version "0.1.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.systemreboot.net/tamil99/")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0f9s3b6fd42j21922qkxfr3j83a7qym73nynph86w87vkis40zqw"))))
(build-system emacs-build-system)
(home-page "https://git.systemreboot.net/tamil99/about/")
(synopsis "Tamil99 input method for Emacs")
(description "This package implements the @code{tamil99} input method for
Emacs. Tamil99 is a keyboard layout and input method that is specifically
designed for the Tamil language. Vowels and vowel modifiers are input with
your left hand, and consonants are input with your right hand.")
(license license:gpl3+)))
(define-public emacs-objed (define-public emacs-objed
(package (package
(name "emacs-objed") (name "emacs-objed")
@ -31020,7 +31111,7 @@ (define-public emacs-html-to-hiccup
(define-public emacs-iter2 (define-public emacs-iter2
(package (package
(name "emacs-iter2") (name "emacs-iter2")
(version "1.2") (version "1.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -31029,7 +31120,7 @@ (define-public emacs-iter2
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1jzd9kzxf3ncw40d55r1apw0cpk4i1a3s5p85mg9n20553cb6lhj")))) (base32 "1hsg5q1acghb0xz2pv5g20zg5j32wikp47b62if8afq767rkc5f3"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/doublep/iter2") (home-page "https://github.com/doublep/iter2")
(synopsis "Reimplementation of Elisp generators") (synopsis "Reimplementation of Elisp generators")

View file

@ -63,6 +63,7 @@ (define-module (gnu packages game-development)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)

View file

@ -253,7 +253,7 @@ (define-public geos
(define-public gnome-maps (define-public gnome-maps
(package (package
(name "gnome-maps") (name "gnome-maps")
(version "41.2") (version "42.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -261,7 +261,7 @@ (define-public gnome-maps
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"037xmkmcmcw87vb1c1s3y225m8757k331cvk1m8cshf6mx61p0l1")))) "1cb9s2zz1zib3f33c035lmgshpl679isbzdd3alrx4yclw61nvay"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
@ -318,7 +318,7 @@ (define-public gnome-maps
("libhandy" ,libhandy) ("libhandy" ,libhandy)
("libsecret" ,libsecret) ("libsecret" ,libsecret)
("libsoup" ,libsoup-minimal-2) ("libsoup" ,libsoup-minimal-2)
("libgweather" ,libgweather) ("libgweather" ,libgweather4)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("librsvg" ,librsvg) ("librsvg" ,librsvg)
("glib-networking" ,glib-networking) ("glib-networking" ,glib-networking)

View file

@ -5538,27 +5538,24 @@ (define-public libgweather
"1rkf4yv43qcahyx7bismdv6z2vh5azdnm1fqfmnzrada9cm8ykna")))) "1rkf4yv43qcahyx7bismdv6z2vh5azdnm1fqfmnzrada9cm8ykna"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:tests? #f ; one of two tests requires network access (list
#:configure-flags #:tests? #f ;one of two tests requires network access
`(,(string-append "-Dzoneinfo_dir=" #:configure-flags
(assoc-ref %build-inputs "tzdata") #~(list (string-append "-Dzoneinfo_dir="
"/share/zoneinfo")))) (search-input-directory %build-inputs
"share/zoneinfo")))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums (list gettext-minimal
("gobject-introspection" ,gobject-introspection) `(,glib "bin") ;for glib-mkenums
("pkg-config" ,pkg-config) gobject-introspection
("python" ,python) pkg-config
("vala" ,vala) python
("intltool" ,intltool) vala
("python-pygobject" ,python-pygobject))) python-pygobject))
(propagated-inputs (propagated-inputs
;; gweather-3.0.pc refers to GTK+, GDK-Pixbuf, GLib/GObject, libxml, and ;; gweather-3.0.pc refers to GTK+, GDK-Pixbuf, GLib/GObject, libxml, and
;; libsoup. ;; libsoup.
`(("gtk+" ,gtk+) (list gtk+ gdk-pixbuf libxml2 libsoup-minimal-2 geocode-glib))
("gdk-pixbuf" ,gdk-pixbuf)
("libxml2" ,libxml2)
("libsoup" ,libsoup-minimal-2)
("geocode-glib" ,geocode-glib)))
(inputs (inputs
(list tzdata)) (list tzdata))
(home-page "https://wiki.gnome.org/action/show/Projects/LibGWeather") (home-page "https://wiki.gnome.org/action/show/Projects/LibGWeather")
@ -5568,6 +5565,55 @@ (define-public libgweather
services for numerous locations.") services for numerous locations.")
(license license:gpl2+))) (license license:gpl2+)))
;; libgweather no longer follows the GNOME version, and recommends changing
;; the package name in distributions to avoid accidental downgrades. See
;; <https://discourse.gnome.org/t/changes-in-libgweather-for-gnome-42/7770/2>.
;; TODO: how to prevent the updater from picking version 40?
(define-public libgweather4
(package
(inherit libgweather)
(name "libgweather4")
(version "4.0.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/libgweather/"
(version-major+minor version) "/"
"libgweather-" version ".tar.xz"))
(sha256
(base32
"0k43mr7vmcg14lkwjk6p9wwy3zlw23wkfpkfcy6b8wkg3f0483a4"))))
(arguments
(list
;; FIXME: multiple tests fails as such:
;; "GLib-GIO-FATAL-ERROR: Settings schema 'org.gnome.system.proxy'
;; is not installed"
#:tests? #f
#:configure-flags
#~(list (string-append "-Dzoneinfo_dir="
(search-input-directory %build-inputs
"share/zoneinfo"))
;; TODO: Requires 'gi-docgen'.
"-Dgtk_doc=false")
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'pre-check
(lambda _
(setenv "HOME" "/tmp"))))))
(native-inputs
(list gettext-minimal
`(,glib "bin") ;for glib-mkenums
gobject-introspection
pkg-config
python
vala
python-pygobject))
;; TODO: It would be good to make the package respect TZDIR instead
;; of using a "hard coded" version of tzdata.
(inputs (list tzdata))
(propagated-inputs
;; gweather4.pc refers to all of these.
(list glib libxml2 libsoup-minimal-2 geocode-glib))))
(define-public gnome-settings-daemon (define-public gnome-settings-daemon
(package (package
(name "gnome-settings-daemon") (name "gnome-settings-daemon")
@ -8671,6 +8717,7 @@ (define-public gnome-shell
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
(version-major version) "/" (version-major version) "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(patches (search-patches "gnome-shell-polkit-autocleanup.patch"))
(sha256 (sha256
(base32 (base32
"0ragmcln210zvzhc2br33yprbkj9drjzd7inp5sdxra0a7l73yaj")))) "0ragmcln210zvzhc2br33yprbkj9drjzd7inp5sdxra0a7l73yaj"))))

View file

@ -34,6 +34,7 @@ (define-module (gnu packages gps)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)

View file

@ -69,7 +69,6 @@ (define-module (gnu packages gtk)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)

View file

@ -58,6 +58,7 @@ (define-module (gnu packages image)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages cmake) #:use-module (gnu packages cmake)
#:use-module (gnu packages cpp) #:use-module (gnu packages cpp)

View file

@ -19,9 +19,9 @@
(define-module (gnu packages installers) (define-module (gnu packages installers)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cross-base) #:use-module (gnu packages cross-base)
#:use-module (gnu packages python-xyz)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system scons) #:use-module (guix build-system scons)

View file

@ -171,28 +171,22 @@ (define-public python-cffi-documentation
(define-public ruby-ffi (define-public ruby-ffi
(package (package
(name "ruby-ffi") (name "ruby-ffi")
(version "1.12.2") (version "1.15.5")
(source (origin (source (origin
;; Pull from git because the RubyGems release bundles LibFFI, ;; Pull from git because the RubyGems release bundles LibFFI,
;; and comes with a gemspec that makes it difficult to unbundle. ;; and comes with a gemspec that makes it difficult to unbundle.
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/ffi/ffi") (url "https://github.com/ffi/ffi")
(commit version))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1cvqsbjr2gfjgqggq9kdx90qhhzr7qkyr9wmxdsfsik6cnxnnpmd")))) "1qk55s1zwpdjykwkj9l37m71i5n228i7f8bg3ply3ks9py16m7s6"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-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 (replace 'replace-git-ls-files
(lambda _ (lambda _
;; Do not try to execute git, or include the (un)bundled LibFFI. ;; Do not try to execute git, or include the (un)bundled LibFFI.
@ -202,9 +196,10 @@ (define-public ruby-ffi
(("lfs \\+?= .*") (("lfs \\+?= .*")
"lfs = []\n")) "lfs = []\n"))
(substitute* "Rakefile" (substitute* "Rakefile"
(("git .*ls-files -z")
"find * -type f -print0 | sort -z")
(("LIBFFI_GIT_FILES = .*") (("LIBFFI_GIT_FILES = .*")
"LIBFFI_GIT_FILES = []\n")) "LIBFFI_GIT_FILES = []\n"))))
#t))
(replace 'build (replace 'build
(lambda _ (lambda _
;; Tests depend on the native extensions, so we build it ;; Tests depend on the native extensions, so we build it
@ -223,8 +218,7 @@ (define-public ruby-ffi
(setenv "MAKE" "make") (setenv "MAKE" "make")
(setenv "CC" "gcc") (setenv "CC" "gcc")
(invoke "rspec" "spec")) (invoke "rspec" "spec"))
(format #t "test suite not run~%")) (format #t "test suite not run~%")))))))
#t)))))
(native-inputs (native-inputs
(list ruby-rake-compiler ruby-rspec ruby-rubygems-tasks)) (list ruby-rake-compiler ruby-rspec ruby-rubygems-tasks))
(inputs (inputs

View file

@ -0,0 +1,50 @@
Don't redefine G_DEFINE_AUTOPTR_CLEANUP_FUNC when available in polkit.
Taken from upstream:
https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
diff --git a/config.h.meson b/config.h.meson
index b93fda8727..ff355d3062 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -33,3 +33,6 @@
/* Define if fdwalk is available in libc */
#mesondefine HAVE_FDWALK
+
+/* Define if polkit defines autocleanup functions */
+#mesondefine HAVE_POLKIT_AUTOCLEANUP
diff --git a/meson.build b/meson.build
index 42ec01c566..778a34c6ef 100644
--- a/meson.build
+++ b/meson.build
@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
cc.has_function('fdwalk')
)
+polkit_has_autocleanup = cc.compiles(
+ '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
+ #include <polkitagent/polkitagent.h>
+ void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
+ dependencies: polkit_dep)
+cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
+
buildtype = get_option('buildtype')
if buildtype != 'plain'
all_warnings = [
diff --git a/src/shell-polkit-authentication-agent.h b/src/shell-polkit-authentication-agent.h
index 55b46af110..4f14749563 100644
--- a/src/shell-polkit-authentication-agent.h
+++ b/src/shell-polkit-authentication-agent.h
@@ -14,8 +14,10 @@
G_BEGIN_DECLS
+#ifndef HAVE_POLKIT_AUTOCLEANUP
/* Polkit doesn't have g_autoptr support, thus we have to manually set the autoptr function here */
G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
+#endif
#define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT (shell_polkit_authentication_agent_get_type())

View file

@ -0,0 +1,57 @@
Inherit essential environment variables in tests.
Note: it could be better to generalize this in SCons/Platform/posix.py
instead of just patching the tests.
diff --git a/SCons/ActionTests.py b/SCons/ActionTests.py
--- a/SCons/ActionTests.py
+++ b/SCons/ActionTests.py
@@ -98,6 +98,7 @@ outfile2 = test.workpath('outfile2')
pipe_file = test.workpath('pipe.out')
scons_env = SCons.Environment.Environment()
+scons_env['ENV']['PATH'] += os.environ['PATH']
# Capture all the stuff the Actions will print,
# so it doesn't clutter the output.
@@ -1090,6 +1091,8 @@ class CommandActionTestCase(unittest.TestCase):
except AttributeError:
env = Environment()
+ env = Environment(ENV={'PATH': os.environ['PATH']})
+
cmd1 = r'%s %s %s xyzzy' % (_python_, act_py, outfile)
act = SCons.Action.CommandAction(cmd1)
@@ -1884,7 +1887,7 @@ class ListActionTestCase(unittest.TestCase):
f.write("class2b\n")
act = SCons.Action.ListAction([cmd2, function2, class2a(), class2b])
- r = act([], [], Environment(out=outfile))
+ r = act([], [], Environment(out=outfile, ENV={'PATH' : os.getenv('PATH')}))
assert isinstance(r.status, class2b), r.status
c = test.read(outfile, 'r')
assert c == "act.py: 'syzygy'\nfunction2\nclass2a\nclass2b\n", c
@@ -1948,7 +1951,7 @@ class LazyActionTestCase(unittest.TestCase):
a([], [], env=Environment(BAR=f, s=self))
assert self.test == 1, self.test
cmd = r'%s %s %s lazy' % (_python_, act_py, outfile)
- a([], [], env=Environment(BAR=cmd, s=self))
+ a([], [], env=Environment(BAR=cmd, s=self, ENV={'PATH' : os.getenv('PATH')}))
c = test.read(outfile, 'r')
assert c == "act.py: 'lazy'\n", c
diff --git a/SCons/SConfTests.py b/SCons/SConfTests.py
--- a/SCons/SConfTests.py
+++ b/SCons/SConfTests.py
@@ -71,7 +71,9 @@ class SConfTestCase(unittest.TestCase):
# and we need a new environment, cause references may point to
# old modules (well, at least this is safe ...)
self.scons_env = self.Environment.Environment()
- self.scons_env.AppendENVPath('PATH', os.environ['PATH'])
+ # Inherit the OS environment to get essential variables.
+ inherited_env = os.environ.copy()
+ self.scons_env['ENV'] = inherited_env
# we want to do some autodetection here
# this stuff works with

View file

@ -3047,51 +3047,6 @@ (define-public python-poyo
and is not compatible with JSON.") and is not compatible with JSON.")
(license license:expat))) (license license:expat)))
(define-public scons
(package
(name "scons")
(version "3.0.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/SCons/scons")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1xy8jrwz87y589ihcld4hv7wn122sjbz914xn8h50ww77wbhk8hn"))))
(build-system python-build-system)
(arguments
`(#:use-setuptools? #f ; still relies on distutils
#:tests? #f ; no 'python setup.py test' command
#:phases
(modify-phases %standard-phases
(add-before 'build 'bootstrap
(lambda _
(substitute* "src/engine/SCons/compat/__init__.py"
(("sys.modules\\[new\\] = imp.load_module\\(old, \\*imp.find_module\\(old\\)\\)")
"sys.modules[new] = __import__(old)"))
(substitute* "src/engine/SCons/Platform/__init__.py"
(("mod = imp.load_module\\(full_name, file, path, desc\\)")
"mod = __import__(full_name)"))
(invoke "python" "bootstrap.py" "build/scons" "DEVELOPER=guix")
(chdir "build/scons")
#t)))))
(home-page "https://scons.org/")
(synopsis "Software construction tool written in Python")
(description
"SCons is a software construction tool. Think of SCons as an improved,
cross-platform substitute for the classic Make utility with integrated
functionality similar to autoconf/automake and compiler caches such as ccache.
In short, SCons is an easier, more reliable and faster way to build
software.")
(license license:x11)))
(define-public scons-python2
(package
(inherit (package-with-python2 scons))
(name "scons-python2")))
(define-public python-exceptiongroup (define-public python-exceptiongroup
(package (package
(name "python-exceptiongroup") (name "python-exceptiongroup")

View file

@ -2831,7 +2831,7 @@ (define (delete-unwanted-files child stat flag base level)
(file-type 'regular) (file-type 'regular)
(separator #f) (separator #f)
(variable "QTWEBENGINEPROCESS_PATH") (variable "QTWEBENGINEPROCESS_PATH")
(files '("lib/qt5/libexec/QtWebEngineProcess"))))) (files '("lib/qt6/libexec/QtWebEngineProcess")))))
(home-page "https://wiki.qt.io/QtWebEngine") (home-page "https://wiki.qt.io/QtWebEngine")
(synopsis "Qt WebEngine module") (synopsis "Qt WebEngine module")
(description "The Qt WebEngine module provides support for web (description "The Qt WebEngine module provides support for web

View file

@ -12,6 +12,7 @@
;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech> ;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
;;; Copyright © 2022 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -185,14 +186,16 @@ (define (install dir)
(define-public samba (define-public samba
(package (package
(name "samba") (name "samba")
(version "4.16.2") (version "4.16.4")
(source (source
;; For updaters: the current PGP fingerprint is
;; 81F5E2832BD2545A1897B713AA99442FB680B620.
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.samba.org/pub/samba/stable/" (uri (string-append "https://download.samba.org/pub/samba/stable/"
"samba-" version ".tar.gz")) "samba-" version ".tar.gz"))
(sha256 (sha256
(base32 "1745gx36gyd7353a94w4lrgksbmms0502kj9gg63il9zbdns1dx0")))) (base32 "0bvhqinxwpbwp4ayhd9q8ga0w89gnkl1m3nrwpj1fnhjzd4ghclm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list

View file

@ -107,6 +107,7 @@ (define-module (gnu packages web)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages bittorrent) #:use-module (gnu packages bittorrent)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cpp) #:use-module (gnu packages cpp)
@ -1943,7 +1944,8 @@ (define-public serf
;;("gss" ,gss) ;;("gss" ,gss)
zlib)) zlib))
(arguments (arguments
`(#:scons-flags (list (string-append "APR=" (assoc-ref %build-inputs "apr")) `(#:scons ,scons-3 ;TODO: remove in the next rebuild cycle
#:scons-flags (list (string-append "APR=" (assoc-ref %build-inputs "apr"))
(string-append "APU=" (assoc-ref %build-inputs "apr-util")) (string-append "APU=" (assoc-ref %build-inputs "apr-util"))
(string-append "OPENSSL=" (assoc-ref %build-inputs "openssl")) (string-append "OPENSSL=" (assoc-ref %build-inputs "openssl"))
;; (string-append "GSSAPI=" (assoc-ref %build-inputs "gss")) ;; (string-append "GSSAPI=" (assoc-ref %build-inputs "gss"))

View file

@ -7,6 +7,7 @@
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -123,7 +124,7 @@ (define-public wpebackend-fdo
engine that uses Wayland for graphics output.") engine that uses Wayland for graphics output.")
(license license:bsd-2))) (license license:bsd-2)))
(define %webkit-version "2.36.4") (define %webkit-version "2.36.7")
(define-public webkitgtk (define-public webkitgtk
(package (package
@ -134,7 +135,7 @@ (define-public webkitgtk
(uri (string-append "https://www.webkitgtk.org/releases/" (uri (string-append "https://www.webkitgtk.org/releases/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "1a72w9md2xvb82rd2sk3c7pqrvr28rqa8i4yq5ldjyd4hlgvxgmn")) (base32 "0hqpfgzbb7lzdih9aw86rmkljm8ynv8zw3b72z88211gngr0q9hc"))
(patches (search-patches (patches (search-patches
"webkitgtk-adjust-bubblewrap-paths.patch")))) "webkitgtk-adjust-bubblewrap-paths.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
@ -302,7 +303,7 @@ (define-public wpewebkit
(uri (string-append "https://wpewebkit.org/releases/" (uri (string-append "https://wpewebkit.org/releases/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "08f0sz4d5bpgrgvkgby3fri3wk5474f66gvp3y39laflypnknyih")))) (base32 "1jcm5fjzn1k9l87qwqgmvd5qriwpv3vgs632zc6asqn5zxr7sx7k"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments webkitgtk) (substitute-keyword-arguments (package-arguments webkitgtk)
((#:configure-flags flags) ((#:configure-flags flags)

View file

@ -579,7 +579,16 @@ (define-public qtile
(assoc-ref inputs "pango") "/lib/libpango-1.0.so.0\")\n")) (assoc-ref inputs "pango") "/lib/libpango-1.0.so.0\")\n"))
(("^pangocairo = ffi.dlopen.*") (("^pangocairo = ffi.dlopen.*")
(string-append "pangocairo = ffi.dlopen(\"" (string-append "pangocairo = ffi.dlopen(\""
(assoc-ref inputs "pango") "/lib/libpangocairo-1.0.so.0\")\n")))))))) (assoc-ref inputs "pango") "/lib/libpangocairo-1.0.so.0\")\n")))))
(add-after 'install 'install-xsession
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(xsessions (string-append out "/share/xsessions"))
(qtile (string-append out "/bin/qtile start")))
(mkdir-p xsessions)
(copy-file "resources/qtile.desktop" (string-append xsessions "/qtile.desktop"))
(substitute* (string-append xsessions "/qtile.desktop")
(("qtile start") qtile))))))))
(inputs (inputs
(list glib pango pulseaudio)) (list glib pango pulseaudio))
(propagated-inputs (propagated-inputs

View file

@ -93,6 +93,7 @@ (define-module (gnu packages xdisorg)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)

View file

@ -45,8 +45,8 @@ (define %scons-build-system-modules
(define (default-scons) (define (default-scons)
"Return the default SCons package." "Return the default SCons package."
;; Lazily resolve the binding to avoid a circular dependency. ;; Lazily resolve the binding to avoid a circular dependency.
(let ((python (resolve-interface '(gnu packages python-xyz)))) (let ((build-tools (resolve-interface '(gnu packages build-tools))))
(module-ref python 'scons))) (module-ref build-tools 'scons)))
(define* (lower name (define* (lower name
#:key source inputs native-inputs outputs system target #:key source inputs native-inputs outputs system target