diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 22:46:05 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 22:46:05 +0200 |
| commit | 66bc7fc1b3e7a85a2cfde9bb121498a181d411a4 (patch) | |
| tree | fa53c32dfef1265496170172a28a3c71bb32a655 /pkgs/applications/science | |
| parent | f9237f315264a0ccb8b50ff4fa6ff456239e4dc1 (diff) | |
| parent | cfe51be04f8b7c36fe9f71ca5835bd683ede087f (diff) | |
| download | nixpkgs-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar nixpkgs-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.gz nixpkgs-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.bz2 nixpkgs-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.lz nixpkgs-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.xz nixpkgs-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.zst nixpkgs-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/astronomy/gildas/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/applications/science/biology/bedtools/default.nix | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 968d8769caa..a21c9f328f4 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gtk2-x11 , pkgconfig , python27 , gfortran , lesstif -, cfitsio , getopt , perl , groff , which +, cfitsio , getopt , perl , groff , which, darwin }: let @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "jul19a"; - version = "20190701_a"; + srcVersion = "sep19a"; + version = "20190901_a"; pname = "gildas"; src = fetchurl { @@ -16,19 +16,22 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "97eaa0d0a0f53f0616462642a9bfaddb0305a8a0948e60531d8a524a13a370b6"; + sha256 = "0l4jfzzxp1ab70a920qfbxiphgnc06m46wfwv0jlsq2mfk7cxac1"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ]; - buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]; + buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ] + ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); + configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env} diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix index b5bc3b622b9..4e4c093ad7f 100644 --- a/pkgs/applications/science/biology/bedtools/default.nix +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bedtools"; - version = "2.28.0"; + version = "2.29.0"; src = fetchFromGitHub { owner = "arq5x"; repo = "bedtools2"; rev = "v${version}"; - sha256 = "1266bcn5hgbvysfi6nr4cqxlbxcx7vn7ng8kb0v3gz37qh2zxxw9"; + sha256 = "0d6i985qqxp92ddq4n6558m70qi5rqhl724wrfys0hm0p6a9h56x"; }; buildInputs = [ zlib python bzip2 lzma ]; |