diff options
author | Christopher Baines <mail@cbaines.net> | 2018-01-31 13:45:34 +0000 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2018-02-01 20:21:25 +0000 |
commit | 9b32bf6e6c351a1b395512bd14a94dde23c06044 (patch) | |
tree | 6281335422844899bbfe4be4834d172fbd749bfc | |
parent | 8d54ace78e4bb51f0c460fff11c0b3bbc97c7e1b (diff) | |
download | patches-9b32bf6e6c351a1b395512bd14a94dde23c06044.tar patches-9b32bf6e6c351a1b395512bd14a94dde23c06044.tar.gz |
gnu: Fix and improve the mongo-tools package.
The hash of the source for this package is wrong. Most probably because the
source was changed from a tarball to a git repository without updating the
hash. Fixing this seems to break the check phase, so I rewrote that as well,
making changes to the build and install phases as needed.
* gnu/packages/databases.scm (mongo-tools)[source]: Update the hash value.
[arguments]: Remove the different unpack path, as this isn't necessary when
using the git repository as a source. Move the list of tools to make it
accessible from multiple phases. Rewrite the build phase, getting it to
install the tools in to the location the tests seem to expect to find
them. Replace the check phase to run the tests for each tool
individually. Add an install phase to install the tools, now that go install
is not being run in the build phase.
[native-inputs]: Add go-github.com-smartystreets-goconvey as a native-input
as this is required for running the tests.
-rw-r--r-- | gnu/packages/databases.scm | 80 |
1 files changed, 50 insertions, 30 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 79dac20132..31ed2cd203 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2617,51 +2617,71 @@ transforms idiomatic python function calls to well-formed SQL queries.") (file-name (git-file-name name version)) (sha256 (base32 - "095nc57k4m4iyim0x3fgpw681qba123iyl4qz7xysbv5ngbr19mc")))) + "1bcsz5cvj39a7nsxsfqmz9igrw33j6yli9kffigqyscs52amw7x1")))) (build-system go-build-system) (arguments - `(#:unpack-path "github.com/mongodb" - #:import-path "github.com/mongodb/mongo-tools" + `(#:import-path "github.com/mongodb/mongo-tools" + #:modules ((srfi srfi-1) + (guix build go-build-system) + (guix build utils)) #:phases - (modify-phases %standard-phases - (add-after 'unpack 'delete-bundled-source-code - (lambda _ - (delete-file-recursively - "src/github.com/mongodb/mongo-tools/vendor") - #t)) - - ;; We don't need to install the source code for end-user application - (delete 'install-source) - - (replace 'build - (lambda* (#:key inputs outputs #:allow-other-keys) - (let build ((tools - '("bsondump" "mongodump" "mongoexport" "mongofiles" - "mongoimport" "mongooplog" "mongorestore" - "mongostat" "mongotop"))) - (if (null? tools) - #t - (if (let* ((tool (car tools)) - (command - `("go" "install" "-v" + (let ((all-tools + '("bsondump" "mongodump" "mongoexport" "mongofiles" + "mongoimport" "mongooplog" "mongorestore" + "mongostat" "mongotop"))) + (modify-phases %standard-phases + (add-after 'unpack 'delete-bundled-source-code + (lambda _ + (delete-file-recursively + "src/github.com/mongodb/mongo-tools/vendor") + #t)) + ;; We don't need to install the source code for end-user applications + (delete 'install-source) + (replace 'build + (lambda _ + (every (lambda (tool) + (let ((command + `("go" "build" + ;; This is where the tests expect to find the + ;; executables + "-o" ,(string-append + "src/github.com/mongodb/mongo-tools/bin/" + tool) + "-v" "-tags=\"ssl sasl\"" "-ldflags" "-extldflags=-Wl,-z,now,-z,relro" ,(string-append "src/github.com/mongodb/mongo-tools/" tool "/main/" tool ".go")))) - (simple-format #t "build: running ~A\n" - (string-join command)) - (zero? (apply system* command))) - (build (cdr tools)) - #f)))))))) + (simple-format #t "build: running ~A\n" + (string-join command)) + (apply invoke command))) + all-tools))) + (replace 'check + (lambda _ + (with-directory-excursion "src" + (every (lambda (tool) + (invoke + "go" "test" "-v" + (string-append "github.com/mongodb/mongo-tools/" tool))) + all-tools)))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (for-each (lambda (tool) + (install-file + (string-append "src/github.com/mongodb/mongo-tools/bin/" tool) + (string-append (assoc-ref outputs "out") + "/bin"))) + all-tools))))))) (native-inputs `(("go-github.com-howeyc-gopass" ,go-github.com-howeyc-gopass) ("go-github.com-jessevdk-go-flags" ,go-github.com-jessevdk-go-flags) ("go-golang.org-x-crypto-ssh-terminal" ,go-golang.org-x-crypto-ssh-terminal) ("go-gopkg.in-mgo.v2" ,go-gopkg.in-mgo.v2) ("go-gopkg.in-tomb.v2" ,go-gopkg.in-tomb.v2) - ("go-github.com-nsf-termbox-go" ,go-github.com-nsf-termbox-go))) + ("go-github.com-nsf-termbox-go" ,go-github.com-nsf-termbox-go) + ("go-github.com-smartystreets-goconvey" ,go-github.com-smartystreets-goconvey))) (home-page "https://github.com/mongodb/mongo-tools") (synopsis "Various tools for interacting with MongoDB and BSON") (description |