diff options
| -rw-r--r-- | Makefile.am | 18 | ||||
| -rw-r--r-- | guix/scripts/web.scm | 4 | ||||
| -rw-r--r-- | guix/web/config.scm (renamed from guix-web/config.scm) | 2 | ||||
| -rw-r--r-- | guix/web/controller.scm (renamed from guix-web/controller.scm) | 10 | ||||
| -rw-r--r-- | guix/web/package.scm (renamed from guix-web/package.scm) | 2 | ||||
| -rw-r--r-- | guix/web/render.scm (renamed from guix-web/render.scm) | 10 | ||||
| -rw-r--r-- | guix/web/server.scm (renamed from guix-web/server.scm) | 10 | ||||
| -rw-r--r-- | guix/web/sxml.scm (renamed from guix-web/sxml.scm) | 2 | ||||
| -rw-r--r-- | guix/web/util.scm (renamed from guix-web/util.scm) | 2 | ||||
| -rw-r--r-- | guix/web/view/html.scm (renamed from guix-web/view/html.scm) | 4 | ||||
| -rw-r--r-- | guix/web/view/json.scm (renamed from guix-web/view/json.scm) | 4 |
11 files changed, 34 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am index ee0cab2..19e5aaf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,15 +21,15 @@ moddir=$(prefix)/share/guile/site/2.0 godir=$(libdir)/guile/2.0/ccache SOURCES = \ - guix-web/config.scm \ - guix-web/controller.scm \ - guix-web/package.scm \ - guix-web/render.scm \ - guix-web/server.scm \ - guix-web/util.scm \ - guix-web/sxml.scm \ - guix-web/view/html.scm \ - guix-web/view/json.scm \ + guix/web/config.scm \ + guix/web/controller.scm \ + guix/web/package.scm \ + guix/web/render.scm \ + guix/web/server.scm \ + guix/web/util.scm \ + guix/web/sxml.scm \ + guix/web/view/html.scm \ + guix/web/view/json.scm \ guix/scripts/web.scm EXTRA_DIST += env.in diff --git a/guix/scripts/web.scm b/guix/scripts/web.scm index da6270e..cb9fb47 100644 --- a/guix/scripts/web.scm +++ b/guix/scripts/web.scm @@ -17,8 +17,8 @@ (define-module (guix scripts web) #:use-module (system repl server) - #:use-module (guix-web controller) - #:use-module (guix-web server) + #:use-module (guix web controller) + #:use-module (guix web server) #:export (guix-web)) (define (guix-web . args) diff --git a/guix-web/config.scm b/guix/web/config.scm index 8094d83..2461cc9 100644 --- a/guix-web/config.scm +++ b/guix/web/config.scm @@ -15,7 +15,7 @@ ;;; License along with this program. If not, see ;;; <http://www.gnu.org/licenses/>. -(define-module (guix-web config) +(define-module (guix web config) #:use-module (ice-9 match) #:export (guix-web-asset-dir guix-web-host diff --git a/guix-web/controller.scm b/guix/web/controller.scm index fa7dfc3..dedb1c5 100644 --- a/guix-web/controller.scm +++ b/guix/web/controller.scm @@ -15,17 +15,17 @@ ;;; License along with this program. If not, see ;;; <http://www.gnu.org/licenses/>. -(define-module (guix-web controller) +(define-module (guix web controller) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (web request) #:use-module (gnu packages) - #:use-module (guix-web render) - #:use-module (guix-web view html) - #:use-module (guix-web view json) - #:use-module (guix-web package) + #:use-module (guix web render) + #:use-module (guix web view html) + #:use-module (guix web view json) + #:use-module (guix web package) #:export (controller)) (define extract-package-name diff --git a/guix-web/package.scm b/guix/web/package.scm index bf92351..f5a032c 100644 --- a/guix-web/package.scm +++ b/guix/web/package.scm @@ -15,7 +15,7 @@ ;;; License along with this program. If not, see ;;; <http://www.gnu.org/licenses/>. -(define-module (guix-web package) +(define-module (guix web package) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (guix derivations) diff --git a/guix-web/render.scm b/guix/web/render.scm index 04e687a..9a91c73 100644 --- a/guix-web/render.scm +++ b/guix/web/render.scm @@ -15,14 +15,14 @@ ;;; License along with this program. If not, see ;;; <http://www.gnu.org/licenses/>. -(define-module (guix-web render) +(define-module (guix web render) #:use-module (ice-9 binary-ports) #:use-module (web response) #:use-module (web uri) - #:use-module (guix-web sxml) + #:use-module (guix web sxml) #:use-module (json) - #:use-module (guix-web config) - #:use-module (guix-web util) + #:use-module (guix web config) + #:use-module (guix web util) #:export (render-static-asset render-html render-json @@ -72,7 +72,7 @@ (define (redirect path) (let ((uri (build-uri 'http - #:host guix-web-host + #:host "192.168.1.157" ;;guix-web-host #:port guix-web-port #:path (string-append "/" (encode-and-join-uri-path path))))) diff --git a/guix-web/server.scm b/guix/web/server.scm index c713616..e95487f 100644 --- a/guix-web/server.scm +++ b/guix/web/server.scm @@ -15,17 +15,17 @@ ;;; License along with this program. If not, see ;;; <http://www.gnu.org/licenses/>. -(define-module (guix-web server) +(define-module (guix web server) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (web http) #:use-module (web request) #:use-module (web server) #:use-module (web uri) - #:use-module (guix-web config) - #:use-module (guix-web controller) - #:use-module (guix-web render) - #:use-module (guix-web util) + #:use-module (guix web config) + #:use-module (guix web controller) + #:use-module (guix web render) + #:use-module (guix web util) #:export (start-guix-web)) (define (run-controller controller request) diff --git a/guix-web/sxml.scm b/guix/web/sxml.scm index 91dee4c..0b65a2d 100644 --- a/guix-web/sxml.scm +++ b/guix/web/sxml.scm @@ -21,7 +21,7 @@ ;; ;;; Code: -(define-module (guix-web sxml) +(define-module (guix web sxml) #:use-module (sxml simple) #:use-module (srfi srfi-26) #:use-module (ice-9 match) diff --git a/guix-web/util.scm b/guix/web/util.scm index f99eed5..396f4ee 100644 --- a/guix-web/util.scm +++ b/guix/web/util.scm @@ -15,7 +15,7 @@ ;;; License along with this program. If not, see ;;; <http://www.gnu.org/licenses/>. -(define-module (guix-web util) +(define-module (guix web util) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (web request) diff --git a/guix-web/view/html.scm b/guix/web/view/html.scm index 83ff226..462055c 100644 --- a/guix-web/view/html.scm +++ b/guix/web/view/html.scm @@ -15,7 +15,7 @@ ;;; License along with this program. If not, see ;;; <http://www.gnu.org/licenses/>. -(define-module (guix-web view html) +(define-module (guix web view html) #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (srfi srfi-1) @@ -25,7 +25,7 @@ #:use-module (guix packages) #:use-module (guix profiles) #:use-module (gnu packages) - #:use-module (guix-web package) + #:use-module (guix web package) #:export (all-packages view-package librejs)) diff --git a/guix-web/view/json.scm b/guix/web/view/json.scm index 8896c9d..4fe45a2 100644 --- a/guix-web/view/json.scm +++ b/guix/web/view/json.scm @@ -15,7 +15,7 @@ ;;; License along with this program. If not, see ;;; <http://www.gnu.org/licenses/>. -(define-module (guix-web view json) +(define-module (guix web view json) #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (srfi srfi-1) @@ -26,7 +26,7 @@ #:use-module (guix packages) #:use-module (guix profiles) #:use-module (gnu packages) - #:use-module (guix-web package) + #:use-module (guix web package) #:export (all-packages-json view-package-json generations-json)) |