Merge pull request #418 from AndersonTorres/nix

Nix updates

Author: AndreaCrotti

snippets.html

@@ -3,6 +3,8 @@
 # key: bp
 # --
 buildPhase= ''
+  runHook preBuild
 $1
+  runHook postBuild
 '';
 $0

snippets/nix-mode/buildPhase

@@ -0,0 +1,6 @@
+# -*- mode: snippet -*-
+# name: callPackage
+# key: ca
+# --
+  $1 = callPackage ../$2/$1 { };
+$0

snippets/nix-mode/callPackage

@@ -3,6 +3,8 @@
 # key: ch
 # --
 checkPhase= ''
+  runHook preCheck
 $1
+  runHook postCheck
 '';
 $0

snippets/nix-mode/checkPhase

@@ -3,6 +3,8 @@
 # key: cp
 # --
 configurePhase= ''
+  runHook preConfigure
 $1
+  runHook postConfigure
 '';
 $0

snippets/nix-mode/configurePhase

@@ -3,6 +3,8 @@
 # key: dp
 # --
 distPhase= ''
+  runHook preDist
 $1
+  runHook postDist
 '';
 $0

snippets/nix-mode/distPhase

@@ -2,7 +2,9 @@
 # name: fixPhase
 # key: fp
 # --
-fixPhase= ''
+fixupPhase= ''
+  runHook preFixup
 $1
+  runHook postFixup
 '';
 $0

snippets/nix-mode/fixPhase renamed to snippets/nix-mode/fixupPhase

@@ -3,6 +3,8 @@
 # key: ic
 # --
 installCheckPhase= ''
+  runHook preInstallCheck
 $1
+  runHook postInstallCheck
 '';
 $0

snippets/nix-mode/installCheckPhase

@@ -3,10 +3,12 @@
 # key: ip
 # --
 installPhase= ''
+  runHook preInstall
 ${1:    mkdir -p \$out/bin
     for f in \$(find . -executable -type f);
     do
       cp \$f \$out/bin/
     done}
+  runHook postInstall
 '';
 $0

snippets/nix-mode/installPhase

@@ -2,66 +2,81 @@
 # name: package github
 # key: pg
 # --
-{ stdenv, fetchFromGitHub$1 }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, $1
+, $2
+}:
 
 stdenv.mkDerivation rec {
-  pname = "$2";
-  version = "$3";
+  pname = "$3";
+  version = "$4";
 
   src = fetchFromGitHub {
-    owner = "$4";
-    repo = "$2";
-    rev = "${5:v\$\{version\}}";
-    sha256 = "$6";
+    owner = "$5";
+    repo = ${6:pname};
+    rev = "${7:v\$\{version\}}";
+    sha256 = "${8:\$\{lib.fakeSha256\}}";
   };
 
-  buildInputs = [ $1 ];
+  nativeBuildInputs = [ ${1:$(replace-regexp-in-string "  *" " "(subst-char-in-string ?, ? yas-text))} ];
+  buildInputs = [
+    ${2:$(replace-regexp-in-string "  *" " "(subst-char-in-string ?, ? yas-text))}
+  ];
 
-  meta = with stdenv.lib; {
-    description = "$7";
-    homepage = "https://${8:github.com/$4/$2}";
-
-    license = licenses.${9:$$
+  meta = with lib; {
+    homepage = "https://${9:github.com/$5/$3}";
+    description = "$10";
+    longDescription = ''
+      $11
+    '';
+    license = licenses.${12:$$
   (yas-choose-value '(
-  "asl20"
-  "bsd2"
-  "bsd3"
-  "free"
-  "gpl2Only"
-  "gpl2Plus"
-  "gpl3Only"
-  "gpl3Plus"
-  "isc"
-  "lgpl21Only"
-  "lgpl21Plus"
-  "lgpl2Only"
-  "lgpl2Plus"
-  "lgpl3Only"
-  "mit"
-  "mpl20"
-  "ofl"
-  "unfree"
+    "agpl3"
+    "asl20"
+    "bsd1"
+    "bsd2"
+    "bsd3"
+    "free"
+    "gpl2"
+    "gpl2Only"
+    "gpl2Plus"
+    "gpl3"
+    "gpl3Only"
+    "gpl3Plus"
+    "isc"
+    "lgpl21Only"
+    "lgpl21Plus"
+    "lgpl2Only"
+    "lgpl2Plus"
+    "lgpl3"
+    "lgpl3Only"
+    "mit"
+    "mpl20"
+    "ofl"
+    "unfree"
   ))};
-    maintainers = with maintainers; [ $10 ];
-    platforms = platforms.${11:$$
+    maintainers = with maintainers; [ $12 ];
+    platforms = platforms.${13:$$
   (yas-choose-value '(
-  "linux"
-  "unix"
-  "all"
-  "darwin"
-  "gnu"
-  "freebsd"
-  "openbsd"
-  "netbsd"
-  "cygwin"
-  "illumos"
-  "none"
-  "allBut"
-  "mesaPlatforms"
-  "x86"
-  "i686"
-  "arm"
-  "mips"
+    "all"
+    "allBut"
+    "arm"
+    "cygwin"
+    "darwin"
+    "freebsd"
+    "gnu"
+    "i686"
+    "illumos"
+    "linux"
+    "mesaPlatforms"
+    "mips"
+    "netbsd"
+    "none"
+    "openbsd"
+    "unix"
+    "x86"
   ))};
   };
 }