nix flake checkHEADupstream

3 files changed, 25 insertions, 21 deletions

diff --git a/README b/README
index c7ce091..9a48405 100644
--- a/README
+++ b/README
@@ -1,10 +1,12 @@
 -*- mode: org -*-
 
+git clone git://git.sisudoc.org/markup/sisu-markup-samples
+
 * what is this
 
 These are samples of documents for use by SiSU prepared with SiSU markup
 
-the current versions are contained in the sub-directory:
+the current markup versions are contained in the sub-directory:
 
 ./data/samples/current/en/
 
diff --git a/flake.nix b/flake.nix
index d259bd1..e6ca0d1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,6 +23,12 @@
           default              = sisu.packages.${system}.default;
           #vendorSha256         = "sha256-0Q00000000000000000000000000000000000000000=";
       });
+      apps = forAllSystems (system: {
+        default = {
+          type                 = "app";
+          program              = "${self.packages.${system}.default}/bin/sisu";
+        };
+      });
       devShells = forAllSystems (system:
         let
           pkgs = nixpkgsFor.${system};
@@ -55,14 +61,14 @@
             #export sisuSqlite="sisu --very-verbose --sqlite-update --sqlite-db-path=\"$sisuDBpath\" --sqlite-db-filename=\"sisu.search.db\" --output=\"\$sisuOUT\" $sisuPOD/*"
           '';
         in with pkgs; {
-          devShell = mkShell rec {
+          devShell = mkShell {
             name               = "sisu dev shell default";
             inherit shell;
             inherit devEnv;
             packages = [ sqlite ];
             inherit shellHook;
           };
-          devShell-epub = mkShell rec {
+          devShell-epub = mkShell {
             name               = "sisu dev shell for epub output";
             inherit shell;
             inherit devEnv;
@@ -89,7 +95,6 @@
               sigil
               calibre #(suite includes: ebook-viewer)
               foliate
-              devenv
               nixFlakes
               validatePkgConfig
               jq
@@ -97,7 +102,7 @@
             ];
             inherit shellHook;
           };
-          devShell-html = mkShell rec {
+          devShell-html = mkShell {
             name               = "sisu dev shell for latex & pdf output";
             inherit shell;
             inherit devEnv;
@@ -110,7 +115,6 @@
               zip
               unzip
               xz
-              devenv
               nixFlakes
               validatePkgConfig
               jq
@@ -118,7 +122,7 @@
             ];
             inherit shellHook;
           };
-          devShell-latex-pdf = mkShell rec {
+          devShell-latex-pdf = mkShell {
             name               = "sisu dev shell for latex & pdf output";
             inherit shell;
             inherit devEnv;
@@ -135,7 +139,6 @@
               source-serif-pro
               source-code-pro
               texlive.combined.scheme-full
-              devenv
               nixFlakes
               validatePkgConfig
               jq
@@ -143,7 +146,7 @@
             ];
             inherit shellHook;
           };
-          devShell-sqlite = mkShell rec {
+          devShell-sqlite = mkShell {
             name               = "sisu dev shell for latex & pdf output";
             inherit shell;
             inherit devEnv;
@@ -156,7 +159,6 @@
               zip
               unzip
               xz
-              devenv
               nixFlakes
               validatePkgConfig
               jq
@@ -175,7 +177,6 @@
               rubyPackages_3_1.thor
               sqlite
               perl534Packages.Po4a
-              devenv
               nixFlakes
               validatePkgConfig
               jq
diff --git a/org/config_nix.org b/org/config_nix.org
index 5bf9d72..6455b5a 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -107,6 +107,12 @@ export sisuSQLdb='spine.search.db'
           default              = sisu.packages.${system}.default;
           #vendorSha256         = "sha256-0Q00000000000000000000000000000000000000000=";
       });
+      apps = forAllSystems (system: {
+        default = {
+          type                 = "app";
+          program              = "${self.packages.${system}.default}/bin/sisu";
+        };
+      });
       devShells = forAllSystems (system:
         let
           pkgs = nixpkgsFor.${system};
@@ -139,14 +145,14 @@ export sisuSQLdb='spine.search.db'
             #export sisuSqlite="sisu --very-verbose --sqlite-update --sqlite-db-path=\"$sisuDBpath\" --sqlite-db-filename=\"sisu.search.db\" --output=\"\$sisuOUT\" $sisuPOD/*"
           '';
         in with pkgs; {
-          devShell = mkShell rec {
+          devShell = mkShell {
             name               = "sisu dev shell default";
             inherit shell;
             inherit devEnv;
             packages = [ sqlite ];
             inherit shellHook;
           };
-          devShell-epub = mkShell rec {
+          devShell-epub = mkShell {
             name               = "sisu dev shell for epub output";
             inherit shell;
             inherit devEnv;
@@ -173,7 +179,6 @@ export sisuSQLdb='spine.search.db'
               sigil
               calibre #(suite includes: ebook-viewer)
               foliate
-              devenv
               nixFlakes
               validatePkgConfig
               jq
@@ -181,7 +186,7 @@ export sisuSQLdb='spine.search.db'
             ];
             inherit shellHook;
           };
-          devShell-html = mkShell rec {
+          devShell-html = mkShell {
             name               = "sisu dev shell for latex & pdf output";
             inherit shell;
             inherit devEnv;
@@ -194,7 +199,6 @@ export sisuSQLdb='spine.search.db'
               zip
               unzip
               xz
-              devenv
               nixFlakes
               validatePkgConfig
               jq
@@ -202,7 +206,7 @@ export sisuSQLdb='spine.search.db'
             ];
             inherit shellHook;
           };
-          devShell-latex-pdf = mkShell rec {
+          devShell-latex-pdf = mkShell {
             name               = "sisu dev shell for latex & pdf output";
             inherit shell;
             inherit devEnv;
@@ -219,7 +223,6 @@ export sisuSQLdb='spine.search.db'
               source-serif-pro
               source-code-pro
               texlive.combined.scheme-full
-              devenv
               nixFlakes
               validatePkgConfig
               jq
@@ -227,7 +230,7 @@ export sisuSQLdb='spine.search.db'
             ];
             inherit shellHook;
           };
-          devShell-sqlite = mkShell rec {
+          devShell-sqlite = mkShell {
             name               = "sisu dev shell for latex & pdf output";
             inherit shell;
             inherit devEnv;
@@ -240,7 +243,6 @@ export sisuSQLdb='spine.search.db'
               zip
               unzip
               xz
-              devenv
               nixFlakes
               validatePkgConfig
               jq
@@ -259,7 +261,6 @@ export sisuSQLdb='spine.search.db'
               rubyPackages_3_1.thor
               sqlite
               perl534Packages.Po4a
-              devenv
               nixFlakes
               validatePkgConfig
               jq