aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/qt.scm14
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8696dc4bb6..9c517d0acf 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2040,7 +2040,10 @@ contain over 620 classes.")
("qtwebengine" ,qtwebengine)))
(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
(replace 'configure
@@ -2050,13 +2053,8 @@ contain over 620 classes.")
(pyqt-sipdir (string-append
(assoc-ref inputs "python-pyqt") "/share/sip"))
(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/PyQt5"))
(stubs (string-append lib "/PyQt5")))
@@ -2075,7 +2073,9 @@ contain over 620 classes.")
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((__init__.py (string-append
(assoc-ref outputs "out")
- "/lib/python3.7/site-packages/PyQt5/__init__.py")))
+ "/lib/python"
+ (python-version (assoc-ref inputs "python"))
+ "/site-packages/PyQt5/__init__.py")))
(with-output-to-file __init__.py
(lambda _ (display "
from pkgutil import extend_path
n * gnu/bootloader/grub.scm (<grub-theme>): Add `gfxmode' entry. (eye-candy): Use it. * doc/guix.texi (Bootloader Configuration): Document it. 2020-01-05doc: Add JFS to Guix System-supported file systems.Tobias Geerinckx-Rice * doc/guix.texi (Keyboard Layout and Networking and Partitioning): Note JFS support. 2019-12-30services: console-font: Update example with HDPI font suggestion.Jan Nieuwenhuizen This solution was kindly provided by Bernard M. Wiedemann. * gnu/services/base.scm (console-font-service-type): Add ter132n (terminus 132 nomal) font example, for HDPI displays. * doc/guix.texi (Invoking guix system): Update to `guix system search console' example output. 2019-12-27doc: Mention "make authenticate".Ludovic Courtès * doc/contributing.texi (Building from Git): Add instructions to run 'git verify-commit' and 'make authenticate'. 2019-12-21services: Add Mumi service.Ludovic Courtès * gnu/services/web.scm (%mumi-activation, %mumi-accounts): New variables. (mumi-shepherd-services): New procedure. (mumi-service-type): New variable. * doc/guix.texi (Web Services): Document it. 2019-12-18gnu: Remove uses of deprecated Qemu network configuration.Marius Bakke * gnu/build/vm.scm (load-in-linux-vm): Move Qemu network configuration from ARCH-SPECIFIC-FLAGS to the Qemu command line. Use the "-nic" option of Qemu instead of "-device" and "-net". * gnu/system/vm.scm (common-qemu-options): Do not add a '-net' command. (virtual-machine-compiler): Use "-nic user,..." instead of "-net". * doc/guix.texi (Installing Guix in a VM, Invoking guix system, Running Guix in a VM): Do the same for examples. 2019-12-13doc: Link to "Building from Git" instead of quoting command to build Guix.Pierre Neidhardt * doc/contributing.texi (Submitting Patches): Remove example. Add link to "Building from Git" section. 2019-12-12challenge: Support "--diff=diffoscope".Ludovic Courtès * guix/scripts/challenge.scm (call-with-nar): New procedure. (narinfo-contents): Express in terms of 'call-with-nar'. (call-with-mismatches, report-differing-files/external): New procedures. (%diffoscope-command): New variable. (%options): Support "diffoscope" and a string starting with "/". * tests/challenge.scm (call-mismatch-test): New procedure. ("differing-files"): Rewrite in terms of 'call-mismatch-test'. ("call-with-mismatches"): New test. * doc/guix.texi (Invoking guix challenge): Document it. 2019-12-12challenge: Add "--diff".Ludovic Courtès * guix/scripts/challenge.scm (dump-port*): New variable. (archive-contents, store-item-contents, narinfo-contents) (differing-files, report-differing-files): New procedures. (summarize-report): Add #:report-differences and call it. (show-help, %options): Add "--diff". (%default-options): Add 'difference-report' key. (report-differing-files): Parameterize CURRENT-TERMINAL-COLUMNS and pass #:report-differences to 'summarize-report'. * guix/tests/http.scm (%local-url): Add optional argument. (call-with-http-server): Fix docstring typo. * tests/challenge.scm (query-path-size, make-narinfo): New procedures. ("differing-files"): New test. * doc/guix.texi (Invoking guix challenge): Document "--diff". 2019-12-12guix archive: Add '--list'.Ludovic Courtès * guix/scripts/archive.scm (show-help, %options): Add '--list'. (list-contents): New procedure. (guix-archive): Honor the '--list' option. * tests/guix-archive.sh: Test it. * doc/guix.texi (Invoking guix archive): Document it. 2019-12-12doc: Add missing MKDIR call.Clément Lassieur * doc/guix.texi (G-Expressions): Add missing MKDIR call. 2019-12-10pack: Clarify the /bin/sh requirement for Singularity.Ludovic Courtès * guix/scripts/pack.scm (squashfs-image)[symlinks*]: New variable. [build]: Use it instead of SYMLINKS. (guix-pack): Emit a warning and a hint when "bash" and "bash-minimal" are missing and PACK-FORMAT is 'squashfs. * doc/guix.texi (Invoking guix pack): Document the /bin/sh requirement for Singularity. 2019-12-09doc: Fix typo.Jelle Licht * doc/guix.texi (bitlbee-configuration): The field that refers to the bitlbee package is called "bitlbee", not "package". 2019-12-08lint: Add '--load-path' option.zimoun * guix/scripts/lint.scm (%options): Add '--load-path' option. * doc/guix.texi: Document it. * tests/guix-lint.sh: Test it. Signed-off-by: Ludovic Courtès <ludo@gnu.org> 2019-12-08doc: Mention how to simulate a `guix pull' before submitting patches.Pierre Neidhardt * doc/contributing.texi (Submitting Patches): Mention the dummy guix pull command in the check list. 2019-12-08doc: Mention how to rebuild guix before submitting patches.Pierre Neidhardt * doc/contributing.texi (Submitting Patches): Mention rebuild command in the check list. 2019-12-07file-systems: Add support for 'strict-atime' and 'lazy-time' flags.Guillaume Le Vaillant * guix/build/syscalls.scm (MS_LAZYTIME): New variable. * gnu/build/file-systems.scm (mount-flags->bit-mask): Add match rules for 'strict-atime' and 'lazy-time'. * doc/guix.texi (File Systems): Add 'strict-atime' and 'lazy-time' to the list of supported flags. Signed-off-by: Ludovic Courtès <ludo@gnu.org> 2019-12-07guix system: Add "describe" action.Ludovic Courtès * guix/scripts/system.scm (show-help): Add "describe". (process-command): Handle it. (guix-system): Likewise. * doc/guix.texi (Invoking guix system): Document it. 2019-12-07machine: Add provenance tracking to each machine operating system.Ludovic Courtès * gnu/machine.scm (<machine>): Rename accessor to '%machine-operating-system'. (machine-operating-system): New procedure. * doc/guix.texi (Service Reference): Mention it. 2019-12-07guix system: Use 'provenance-service-type', add "--save-provenance".Ludovic Courtès * guix/scripts/system.scm (show-help, %options): Add "--save-provenance". (process-action): Define 'save-provenance?' and 'transform'; call 'transform' on the OS. * doc/guix.texi (Invoking guix system): Document it under 'reconfigure'. (Service Reference): Mention that 'provenance-service-type' is automatically added by 'reconfigure' & 'init'. 2019-12-07services: Add 'provenance-service-type'.Ludovic Courtès * gnu/services.scm (object->pretty-string) (channel->code, channel->sexp, provenance-file) (provenance-entry): New procedures. (provenance-service-type): New variable. * gnu/system.scm (operating-system-with-provenance): New procedure. * doc/guix.texi (Service Reference): Document 'provenance-service-type'. 2019-12-04machine: ssh: <machine-ssh-configuration> can include the host key.Ludovic Courtès * gnu/machine/ssh.scm (<machine-ssh-configuration>)[host-key]: New field. (machine-ssh-session): Pass #:host-key to 'open-ssh-session'. * doc/guix.texi (Invoking guix deploy): Document it. 2019-12-04services: Add GNOME Keyring service.Leo Prikler * gnu/services/desktop.scm: (<gnome-keyring-configuration>): New record type. (pam-gnome-keyring): New procedure. (gnome-keyring-service-type): New variable. * doc/guix.texi (Desktop Services): Document it. Signed-off-by: Ludovic Courtès <ludo@gnu.org> 2019-12-03Revert "doc: Fix typo in example."Efraim Flashner This reverts commit 7b40d59114e1462d6d8140f325a66b12e91db667. 2019-12-01guix: Add the 'qt' build system.Hartmut Goebel * guix/build-system/qt.scm, guix/build/qt-build-system.scm: New files. * Makefile.am (MODULES): Add them. * doc/guix.texi (Buiild systems): Add the new build system. 2019-11-30services: Add polkit-wheel-service.Leo Prikler * gnu/services/desktop.scm: (polkit-wheel): New variable. (polkit-wheel-service): New service. * doc/guix.texi: Document polkit-wheel-service. Signed-off-by: Ludovic Courtès <ludo@gnu.org> 2019-11-30gexp: 'local-file' properly resolves non-literal relative file names.Ludovic Courtès * guix/gexp.scm (local-file): Distinguish the case where FILE is a literal string and when it's not. Add a clause for when FILE is not a literal string. * tests/gexp.scm ("local-file, non-literal relative file name"): New test. * doc/guix.texi (G-Expressions): Update accordingly. 2019-11-28doc: Link to Guile's SXML section.Ludovic Courtès * doc/guix.texi (PAM Mount Service): Add xref to the "SXML" section of the Guile manual. 2019-11-28services: Add pam-mount.Guillaume Le Vaillant * gnu/services/pam-mount.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * doc/guix.texi (PAM Mount Service): New subsection. Signed-off-by: Ludovic Courtès <ludo@gnu.org> 2019-11-28doc: Handle right arrows in 'syntax-highlighted-html'.Ludovic Courtès * doc/build.scm (syntax-highlighted-html)[build](entity->string): Add "rarr". 2019-11-26doc: Fix typo.Efraim Flashner * doc/guix.texi (php-fpm-service-type): Note that the socket-group default is "nagios" and not "php-fpm". 2019-11-26guix build: '--keep-failed' implies '--no-offload'.Ludovic Courtès * guix/scripts/build.scm (set-build-options-from-command-line): Pass #:offload? #f when 'keep-failed? is true. * doc/guix.texi (Common Build Options): Document it. 2019-11-26guix build, daemon: Rename "--no-build-hook" to "--no-offload".Ludovic Courtès This is a followup to bc69ea2d605810cc32e13ed03d5848b8dc358b61. * guix/scripts/build.scm (show-build-options-help): Rename "--no-build-hook" to "--no-offload". (%standard-build-options): Likewise, and warn when "--no-build-hook" is passed. * nix/nix-daemon/guix-daemon.cc (options): Add "--no-offload" and mark "--no-build-hook" as hidden. * guix/scripts/offload.scm: Adjust comment. * doc/guix.texi (Invoking guix-daemon, Common Build Options): Replace "--no-build-hook" with "--no-offload". * etc/completion/fish/guix.fish, etc/completion/zsh/_guix: Adjust accordingly. 2019-11-26doc: cookbook: Add cross-references to the Guile manual.Ludovic Courtès * doc/guix-cookbook.texi (A Scheme Crash Course): Add cross-reference to the Guile manual. 2019-11-26doc: cookbook: Use @result{} & co. instead of a '>' prompt.Ludovic Courtès * doc/guix-cookbook.texi (A Scheme Crash Course) (Extended example): Use @result{}, @print{}, and @error{}. 2019-11-26doc: cookbook: Use Texinfo quotes.Ludovic Courtès * doc/guix-cookbook.texi: Use Texinfo quotes ``like this'' instead of straight quotes or curly quotes. 2019-11-26doc: cookbook: Add cross-reference about ./pre-inst-env.Ludovic Courtès * doc/guix-cookbook.texi (Direct checkout hacking): Refer to "Running Guix Before It Is Installed". 2019-11-26doc: cookbook: Use @lisp for Scheme snippets.Ludovic Courtès * doc/guix-cookbook.texi: Use @lisp instead of @example where appropriate. 2019-11-22pack: Allow multiple '--manifest' options.Ludovic Courtès * guix/scripts/pack.scm (guix-pack): Collect 'manifest' options, and concatenate the resulting manifests. * tests/guix-pack.sh: Test it. * doc/guix.texi (Invoking guix pack): Document it. 2019-11-22package: Allow multiple '--manifest' options.Ludovic Courtès * guix/scripts/package.scm (manifest-action): Remove. (%actions): Remove it. (load-manifest): New procedure. (process-actions): Handle 'manifest' options. Define 'files' from 'manifest' options. Define 'manifest' based on FILES. Define 'trans' to represent the final transaction. * tests/guix-package.sh: Test it. * doc/guix.texi (Invoking guix package): Mention