From 847bb22acddd1ac5beb1d5b597eb43ff673f0fc4 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Fri, 10 Feb 2023 10:21:30 -0500
Subject: nix .envrc, add ./result/bin path, flake.nix minor
---
.envrc | 1 +
.envrc-local_ | 1 -
flake.lock | 28 ++++++++++++++--------------
flake.nix | 13 +++++++------
org/config_nix.org | 17 +++++++++--------
5 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/.envrc b/.envrc
index a874689..6dd373f 100644
--- a/.envrc
+++ b/.envrc
@@ -13,6 +13,7 @@ watch_file flake.nix
if [ -f .envrc-local ]; then
source_env_if_exists .envrc-local || source .envrc-local
fi
+PATH_add result/bin
# echo "
#
# - nix flake update && nix flake check --show-trace && nix flake show && nix develop .#devShell
diff --git a/.envrc-local_ b/.envrc-local_
index 2b68c94..0f0949b 100644
--- a/.envrc-local_
+++ b/.envrc-local_
@@ -1,4 +1,3 @@
-PATH_add result/bin
#export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
#export NIX_PATH=/srv/nix/nixpkgs
#export NIX_PATH=nixpkgs=/srv/nix/nixpkgs
diff --git a/flake.lock b/flake.lock
index 331f864..602611a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"flake-utils": {
"locked": {
- "lastModified": 1667395993,
- "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+ "lastModified": 1676283394,
+ "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+ "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
@@ -17,11 +17,11 @@
},
"flake-utils_2": {
"locked": {
- "lastModified": 1667395993,
- "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+ "lastModified": 1676283394,
+ "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+ "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
@@ -32,11 +32,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1674839022,
- "narHash": "sha256-8F1U06t9glkgBC8gBfjoA2eeUb9MYRRp6NMKY3c0VEI=",
+ "lastModified": 1676335949,
+ "narHash": "sha256-mnvvqmFhotH++nSovRiIZX4CW8nbr2bEEnWgymzM4z4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "14b6cf7602c341e525a8fe17ac2349769376515e",
+ "rev": "0a25e2c87e784bf7e06e7833ec0e06d34836959a",
"type": "github"
},
"original": {
@@ -61,11 +61,11 @@
]
},
"locked": {
- "lastModified": 1674863393,
- "narHash": "sha256-qxpVM7P8BIZqvx/xRojznXY7jbD8PdtHqZxOZrOB0IM=",
- "ref": "refs/heads/main",
- "rev": "f7d1b8f0326b7adfcdbd5eb1adbc1c4fd2d99c60",
- "revCount": 572,
+ "lastModified": 1676487451,
+ "narHash": "sha256-Ba554jxDWqwr6zHwiJunsaJVWettdURy7knDswG5x/E=",
+ "ref": "refs/heads/document-history",
+ "rev": "3ff9ac182fe4763e704849c687d90d9ca20dc7a2",
+ "revCount": 573,
"type": "git",
"url": "file:///home/ralph/grotto/repo/git.repo/projects/doc-reform/code/software/spine"
},
diff --git a/flake.nix b/flake.nix
index c110f56..00bcaad 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,7 +56,7 @@
'';
in with pkgs; {
devShell = mkShell rec {
- name = "spine dev shell default";
+ name = "spine base dev shell";
inherit shell;
inherit devEnv;
#buildInputs = [ sqlite ];
@@ -72,8 +72,8 @@
inherit shell;
inherit devEnv;
packages = [
- sqlite
dub dmd ldc gdc gnumake
+ sqlite
libxml2
html-tidy
xmlstarlet
@@ -96,8 +96,8 @@
inherit shell;
inherit devEnv;
packages = [
- sqlite
dub dmd ldc gdc gnumake
+ sqlite
];
inherit shellHook;
};
@@ -106,8 +106,8 @@
inherit shell;
inherit devEnv;
packages = [
- sqlite
dub dmd ldc gdc gnumake
+ sqlite
source-sans-pro
source-serif-pro
source-code-pro
@@ -120,8 +120,8 @@
inherit shell;
inherit devEnv;
packages = [
- sqlite
dub dmd ldc gdc gnumake
+ sqlite
];
inherit shellHook;
};
@@ -129,12 +129,13 @@
inherit shell;
inherit devEnv;
packages = [
- sqlite
dub dmd ldc gdc gnumake
+ sqlite
perl534Packages.Po4a
];
inherit shellHook;
};
+ default = import ./shell.nix { inherit pkgs; };
});
};
}
diff --git a/org/config_nix.org b/org/config_nix.org
index 7e16bc4..d206b6d 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -50,6 +50,7 @@ watch_file flake.nix
if [ -f .envrc-local ]; then
source_env_if_exists .envrc-local || source .envrc-local
fi
+PATH_add result/bin
# echo "
#
# - nix flake update && nix flake check --show-trace && nix flake show && nix develop .#devShell
@@ -78,7 +79,6 @@ fi
#+HEADER: :tangle ../.envrc-local_
#+HEADER: :noweb yes
#+BEGIN_SRC sh
-PATH_add result/bin
#export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
#export NIX_PATH=/srv/nix/nixpkgs
#export NIX_PATH=nixpkgs=/srv/nix/nixpkgs
@@ -161,14 +161,14 @@ export SpineSQLdb='spine.search.db'
'';
in with pkgs; {
devShell = mkShell rec {
- name = "spine dev shell default";
+ name = "spine base dev shell";
inherit shell;
inherit devEnv;
#buildInputs = [ sqlite ];
#nativeBuildInputs = [ dub dmd ldc gdc gnumake ];
packages = [
- sqlite
dub dmd ldc gdc gnumake
+ sqlite
];
inherit shellHook;
};
@@ -177,8 +177,8 @@ export SpineSQLdb='spine.search.db'
inherit shell;
inherit devEnv;
packages = [
- sqlite
dub dmd ldc gdc gnumake
+ sqlite
libxml2
html-tidy
xmlstarlet
@@ -201,8 +201,8 @@ export SpineSQLdb='spine.search.db'
inherit shell;
inherit devEnv;
packages = [
- sqlite
dub dmd ldc gdc gnumake
+ sqlite
];
inherit shellHook;
};
@@ -211,8 +211,8 @@ export SpineSQLdb='spine.search.db'
inherit shell;
inherit devEnv;
packages = [
- sqlite
dub dmd ldc gdc gnumake
+ sqlite
source-sans-pro
source-serif-pro
source-code-pro
@@ -225,8 +225,8 @@ export SpineSQLdb='spine.search.db'
inherit shell;
inherit devEnv;
packages = [
- sqlite
dub dmd ldc gdc gnumake
+ sqlite
];
inherit shellHook;
};
@@ -234,12 +234,13 @@ export SpineSQLdb='spine.search.db'
inherit shell;
inherit devEnv;
packages = [
- sqlite
dub dmd ldc gdc gnumake
+ sqlite
perl534Packages.Po4a
];
inherit shellHook;
};
+ default = import ./shell.nix { inherit pkgs; };
});
};
}
--
cgit v1.2.3