pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #145823 from prusnak/rocksdb_6_23

rocksdb: reintroduce rocksdb 6.23.3 as rocksdb_6_23

authored by Pavol Rusnak and committed by GitHub aa7981eb 20d6600e

+32 -21
unified split
+6 -6
pkgs/applications/blockchains/electrs/default.nix
··· 3 3 , rustPlatform 4 4 , fetchFromGitHub 5 5 , llvmPackages 6 - , rocksdb 6 + , rocksdb_6_23 7 7 , Security 8 8 }: 9 9 10 + let 11 + rocksdb = rocksdb_6_23; 12 + in 10 13 rustPlatform.buildRustPackage rec { 11 14 pname = "electrs"; 12 15 version = "0.9.2"; ··· 24 27 nativeBuildInputs = [ llvmPackages.clang ]; 25 28 LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; 26 29 27 - # temporarily disable dynamic linking, which broke with rocksdb update 6.23.3 -> 6.25.3 28 - # https://github.com/NixOS/nixpkgs/pull/143524#issuecomment-955053331 29 - # 30 30 # link rocksdb dynamically 31 - # ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; 32 - # ROCKSDB_LIB_DIR = "${rocksdb}/lib"; 31 + ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; 32 + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; 33 33 34 34 buildInputs = lib.optionals stdenv.isDarwin [ Security ]; 35 35
+15 -15
pkgs/servers/blockbook/default.nix
··· 1 - { lib, stdenv 1 + { lib 2 + , stdenv 2 3 , buildGoModule 3 4 , fetchFromGitHub 4 - , packr 5 5 , pkg-config 6 6 , bzip2 7 7 , lz4 8 - , rocksdb 8 + , rocksdb_6_23 9 9 , snappy 10 10 , zeromq 11 11 , zlib 12 12 , nixosTests 13 13 }: 14 14 15 + let 16 + rocksdb = rocksdb_6_23; 17 + in 15 18 buildGoModule rec { 16 19 pname = "blockbook"; 17 - version = "0.3.4"; 18 - commit = "eb4e10a"; 20 + version = "0.3.6"; 21 + commit = "5f8cf45"; 19 22 20 23 src = fetchFromGitHub { 21 24 owner = "trezor"; 22 25 repo = "blockbook"; 23 26 rev = "v${version}"; 24 - sha256 = "0da1kav5x2xcmwvdgfk1q70l1k0sqqj3njgx2xx885d40m6qbnrs"; 27 + sha256 = "1jb195chy3kbspmv9vyg7llw6kgykkmvz3znd97mxf24f4q622jv"; 25 28 }; 26 29 27 - runVend = true; 28 - vendorSha256 = "0p7vyw61nwvmaz7gz2bdh9fi6wp62i2vnzw6iz2r8cims4sbz53b"; 30 + vendorSha256 = "0d17qaqn33wi7lzw4hlym56d9v4qnmvs6plpm5jiby2g5yckq0mz"; 29 31 30 - doCheck = false; 31 - 32 - nativeBuildInputs = [ packr pkg-config ]; 32 + nativeBuildInputs = [ pkg-config ]; 33 33 34 34 buildInputs = [ bzip2 lz4 rocksdb snappy zeromq zlib ]; 35 35 ··· 39 39 "-X github.com/trezor/blockbook/common.buildDate=unknown" 40 40 ]; 41 41 42 + tags = [ "rocksdb_6_16" ]; 43 + 42 44 preBuild = lib.optionalString stdenv.isDarwin '' 43 45 ulimit -n 8192 44 46 '' + '' 45 47 export CGO_LDFLAGS="-L${stdenv.cc.cc.lib}/lib -lrocksdb -lz -lbz2 -lsnappy -llz4 -lm -lstdc++" 46 - packr clean && packr 48 + buildFlagsArray+=("-tags=${lib.concatStringsSep " " tags}") 49 + buildFlagsArray+=("-ldflags=${lib.concatStringsSep " " ldflags}") 47 50 ''; 48 51 49 52 subPackages = [ "." ]; ··· 64 67 license = licenses.agpl3; 65 68 maintainers = with maintainers; [ mmahut _1000101 ]; 66 69 platforms = platforms.unix; 67 - # go dependency tecbot/gorocksdb requires rocksdb 5.x but nixpkgs has only rocksdb 6.x 68 - # issue in upstream can be tracked here: https://github.com/trezor/blockbook/issues/617 69 - broken = true; 70 70 }; 71 71 }
+11
pkgs/top-level/all-packages.nix
··· 19323 19323 19324 19324 rocksdb_lite = rocksdb.override { enableLite = true; }; 19325 19325 19326 + rocksdb_6_23 = rocksdb.overrideAttrs (old: rec { 19327 + pname = "rocksdb"; 19328 + version = "6.23.3"; 19329 + src = fetchFromGitHub { 19330 + owner = "facebook"; 19331 + repo = pname; 19332 + rev = "v${version}"; 19333 + sha256 = "sha256-SsDqhjdCdtIGNlsMj5kfiuS3zSGwcxi4KV71d95h7yk="; 19334 + }; 19335 + }); 19336 + 19326 19337 rotate-backups = callPackage ../tools/backup/rotate-backups { }; 19327 19338 19328 19339 rote = callPackage ../development/libraries/rote { };