diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2021-01-26 18:24:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 18:24:50 +0000 |
| commit | fbaf92270556c23bb972f00d439051c8960ab97c (patch) | |
| tree | 10b325291739eaee72d214b187e6a75d4141faf9 /pkgs | |
| parent | f6f2333654c17293a802ca04da8227e38ef276a1 (diff) | |
| parent | bba47f95f187449b8dec64cc28fcd7cdf0ed0c29 (diff) | |
Merge pull request #109633 from cpcloud/update-rocksdb
rocksdb: 6.14.6 -> 6.15.4
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/biology/sortmerna/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/rocksdb/default.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index 2efa39ac489d..11530c6a7226 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; }; } diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index d6f685ff4dee..dea8fcc67597 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.4"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0cp0jgzwkwamykgnmsg0zvzakq58f1ihs7lslnn4nh4p9gm75rq5"; + sha256 = "06lddr6md4ypmywvi6qrrkw97c8ddz0flj43hzx32ia3iq2mw4w5"; }; nativeBuildInputs = [ cmake ninja ]; |