summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-05-20 11:48:57 +0200
committerLudovic Courtès <ludo@gnu.org>2019-05-20 11:48:57 +0200
commit99f47b53f755f0a6cb15615c2b9a449a930e82e9 (patch)
tree853674ba28bc780e7916b2ccf044285d71c770b8 /gnu/packages
parent8d036f3ecf3b837e8f38c2dca9f8a78568cc664b (diff)
parentfb2abbd6f5abac8ae0fec594594dd54ff7e3f4db (diff)
downloadpatches-99f47b53f755f0a6cb15615c2b9a449a930e82e9.tar
patches-99f47b53f755f0a6cb15615c2b9a449a930e82e9.tar.gz
Merge branch 'version-1.0.1'
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/javascript.scm6
-rw-r--r--gnu/packages/package-management.scm6
2 files changed, 8 insertions, 4 deletions
diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index 8731a44927..e7dcd7962d 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -117,7 +117,11 @@
(let ((minified (open-pipe* OPEN_READ "uglify-js" file)))
(call-with-output-file installed
(lambda (port)
- (dump-port minified port)))))
+ (dump-port minified port)))
+
+ (let ((exit (close-pipe minified)))
+ (unless (zero? exit)
+ (error "dear, uglify-js failed" exit)))))
(else
(install-file file (dirname installed))))))
(find-files "."))
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index b4e1e077fe..a356a6dab7 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -110,8 +110,8 @@
;; Latest version of Guix, which may or may not correspond to a release.
;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
- (let ((version "1.0.0")
- (commit "326dcbf1b3c30aa525185fda435c34cb9495dd04")
+ (let ((version "1.0.1")
+ (commit "820429517f9cc8333704a839b4346ac4b02468c4")
(revision 1))
(package
(name "guix")
@@ -128,7 +128,7 @@
(commit commit)))
(sha256
(base32
- "0k9v9lh69q353x055id1sq1gx4p8idg8ifrgidv5s73wdil2cflm"))
+ "1vfp7ps1k1cwn8p0gsgarlxcy982hzyvb7zqnj66jqd258a1qfgh"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments