[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
183/184: Merge branch 'master' into wip-gnome-updates
From: |
guix-commits |
Subject: |
183/184: Merge branch 'master' into wip-gnome-updates |
Date: |
Wed, 27 Nov 2019 14:37:23 -0500 (EST) |
kkebreau pushed a commit to branch wip-gnome-updates
in repository guix.
commit 87676e95104e88c40915c7d385c662d3e2216cbc
Merge: a781cb5 116787d
Author: Kei Kebreau <address@hidden>
Date: Fri Nov 22 22:01:06 2019 -0500
Merge branch 'master' into wip-gnome-updates
.dir-locals.el | 1 +
Makefile.am | 1 +
doc/guix.texi | 86 +-
etc/news.scm | 18 +
gnu/build/file-systems.scm | 6 +-
gnu/build/linux-boot.scm | 165 +-
gnu/build/vm.scm | 27 +-
gnu/local.mk | 25 +-
gnu/packages/admin.scm | 4 +-
gnu/packages/agda.scm | 9 +-
gnu/packages/audio.scm | 131 +-
gnu/packages/aux-files/emacs/guix-emacs.el | 98 +-
gnu/packages/bioinformatics.scm | 30 +-
gnu/packages/build-tools.scm | 22 +-
gnu/packages/c.scm | 43 +-
gnu/packages/cedille.scm | 2 +-
gnu/packages/chemistry.scm | 11 +-
gnu/packages/chromium.scm | 126 +-
gnu/packages/cmake.scm | 16 +
gnu/packages/compression.scm | 4 +-
gnu/packages/cpp.scm | 29 +-
gnu/packages/cran.scm | 10 +-
gnu/packages/crypto.scm | 15 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/elixir.scm | 20 +-
gnu/packages/elm.scm | 18 +-
gnu/packages/emacs-xyz.scm | 90 +-
gnu/packages/emacs.scm | 9 +-
gnu/packages/emulators.scm | 2 +
gnu/packages/engineering.scm | 4 +-
gnu/packages/erlang.scm | 2 +-
gnu/packages/fabric-management.scm | 9 +-
gnu/packages/finance.scm | 8 +-
gnu/packages/flashing-tools.scm | 50 +-
gnu/packages/fonts.scm | 41 +
gnu/packages/games.scm | 116 +-
gnu/packages/gnome.scm | 29 +-
gnu/packages/guile-xyz.scm | 15 +-
gnu/packages/haskell-apps.scm | 59 +-
gnu/packages/haskell-check.scm | 195 +-
gnu/packages/haskell-crypto.scm | 36 +-
gnu/packages/haskell-web.scm | 128 +-
gnu/packages/haskell-xyz.scm | 2642 +++++++++++++++-----
gnu/packages/haskell.scm | 2 +-
gnu/packages/idris.scm | 9 +-
gnu/packages/libusb.scm | 40 +-
gnu/packages/linux.scm | 103 +-
gnu/packages/llvm.scm | 90 +
gnu/packages/man.scm | 4 +-
gnu/packages/markup.scm | 26 +-
gnu/packages/maths.scm | 40 +
gnu/packages/messaging.scm | 3 +-
gnu/packages/mpi.scm | 90 +-
gnu/packages/music.scm | 12 +-
gnu/packages/opencl.scm | 2 +-
gnu/packages/parallel.scm | 36 +-
gnu/packages/password-utils.scm | 16 +-
.../patches/elm-compiler-relax-glsl-bound.patch | 19 -
.../patches/ghc-diff-swap-cover-args.patch | 20 +
.../patches/ghc-haddock-api-fix-haddock.patch | 54 +
.../patches/ghc-haddock-library-unbundle.patch | 86 -
gnu/packages/patches/ghc-hpack-fix-tests.patch | 193 ++
.../patches/ghc-microlens-aeson-fix-tests.patch | 27 +
gnu/packages/patches/ghc-monad-par-fix-tests.patch | 45 +
.../patches/ghc-pandoc-fix-html-tests.patch | 92 +
.../patches/ghc-pandoc-fix-latex-test.patch | 31 +
gnu/packages/patches/hexchat-crash-exit.patch | 31 +
gnu/packages/patches/libseccomp-open-aarch64.patch | 27 +
.../patches/minisat-friend-declaration.patch | 25 +
gnu/packages/patches/minisat-install.patch | 19 +
gnu/packages/patches/openmpi-psm2-priority.patch | 21 +
gnu/packages/patches/python-3.8-fix-tests.patch | 42 +
gnu/packages/patches/python-3.8-search-paths.patch | 17 +
gnu/packages/patches/tomb-fix-errors-on-open.patch | 25 +
gnu/packages/patches/ucx-tcp-iface-ioctl.patch | 109 +
gnu/packages/patches/xsane-fix-memory-leak.patch | 34 +
gnu/packages/patches/xsane-fix-pdf-floats.patch | 85 +
.../patches/xsane-fix-snprintf-buffer-length.patch | 72 +
gnu/packages/patches/xsane-support-ipv6.patch | 153 ++
.../patches/xsane-tighten-default-umask.patch | 36 +
gnu/packages/php.scm | 14 +-
gnu/packages/printers.scm | 84 +-
gnu/packages/protobuf.scm | 2 +-
gnu/packages/python-crypto.scm | 39 +
gnu/packages/python-xyz.scm | 60 +-
gnu/packages/python.scm | 26 +
gnu/packages/ruby.scm | 12 +-
gnu/packages/scanner.scm | 89 +
gnu/packages/serialization.scm | 4 +-
gnu/packages/sml.scm | 7 +-
gnu/packages/spice.scm | 4 +-
gnu/packages/virtualization.scm | 26 +-
gnu/packages/web.scm | 36 +-
gnu/packages/wm.scm | 34 +-
gnu/packages/xdisorg.scm | 43 +
gnu/services/sysctl.scm | 3 +-
gnu/system/vm.scm | 17 +-
gnu/tests/install.scm | 2 +-
guix/build/download.scm | 13 +-
guix/build/emacs-build-system.scm | 42 +-
guix/build/make-bootstrap.scm | 1 -
guix/import/hackage.scm | 6 +-
guix/import/texlive.scm | 8 +-
guix/inferior.scm | 105 +-
guix/profiles.scm | 5 +
guix/scripts/build.scm | 19 +-
guix/scripts/deploy.scm | 4 +
guix/scripts/pack.scm | 38 +-
guix/scripts/package.scm | 50 +-
guix/scripts/pull.scm | 32 +-
guix/scripts/substitute.scm | 142 +-
guix/scripts/time-machine.scm | 135 +
guix/utils.scm | 20 +-
nix/libstore/gc.cc | 11 +-
tests/guix-build.sh | 13 +
tests/guix-environment.sh | 23 +
tests/guix-pack.sh | 15 +
tests/guix-package.sh | 13 +
tests/profiles.scm | 5 +
119 files changed, 5441 insertions(+), 1853 deletions(-)
diff --cc gnu/local.mk
index c0e0f94,e6c6f57..35be0a0
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1383,6 -1397,9 +1395,7 @@@ dist_patch_DATA =
%D%/packages/patches/tk-find-library.patch \
%D%/packages/patches/ttf2eot-cstddef.patch \
%D%/packages/patches/ttfautohint-source-date-epoch.patch \
+ %D%/packages/patches/tomb-fix-errors-on-open.patch \
- %D%/packages/patches/totem-meson-compat.patch \
- %D%/packages/patches/totem-meson-easy-codec.patch \
%D%/packages/patches/tuxpaint-stamps-path.patch \
%D%/packages/patches/txr-shell.patch \
%D%/packages/patches/u-boot-fix-mkimage-header-verification.patch \
diff --cc gnu/packages/gnome.scm
index ce3bfe1,89dc7a3..6beca88
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -873,10 -859,23 +873,23 @@@ on the GNOME Desktop with a single simp
name "-" version ".tar.xz"))
(sha256
(base32
- "0bshwm49cd01ighsxqlbqn10q0ch71ff99gcrx8pr2gyky2ad3pq"))))
- (build-system gnu-build-system)
+ "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d"))))
+ (build-system meson-build-system)
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (add-after 'unpack 'set-adwaita-theme-file-name
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Provide the correct file name of the default GNOME
+ ;; background, 'adwaita-timed.xml'.
+ (let ((theme (assoc-ref inputs "gnome-backgrounds")))
+ (substitute* (find-files "schemas"
+ "\\.gschema\\.xml\\.in$")
+ (("@datadir@/backgrounds/gnome")
+ (string-append theme "/share/backgrounds/gnome")))
+ #t))))))
(inputs
- `(("glib" ,glib)))
+ `(("glib" ,glib)
+ ("gnome-backgrounds" ,gnome-backgrounds)))
(native-inputs
`(("intltool" ,intltool)
("glib" ,glib "bin") ; glib-compile-schemas, etc.
diff --cc gnu/packages/python-xyz.scm
index 597553f,8d53a59..ff3f0b9
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -16886,39 -16889,26 +16890,63 @@@ qvarious formats: PDF, PostScript, PNG
existing Hunspell hyphenation dictionaries.")
(license (list license:gpl2 license:lgpl2.1 license:mpl1.1))))
+(define-public python-dbusmock
+ (package
+ (name "python-dbusmock")
+ (version "0.18.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "python-dbusmock" version))
+ (sha256
+ (base32
+ "0hp2kyac88nh9iv6l8hlmv7s1sa1s5f1a3wc2pmlmmxnd211fjlr"))))
+ (build-system python-build-system)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-shell-path
+ (lambda _
+ (substitute* "tests/test_code.py"
+ (("/bin/bash") (which "bash")))
+ #t)))))
+ (native-inputs
+ `(;; For tests.
+ ("dbus" ,dbus) ; for dbus-daemon
+ ("python-nose" ,python-nose)
+ ("which" ,which)))
+ (propagated-inputs
+ `(("python-dbus" ,python-dbus)
+ ("python-pygobject" ,python-pygobject)))
+ (home-page "https://github.com/martinpitt/python-dbusmock")
+ (synopsis "Python library for mock D-Bus objects")
+ (description "python-dbusmock allows for the easy creation of mock objects
on
+D-Bus. This is useful for writing tests for software which talks to D-Bus
+services such as upower, systemd, logind, gnome-session or others, and it is
+hard (or impossible without root privileges) to set the state of the real
+services to what you expect in your tests.")
+ (license license:lgpl3+)))
++
+ (define-public python-intelhex
+ (package
+ (name "python-intelhex")
+ (version "2.2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "intelhex" version))
+ (sha256
+ (base32
+ "0ckqjbxd8gwcg98gfzpn4vq1qxzfvq3rdbrr1hikj1nmw08qb780"))))
+ (build-system python-build-system)
+ (arguments '(#:tests? #f)) ;issue with version
+ (home-page "https://pypi.org/project/IntelHex/")
+ (synopsis "Python library for Intel HEX files manipulations")
+ (description "The Intel HEX file format is widely used in microprocessors
+ and microcontrollers area (embedded systems etc.) as the de facto standard for
+ representation of code to be programmed into microelectronic devices. This
+ package provides an intelhex Python library to read, write, create from
+ scratch and manipulate data from Intel HEX file format. It also includes
+ several convenience Python scripts, including \"classic\" hex2bin and bin2hex
+ converters and more, those based on the library itself.")
+ (license license:bsd-3)))
- 167/184: gnu: haskell-apps.scm: Add missing import., (continued)
- 167/184: gnu: haskell-apps.scm: Add missing import., guix-commits, 2019/11/27
- 169/184: gnu: raincat: Use 'mirror-url'., guix-commits, 2019/11/27
- 178/184: gnu: gnome: Add gnome-screenshot to default apps., guix-commits, 2019/11/27
- 131/184: gnu: python-reportlab: Update to 3.5.32., guix-commits, 2019/11/27
- 130/184: gnu: botan: Use getentropy()., guix-commits, 2019/11/27
- 116/184: gnu: perl-danga-socket: Update to 1.62., guix-commits, 2019/11/27
- 143/184: gnu: make-bootstrap: Slightly clarify 'package-with-relocatable-glibc'., guix-commits, 2019/11/27
- 144/184: doc: Mention value /var to localstatedir option., guix-commits, 2019/11/27
- 173/184: gnu: qtwebkit: Don't use NAME in source URI., guix-commits, 2019/11/27
- 168/184: gnu: delta: Use 'mirror-url'., guix-commits, 2019/11/27
- 183/184: Merge branch 'master' into wip-gnome-updates,
guix-commits <=
- 132/184: gnu: rdesktop: Update to 1.9.0., guix-commits, 2019/11/27
- 137/184: gnu: perl-file-configdir: Update to 0.021., guix-commits, 2019/11/27
- 129/184: gnu: botan: Optimise., guix-commits, 2019/11/27
- 123/184: news: Add Spanish translation., guix-commits, 2019/11/27
- 153/184: gnu: gegl: Update to 0.4.18., guix-commits, 2019/11/27
- 163/184: gnu: monero-gui: Update to 0.15.0.0., guix-commits, 2019/11/27
- 166/184: gnu: Add scroll., guix-commits, 2019/11/27
- 165/184: gnu: Add ghc-ncurses., guix-commits, 2019/11/27
- 155/184: gnu: xfce4-whiskermenu-plugin: Don't use NAME in source URI., guix-commits, 2019/11/27
- 181/184: gnu: jalv: Fix gtkmm, add gtk+-2 and qtbase., guix-commits, 2019/11/27