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

Merge remote-tracking branch 'upstream/master' into openssl-1.1

Browse Source
This commit is contained in:
Robin Gloster
2019-08-23 02:00:31 +02:00
parent 0f4256a2f8 1e2497720f
commit c7e75df21f
126 changed files with 3903 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/aws-sam-cli/default.nix
View File

@@ -56,7 +56,7 @@ buildPythonApplication rec {
];
postPatch = ''
substituteInPlace requirements/base.txt --replace "requests==2.20.1" "requests==2.21.0"
substituteInPlace requirements/base.txt --replace "requests==2.20.1" "requests==2.22.0"
substituteInPlace requirements/base.txt --replace "six~=1.11.0" "six~=1.12.0"
substituteInPlace requirements/base.txt --replace "PyYAML~=3.12" "PyYAML~=5.1"
'';

8
pkgs/development/tools/cbor-diag/Gemfile.lock
View File

@@ -1,10 +1,12 @@
GEM
remote: https://rubygems.org/
specs:
cbor-diag (0.5.2)
cbor-diag (0.5.6)
json
neatjson
treetop (~> 1)
json (2.1.0)
json (2.2.0)
neatjson (0.9)
polyglot (0.3.5)
treetop (1.6.10)
polyglot (~> 0.3)
@@ -16,4 +18,4 @@ DEPENDENCIES
cbor-diag
BUNDLED WITH
1.14.6
1.17.2

28
pkgs/development/tools/cbor-diag/gemset.nix
View File

@@ -1,22 +1,38 @@
{
cbor-diag = {
dependencies = ["json" "treetop"];
dependencies = ["json" "neatjson" "treetop"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g4pxf1ag4pyb351m06l08ig1smnf8w27ynqfxkgmwak5mh1z7w1";
sha256 = "0pd0k4malg1l7w3ck5glh9w0hrsvknk8rp32vrir74yww1g6yplv";
type = "gem";
};
version = "0.5.2";
version = "0.5.6";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
type = "gem";
};
version = "2.1.0";
version = "2.2.0";
};
neatjson = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fa2v7b6433j0iqh5iq9r71v7a5xabgjvqwsbl21vcsac7vf3ncw";
type = "gem";
};
version = "0.9";
};
polyglot = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
@@ -26,6 +42,8 @@
};
treetop = {
dependencies = ["polyglot"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";

12
pkgs/development/tools/cddl/Gemfile.lock
View File

@@ -2,19 +2,21 @@ GEM
remote: https://rubygems.org/
specs:
abnc (0.1.0)
cbor-diag (0.5.2)
cbor-diag (0.5.6)
json
neatjson
treetop (~> 1)
cddl (0.8.5)
cddl (0.8.9)
abnc
cbor-diag
colorize
json
regexp-examples
colorize (0.8.1)
json (2.1.0)
json (2.2.0)
neatjson (0.9)
polyglot (0.3.5)
regexp-examples (1.4.2)
regexp-examples (1.5.0)
treetop (1.6.10)
polyglot (~> 0.3)
@@ -25,4 +27,4 @@ DEPENDENCIES
cddl
BUNDLED WITH
1.14.6
1.17.2

44
pkgs/development/tools/cddl/gemset.nix
View File

@@ -1,5 +1,7 @@
{
abnc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13nvzrk72nj130fs8bq8q3cfm48939rdzh7l31ncj5c4969hrbig";
@@ -8,24 +10,30 @@
version = "0.1.0";
};
cbor-diag = {
dependencies = ["json" "treetop"];
dependencies = ["json" "neatjson" "treetop"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g4pxf1ag4pyb351m06l08ig1smnf8w27ynqfxkgmwak5mh1z7w1";
sha256 = "0pd0k4malg1l7w3ck5glh9w0hrsvknk8rp32vrir74yww1g6yplv";
type = "gem";
};
version = "0.5.2";
version = "0.5.6";
};
cddl = {
dependencies = ["abnc" "cbor-diag" "colorize" "json" "regexp-examples"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pg91wrby0qgrdnf089ddy5yy2jalxd3bb9dljj16cpwv4gjx047";
sha256 = "16rmcrsxwx33pj25g1si0dhjdl2brfhy2vlpfwdb6qqkaikmzhpz";
type = "gem";
};
version = "0.8.5";
version = "0.8.9";
};
colorize = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b";
@@ -34,14 +42,28 @@
version = "0.8.1";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
type = "gem";
};
version = "2.1.0";
version = "2.2.0";
};
neatjson = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fa2v7b6433j0iqh5iq9r71v7a5xabgjvqwsbl21vcsac7vf3ncw";
type = "gem";
};
version = "0.9";
};
polyglot = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
@@ -50,15 +72,19 @@
version = "0.3.5";
};
regexp-examples = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "104f0j0h2x5ijly7kyaj7zz0md65r2c03cpbi5cngm0hs2sr1qkz";
sha256 = "08s5d327i9dw5yjwv9vfss3qb7lwasjyc75wvh7vrdi5v4vm1y2k";
type = "gem";
};
version = "1.4.2";
version = "1.5.0";
};
treetop = {
dependencies = ["polyglot"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";

25
pkgs/development/tools/misc/wishbone-tool/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ lib, fetchFromGitHub, rustPlatform, libusb }:
let
version = "0.2.8";
src = fetchFromGitHub {
owner = "xobs";
repo = "wishbone-utils";
rev = "v${version}";
sha256 = "0v6s5yl0y6bd2snf12x6c77rwvqkg6ybi1sm4wr7qdgbwq563nxp";
};
in
rustPlatform.buildRustPackage {
pname = "wishbone-tool";
inherit version;
src = "${src}/wishbone-tool";
cargoSha256 = "0pj8kf6s1c666p4kc6q1hlvaqm0lm9aqnsx5r034g1y8sxnnyri2";
buildInputs = [ libusb ];
meta = with lib; {
description = "Manipulate a Wishbone device over some sort of bridge";
homepage = "https://github.com/xobs/wishbone-utils#wishbone-tool";
license = licenses.bsd2;
maintainers = with maintainers; [ edef ];
platforms = platforms.linux;
};
}

31
pkgs/development/tools/osslsigncode/default.nix Normal file
View File

@@ -0,0 +1,31 @@
{ stdenv
, fetchFromGitHub
, autoreconfHook
, libgsf
, pkgconfig
, openssl_1_1
, curl
}:
stdenv.mkDerivation rec {
pname = "osslsigncode";
version = "unstable-2019-07-25";
src = fetchFromGitHub {
owner = "mtrojnar";
repo = pname;
rev = "18810b7e0bb1d8e0d25b6c2565a065cf66bce5d7";
sha256 = "02jnbr3xdsb5dpll3k65080ryrfr7agawmjavwxd0v40w0an5yq8";
};
nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl_1_1 curl ];
meta = with stdenv.lib; {
homepage = "https://github.com/mtrojnar/osslsigncode";
description = "OpenSSL based Authenticode signing for PE/MSI/Java CAB files";
license = licenses.gpl3Plus;
maintainers = [ maintainers.mmahut ];
platforms = platforms.all;
};
}

