Improve definitions for building on Nix

jbboehr · Nov 11, 2018 · 9306f30 · 9306f30
1 parent b4f9dee
commit 9306f30
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 36 deletions.
diff --git a/default.nix b/default.nix
@@ -1,37 +1,11 @@
-{ pkgs ? import <nixpkgs> {} }:
-
-let
- stdenv = pkgs.stdenv;
- fetchurl = pkgs.fetchurl;
-in
-  stdenv.mkDerivation rec {
-    name = "handlebars-spec-4.0.5-p1";
-
-    builder = pkgs.writeText "builder.sh" ''
-        source $stdenv/setup
-        
-        buildPhase() {
-            echo do nothing
-        }
-        
-        installPhase() {
-            mkdir -p $out/share/handlebars-spec
-            cp -prvd spec export $out/share/handlebars-spec/
-        }
-        
-        genericBuild
-      '';
-
-    src = fetchurl {
-      url = https://github.com/jbboehr/handlebars-spec/archive/v4.0.5-p1.tar.gz;
-      sha256 = "223985eba1ce477c92bcc9c8fab212c059775a54c123dd041b813a6d3844190f";
-    };
-
-    meta = {
-      description = "The Handlebars.js specification converted to JSON.";
-      homepage = https://github.com/jbboehr/handlebars-spec;
-      license = "MIT";
-      maintainers = [ "John Boehr <jbboehr@gmail.com>" ];
-    };
-  }
+{
+  pkgs ? import <nixpkgs> {},
+  handlebarsSpecVersion ? null,
+  handlebarsSpecSrc ? ./.,
+  handlebarsSpecSha256 ? null
+}:
+
+pkgs.callPackage ./derivation.nix {
+  inherit handlebarsSpecVersion handlebarsSpecSrc handlebarsSpecSha256;
+}
 
diff --git a/derivation.nix b/derivation.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  writeText,
+  fetchurl,
+  handlebarsSpecVersion ? null,
+  handlebarsSpecSrc ? null,
+  handlebarsSpecSha256 ? null
+}:
+
+let 
+  orDefault = x: y: (if (!isNull x) then x else y);
+in
+
+stdenv.mkDerivation rec {
+  name = "handlebars-spec-${version}";
+  version = orDefault handlebarsSpecVersion "v4.0.5-p1";
+  src = orDefault handlebarsSpecSrc (fetchurl {
+    url = "https://github.com/jbboehr/handlebars-spec/archive/${version}.tar.gz";
+    sha256 = orDefault handlebarsSpecSha256 "477552869cf4a8d3cadb74f0d297988dfa9edddbc818ee8f56bae0a097dc657c";
+  });
+
+  builder = writeText "builder.sh" ''
+      source $stdenv/setup
+      
+      buildPhase() {
+          echo do nothing
+      }
+      
+      installPhase() {
+          mkdir -p $out/share/handlebars-spec
+          cp -prvd spec export $out/share/handlebars-spec/
+      }
+      
+      genericBuild
+    '';
+
+  meta = {
+    description = "The Handlebars.js specification converted to JSON.";
+    homepage = https://github.com/jbboehr/handlebars-spec;
+    license = "MIT";
+    maintainers = [ "John Boehr <jbboehr@gmail.com>" ];
+  };
+}
+