X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=default.nix;h=abf6237fe689665c7ce918429c0debcd9f5ffaa4;hb=267e5ce7c38b8f45b8400adc4e21c3cf705b4b6a;hp=b1ae800027ceffcf35e5c0f9d4cfb5e20864cfbb;hpb=111049f36408d221bf5452ba9124b782100376a8;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/default.nix b/default.nix
index b1ae800..abf6237 100644
--- a/default.nix
+++ b/default.nix
@@ -1,5 +1,5 @@
-with import <immaeNixpkgsNext> {};
-with import ./libs.nix { nixpkgs = import <immaeNixpkgsNext> {}; };
+with import <nixpkgs> {};
+with import ./libs.nix { nixpkgs = import <nixpkgs> {}; };
 let
   mypkgs = {};
 
@@ -93,7 +93,7 @@ let
     };
   };
 
-  mypkgs.terminal-velocity = with python3Packages; buildPythonApplication rec {
+  mypkgs.terminal-velocity = with python36Packages; buildPythonApplication rec {
     pname = "terminal-velocity-git";
     version = "0.2.0";
 
@@ -161,6 +161,7 @@ let
     configureFlags = [
       "--with-etc-dir=/etc/cnagios"
       "--with-var-dir=/var/lib/naemon"
+      "--with-status-file=/var/lib/naemon/status.dat"
       "--with-nagios-data=4"
     ];
 
@@ -616,6 +617,44 @@ let
       '';
   });
 
+  mypkgs.flrn = let
+    slang = stdenv.mkDerivation rec {
+      name = "slang-debian-patched-${version}";
+      version = "1.4.9";
+      src = fetchurl {
+        url = "ftp://space.mit.edu/pub/davis/slang/v1.4/slang-1.4.9.tar.gz";
+        sha256 = "1y2mg0whqh4b3acd0k17i4biz55bimxg8aaxhmwd165cvspxns9r";
+      };
+      debianPatches = fetchurl {
+        url = "http://archive.debian.org/debian-archive/debian-amd64/pool/main/s/slang/slang_1.4.9dbs-8.diff.gz";
+        sha256 = "0xdq14k5ynqfwpmis1rcggs7m4n921i3bs27icbmbhfg5gb2hap2";
+      };
+      preConfigure = ''
+        cp $debianPatches ./slang.diff.gz
+        gunzip slang.diff.gz
+        patch -p1 < slang.diff
+        for i in debian/patches/*; do
+          patch -p1 < $i
+        done
+        makeFlagsArray=(CFLAGS=" -g -O2 -fno-strength-reduce -DUTF8 -D_REENTRANT -D_XOPEN_SOURCE=500")
+        '';
+      postBuild = ''
+        sed -i "1i#ifndef UTF8\n#define UTF8\n#endif" src/slang.h
+        '';
+    };
+  in
+    stdenv.mkDerivation (fetchedGithub ./fetched/flrn.json // rec {
+      buildInputs = [ libetpan openssl autoconf groff slang yacc ];
+      preConfigure = ''
+        sed -i -e "s/test -e configure/false/" configure.in
+        autoconf
+        sed -i -e '/define CHECK_MAIL/d' src/flrn_config.h
+        sed -i -e '/DEFAULT_DIR_FILE/s@".flrn"@".config/flrn"@' src/flrn_config.h
+        sed -i -e '/DEFAULT_CONFIG_FILE/s@".flrnrc"@"flrnrc"@' src/flrn_config.h
+        sed -i -e '/DEFAULT_FLNEWS_FILE/s@".flnewsrc"@"flnewsrc"@' src/flrn_config.h
+        sed -i -e '/flrn_char chaine/s@18@20@' src/flrn_command.c
+        '';
+    });
 # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh
 # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks
 in
@@ -679,4 +718,7 @@ in
     inherit bc;
     inherit cpulimit;
     inherit dmenu st;
+    inherit poppler_utils;
+    inherit tmux;
+    inherit netcat-gnu;
   }