From dc1287e4a6a541b5830c35c7d52038338e992549 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 22 Apr 2024 12:54:59 +0200 Subject: [PATCH 1/2] rocksdb: 8.3.2 -> 9.1.0, rocksdb_8_3: init at 8.3.2 --- pkgs/development/libraries/rocksdb/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 6c2aaaa8815a..e1518b6662f6 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 889d9b3cd0cf..d450d3b91408 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24259,6 +24259,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"; @@ -24266,8 +24277,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 { From f7709cf1b33a050044bde96d66d22f8472fd080c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 22 Apr 2024 13:02:14 +0200 Subject: [PATCH 2/2] treewide: switch from rocksdb -> rocksdb_8_3 --- pkgs/applications/blockchains/polkadot/default.nix | 6 +++++- .../blockchains/solana-validator/default.nix | 3 ++- .../science/biology/sortmerna/default.nix | 13 ++++++++++++- pkgs/by-name/so/solana-cli/package.nix | 3 ++- pkgs/by-name/su/surrealdb/package.nix | 5 ++++- pkgs/development/compilers/chicken/5/overrides.nix | 2 +- pkgs/servers/mail/stalwart/default.nix | 3 ++- pkgs/servers/matrix-conduit/default.nix | 5 ++++- 8 files changed, 32 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 770b4a29543e..fe54ddacc311 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -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"; diff --git a/pkgs/applications/blockchains/solana-validator/default.nix b/pkgs/applications/blockchains/solana-validator/default.nix index 56f38c49b12a..caaae11fd88f 100644 --- a/pkgs/applications/blockchains/solana-validator/default.nix +++ b/pkgs/applications/blockchains/solana-validator/default.nix @@ -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 diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index d47aae9ce665..c19556318843 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -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"; diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix index e1a0ae412c90..b4a56dda78c9 100644 --- a/pkgs/by-name/so/solana-cli/package.nix +++ b/pkgs/by-name/so/solana-cli/package.nix @@ -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; diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index f5c8fecc1b09..79c859684449 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -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"; diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index adaad31b52bb..444979b86eb3 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -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); diff --git a/pkgs/servers/mail/stalwart/default.nix b/pkgs/servers/mail/stalwart/default.nix index 096e600ba862..44b2251ce0c7 100644 --- a/pkgs/servers/mail/stalwart/default.nix +++ b/pkgs/servers/mail/stalwart/default.nix @@ -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"; diff --git a/pkgs/servers/matrix-conduit/default.nix b/pkgs/servers/matrix-conduit/default.nix index cc162e6373d6..1eb7500222d3 100644 --- a/pkgs/servers/matrix-conduit/default.nix +++ b/pkgs/servers/matrix-conduit/default.nix @@ -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";