From 676627abaaae24a7e6d587255b81111521f4d92a Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sun, 17 Jan 2021 08:56:22 -0500 Subject: [PATCH 1/4] rocksdb: 6.14.6 -> 6.15.2 --- pkgs/development/libraries/rocksdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index d6f685ff4de..a2c91aca700 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.14.6"; + version = "6.15.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0cp0jgzwkwamykgnmsg0zvzakq58f1ihs7lslnn4nh4p9gm75rq5"; + sha256 = "07n54dis7jy1jinxqf4qlgm35bgvpvaz3irdqr39qxz68hblhfii"; }; nativeBuildInputs = [ cmake ninja ]; From feea22fadbb4231eb90d4c7d5550b034cb615980 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sun, 17 Jan 2021 11:26:20 -0500 Subject: [PATCH 2/4] rocksdb: fix output hash --- pkgs/development/libraries/rocksdb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index a2c91aca700..efe7c0a8852 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "07n54dis7jy1jinxqf4qlgm35bgvpvaz3irdqr39qxz68hblhfii"; + sha256 = "12ynm6ccbp6r2z71p0mvipas41928iyil12sklnafdykxgwdyv3b"; }; nativeBuildInputs = [ cmake ninja ]; From abed89b112f86733ad428dfbbc25b35c29f7d290 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Tue, 26 Jan 2021 12:53:48 -0500 Subject: [PATCH 3/4] rocksdb: 6.15.2 -> 6.15.4 --- pkgs/development/libraries/rocksdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index efe7c0a8852..dea8fcc6759 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.15.2"; + version = "6.15.4"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "12ynm6ccbp6r2z71p0mvipas41928iyil12sklnafdykxgwdyv3b"; + sha256 = "06lddr6md4ypmywvi6qrrkw97c8ddz0flj43hzx32ia3iq2mw4w5"; }; nativeBuildInputs = [ cmake ninja ]; From bba47f95f187449b8dec64cc28fcd7cdf0ed0c29 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Tue, 26 Jan 2021 12:55:33 -0500 Subject: [PATCH 4/4] sortmerna: mark broken on darwin --- pkgs/applications/science/biology/sortmerna/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index 2efa39ac489..11530c6a722 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { platforms = platforms.x86_64; homepage = "https://bioinfo.lifl.fr/RNA/sortmerna/"; maintainers = with maintainers; [ luispedro ]; + broken = stdenv.isDarwin; }; }