summary refs log tree commit diff
path: root/pkgs/applications/misc/styx
diff options
context:
space:
mode:
authorEric Sagnes <eric.sagnes@gmail.com>2016-12-07 15:01:03 +0900
committerEric Sagnes <eric.sagnes@gmail.com>2016-12-07 15:01:03 +0900
commitc56fa24745374b95ed4ec08a3004d8aab844da09 (patch)
tree244177db8fa56ca8599adf54276b48053b0c94af /pkgs/applications/misc/styx
parent85ecde87c8b5ab39ce34407b1d74ec92db784ae1 (diff)
downloadnixpkgs-c56fa24745374b95ed4ec08a3004d8aab844da09.tar
nixpkgs-c56fa24745374b95ed4ec08a3004d8aab844da09.tar.gz
nixpkgs-c56fa24745374b95ed4ec08a3004d8aab844da09.tar.bz2
nixpkgs-c56fa24745374b95ed4ec08a3004d8aab844da09.tar.lz
nixpkgs-c56fa24745374b95ed4ec08a3004d8aab844da09.tar.xz
nixpkgs-c56fa24745374b95ed4ec08a3004d8aab844da09.tar.zst
nixpkgs-c56fa24745374b95ed4ec08a3004d8aab844da09.zip
styx: 0.3.1 -> 0.4.0
Diffstat (limited to 'pkgs/applications/misc/styx')
-rw-r--r--pkgs/applications/misc/styx/default.nix20
1 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix
index aa1c1deebd6..15e8453de51 100644
--- a/pkgs/applications/misc/styx/default.nix
+++ b/pkgs/applications/misc/styx/default.nix
@@ -1,21 +1,30 @@
-{ stdenv, fetchFromGitHub, caddy, asciidoctor }:
+{ stdenv, fetchFromGitHub, caddy, asciidoctor
+, file, lessc, sass, multimarkdown }:
 
 stdenv.mkDerivation rec {
   name    = "styx-${version}";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner  = "styx-static";
     repo   = "styx";
     rev    = "v${version}";
-    sha256 = "0wyibdyi4ld0kfhng5ldb2rlgjrci014fahxn7nnchlg7dvcc5ni";
+    sha256 = "1s4465absxqwlwhn5rf51h0s1rw25ls581yjg0fy9kbyhy979qvs";
   };
 
-  server = caddy.bin;
+  setSourceRoot = "cd styx-*/src; export sourceRoot=`pwd`";
+
+  server = "${caddy.bin}/bin/caddy";
 
   nativeBuildInputs = [ asciidoctor ];
 
-  setSourceRoot = "cd styx-*/src; export sourceRoot=`pwd`";
+  propagatedBuildInputs = [
+    file
+    lessc
+    sass
+    asciidoctor
+    multimarkdown
+  ];
 
   installPhase = ''
     mkdir $out
@@ -24,6 +33,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/styx
     cp -r lib $out/share/styx
     cp -r scaffold $out/share/styx
+    cp    builder.nix $out/share/styx
 
     mkdir -p $out/share/doc/styx
     asciidoctor doc/manual.adoc -o $out/share/doc/styx/index.html