mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
Merge pull request #305974 from onny/rocksdb-update
rocksdb: 8.3.2 -> 9.1.0, rocksdb_8_3: init at 8.3.2
This commit is contained in:
commit
f2157c2a34
|
@ -1,7 +1,7 @@
|
|||
{ fetchFromGitHub
|
||||
, lib
|
||||
, protobuf
|
||||
, rocksdb
|
||||
, rocksdb_8_3
|
||||
, rust-jemalloc-sys-unprefixed
|
||||
, rustPlatform
|
||||
, rustc
|
||||
|
@ -9,6 +9,10 @@
|
|||
, Security
|
||||
, SystemConfiguration
|
||||
}:
|
||||
|
||||
let
|
||||
rocksdb = rocksdb_8_3;
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polkadot";
|
||||
version = "1.10.0";
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
, openssl
|
||||
, libclang
|
||||
, libcxx
|
||||
, rocksdb
|
||||
, rocksdb_8_3
|
||||
, rustfmt
|
||||
, perl
|
||||
, hidapi
|
||||
|
@ -46,6 +46,7 @@ let
|
|||
pinData = lib.importJSON ./pin.json;
|
||||
version = pinData.version;
|
||||
hash = pinData.hash;
|
||||
rocksdb = rocksdb_8_3;
|
||||
inherit (darwin.apple_sdk_11_0) Libsystem;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security;
|
||||
in
|
||||
|
|
|
@ -1,5 +1,16 @@
|
|||
{ lib, stdenv, cmake, rocksdb, rapidjson, pkg-config, fetchFromGitHub, zlib }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, cmake
|
||||
, rocksdb_8_3
|
||||
, rapidjson
|
||||
, pkg-config
|
||||
, fetchFromGitHub
|
||||
, zlib
|
||||
}:
|
||||
|
||||
let
|
||||
rocksdb = rocksdb_8_3;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sortmerna";
|
||||
version = "4.2.0";
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, udev
|
||||
, protobuf
|
||||
, libcxx
|
||||
, rocksdb
|
||||
, rocksdb_8_3
|
||||
, installShellFiles
|
||||
, pkg-config
|
||||
, openssl
|
||||
|
@ -33,6 +33,7 @@
|
|||
let
|
||||
version = "1.17.31";
|
||||
sha256 = "sha256-5qPW199o+CVJlqGwiAegsquBRWEb5uDKITxjN5dQYAQ=";
|
||||
rocksdb = rocksdb_8_3;
|
||||
|
||||
inherit (darwin.apple_sdk_11_0) Libsystem;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security;
|
||||
|
|
|
@ -4,13 +4,16 @@
|
|||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, openssl
|
||||
, rocksdb
|
||||
, rocksdb_8_3
|
||||
, testers
|
||||
, surrealdb
|
||||
, darwin
|
||||
, protobuf
|
||||
}:
|
||||
|
||||
let
|
||||
rocksdb = rocksdb_8_3;
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "surrealdb";
|
||||
version = "1.3.1";
|
||||
|
|
|
@ -65,7 +65,7 @@ in
|
|||
openssl = addToBuildInputs pkgs.openssl;
|
||||
plot = addToBuildInputs pkgs.plotutils;
|
||||
postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql;
|
||||
rocksdb = addToBuildInputs pkgs.rocksdb;
|
||||
rocksdb = addToBuildInputs pkgs.rocksdb_8_3;
|
||||
scheme2c-compatibility = old:
|
||||
addToNativeBuildInputs (lib.optionals (stdenv.system == "x86_64-darwin") [ pkgs.memorymappingHook ])
|
||||
(addPkgConfig old);
|
||||
|
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rocksdb";
|
||||
version = "8.3.2";
|
||||
version = "9.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-mfIRQ8nkUbZ3Bugy3NAvOhcfzFY84J2kBUIUBcQ2/Qg=";
|
||||
hash = "sha256-vRPyrXkXVVhP56n5FVYef8zbIsnnanQSpElmQLZ7mh8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
|
|
@ -10,11 +10,12 @@
|
|||
, stdenv
|
||||
, darwin
|
||||
, nix-update-script
|
||||
, rocksdb
|
||||
, rocksdb_8_3
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.6.0";
|
||||
rocksdb = rocksdb_8_3;
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "stalwart-mail";
|
||||
|
|
|
@ -6,10 +6,13 @@
|
|||
, stdenv
|
||||
, darwin
|
||||
, nixosTests
|
||||
, rocksdb
|
||||
, rocksdb_8_3
|
||||
, rust-jemalloc-sys
|
||||
}:
|
||||
|
||||
let
|
||||
rocksdb = rocksdb_8_3;
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "matrix-conduit";
|
||||
version = "0.6.0";
|
||||
|
|
|
@ -24252,6 +24252,17 @@ with pkgs;
|
|||
|
||||
rocksdb = callPackage ../development/libraries/rocksdb { };
|
||||
|
||||
rocksdb_8_3 = rocksdb.overrideAttrs rec {
|
||||
pname = "rocksdb";
|
||||
version = "8.3.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mfIRQ8nkUbZ3Bugy3NAvOhcfzFY84J2kBUIUBcQ2/Qg=";
|
||||
};
|
||||
};
|
||||
|
||||
rocksdb_7_10 = rocksdb.overrideAttrs rec {
|
||||
pname = "rocksdb";
|
||||
version = "7.10.2";
|
||||
|
@ -24259,8 +24270,8 @@ with pkgs;
|
|||
owner = "facebook";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-U2ReSrJwjAXUdRmwixC0DQXht/h/6rV8SOf5e2NozIs=";
|
||||
};
|
||||
hash = "sha256-U2ReSrJwjAXUdRmwixC0DQXht/h/6rV8SOf5e2NozIs=";
|
||||
};
|
||||
};
|
||||
|
||||
rocksdb_6_23 = rocksdb.overrideAttrs rec {
|
||||
|
|
Loading…
Reference in a new issue