diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-10-27 19:58:03 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-10-27 19:58:03 +0300 |
| commit | 067d1cf33067a514489ed6d3953dd348dbdc2233 (patch) | |
| tree | 74dc49535964849be2168f56056439a121f55e85 /pkgs/tools | |
| parent | 4b45aa784e2933ac89334622c969870bd0f87650 (diff) | |
| parent | f2b8262e053f6d2ab91cb9e5ead0496e3e4d3eab (diff) | |
| download | nixlib-067d1cf33067a514489ed6d3953dd348dbdc2233.tar nixlib-067d1cf33067a514489ed6d3953dd348dbdc2233.tar.gz nixlib-067d1cf33067a514489ed6d3953dd348dbdc2233.tar.bz2 nixlib-067d1cf33067a514489ed6d3953dd348dbdc2233.tar.lz nixlib-067d1cf33067a514489ed6d3953dd348dbdc2233.tar.xz nixlib-067d1cf33067a514489ed6d3953dd348dbdc2233.tar.zst nixlib-067d1cf33067a514489ed6d3953dd348dbdc2233.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/applications/science/math/sage/sage-src.nix
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/urlwatch/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/trufflehog/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/syslog-ng/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/text/miller/default.nix | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 850a33db58cf..c9de3f8ea574 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.14"; + version = "2.15"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1m7qdh2lk5napncmfnk86dj4wqcahq8y24xnylxa4qlx2ivwkr6b"; + sha256 = "1bkd0r5arzdvinpn1n23cw1gf7byxml95hl6qvvf6mnggb1ifcwg"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index f805670a5d5e..9492f2bb6eac 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -12,11 +12,11 @@ let in pythonPackages.buildPythonApplication rec { pname = "truffleHog"; - version = "2.0.91"; + version = "2.0.97"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0r4c9ihy6wjh5cwli7lb6cr2yfvxrh7r6cgznql1src5gzlnkymx"; + sha256 = "034kpv1p4m90286slvc6d4mlrzaf0b5jbd4qaj87hj65wbpcpg8r"; }; # Relax overly restricted version constraint diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 5b8a9cd0aee5..1ce7e766a18e 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.17.2"; + version = "3.18.1"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "02y593ar1c4503ww7mhn0p5ajfl3q6769c6m311m6srwl5y1yq3k"; + sha256 = "1y1v16vvyirh0qv4wzczqp8d3llh6dl63lz3irwib1qhh7x56dyn"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index a17c348c4cc1..3e0bee3b9b98 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "miller-${version}"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "${version}"; - sha256 = "0abw2n6mi4wbgwihcv3y2xccqx4sj0gdgwvdrg2jkcgraa78sw8v"; + sha256 = "0158by642frh9x6rrgqxwmk4766wb36kp0rrjg5swdbs9w3is3xg"; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; |