Rob/tsd80 buildkite ci nix (#34)

* test pipeline

* Stack effort

* added quotes

* docker effort

* fixed nix

* nix test

* nix fix

* nix fixes

* buildkite

* Another nix revision

* buildkite nix file reference change

* pipeline edit

* pipeline edit

* pipeline fix

* changed referenced hash to nixpkgs

* CI note

* build badge

* Semigroup needed to be added alongside Monoid

* CI Notes updated

* slight polishing of notes

* Forgot nix-shell -p

* [TSD-80] - Removed old nix files, renamed release1 to shell, took excess comments out of stack.yaml

* changed pipeline/docs to reflect rename to shell.nix

* stack yaml updates

* replaced stack comments

* Regenerated default.nix

* re-added fetchNixpkgs

* nixpkgs-src.json added

* readded all old nix

* copied nixpkgs-src.json from cardano-sl

* readded old shell.nix

* pipeline edit

* default modified

* default/shell modified

* default.nix changed

* reverted to older nixpkgs

* Regex issue fixed

* added Hydra config

Signed-off-by: Rob Cohen <[email protected]>

* changed buildkite to nix build -f default.nix

* changed nix

* Regex change needs to stay

Author: robcohen

.buildkite/pipeline.yml

@@ -0,0 +1,5 @@
+steps:
+  - label: 'log-classifier-x86_64-linux-nix'
+    command: 'nix build -f default.nix' 
+    agents:
+      system: x86_64-linux

CI.md

@@ -0,0 +1,14 @@
+# Buildkite
+
+These are the instructions for generating nix expressions for buildkite CI for log-classifier.
+
+```
+$ cd $LOG_CLASSIFIER_ROOT
+$ cabal2nix . > default.nix
+$ nix-shell -p nix-prefetch-git
+nix-shell $ nix-prefetch-git https://github.com/NixOS/nixpkgs.git > nixpkgs.json
+```
+
+NOTE: 
+  - NIX_PATH - Get from https://github.com/NixOS/nixpkgs, click clone, copy ZIP link, rename to .tar.gz.
+  - buildkite pipeline command is "nix-build -I nixpkgs=$NIX_PATH shell.nix"

README.md

@@ -1,3 +1,5 @@
+[![Build status](https://badge.buildkite.com/50d1fa0b6ed53deb7bca3b81419fd2c65e7c22f67d2101e552.svg)](https://buildkite.com/input-output-hk/log-classifier)
+
 # log-classifier
 
 Original version by Hiroto Shioi (https://github.com/HirotoShioi).

cabal2nix.nix

@@ -0,0 +1,28 @@
+{ mkDerivation, aeson, array, attoparsec, base, bytestring
+, containers, directory, generics-sop, hspec, http-conduit
+, monad-control, mtl, optparse-applicative, QuickCheck, reflection
+, regex-tdfa, resource-pool, sqlite-simple, stdenv, text, time
+, transformers-base, universum, unliftio, zip-archive
+}:
+mkDerivation {
+  pname = "log-classifier";
+  version = "1.2.0.0";
+  src = ./.;
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    aeson array attoparsec base bytestring containers directory
+    generics-sop http-conduit monad-control mtl optparse-applicative
+    QuickCheck reflection regex-tdfa resource-pool sqlite-simple text
+    time transformers-base universum unliftio zip-archive
+  ];
+  executableHaskellDepends = [ base universum ];
+  testHaskellDepends = [
+    aeson array attoparsec base bytestring containers hspec
+    http-conduit mtl QuickCheck reflection regex-tdfa text universum
+    zip-archive
+  ];
+  homepage = "https://github.com/input-output-hk/log-classifier#readme";
+  description = "Log classifier for a Cardano node";
+  license = stdenv.lib.licenses.mit;
+}

default.nix

@@ -1,12 +1,5 @@
-with import <nixpkgs> {};
+let lib = import ./lib.nix;
 
-let
-  ghc = haskellPackages.ghcWithPackages (ps: with ps; [aeson array attoparsec bytestring containers http-conduit
-                                                       mtl optparse-applicative regex-tdfa reflection universum zip-archive]);
-in runCommand "log-classifier" { buildInputs = [ ghc haskellPackages.ghcid ]; } ''
-  cp -r ${builtins.fetchGit ./.} src
-  chmod -R +w src
-  cd src
-  mkdir -p $out/bin/
-  ghc src/Lib.hs -o $out/bin/log-classifier -Wall
-''
+    pkgs = import lib.fetchNixPkgs {};
+in
+  pkgs.haskell.packages.ghc822.callPackage ./cabal2nix.nix {}

fetch-nixpkgs.nix

@@ -1,4 +1,9 @@
 let
-  spec = builtins.fromJSON (builtins.readFile ./nixpkgs-src.json);
-in
-  import ./fetchNixpkgs.nix spec
+  # temporary hack until scripts/nix-shell.sh ceases to use -p
+  pkgs_path = import ./fetchNixpkgs.nix (builtins.fromJSON (builtins.readFile ./nixpkgs-src.json));
+  pkgs = import pkgs_path { config = {}; overlays = []; };
+  wrapped = pkgs.runCommand "nixpkgs" {} ''
+    ln -sv ${pkgs_path} $out
+  '';
+in if 0 <= builtins.compareVersions builtins.nixVersion "1.12" then wrapped else pkgs_path
+

fetchNixpkgs.nix

@@ -38,4 +38,4 @@ else
       gzip      = builtins.storePath builtin-paths.gzip;
       coreutils = builtins.storePath builtin-paths.coreutils;
     };
-  }).nixpkgs
+}).nixpkgs

