diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-01 06:09:20 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-01 06:09:20 +0200 |
| commit | b8b2225f6b2f9416b18906e28b294ed8b099095a (patch) | |
| tree | a06db55819007a3105d4499e7a9c8bb097fc9941 /pkgs/development/tools | |
| parent | bcc04c75f8f3d82cd1a86bec6af21daa42e09385 (diff) | |
| parent | 4a7fc5f062a438cf1199e917bad501a9cfdf7e0a (diff) | |
| download | nixlib-b8b2225f6b2f9416b18906e28b294ed8b099095a.tar nixlib-b8b2225f6b2f9416b18906e28b294ed8b099095a.tar.gz nixlib-b8b2225f6b2f9416b18906e28b294ed8b099095a.tar.bz2 nixlib-b8b2225f6b2f9416b18906e28b294ed8b099095a.tar.lz nixlib-b8b2225f6b2f9416b18906e28b294ed8b099095a.tar.xz nixlib-b8b2225f6b2f9416b18906e28b294ed8b099095a.tar.zst nixlib-b8b2225f6b2f9416b18906e28b294ed8b099095a.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/waf/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/database/squirrel-sql/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/wiggle/default.nix | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 61184cb6ba1a..65501b2b9350 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "waf-${version}"; - version = "1.9.0"; + version = "2.0.4"; src = fetchurl { url = "https://waf.io/waf-${version}.tar.bz2"; - sha256 = "1sjpqzm2fzm8pxi3fwfinpsbw4z9040qkrzbg3lxik7ppsbjhn58"; + sha256 = "0zmnwgccq5j7ipfi2j0k5s40q27krp1m6v2bd650axgzdbpa7ain"; }; buildInputs = [ python2 ]; diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index afac17e121ad..7d4cf6ea5d5e 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -5,13 +5,13 @@ , drivers ? [] }: let - version = "3.7.1"; + version = "3.8.1"; in stdenv.mkDerivation rec { name = "squirrel-sql-${version}"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "1v141ply57k5krwbnnmz4mbs9hs8rbys0bkjz69gvxlqjizyiq23"; + sha256 = "1vv38i4rwm8c8h0p9mmz21dyafd71pqprj7b8i5vx7f4q8xns2d2"; }; buildInputs = [ diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix index ffa6d4aac0ca..df32d68767fb 100644 --- a/pkgs/development/tools/wiggle/default.nix +++ b/pkgs/development/tools/wiggle/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "wiggle-1.0"; + name = "wiggle-1.1"; src = fetchurl { - url = "https://github.com/neilbrown/wiggle/archive/v1.0.tar.gz"; - sha256 = "0552dkdvl001b2jasj0jwb69s7zy6wbc8gcysqj69b4qgl9c54cs"; + url = "https://github.com/neilbrown/wiggle/archive/v1.1.tar.gz"; + sha256 = "0gg1c0zcrd5fgawvjccmdscm3fka8h1qz4v807kvy1b2y1cf9c4w"; }; buildInputs = [ ncurses groff ]; |