diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:18:44 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:25:38 +0200 |
| commit | 7a005601d48f760864258e369364b3b847d4e9fd (patch) | |
| tree | fb562597c59110eb319e9cd8f484280fcf587433 /pkgs/tools/text | |
| parent | 7d7a9df3605c86e17bced51afe67eecd43f99754 (diff) | |
| parent | df310048e5f4a516663bf8c5a74029b54813a7f3 (diff) | |
| download | nixlib-7a005601d48f760864258e369364b3b847d4e9fd.tar nixlib-7a005601d48f760864258e369364b3b847d4e9fd.tar.gz nixlib-7a005601d48f760864258e369364b3b847d4e9fd.tar.bz2 nixlib-7a005601d48f760864258e369364b3b847d4e9fd.tar.lz nixlib-7a005601d48f760864258e369364b3b847d4e9fd.tar.xz nixlib-7a005601d48f760864258e369364b3b847d4e9fd.tar.zst nixlib-7a005601d48f760864258e369364b3b847d4e9fd.zip | |
Merge branch 'master' to resolve conflicts
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/grin/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/highlight/default.nix | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index da3a77e8d2e4..149af7baa2d7 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec { namePrefix = ""; src = fetchurl { - url = "https://pypi.python.org/packages/source/g/grin/${name}.tar.gz"; + url = "mirror://pypi/g/grin/${name}.tar.gz"; sha256 = "1swzwb17wibam8jszdv98h557hlx44pg6psv6rjz7i33qlxk0fdz"; }; diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index debf862672ce..81995705b523 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, getopt, lua, boost, pkgconfig }: stdenv.mkDerivation rec { - name = "highlight-3.18"; + name = "highlight-${version}"; + version = "3.28"; src = fetchurl { url = "http://www.andre-simon.de/zip/${name}.tar.bz2"; - sha256 = "0jsq78qb75sawwggbpx5pdqxk00wgjr1a0la0w8wihmamsjzgijm"; + sha256 = "1kg73isgz3czb1k6ccajqzifahr3zs9ci8168k0dlj31j1nlndin"; }; buildInputs = [ getopt lua boost pkgconfig ]; |