diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-05-24 22:44:51 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-05-24 22:44:51 +0200 |
commit | ddb4062784c66ecc0c42910b209dc80356a197ea (patch) | |
tree | d61154cfe888201707c2b4708bd6297ac371f0b0 /gnu/packages/geo.scm | |
parent | 563ecba5cf1dac64818fa7c452fcb191ec28e0fd (diff) | |
parent | dbe533292b2af2faad371c10bc9b3f03193f94b7 (diff) | |
download | guix-patches-ddb4062784c66ecc0c42910b209dc80356a197ea.tar guix-patches-ddb4062784c66ecc0c42910b209dc80356a197ea.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/geo.scm')
-rw-r--r-- | gnu/packages/geo.scm | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0b95fbe613..94f2cf0cfb 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -668,21 +668,15 @@ extension.") (build-system go-build-system) (arguments `(#:import-path "github.com/go-spatial/tegola/cmd/tegola" - #:unpack-path "github.com/go-spatial" + #:unpack-path "github.com/go-spatial/tegola" #:phases (modify-phases %standard-phases (add-before 'build 'set-version (lambda _ - (with-directory-excursion - (string-append "src/github.com/go-spatial/tegola-" ,version) + (with-directory-excursion "src/github.com/go-spatial/tegola" (substitute* '("cmd/tegola/cmd/root.go" "cmd/tegola_lambda/main.go") (("version not set") ,version))) - #t)) - (add-before 'build 'rename-import - (lambda _ - (rename-file (string-append "src/github.com/go-spatial/tegola-" ,version) - "src/github.com/go-spatial/tegola") #t))))) (home-page "http://tegola.io") (synopsis "Vector tile server for maps") @@ -713,14 +707,9 @@ delivered to any client.") (build-system go-build-system) (arguments `(#:import-path "github.com/omniscale/imposm3/cmd/imposm" - #:unpack-path "github.com/omniscale" + #:unpack-path "github.com/omniscale/imposm3" #:phases (modify-phases %standard-phases - (add-before 'build 'rename-import - (lambda _ - (rename-file (string-append "src/github.com/omniscale/imposm3-" ,version) - "src/github.com/omniscale/imposm3") - #t)) (add-before 'build 'set-version (lambda _ (substitute* "src/github.com/omniscale/imposm3/version.go" |