diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-10-30 09:50:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-30 09:50:39 -0400 |
| commit | edc2796b1515e823ee431d05137dc293435aaca8 (patch) | |
| tree | a8f3bbb295bdb98a2d3b4c300459ebcc89ec7bba | |
| parent | mikutter: mark as broken (diff) | |
| parent | highlight: 3.39 -> 3.40, fetch src from Github (diff) | |
| download | nixpkgs-edc2796b1515e823ee431d05137dc293435aaca8.tar.gz | |
Merge pull request #30968 from WilliButz/highlight-update
highlight: 3.39 -> 3.40
| -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 ]; }; } |