colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #305974 from onny/rocksdb-update

Browse Source 
rocksdb: 8.3.2 -> 9.1.0, rocksdb_8_3: init at 8.3.2
This commit is contained in:
Yt 2024-04-25 01:38:37 +00:00 committed by GitHub
commit f2157c2a34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/blockchains/polkadot/default.nix
View File

@ -1,7 +1,7 @@
{ fetchFromGitHub { fetchFromGitHub
, lib , lib
, protobuf , protobuf
, rocksdb , rocksdb_8_3
, rust-jemalloc-sys-unprefixed , rust-jemalloc-sys-unprefixed
, rustPlatform , rustPlatform
, rustc , rustc
@ -9,6 +9,10 @@
, Security , Security
, SystemConfiguration , SystemConfiguration
}: }:
let
rocksdb = rocksdb_8_3;
in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "polkadot"; pname = "polkadot";
version = "1.10.0"; version = "1.10.0";

3
pkgs/applications/blockchains/solana-validator/default.nix
View File

@ -13,7 +13,7 @@
, openssl , openssl
, libclang , libclang
, libcxx , libcxx
, rocksdb , rocksdb_8_3
, rustfmt , rustfmt
, perl , perl
, hidapi , hidapi
@ -46,6 +46,7 @@ let
pinData = lib.importJSON ./pin.json; pinData = lib.importJSON ./pin.json;
version = pinData.version; version = pinData.version;
hash = pinData.hash; hash = pinData.hash;
rocksdb = rocksdb_8_3;
inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0) Libsystem;
inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security; inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security;
in in

13
pkgs/applications/science/biology/sortmerna/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
pname = "sortmerna"; pname = "sortmerna";
version = "4.2.0"; version = "4.2.0";

3
pkgs/by-name/so/solana-cli/package.nix
View File

@ -6,7 +6,7 @@
, udev , udev
, protobuf , protobuf
, libcxx , libcxx
, rocksdb , rocksdb_8_3
, installShellFiles , installShellFiles
, pkg-config , pkg-config
, openssl , openssl
@ -33,6 +33,7 @@
let let
version = "1.17.31"; version = "1.17.31";
sha256 = "sha256-5qPW199o+CVJlqGwiAegsquBRWEb5uDKITxjN5dQYAQ="; sha256 = "sha256-5qPW199o+CVJlqGwiAegsquBRWEb5uDKITxjN5dQYAQ=";
rocksdb = rocksdb_8_3;
inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin.apple_sdk_11_0) Libsystem;
inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security; inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security;

5
pkgs/by-name/su/surrealdb/package.nix
View File

@ -4,13 +4,16 @@
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
, openssl , openssl
, rocksdb , rocksdb_8_3
, testers , testers
, surrealdb , surrealdb
, darwin , darwin
, protobuf , protobuf
}: }:
let
rocksdb = rocksdb_8_3;
in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "surrealdb"; pname = "surrealdb";
version = "1.3.1"; version = "1.3.1";

2
pkgs/development/compilers/chicken/5/overrides.nix
View File

@ -65,7 +65,7 @@ in
openssl = addToBuildInputs pkgs.openssl; openssl = addToBuildInputs pkgs.openssl;
plot = addToBuildInputs pkgs.plotutils; plot = addToBuildInputs pkgs.plotutils;
postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql; postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql;
rocksdb = addToBuildInputs pkgs.rocksdb; rocksdb = addToBuildInputs pkgs.rocksdb_8_3;
scheme2c-compatibility = old: scheme2c-compatibility = old:
addToNativeBuildInputs (lib.optionals (stdenv.system == "x86_64-darwin") [ pkgs.memorymappingHook ]) addToNativeBuildInputs (lib.optionals (stdenv.system == "x86_64-darwin") [ pkgs.memorymappingHook ])
(addPkgConfig old); (addPkgConfig old);

4
pkgs/development/libraries/rocksdb/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rocksdb"; pname = "rocksdb";
version = "8.3.2"; version = "9.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = finalAttrs.pname; repo = finalAttrs.pname;
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-mfIRQ8nkUbZ3Bugy3NAvOhcfzFY84J2kBUIUBcQ2/Qg="; hash = "sha256-vRPyrXkXVVhP56n5FVYef8zbIsnnanQSpElmQLZ7mh8=";
}; };
nativeBuildInputs = [ cmake ninja ]; nativeBuildInputs = [ cmake ninja ];

3
pkgs/servers/mail/stalwart/default.nix
View File

@ -10,11 +10,12 @@
, stdenv , stdenv
, darwin , darwin
, nix-update-script , nix-update-script
, rocksdb , rocksdb_8_3
}: }:
let let
version = "0.6.0"; version = "0.6.0";
rocksdb = rocksdb_8_3;
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "stalwart-mail"; pname = "stalwart-mail";

5
pkgs/servers/matrix-conduit/default.nix
View File

@ -6,10 +6,13 @@
, stdenv , stdenv
, darwin , darwin
, nixosTests , nixosTests
, rocksdb , rocksdb_8_3
, rust-jemalloc-sys , rust-jemalloc-sys
}: }:
let
rocksdb = rocksdb_8_3;
in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "matrix-conduit"; pname = "matrix-conduit";
version = "0.6.0"; version = "0.6.0";

15
pkgs/top-level/all-packages.nix
View File

@ -24252,6 +24252,17 @@ with pkgs;
rocksdb = callPackage ../development/libraries/rocksdb { }; 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 { rocksdb_7_10 = rocksdb.overrideAttrs rec {
pname = "rocksdb"; pname = "rocksdb";
version = "7.10.2"; version = "7.10.2";
@ -24259,8 +24270,8 @@ with pkgs;
owner = "facebook"; owner = "facebook";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-U2ReSrJwjAXUdRmwixC0DQXht/h/6rV8SOf5e2NozIs="; hash = "sha256-U2ReSrJwjAXUdRmwixC0DQXht/h/6rV8SOf5e2NozIs=";
}; };
}; };
rocksdb_6_23 = rocksdb.overrideAttrs rec { rocksdb_6_23 = rocksdb.overrideAttrs rec {