gnu: r-rhdf5lib: Update to 1.14.0.
* gnu/packages/bioconductor.scm (r-rhdf5lib): Update to 1.14.0. [source]: Update deletions. [arguments]: Update substitutions. [inputs]: Move zlib from here... [propagated-inputs]: ...to here.
This commit is contained in:
		
							parent
							
								
									53ec97713a
								
							
						
					
					
						commit
						1b0338d76b
					
				
					 1 changed files with 9 additions and 10 deletions
				
			
		|  | @ -12253,22 +12253,21 @@ block processing.") | ||||||
| (define-public r-rhdf5lib | (define-public r-rhdf5lib | ||||||
|   (package |   (package | ||||||
|     (name "r-rhdf5lib") |     (name "r-rhdf5lib") | ||||||
|     (version "1.12.1") |     (version "1.14.0") | ||||||
|     (source |     (source | ||||||
|      (origin |      (origin | ||||||
|        (method url-fetch) |        (method url-fetch) | ||||||
|        (uri (bioconductor-uri "Rhdf5lib" version)) |        (uri (bioconductor-uri "Rhdf5lib" version)) | ||||||
|        (sha256 |        (sha256 | ||||||
|         (base32 |         (base32 | ||||||
|          "14fnq4gijxp2l7985pksfk52i6klvy81r3892lnna73c6hh1dj28")) |          "1ypqmd4nz4hxlb2qsay7f5784dqdjhc3b19pckzkhb65bfycdn87")) | ||||||
|        (modules '((guix build utils))) |        (modules '((guix build utils))) | ||||||
|        (snippet |        (snippet | ||||||
|         '(begin |         '(begin | ||||||
|            ;; Delete bundled binaries |            ;; Delete bundled binaries | ||||||
|            (delete-file-recursively "src/wininclude/") |            (delete-file-recursively "src/wininclude/") | ||||||
|            (delete-file-recursively "src/winlib-4.9.3/") |  | ||||||
|            (delete-file-recursively "src/winlib-8.3.0/") |            (delete-file-recursively "src/winlib-8.3.0/") | ||||||
|            (delete-file "src/hdf5small_cxx_hl_1.10.6.tar.gz") |            (delete-file "src/hdf5small_cxx_hl_1.10.7.tar.gz") | ||||||
|            #t)))) |            #t)))) | ||||||
|     (properties `((upstream-name . "Rhdf5lib"))) |     (properties `((upstream-name . "Rhdf5lib"))) | ||||||
|     (build-system r-build-system) |     (build-system r-build-system) | ||||||
|  | @ -12280,7 +12279,9 @@ block processing.") | ||||||
|              (for-each delete-file '("configure" "configure.ac")) |              (for-each delete-file '("configure" "configure.ac")) | ||||||
|              ;; Do not make other packages link with the proprietary libsz. |              ;; Do not make other packages link with the proprietary libsz. | ||||||
|              (substitute* "R/zzz.R" |              (substitute* "R/zzz.R" | ||||||
|                ((" \"%s/libsz.a\"") "")) |                ((" \"%s/libsz.a\"") "") | ||||||
|  |                (("patharch, .getDynamicLinks") | ||||||
|  |                 ".getDynamicLinks")) | ||||||
|              (with-directory-excursion "src" |              (with-directory-excursion "src" | ||||||
|                (invoke "tar" "xvf" (assoc-ref inputs "hdf5-source")) |                (invoke "tar" "xvf" (assoc-ref inputs "hdf5-source")) | ||||||
|                (rename-file (string-append "hdf5-" ,(package-version hdf5-1.10)) |                (rename-file (string-append "hdf5-" ,(package-version hdf5-1.10)) | ||||||
|  | @ -12319,12 +12320,10 @@ block processing.") | ||||||
|                                  (assoc-ref inputs "hdf5") "/lib/libhdf5_hl_cpp.a\n")) |                                  (assoc-ref inputs "hdf5") "/lib/libhdf5_hl_cpp.a\n")) | ||||||
|                  ;; szip is non-free software |                  ;; szip is non-free software | ||||||
|                  (("cp \"\\$\\{SZIP_LIB\\}.*") "") |                  (("cp \"\\$\\{SZIP_LIB\\}.*") "") | ||||||
|                  (("PKG_LIBS =.*") "PKG_LIBS = -lz -lhdf5\n"))) |                  (("PKG_LIBS =.*") "PKG_LIBS = -lz -lhdf5\n")))))))) | ||||||
|              #t))))) |  | ||||||
|     (inputs |  | ||||||
|      `(("zlib" ,zlib))) |  | ||||||
|     (propagated-inputs |     (propagated-inputs | ||||||
|      `(("hdf5" ,hdf5-1.10))) |      `(("hdf5" ,hdf5-1.10) | ||||||
|  |        ("zlib" ,zlib))) | ||||||
|     (native-inputs |     (native-inputs | ||||||
|      `(("hdf5-source" ,(package-source hdf5-1.10)) |      `(("hdf5-source" ,(package-source hdf5-1.10)) | ||||||
|        ("r-knitr" ,r-knitr))) |        ("r-knitr" ,r-knitr))) | ||||||
|  |  | ||||||
		Reference in a new issue