6
pkgs/development/tools/rust/cargo-expand/default.nix
View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "0.4.13";
version = "0.4.14";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
sha256 = "0s3xd9dr0n64j0m38gd4cafrdr5vnpl557ks4wr0jszyhldnlfkz";
sha256 = "0i59m34lav3cmrazaxfraj3jk5mdi5fgaq8p7l4s8qr1fpmmw9vy";
};
cargoSha256 = "13zz3n1p75267h3qrmvpmd8agnkbk8vfbr8s38wcyysck81pr4px";
cargoSha256 = "1sjbcgscgvjq4qpcljrsj1dyxbr10jl6wpp27xh3bv8c2rv4bzz8";
buildInputs = [ llvmPackages.libclang ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;

10
pkgs/development/tools/rust/cargo-make/default.nix
View File

@@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.22.0";
version = "0.22.1";
src =
let
@@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec {
owner = "sagiegurari";
repo = pname;
rev = version;
sha256 = "13nl370immbhjarc0vfzrsflml3alh2f2zrh4znbks4yc3yp790z";
sha256 = "1wsams41zl56mkb8671n5fqkkchs68jd9nvfzry8axxiv7n175gc";
};
cargo-lock = fetchurl {
url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/d31cfb3598d0a2886abd4d2ed43a02d493c8de8c/cargo-make-Cargo.lock";
sha256 = "08fzl98d277n9xn3hrg9jahkqwdjfi5saajsppwzdbb3l7xw4jh2";
url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/850e9830f4ab4bc65da6eb5cd8b0911970a7739f/cargo-make-Cargo.lock";
sha256 = "0knmzplxmh8vksmpg56l2p1a10hpqbr9hmbk3hv0aj63125rhhqy";
};
in
runCommand "cargo-make-src" {} ''
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "0gj4a15slxnp31mlfgh57h3cwv0lnw5gdmkrmmj79migi96i5i6y";
cargoSha256 = "18j0nflf997z4nwdxifxp1ji1rbwqbg6zm2256j21am4ak45krsy";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.

47
pkgs/development/tools/rust/rls/default.nix
View File

@@ -1,47 +0,0 @@
{ stdenv, fetchFromGitHub, rustPlatform
, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv
, CoreFoundation, Security }:
rustPlatform.buildRustPackage rec {
pname = "rls";
# with rust 1.x you can only build rls version 1.x.y
version = "1.36.0";
src = fetchFromGitHub {
owner = "rust-lang";
repo = pname;
rev = version;
sha256 = "1mclv0admxv48pndyqghxc4nf1amhbd700cgrzjshf9jrnffxmrn";
};
cargoSha256 = "1yli9540510xmzqnzfi3p6rh23bjqsviflqw95a0fawf2rnj8sin";
# a nightly compiler is required unless we use this cheat code.
RUSTC_BOOTSTRAP=1;
# rls-rustc links to rustc_private crates
CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null;
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ openssh openssl curl zlib libiconv ]
++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]);
doCheck = true;
preCheck = ''
# client tests are flaky
rm tests/client.rs
'';
doInstallCheck = true;
installCheckPhase = ''
$out/bin/rls --version
'';
meta = with stdenv.lib; {
description = "Rust Language Server - provides information about Rust programs to IDEs and other tools";
homepage = https://github.com/rust-lang/rls/;
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ symphorien ];
platforms = platforms.all;
};
}