diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-05-25 00:25:15 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-05-25 00:25:15 +0200 |
commit | 57df83e07d4b5e78d9a54c1a88d05b4a9ed65714 (patch) | |
tree | 76684e63965e9ad6e37d9d45bc3159e6c9782cd0 /gnu/packages/geo.scm | |
parent | 43d9ed7792808638eabb43aa6133f1d6186c520b (diff) | |
parent | 136b7d81f0eb713783e9ea7cf7f260a2b6252dfd (diff) | |
download | patches-57df83e07d4b5e78d9a54c1a88d05b4a9ed65714.tar patches-57df83e07d4b5e78d9a54c1a88d05b4a9ed65714.tar.gz |
Merge branch 'staging' into core-updates
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" |