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

Merge pull request #62603 from dywedir/cargo-web

Browse Source 
cargo-web: 0.6.23 -> 0.6.25
This commit is contained in:
Kevin Cox 2019-06-04 12:49:13 +01:00 committed by GitHub
commit 2156d43659
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/tools/cargo-web/default.nix
View File

@ -1,29 +1,32 @@
{ stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform { stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform
, CoreServices, Security , CoreServices, Security, cf-private
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
name = "cargo-web-${version}"; pname = "cargo-web";
version = "0.6.23"; version = "0.6.25";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "koute"; owner = "koute";
repo = "cargo-web"; repo = pname;
rev = version; rev = version;
sha256 = "1qbi3z4x39il07xlhfvq5ckzjqrf0yf6p8qidf24fp92gb940zxr"; sha256 = "0q77bryc7ap8gb4rzp9xk8ngqwxh106qn7899g30lwxycnyii0mf";
}; };
cargoSha256 = "1ysp8y0s0ha5gffwkra2vd1qh5wmfy1678k9hsfals0ww2f79wii"; cargoSha256 = "1f4sj260q4rlzbajwimya1yhh90hmmbhr47yfg9i8xcv5cg0cqjn";
nativeBuildInputs = [ openssl perl pkgconfig ]; nativeBuildInputs = [ openssl perl pkgconfig ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [
CoreServices Security
# Needed for CFURLResourceIsReachable symbols.
cf-private
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A Cargo subcommand for the client-side Web"; description = "A Cargo subcommand for the client-side Web";
homepage = https://github.com/koute/cargo-web; homepage = https://github.com/koute/cargo-web;
license = with licenses; [asl20 /* or */ mit]; license = with licenses; [ asl20 /* or */ mit ];
maintainers = [ maintainers.kevincox ]; maintainers = [ maintainers.kevincox ];
broken = stdenv.isDarwin; # test with CoreFoundation 10.11
platforms = platforms.all; platforms = platforms.all;
}; };
} }

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

@ -7966,6 +7966,7 @@ in
cargo-web = callPackage ../development/tools/cargo-web { cargo-web = callPackage ../development/tools/cargo-web {
inherit (darwin.apple_sdk.frameworks) CoreServices Security; inherit (darwin.apple_sdk.frameworks) CoreServices Security;
inherit (darwin) cf-private;
}; };
carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { };