@@ -1,27 +1,30 @@
1−{ stdenv, lib, fetchurl, python, zip, fop }:
1+{ stdenv, lib, fetchFromGitHub, python3, pandoc }:
3stdenv.mkDerivation {
3stdenv.mkDerivation {
4 pname = "bgnet";
4 pname = "bgnet";
5+ # to be found in the Makefile
5− version = "3.0.21";
6+ version = "3.1.2";
7− src = fetchurl {
8+ src = fetchFromGitHub {
8− url = "https://beej.us/guide/bgnet/bgnet.tgz";
9+ owner = "beejjorgensen";
9− sha256 = "00ggr5prc5i3w9gaaw2sadfq6haq7lmh0vdilaxx8xz9z5znxvyv";
10+ repo = "bgnet";
11+ rev = "782a785a35d43c355951b8151628d7c64e4d0346";
12+ sha256 = "19w0r3zr71ydd29amqwn8q3npgrpy5kkshyshyji2hw5hky6iy92";
12− buildInputs = [ python zip fop ];
15+ buildPhase = ''
15− sed -i "s/#disable=1/disable=1/" bin/bgvalidate
16 # build scripts need some love
16 # build scripts need some love
17− patchShebangs .
17+ patchShebangs bin/preproc
19+ make -C src bgnet.html
20 installPhase = ''
22 installPhase = ''
21− mkdir -p $out
23+ install -Dm644 src/bgnet.html $out/share/doc/bgnet/html/index.html
26+ nativeBuildInputs = [ python3 pandoc ];
26 description = "Beej’s Guide to Network Programming";
29 description = "Beej’s Guide to Network Programming";
27 homepage = "https://beej.us/guide/bgnet/";
30 homepage = "https://beej.us/guide/bgnet/";