3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #88977 from filalex77/wrangler-1.9.2

wrangler: 1.9.1 -> 1.9.2
This commit is contained in:
Frederik Rietdijk 2020-06-07 16:12:20 +02:00 committed by GitHub
commit 11398cb350
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 37 deletions

View file

@ -1,35 +0,0 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin }:
rustPlatform.buildRustPackage rec {
pname = "cloudflare-wrangler";
version = "1.9.1";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "wrangler";
rev = "v${version}";
sha256 = "09rq6lnv9993ah49jxqaqqhv5xxj51gxlqdi99wkj217cxp9gqqn";
};
cargoSha256 = "0vlb1g4pki84n2zf6w3bisa7jpv0ws8nb3lgr0bkjrirf60a9xsk";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [
curl
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.CoreFoundation
];
# tries to use "/homeless-shelter" and fails
doCheck = false;
meta = with stdenv.lib; {
description = "A CLI tool designed for folks who are interested in using Cloudflare Workers";
homepage = "https://github.com/cloudflare/wrangler";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}

View file

@ -0,0 +1,36 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin }:
rustPlatform.buildRustPackage rec {
pname = "wrangler";
version = "1.9.2";
src = fetchFromGitHub {
owner = "cloudflare";
repo = pname;
rev = "v${version}";
sha256 = "0i3fhdq8v9459mlnazkv9bpkcv01rdy5rk149lhpsan76zlyzzwr";
};
cargoSha256 = "0c2ss3j53vra1b4m3jsy2w2gdf6k1hw3qf6sd4qlg2ybk4k83g3b";
nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [
curl
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.CoreFoundation
];
# tries to use "/homeless-shelter" and fails
doCheck = false;
meta = with stdenv.lib; {
description = "A CLI tool designed for folks who are interested in using Cloudflare Workers";
homepage = "https://github.com/cloudflare/wrangler";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ filalex77 ];
platforms = platforms.all;
};
}

View file

@ -874,8 +874,6 @@ in
cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { };
cloudflare-wrangler = callPackage ../development/tools/cloudflare-wrangler { };
codeql = callPackage ../development/tools/analysis/codeql { };
container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { };
@ -3179,6 +3177,8 @@ in
wob = callPackage ../tools/misc/wob { };
wrangler = callPackage ../development/tools/wrangler { };
xkcdpass = with pythonPackages; toPythonApplication xkcdpass;
xob = callPackage ../tools/X11/xob { };