pyrox.dev / nixpkgs
lol
fork atom

Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub 26447bdb 411405c9

+12 -9
unified split
+7 -4
pkgs/applications/blockchains/polkadot/default.nix
··· 3 , lib 4 , llvmPackages 5 , protobuf 6 , rustPlatform 7 , stdenv 8 , writeShellScriptBin 9 , Security 10 }: 11 rustPlatform.buildRustPackage rec { 12 pname = "polkadot"; 13 - version = "0.9.36"; 14 15 src = fetchFromGitHub { 16 owner = "paritytech"; 17 repo = "polkadot"; 18 rev = "v${version}"; 19 - sha256 = "sha256-HzQFlnn+SPasI0g0DYDCRoFCMVyxlUmEQAobvzRnAW4="; 20 21 # the build process of polkadot requires a .git folder in order to determine 22 # the git commit hash that is being built and add it to the version string. ··· 32 ''; 33 }; 34 35 - cargoSha256 = "sha256-P31GW/1HiaZLF6e8Fq1YnH1ZLhiOhURm8st9a4KRlJU="; 36 37 - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; 38 39 nativeBuildInputs = [ rustPlatform.bindgenHook ]; 40 ··· 44 ''; 45 46 PROTOC = "${protobuf}/bin/protoc"; 47 48 # NOTE: We don't build the WASM runtimes since this would require a more 49 # complicated rust environment setup and this is only needed for developer
··· 3 , lib 4 , llvmPackages 5 , protobuf 6 + , rocksdb 7 , rustPlatform 8 , stdenv 9 , writeShellScriptBin 10 , Security 11 + , SystemConfiguration 12 }: 13 rustPlatform.buildRustPackage rec { 14 pname = "polkadot"; 15 + version = "0.9.37"; 16 17 src = fetchFromGitHub { 18 owner = "paritytech"; 19 repo = "polkadot"; 20 rev = "v${version}"; 21 + hash = "sha256-/mgJNjliPUmMkhT/1oiX9+BJHfY3SMsKfFv9HCyWRQQ="; 22 23 # the build process of polkadot requires a .git folder in order to determine 24 # the git commit hash that is being built and add it to the version string. ··· 34 ''; 35 }; 36 37 + cargoHash = "sha256-o+APFYKgA3zjQSGrkpnyf5LEBBqvZtcfWlzCk6nL02A="; 38 39 + buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; 40 41 nativeBuildInputs = [ rustPlatform.bindgenHook ]; 42 ··· 46 ''; 47 48 PROTOC = "${protobuf}/bin/protoc"; 49 + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; 50 51 # NOTE: We don't build the WASM runtimes since this would require a more 52 # complicated rust environment setup and this is only needed for developer
+2 -2
pkgs/development/python-modules/hassil/default.nix
··· 16 17 let 18 pname = "hassil"; 19 - version = "0.2.4"; 20 in 21 buildPythonPackage { 22 inherit pname version; ··· 24 25 src = fetchPypi { 26 inherit pname version; 27 - hash = "sha256-lgGo3zK1GN3MEOinXuvT5nCc8LBCxAHiW0CZfS8Yy7Y="; 28 }; 29 30 nativeBuildInputs = [
··· 16 17 let 18 pname = "hassil"; 19 + version = "0.2.5"; 20 in 21 buildPythonPackage { 22 inherit pname version; ··· 24 25 src = fetchPypi { 26 inherit pname version; 27 + hash = "sha256-/KEYTY3Y/KKP/r2OBf3R/jE7Sp/hNygC/Gdzk9XIf/0="; 28 }; 29 30 nativeBuildInputs = [
+2 -2
pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
··· 12 13 stdenv.mkDerivation rec { 14 pname = "nxpmicro-mfgtools"; 15 - version = "1.4.243"; 16 17 src = fetchFromGitHub { 18 owner = "NXPmicro"; 19 repo = "mfgtools"; 20 rev = "uuu_${version}"; 21 - hash = "sha256-gyy9D6y1y+9GlT3wfW+huoWaZP1e8YzZnc7EbJftppI="; 22 }; 23 24 nativeBuildInputs = [ cmake pkg-config installShellFiles ];
··· 12 13 stdenv.mkDerivation rec { 14 pname = "nxpmicro-mfgtools"; 15 + version = "1.5.11"; 16 17 src = fetchFromGitHub { 18 owner = "NXPmicro"; 19 repo = "mfgtools"; 20 rev = "uuu_${version}"; 21 + hash = "sha256-RD0haw0C89uvTlLHtvlv1VwU4Jw2U19Caiq+BSfB4hU="; 22 }; 23 24 nativeBuildInputs = [ cmake pkg-config installShellFiles ];
+1 -1
pkgs/top-level/all-packages.nix
··· 34366 openethereum = callPackage ../applications/blockchains/openethereum { }; 34367 34368 polkadot = callPackage ../applications/blockchains/polkadot { 34369 - inherit (darwin.apple_sdk.frameworks) Security; 34370 }; 34371 34372 particl-core = callPackage ../applications/blockchains/particl-core { };
··· 34366 openethereum = callPackage ../applications/blockchains/openethereum { }; 34367 34368 polkadot = callPackage ../applications/blockchains/polkadot { 34369 + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; 34370 }; 34371 34372 particl-core = callPackage ../applications/blockchains/particl-core { };