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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-05-28 08:32:03 +02:00
parent 8809ebe42a 2a56ea3593
commit 36a6746f21
153 changed files with 3462 additions and 1013 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,6 +59,7 @@ buildPythonApplication rec {
postPatch = ''
substituteInPlace requirements/base.txt --replace "requests==2.20.1" "requests==2.21.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"
'';
meta = with lib; {

8
pkgs/development/tools/go-tools/default.nix
View File

@@ -5,16 +5,16 @@
buildGoPackage rec {
name = "go-tools-${version}";
version = "2017.2.2";
version = "2019.1.1";
goPackagePath = "honnef.co/go/tools";
excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|unused\)/testdata'';
excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|stylecheck\|unused\)/testdata'';
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-tools";
rev = "${version}";
sha256 = "1khl6szjj0skkfqp234p9rf3icik7fw2pk2x0wbj3wa9q3f84hb7";
sha256 = "1zwh64x3i32p6f6808q609n63xda3bq888n43wl4alpx1b08spha";
};
goDeps = ./deps.nix;
@@ -23,7 +23,7 @@ buildGoPackage rec {
description = "A collection of tools and libraries for working with Go code, including linters and static analysis.";
homepage = https://staticcheck.io;
license = licenses.mit;
maintainers = with maintainers; [ kalbasit ];
maintainers = with maintainers; [ rvolosatovs kalbasit ];
platforms = platforms.linux ++ platforms.darwin;
};
}

13
pkgs/development/tools/go-tools/deps.nix generated
View File

@@ -1,4 +1,13 @@
[
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
};
}
{
goPackagePath = "github.com/kisielk/gotool";
fetch = {
@@ -13,8 +22,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "96e9e165b75e735822645eff82850b08c377be36";
sha256 = "1zj9ck5sg9b0pphxybmvxf64hhcap7v7j37fx3v5aknf18crjjdg";
rev = "2c0ae70061356820330c96810d9483beb9a6da8e";
sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk";
};
}
]

4
pkgs/development/tools/packer/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "packer-${version}";
version = "1.4.0";
version = "1.4.1";
goPackagePath = "github.com/hashicorp/packer";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
sha256 = "0fpzmwh7vq8vc7gvlnpx4ji4yaxwi2h2ksz0z4782469pkcnbg56";
sha256 = "13pj48pbhl47rwyi6gd6dhq9wq0z2h8kzjkahhqhf62dfssv35db";
};
meta = with stdenv.lib; {

4
pkgs/development/tools/parsing/ragel/default.nix
View File

@@ -43,8 +43,8 @@ in
};
ragelDev = generic {
version = "7.0.0.11";
sha256 = "0h2k9bfz9i7x9mvr9rbsrzz8fk17756zwwrkf3fppvm9ivzwdfh8";
version = "7.0.0.12";
sha256 = "0x3si355lv6q051lgpg8bpclpiq5brpri5lv3p8kk2qhzfbyz69r";
license = stdenv.lib.licenses.mit;
};
}

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

@@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.19.1";
version = "0.19.2";
src =
let
@@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec {
owner = "sagiegurari";
repo = pname;
rev = version;
sha256 = "1bv5gv5zd9h0yw7wb28r0c4z9wqa6n7ac4ipd855apwz1v7sm9n3";
sha256 = "175cflcm9k81fpp2pxz4hcaf8v3i7jqc9gcr4flnsqxjrh22vymp";
};
cargo-lock = fetchurl {
url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/8a12a07cafeff4ef4a01983f5243dd8c95d10c48/cargo-make-0.19.1-Cargo.lock";
sha256 = "0v2hygkpsyjcpzrgyzl5mah0y8gmprfbnz7kn4hh6zfhz2lhqqwm";
url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/f1e6360acfbe5ae573f8f31a82a5c881a6f0ed68/cargo-make-Cargo.lock";
sha256 = "004dx4gyby5smpvawqv946mambcg59zq6n8h89hz61mxkh7frmh4";
};
in
runCommand "cargo-make-src" {} ''
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "0j7gyg6l428gypjpfgdz082vz8m86cx1wy2r47az3sc3skl6dhkq";
cargoSha256 = "1hmfg3x9p5a2vz2r3v8m5wgyabbybl5lcjvi930b9wi5cnfm756g";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.

2
pkgs/development/tools/unity3d/default.nix
View File

@@ -135,6 +135,6 @@ in stdenv.mkDerivation rec {
'';
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ jb55 tesq0 ];
maintainers = with maintainers; [ tesq0 ];
};
}