aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gn/packages/web.scm48
-rw-r--r--gn/packages/yaj.scm2
2 files changed, 45 insertions, 5 deletions
diff --git a/gn/packages/web.scm b/gn/packages/web.scm
index 0a13924..873e003 100644
--- a/gn/packages/web.scm
+++ b/gn/packages/web.scm
@@ -1,6 +1,7 @@
(define-module (gn packages web)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
+ #:use-module (gnu packages compression)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
@@ -9,10 +10,50 @@
#:use-module (guix build-system trivial)
#:use-module (srfi srfi-1))
-(define-public web-bootstrap-native-css
+(define-public web-bootstrap
+ (let ((commit "betabeta"))
+ (package
+ (name "web-bootstrap")
+ (version (string-append "4.0.0" "-" (string-take commit 7)))
+ (source
+ (origin
+ (method url-fetch)
+ (uri "https://github.com/twbs/bootstrap/releases/download/v4.0.0-beta/bootstrap-4.0.0-beta-dist.zip")
+ (file-name (string-append name "-" version))
+ (sha256
+ (base32 "0jzi76gm3vyxld5lz1723al8a8skcn9r1ch51sdgzxx32f273bc9"))))
+ (build-system trivial-build-system)
+ (native-inputs `(("unzip" ,unzip)
+ ("source" ,source)))
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (let* ((out (assoc-ref %outputs "out"))
+ (name "bootstrap")
+ (targetdir (string-append out "/share/web/" name))
+ )
+ (begin
+ (use-modules (guix build utils))
+ (let ((source (assoc-ref %build-inputs "source"))
+ (unzip (string-append (assoc-ref %build-inputs "unzip") "/bin/unzip"))
+ )
+ (and
+ (mkdir-p targetdir)
+ (zero? (system* unzip source "-d" targetdir))
+ ; (copy-recursively source targetdir)
+ ))))))
+ (home-page "http://getbootstrap.com/")
+ (synopsis "Bootstrap web framework")
+ (description "Bootstrap is an open source toolkit for developing
+with HTML, CSS, and JS. Quickly prototype your ideas or build your
+entire app with our Sass variables and mixins, responsive grid system,
+extensive prebuilt components, and powerful plugins built on jQuery.")
+ (license license:expat))))
+
+(define-public web-bootstrap-native
(let ((commit "2e48d7ee29d4063e3bd2024ff83ddc50a550c4dd"))
(package
- (name "web-bootstrap-native-css")
+ (name "web-bootstrap-native")
(version (string-append "4.0.0" "-beta-" (string-take commit 7)))
(source (origin
(method git-fetch)
@@ -34,8 +75,7 @@
)
(begin
(use-modules (guix build utils))
- (let ((source (assoc-ref %build-inputs "source"))
- )
+ (let ((source (assoc-ref %build-inputs "source")))
(and
; (mkdir-p targetdir)
(copy-recursively source targetdir)
diff --git a/gn/packages/yaj.scm b/gn/packages/yaj.scm
index 0ae47ed..079c2d3 100644
--- a/gn/packages/yaj.scm
+++ b/gn/packages/yaj.scm
@@ -71,7 +71,7 @@
("python-flask" ,python-flask)
("python-jinja2" ,python-jinja2)
("python-mako" ,python-mako)
- ("web-bootstrap-native-css" ,web-bootstrap-native-css)
+ ("web-bootstrap" ,web-bootstrap)
("sassc" ,sassc)
))
(arguments