diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:15:11 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:15:33 +0200 |
| commit | 153a19df05133657dd3025812a544f8961c41b12 (patch) | |
| tree | 9974b86334e11ffa884610dd0999a62b78e0ee96 /pkgs/tools/text | |
| parent | ae2cf7c00877a3dd778b3e3cabfec682503303d5 (diff) | |
| parent | 6755ab8b3442d6149e4bae5e142d516a506f6e45 (diff) | |
| download | nixlib-153a19df05133657dd3025812a544f8961c41b12.tar nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.gz nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.bz2 nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.lz nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.xz nixlib-153a19df05133657dd3025812a544f8961c41b12.tar.zst nixlib-153a19df05133657dd3025812a544f8961c41b12.zip | |
Merge branch 'master' into staging-next
Hydra: ?compare=1474536
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/diffstat/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/text/discount/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/text/icdiff/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index d106d140a67e..1490f0900b9d 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "diffstat-1.61"; + name = "diffstat-1.62"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/diffstat/${name}.tgz" "https://invisible-mirror.net/archives/diffstat/${name}.tgz" ]; - sha256 = "1vjmda2zfjxg0qkaj8hfqa8g6bfwnn1ja8696rxrjgqq4w69wd95"; + sha256 = "07sr482y6iw7n7ddkba0w51kbjc99snvnijkn5ba2xzd8hv1h2bz"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index 81b88ff8d835..75e380a6b661 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "2.2.3a"; + version = "2.2.4"; name = "discount-${version}"; src = fetchurl { url = "http://www.pell.portland.or.us/~orc/Code/discount/discount-${version}.tar.bz2"; - sha256 = "0m09x9dd75d3pqvmrwr0kqw3dm2x3ss9clj5fxf7lq79lbyxbxbm"; + sha256 = "199hwajpspqil0a4y3yxsmhdp2dm73gqkzfk4mrwzsmlq8y1xzbl"; }; patches = ./fix-configure-path.patch; diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix index 85888dbbf0df..949a9c89e9af 100644 --- a/pkgs/tools/text/icdiff/default.nix +++ b/pkgs/tools/text/icdiff/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "icdiff-${version}"; - version = "1.9.1"; + version = "1.9.3"; src = fetchFromGitHub { owner = "jeffkaufman"; repo = "icdiff"; rev = "release-${version}"; - sha256 = "0ffn5kq7dwvrimxgpj9ksym36c18md8nsdps82qzhm1xq7p9w9yb"; + sha256 = "10hv09sg7m8gzjf1v785kvim9ps81akzyx7ws6ypylyxc0l2fdcl"; }; meta = with stdenv.lib; { |