Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1530372
This commit is contained in:
Vladimír Čunát
2019-07-15 09:39:03 +02:00
148 changed files with 4877 additions and 3631 deletions
@@ -7,17 +7,15 @@
, r2-for-cutter
, python3 }:
let
version = "1.8.0";
in
stdenv.mkDerivation rec {
name = "radare2-cutter-${version}";
pname = "radare2-cutter";
version = "1.8.3";
src = fetchFromGitHub {
owner = "radareorg";
repo = "cutter";
rev = "v${version}";
sha256 = "1z3lpzl7k3qn5xabi0qxl83rdbwi00h45blnljx8yfw0am5vfphc";
sha256 = "03f3cdckh51anx9gd1b0ndb2fg7061hqngvygf32ky29mm2m2lyv";
};
postUnpack = "export sourceRoot=$sourceRoot/src";
@@ -109,7 +109,7 @@ in {
#<generated>
# DO NOT EDIT! Automatically generated by ./update.py
radare2 = generic {
version_commit = "22227";
version_commit = "22265";
gittap = "3.6.0";
gittip = "ff3bb6e3b2e6a519b4c975d05758c171a5186389";
rev = "3.6.0";
@@ -119,12 +119,12 @@ in {
cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
};
r2-for-cutter = generic {
version_commit = "22227";
gittap = "3.3.0";
gittip = "5a9127d2599c8ff61d8544be7d4c9384402e94a3";
rev = "5a9127d2599c8ff61d8544be7d4c9384402e94a3";
version = "2019-02-19";
sha256 = "11ap3icr8w0y49lq5dxch2h589qdmwf3qv9lsdyfsz4l0mjm49ri";
version_commit = "22265";
gittap = "3.6.0";
gittip = "ff3bb6e3b2e6a519b4c975d05758c171a5186389";
rev = "ff3bb6e3b2e6a519b4c975d05758c171a5186389";
version = "2019-06-24";
sha256 = "0vp94qzznqv87vvjbyyj6swkm6gl7byqvb1jv23i8i42zi5n7qmd";
cs_ver = "4.0.1";
cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
};
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tflint";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "wata727";
repo = pname;
rev = "v${version}";
sha256 = "1k050kcgvy21jk01mkgscfl7hlfgaa1621920w111fghqxibssan";
sha256 = "1p6859lax6cmk2q4pvqw4sm78k80gs2561nxa1gwdna3af211fbp";
};
modSha256 = "17pm6v34gya8bgz8g5hh1cijjldk78j53x9yvsjpcjnqm7l0clcd";
modSha256 = "021iqy5a703cymcc66rd1rxnpqa3rnzj37y400s0rmiq0zpkm2nc";
subPackages = [ "." ];