diff --git a/pkgs/by-name/nc/ncbi-vdb/package.nix b/pkgs/by-name/nc/ncbi-vdb/package.nix index ea80fcd216ff..61eed772f061 100644 --- a/pkgs/by-name/nc/ncbi-vdb/package.nix +++ b/pkgs/by-name/nc/ncbi-vdb/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ncbi-vdb"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "ncbi"; repo = "ncbi-vdb"; tag = finalAttrs.version; - hash = "sha256-bYVwgNYnFg2OPaPWSbXIW+VXprxg/PxwHIRCnDfQRls="; + hash = "sha256-A6Pjy1dEkCHy1B6LrWwVs8Et41POvdK4Upsyp4JUnaU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sr/sratoolkit/attribute_unused.patch b/pkgs/by-name/sr/sratoolkit/attribute_unused.patch deleted file mode 100644 index 203a9921fac6..000000000000 --- a/pkgs/by-name/sr/sratoolkit/attribute_unused.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/libs/kxml/xml.c b/libs/kxml/xml.c -index ce445424..41e21612 100644 ---- a/libs/kxml/xml.c -+++ b/libs/kxml/xml.c -@@ -46,6 +46,9 @@ struct s_KNodeNamelist; - #include - #include - -+#ifndef ATTRIBUTE_UNUSED -+#define ATTRIBUTE_UNUSED -+#endif - - #define XML_DEBUG(msg) DBGMSG (DBG_XML, DBG_FLAG(DBG_XML_XML), msg) - diff --git a/pkgs/by-name/sr/sratoolkit/package.nix b/pkgs/by-name/sr/sratoolkit/package.nix index 52c8e69dd727..8f4f4e9853d0 100644 --- a/pkgs/by-name/sr/sratoolkit/package.nix +++ b/pkgs/by-name/sr/sratoolkit/package.nix @@ -16,17 +16,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "sratoolkit"; # NOTE: When updating make sure to update ncbi-vdb as well for versions to match - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "ncbi"; repo = "sra-tools"; tag = finalAttrs.version; - hash = "sha256-Lv4EWAKJ6F5uvsXgo2Bx3JyY9lYaL1El9Jbi2LidmHo="; + hash = "sha256-JMdJ8F4n9WgdP2oj8MN1+QlxCSmqFzsjAovx/+RyVjk="; }; - patches = [ ./attribute_unused.patch ]; - cmakeFlags = [ "-DVDB_INCDIR=${ncbi-vdb}/include" "-DVDB_LIBDIR=${ncbi-vdb}/lib"