diff options
-rw-r--r-- | flake.lock | 6 | ||||
-rw-r--r-- | flake.nix | 20 | ||||
-rw-r--r-- | org/config_nix.org | 20 |
3 files changed, 23 insertions, 23 deletions
@@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1675758091, - "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=", + "lastModified": 1675940568, + "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87", + "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", "type": "github" }, "original": { @@ -120,14 +120,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; @@ -154,7 +154,7 @@ sigil calibre #(suite includes: ebook-viewer) foliate - devenv + #devenv nixFlakes validatePkgConfig jq @@ -162,7 +162,7 @@ ]; inherit shellHook; }; - devShell-html = mkShell rec { + devShell-html = mkShell { name = "sisu dev shell for latex & pdf output"; inherit shell; inherit devEnv; @@ -175,7 +175,7 @@ zip unzip xz - devenv + #devenv nixFlakes validatePkgConfig jq @@ -183,7 +183,7 @@ ]; inherit shellHook; }; - devShell-latex-pdf = mkShell rec { + devShell-latex-pdf = mkShell { name = "sisu dev shell for latex & pdf output"; inherit shell; inherit devEnv; @@ -200,7 +200,7 @@ source-serif-pro source-code-pro texlive.combined.scheme-full - devenv + #devenv nixFlakes validatePkgConfig jq @@ -208,7 +208,7 @@ ]; inherit shellHook; }; - devShell-sqlite = mkShell rec { + devShell-sqlite = mkShell { name = "sisu dev shell for latex & pdf output"; inherit shell; inherit devEnv; @@ -221,7 +221,7 @@ zip unzip xz - devenv + #devenv nixFlakes validatePkgConfig jq @@ -240,7 +240,7 @@ rubyPackages_3_1.thor sqlite perl534Packages.Po4a - devenv + #devenv nixFlakes validatePkgConfig jq diff --git a/org/config_nix.org b/org/config_nix.org index a3470078..8dbfd4e0 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -202,14 +202,14 @@ export RUBYLIB+=`pwd`/lib #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; @@ -236,7 +236,7 @@ export RUBYLIB+=`pwd`/lib sigil calibre #(suite includes: ebook-viewer) foliate - devenv + #devenv nixFlakes validatePkgConfig jq @@ -244,7 +244,7 @@ export RUBYLIB+=`pwd`/lib ]; inherit shellHook; }; - devShell-html = mkShell rec { + devShell-html = mkShell { name = "sisu dev shell for latex & pdf output"; inherit shell; inherit devEnv; @@ -257,7 +257,7 @@ export RUBYLIB+=`pwd`/lib zip unzip xz - devenv + #devenv nixFlakes validatePkgConfig jq @@ -265,7 +265,7 @@ export RUBYLIB+=`pwd`/lib ]; inherit shellHook; }; - devShell-latex-pdf = mkShell rec { + devShell-latex-pdf = mkShell { name = "sisu dev shell for latex & pdf output"; inherit shell; inherit devEnv; @@ -282,7 +282,7 @@ export RUBYLIB+=`pwd`/lib source-serif-pro source-code-pro texlive.combined.scheme-full - devenv + #devenv nixFlakes validatePkgConfig jq @@ -290,7 +290,7 @@ export RUBYLIB+=`pwd`/lib ]; inherit shellHook; }; - devShell-sqlite = mkShell rec { + devShell-sqlite = mkShell { name = "sisu dev shell for latex & pdf output"; inherit shell; inherit devEnv; @@ -303,7 +303,7 @@ export RUBYLIB+=`pwd`/lib zip unzip xz - devenv + #devenv nixFlakes validatePkgConfig jq @@ -322,7 +322,7 @@ export RUBYLIB+=`pwd`/lib rubyPackages_3_1.thor sqlite perl534Packages.Po4a - devenv + #devenv nixFlakes validatePkgConfig jq |