From cf71eed06efccdfdc6fe9319b5df76621601a98f Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 17 Aug 2020 02:39:06 +0200 Subject: [PATCH] bgnet: 3.0.21 -> 3.1.2 Also builds from source now, the old tarball was long gone. --- pkgs/data/documentation/bgnet/default.nix | 27 +++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/data/documentation/bgnet/default.nix index f5ac07f1b7f..a69a2d7a64f 100644 --- a/pkgs/data/documentation/bgnet/default.nix +++ b/pkgs/data/documentation/bgnet/default.nix @@ -1,27 +1,30 @@ -{ stdenv, lib, fetchurl, python, zip, fop }: +{ stdenv, lib, fetchFromGitHub, python3, pandoc }: stdenv.mkDerivation { pname = "bgnet"; - version = "3.0.21"; + # to be found in the Makefile + version = "3.1.2"; - src = fetchurl { - url = "https://beej.us/guide/bgnet/bgnet.tgz"; - sha256 = "00ggr5prc5i3w9gaaw2sadfq6haq7lmh0vdilaxx8xz9z5znxvyv"; + src = fetchFromGitHub { + owner = "beejjorgensen"; + repo = "bgnet"; + rev = "782a785a35d43c355951b8151628d7c64e4d0346"; + sha256 = "19w0r3zr71ydd29amqwn8q3npgrpy5kkshyshyji2hw5hky6iy92"; }; - buildInputs = [ python zip fop ]; - - preBuild = '' - sed -i "s/#disable=1/disable=1/" bin/bgvalidate + buildPhase = '' # build scripts need some love - patchShebangs . + patchShebangs bin/preproc + + make -C src bgnet.html ''; installPhase = '' - mkdir -p $out - mv * $out/ + install -Dm644 src/bgnet.html $out/share/doc/bgnet/html/index.html ''; + nativeBuildInputs = [ python3 pandoc ]; + meta = { description = "Beej’s Guide to Network Programming"; homepage = "https://beej.us/guide/bgnet/";