diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-30 22:30:14 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-30 22:30:14 +0100 |
commit | 687943763c57016b5fc96df14ea49c5f2ad3b7ef (patch) | |
tree | a73ce1d5a41d5f2cd8eee42f696e08989037c548 /pkgs/tools | |
parent | 5d41dda02db3f538fb253056575c151192d4ce41 (diff) | |
parent | 9d74a615ce99da0516d31de25d96ac9c9cd7576e (diff) | |
download | nixlib-687943763c57016b5fc96df14ea49c5f2ad3b7ef.tar nixlib-687943763c57016b5fc96df14ea49c5f2ad3b7ef.tar.gz nixlib-687943763c57016b5fc96df14ea49c5f2ad3b7ef.tar.bz2 nixlib-687943763c57016b5fc96df14ea49c5f2ad3b7ef.tar.lz nixlib-687943763c57016b5fc96df14ea49c5f2ad3b7ef.tar.xz nixlib-687943763c57016b5fc96df14ea49c5f2ad3b7ef.tar.zst nixlib-687943763c57016b5fc96df14ea49c5f2ad3b7ef.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/text/highlight/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 71c5e352b949..275d65e7c370 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, getopt, lua, boost, pkgconfig, gcc }: +{ stdenv, fetchFromGitHub, getopt, lua, boost, pkgconfig, gcc }: with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.39"; + version = "3.40"; - src = fetchurl { - url = "http://www.andre-simon.de/zip/${name}.tar.bz2"; - sha256 = "0z8gs69sqlyis4kvl8wwdgzywi199k73kkvn1mf9pf60npvcxwj4"; + src = fetchFromGitHub { + owner = "andre-simon"; + repo = "highlight"; + rev = "${version}"; + sha256 = "0bkywhz4y10qcajimdha1ck5mvn7fsrv3yn8nd6rqbva39gbfmfd"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; @@ -28,6 +30,6 @@ stdenv.mkDerivation rec { description = "Source code highlighting tool"; homepage = http://www.andre-simon.de/doku/highlight/en/highlight.php; platforms = platforms.unix; - maintainers = [ maintainers.ndowens ]; + maintainers = with maintainers; [ ndowens willibutz ]; }; } |