diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
commit | a5e1520e4538e29ecfbd4b168306f890566d7bfd (patch) | |
tree | 28099c268b5d4b1e33c2b29f0714c45f0b961382 /nixpkgs/pkgs/development/libraries/science/biology | |
parent | 822f7c15c04567fbdc27020e862ea2b70cfbf8eb (diff) | |
parent | 3560d1c8269d0091b9aae10731b5e85274b7bbc1 (diff) | |
download | nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.gz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.bz2 nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.lz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.xz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.zst nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/science/biology')
3 files changed, 4 insertions, 34 deletions
diff --git a/nixpkgs/pkgs/development/libraries/science/biology/EBTKS/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/EBTKS/default.nix deleted file mode 100644 index 7a6122fbc8db..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/biology/EBTKS/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libminc }: - -stdenv.mkDerivation rec { - pname = "EBTKS"; - version = "unstable-2017-09-23"; - - src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = "67e4e197d8a32d6462c9bdc7af44d64ebde4fb5c"; - sha256 = "1a1qw6i47fs1izx60l1ysabpmyx9j5sjnbdv8b47wi2xcc9i3hpq"; - }; - - # error: use of undeclared identifier 'finite'; did you mean 'isfinite'? - postPatch = '' - substituteInPlace templates/EBTKS/SimpleArray.h \ - --replace "#define FINITE(x) finite(x)" "#define FINITE(x) isfinite(x)" - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libminc ]; - - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ]; - - meta = with lib; { - homepage = "https://github.com/BIC-MNI/${pname}"; - description = "Library for working with MINC files"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.free; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix index d89b6dbbe679..8b1aa7d01e81 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "htslib"; - version = "1.19"; + version = "1.19.1"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-h1HEDE+n0fI6aGTFsgpzdE+L5oI5U1rncpxffTlNBzY="; + sha256 = "sha256-Ii1001dPtnsVjGmIyYDuqrqKBlb15P+3a1+lfwNZM+w="; }; # perl is only used during the check phase. diff --git a/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix index b6adf67cbe82..9af6793ef997 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -47,6 +47,8 @@ stdenv.mkDerivation rec { install -Dm644 -t "$out/share/bash-completion/completions/mirtk" share/completion/bash/mirtk ''; + env.NIX_CFLAGS_COMPILE = "-Wno-changes-meaning"; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost |