Merge pull request #144114 from erikarvstedt/electrs-0.9.2

electrs: 0.9.1 -> 0.9.2
This commit is contained in:
Pavol Rusnak 2021-11-01 15:00:00 +01:00 committed by GitHub
commit d752ffcd23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions

View File

@ -9,24 +9,27 @@
rustPlatform.buildRustPackage rec {
pname = "electrs";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "romanz";
repo = pname;
rev = "v${version}";
hash = "sha256-GDO8iGntQncvdJiDMBJk9GrGF9JToasbLRzju3S0TS0=";
hash = "sha256-dYKSc5fU66fu+GdTeWQBrIOJAiBGdYAOS7MCto98Xss=";
};
cargoHash = "sha256-Ms785+3Z4xEUW8FRRu1FIHk7HSWYLBThKlJDFjW6j0I=";
cargoHash = "sha256-M4H5tUbo1f18kk8S53saebSnZhZFr8udw41BUNJbQVI==";
# needed for librocksdb-sys
nativeBuildInputs = [ llvmPackages.clang ];
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
# temporarily disable dynamic linking, which broke with rocksdb update 6.23.3 -> 6.25.3
# https://github.com/NixOS/nixpkgs/pull/143524#issuecomment-955053331
#
# link rocksdb dynamically
ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
ROCKSDB_LIB_DIR = "${rocksdb}/lib";
# ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
# ROCKSDB_LIB_DIR = "${rocksdb}/lib";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];

View File

@ -21,6 +21,7 @@ repo=$tmpdir/repo
trap "rm -rf $tmpdir" EXIT
git clone --depth 1 --branch v${version} -c advice.detachedHead=false https://github.com/romanz/electrs $repo
git -C $repo checkout tags/v${version}
export GNUPGHOME=$tmpdir
echo