diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-11 00:10:23 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-11 00:10:23 +0200 |
| commit | bdb90df764661c11b37c988ea129c8e7a01b1889 (patch) | |
| tree | c320b71b136bfcc5e5ec949279a05c8134fb0cca /gnu/services | |
| parent | b859a1bf7953eb98668cb11b459cde48b0dce991 (diff) | |
| parent | 8ec9c5fd880be35fe322b0d4dbc69bd2c6c89ef1 (diff) | |
| download | guix-patches-bdb90df764661c11b37c988ea129c8e7a01b1889.tar guix-patches-bdb90df764661c11b37c988ea129c8e7a01b1889.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/desktop.scm | 3 | ||||
| -rw-r--r-- | gnu/services/web.scm | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 7300ff5f4a..8663243256 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017, 2019 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2019 David Wilson <david@daviwil.com> +;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -892,7 +893,7 @@ rules.") (define-record-type* <gnome-desktop-configuration> gnome-desktop-configuration make-gnome-desktop-configuration gnome-desktop-configuration? - (gnome-package gnome-package (default gnome))) + (gnome gnome-package (default gnome))) (define (gnome-polkit-settings config) "Return the list of GNOME dependencies that provide polkit actions and diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 9ae84ddbc4..dcbe6ee16f 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2017, 2018, 2019 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> -;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de> +;;; Copyright © 2019, 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; @@ -652,8 +652,8 @@ of index files." "user nginx nginx;\n" "pid " run-directory "/pid;\n" "error_log " log-directory "/error.log info;\n" - (map emit-global-directive global-directives) (map emit-load-module modules) + (map emit-global-directive global-directives) "http {\n" " client_body_temp_path " run-directory "/client_body_temp;\n" " proxy_temp_path " run-directory "/proxy_temp;\n" |