snippets/nix-mode: update/modernization to the new guidelines

AndersonTorres · AndersonTorres · commit 012671b84f86 · 2021-02-16T10:47:08.000-03:00
Nixpkgs has new, clearer guidelines for contribution, like pre- and post- hooks
for the phases and lib independent from stdenv, among others.

This commit applies the guidelines to this recent work.
diff --git a/snippets.html b/snippets.html
diff --git a/snippets/nix-mode/buildPhase b/snippets/nix-mode/buildPhase
@@ -3,6 +3,8 @@
 # key: bp
 # --
 buildPhase= ''
+  runHook preBuild
 $1
+  runHook postBuild
 '';
 $0
diff --git a/snippets/nix-mode/checkPhase b/snippets/nix-mode/checkPhase
@@ -3,6 +3,8 @@
 # key: ch
 # --
 checkPhase= ''
+  runHook preCheck
 $1
+  runHook postCheck
 '';
 $0
diff --git a/snippets/nix-mode/configurePhase b/snippets/nix-mode/configurePhase
@@ -3,6 +3,8 @@
 # key: cp
 # --
 configurePhase= ''
+  runHook preConfigure
 $1
+  runHook postConfigure
 '';
 $0
diff --git a/snippets/nix-mode/distPhase b/snippets/nix-mode/distPhase
@@ -3,6 +3,8 @@
 # key: dp
 # --
 distPhase= ''
+  runHook preDist
 $1
+  runHook postDist
 '';
 $0
diff --git a/snippets/nix-mode/fixupPhase b/snippets/nix-mode/fixupPhase
@@ -2,7 +2,9 @@
 # name: fixPhase
 # key: fp
 # --
-fixPhase= ''
+fixupPhase= ''
+  runHook preFixup
 $1
+  runHook postFixup
 '';
 $0
diff --git a/snippets/nix-mode/installCheckPhase b/snippets/nix-mode/installCheckPhase
@@ -3,6 +3,8 @@
 # key: ic
 # --
 installCheckPhase= ''
+  runHook preInstallCheck
 $1
+  runHook postInstallCheck
 '';
 $0
diff --git a/snippets/nix-mode/installPhase b/snippets/nix-mode/installPhase
@@ -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
diff --git a/snippets/nix-mode/package_github b/snippets/nix-mode/package_github
@@ -2,7 +2,11 @@
 # name: package github
 # key: pg
 # --
-{ stdenv, fetchFromGitHub$1 }:
+{ lib
+, stdenv
+, fetchFromGitHub
+$1
+}:
 
 stdenv.mkDerivation rec {
   pname = "$2";
@@ -12,56 +16,61 @@ stdenv.mkDerivation rec {
     owner = "$4";
     repo = "$2";
     rev = "${5:v\$\{version\}}";
-    sha256 = "$6";
+    sha256 = "${6:\$\{lib.fakeSha256\}}";
   };
 
+  nativeBuildInputs = [ ];
   buildInputs = [ $1 ];
 
-  meta = with stdenv.lib; {
-    description = "$7";
-    homepage = "https://${8:github.com/$4/$2}";
-
+  meta = with lib; {
+    homepage = "https://${7:github.com/$4/$2}";
+    description = "$8";
     license = licenses.${9:$$
   (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:$$
   (yas-choose-value '(
-  "linux"
-  "unix"
   "all"
+  "allBut"
+  "arm"
+  "cygwin"
   "darwin"
-  "gnu"
   "freebsd"
-  "openbsd"
-  "netbsd"
-  "cygwin"
+  "gnu"
+  "i686"
   "illumos"
-  "none"
-  "allBut"
+  "linux"
   "mesaPlatforms"
-  "x86"
-  "i686"
-  "arm"
   "mips"
+  "netbsd"
+  "none"
+  "openbsd"
+  "unix"
+  "x86"
   ))};
   };
 }
diff --git a/snippets/nix-mode/package_url b/snippets/nix-mode/package_url
@@ -2,53 +2,73 @@
 # name: package url
 # key: pu
 # --
-{ stdenv, fetchurl$1}:
+{ lib
+, stdenv
+, fetchurl
+$1
+}:
 
 stdenv.mkDerivation rec {
-  version = "$2";
-  name = "$3-\$\{version\}";
+  pname = "$2";
+  version = "$3";
 
   src = fetchurl {
     url = "$4";
-    sha256 = "$5";
+    sha256 = "${5:\$\{lib.fakeSha256\}}";
   };
 
+  nativeBuildInputs = [ ];
   buildInputs = [ $1 ];
 
-  meta = {
-    description = "$6";
-    homepage = https://$7;
-    license = stdenv.lib.licenses.${8:$$
+  meta = with lib; {
+    homepage = "https://$6";
+    description = "$7";
+    license = licenses.${8:$$
   (yas-choose-value '(
     "agpl3"
     "asl20"
+    "bsd1"
     "bsd2"
     "bsd3"
+    "free"
     "gpl2"
+    "gpl2Only"
+    "gpl2Plus"
     "gpl3"
+    "gpl3Only"
+    "gpl3Plus"
+    "isc"
+    "lgpl21Only"
+    "lgpl21Plus"
+    "lgpl2Only"
+    "lgpl2Plus"
     "lgpl3"
+    "lgpl3Only"
     "mit"
+    "mpl20"
+    "ofl"
+    "unfree"
   ))};
-    maintainers = [ stdenv.lib.maintainers.$9 ];
-    platforms = stdenv.lib.platforms.${10:$$
+    maintainers = with maintainers; [ $9 ];
+    platforms = platforms.${10:$$
   (yas-choose-value '(
-  "gnu"
-  "linux"
+  "all"
+  "allBut"
+  "arm"
+  "cygwin"
   "darwin"
   "freebsd"
-  "openbsd"
-  "netbsd"
-  "cygwin"
+  "gnu"
+  "i686"
   "illumos"
-  "unix"
-  "all"
-  "none"
-  "allBut"
+  "linux"
   "mesaPlatforms"
-  "x86"
-  "i686"
-  "arm"
   "mips"
+  "netbsd"
+  "none"
+  "openbsd"
+  "unix"
+  "x86"
   ))};
   };
 }
diff --git a/snippets/nix-mode/patchPhase b/snippets/nix-mode/patchPhase
@@ -3,6 +3,8 @@
 # key: pp
 # --
 patchPhase = ''
+  runHook prePatch
   $1
+  runHook postPatch
 '';
 $0
diff --git a/snippets/nix-mode/unpackPhase b/snippets/nix-mode/unpackPhase
@@ -3,6 +3,8 @@
 # key: up
 # --
 unpackPhase = ''
+  runHook preUnpack
   $1
+  runHook postUnpack
 '';
 $0
