diff options
| author | Pierre Neidhardt <mail@ambrevar.xyz> | 2018-10-24 10:57:43 +0200 |
|---|---|---|
| committer | Pierre Neidhardt <mail@ambrevar.xyz> | 2018-10-24 12:13:21 +0200 |
| commit | 830dc25176349112c759ba3986c721089e9ec605 (patch) | |
| tree | 5c458a8e3beb924e88138a0046371863751ab129 /gnu/packages/syncthing.scm | |
| parent | 5787e152302c580ea4cbb79291633eed2e743777 (diff) | |
| download | gnu-guix-830dc25176349112c759ba3986c721089e9ec605.tar gnu-guix-830dc25176349112c759ba3986c721089e9ec605.tar.gz | |
gnu: Move go-golang-org-x-crypto-union from syncthing.scm to golang.scm
* gnu/packages/syncthing.scm (go-golang-org-x-crypto-union): Delete.
* gnu/packages/golang.scm (go-golang-org-x-crypto-union): Add.
Diffstat (limited to 'gnu/packages/syncthing.scm')
| -rw-r--r-- | gnu/packages/syncthing.scm | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 0fe1d3d774..48b52d2002 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -728,44 +728,6 @@ generation.") (home-page "https://github.com/vitrun/qart") (license bsd-3)))) -;; Go searches for library modules by looking in the GOPATH environment -;; variable. This variable is a list of paths. However, Go does not -;; keep searching on GOPATH if it tries and fails to import a module. -;; So, we use a union for packages sharing a namespace. -(define* (go-golang-org-x-crypto-union #:optional - (packages (list go-golang-org-x-crypto-blowfish - go-golang-org-x-crypto-bcrypt - go-golang-org-x-crypto-tea - go-golang-org-x-crypto-xtea - go-golang-org-x-crypto-pbkdf2 - go-golang-org-x-crypto-twofish - go-golang-org-x-crypto-cast5 - go-golang-org-x-crypto-salsa20))) - (package - (name "go-golang-org-x-crypto") - (version (package-version go-golang-org-x-crypto-bcrypt)) - (source #f) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build union)) - #:builder (begin - (use-modules (ice-9 match) - (guix build union)) - (match %build-inputs - (((names . directories) ...) - (union-build (assoc-ref %outputs "out") - directories) - #t))))) - (inputs (map (lambda (package) - (list (package-name package) package)) - packages)) - (synopsis "Union of the Go x crypto libraries") - (description "A union of the Golang cryptographic libraries. A -union is required because `go build` assumes that all of the headers and -libraries are in the same directory.") - (home-page (package-home-page go-golang-org-x-crypto-bcrypt)) - (license (package-license go-golang-org-x-crypto-bcrypt)))) - (define* (go-golang-org-x-net-union #:optional (packages (list go-golang-org-x-net-ipv4 go-golang-org-x-net-bpf |