aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkgs/BuildXSLT.nix23
-rw-r--r--pkgs/InputXSLT.nix20
-rw-r--r--pkgs/StaticXSLT.nix23
-rw-r--r--pkgs/generate.nix12
-rw-r--r--pkgs/preview.nix10
-rw-r--r--shell.nix32
6 files changed, 17 insertions, 103 deletions
diff --git a/pkgs/BuildXSLT.nix b/pkgs/BuildXSLT.nix
deleted file mode 100644
index 4e5dcb6..0000000
--- a/pkgs/BuildXSLT.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
- name = "BuildXSLT";
-
- src = fetchFromGitHub {
- owner = "KnairdA";
- repo = "BuildXSLT";
- rev = "master";
- sha256 = "09kxhvhzn0r62l39zgj1kc21rb565fnc1y3sg48p4gi4v15xjmc6";
- };
-
- installPhase = ''
- mkdir $out
- cp -r * $out/
- '';
-
- meta = with stdenv.lib; {
- description = "BuildXSLT";
- homepage = https://github.com/KnairdA/BuildXSLT/;
- license = stdenv.lib.licenses.mit;
- };
-}
diff --git a/pkgs/InputXSLT.nix b/pkgs/InputXSLT.nix
deleted file mode 100644
index a85bc37..0000000
--- a/pkgs/InputXSLT.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, boost, xalanc, xercesc, discount }:
-
-stdenv.mkDerivation rec {
- name = "InputXSLT";
-
- src = fetchFromGitHub {
- owner = "KnairdA";
- repo = "InputXSLT";
- rev = "master";
- sha256 = "1j9fld3sh1jyscnsx6ab9jn5x6q67rjh9p3bgsh5na1qrs40dql0";
- };
-
- buildInputs = [ cmake boost xalanc xercesc discount ];
-
- meta = with stdenv.lib; {
- description = "InputXSLT";
- homepage = https://github.com/KnairdA/InputXSLT/;
- license = stdenv.lib.licenses.asl20;
- };
-}
diff --git a/pkgs/StaticXSLT.nix b/pkgs/StaticXSLT.nix
deleted file mode 100644
index 3caee06..0000000
--- a/pkgs/StaticXSLT.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
- name = "StaticXSLT";
-
- src = fetchFromGitHub {
- owner = "KnairdA";
- repo = "StaticXSLT";
- rev = "master";
- sha256 = "17gd181cw9yyc4h1fn7fikcgm8g7fdwm7d7fxwib4aynm18kwqad";
- };
-
- installPhase = ''
- mkdir $out
- cp -r * $out/
- '';
-
- meta = with stdenv.lib; {
- description = "StaticXSLT";
- homepage = https://github.com/KnairdA/StaticXSLT/;
- license = stdenv.lib.licenses.mit;
- };
-}
diff --git a/pkgs/generate.nix b/pkgs/generate.nix
deleted file mode 100644
index 25f1ca1..0000000
--- a/pkgs/generate.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-
-let
- InputXSLT = pkgs.callPackage ./InputXSLT.nix {};
- StaticXSLT = pkgs.callPackage ./StaticXSLT.nix {};
- BuildXSLT = pkgs.callPackage ./BuildXSLT.nix {};
-in pkgs.writeScriptBin
- "generate"
- ''
- #!/bin/sh
- ${InputXSLT}/bin/ixslt --input make.xml --transformation ${BuildXSLT}/build.xsl --include ${StaticXSLT}/
- ''
diff --git a/pkgs/preview.nix b/pkgs/preview.nix
deleted file mode 100644
index 352de43..0000000
--- a/pkgs/preview.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-
-pkgs.writeScriptBin
- "preview"
- ''
- #!/bin/sh
- pushd target/99_result
- ${pkgs.python3}/bin/python -m http.server 8080
- popd
- ''
diff --git a/shell.nix b/shell.nix
index 6f297a7..84601f8 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,19 +1,21 @@
-with import <nixpkgs> {};
+{ system ? builtins.currentSystem }:
-stdenv.mkDerivation rec {
- name = "env";
- env = buildEnv { name = name; paths = buildInputs; };
+let
+ pkgs = import <nixpkgs> { inherit system; };
+ mypkgs = import (fetchTarball "https://pkgs.kummerlaender.eu/nixexprs.tar.gz") { };
- buildInputs = let
- InputXSLT = pkgs.callPackage ./pkgs/InputXSLT.nix {};
- generate = pkgs.callPackage ./pkgs/generate.nix {};
- preview = pkgs.callPackage ./pkgs/preview.nix {};
- in [
- generate
- preview
- InputXSLT
- wget
- pandoc
- highlight
+in pkgs.stdenv.mkDerivation rec {
+ name = "Overview";
+
+ buildInputs = [
+ pkgs.curl
+ pkgs.pandoc
+ pkgs.highlight
+ mypkgs.katex-wrapper
+ mypkgs.make-xslt
];
+
+ shellHook = ''
+ export NIX_SHELL_NAME="${name}"
+ '';
}