lib.nix

@@ -12,8 +12,40 @@ let
        then result
        else default;
 
+  # Removes files within a Haskell source tree which won't change the
+  # result of building the package.
+  # This is so that cached build products can be used whenever possible.
+  # It also applies the lib.cleanSource filter from nixpkgs which
+  # removes VCS directories, emacs backup files, etc.
+  cleanSourceTree = src:
+    if (builtins.typeOf src) == "path"
+      then lib.cleanSourceWith {
+        filter = with pkgs.stdenv;
+          name: type: let baseName = baseNameOf (toString name); in ! (
+            # Filter out cabal build products.
+            baseName == "dist" || baseName == "dist-newstyle" ||
+            baseName == "cabal.project.local" ||
+            # Filter out stack build products.
+            lib.hasPrefix ".stack-work" baseName ||
+            # Filter out files which are commonly edited but don't
+            # affect the cabal build.
+            lib.hasSuffix ".nix" baseName
+          );
+        src = lib.cleanSource src;
+      } else src;
+
   pkgs = import fetchNixPkgs {};
   lib = pkgs.lib;
 in lib // (rec {
-  inherit fetchNixPkgs;
+  inherit fetchNixPkgs cleanSourceTree;
+  isCardanoSL = lib.hasPrefix "cardano-sl";
+  isBenchmark = args: !((args.isExecutable or false) || (args.isLibrary or true));
+
+  # Insert this into builder scripts where programs require a UTF-8
+  # locale to work.
+  utf8LocaleSetting = ''
+    export LC_ALL=en_GB.UTF-8
+    export LANG=en_GB.UTF-8
+  '';
 })
+

nixpkgs-src.json

@@ -1,5 +1,5 @@
 {
-    "rev":            "5c09cdc187b014143302551e62d4973b5bf52814",
-    "sha256":         "1qzba4apgm9v1vnvmar89b1g9h2z741daiimrc0d3idxv1q97im0",
-    "sha256unpacked": "1qzba4apgm9v1vnvmar89b1g9h2z741daiimrc0d3idxv1q97im0"
+    "rev":            "120b013e0c082d58a5712cde0a7371ae8b25a601",
+    "sha256":         "1hbc3ng4iy4wv0kyr1zc7n4qx3wy5qlank42zq8h87wa8z3zdf14",
+    "sha256unpacked": "0hk4y2vkgm1qadpsm4b0q1vxq889jhxzjx3ragybrlwwg54mzp4f"
 }

release.nix

@@ -0,0 +1,3 @@
+{
+ log-classifier = import ./.;
+}