From ba982583f5db88fe98b69080c83c05c015a24957 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Mon, 2 Dec 2024 20:09:33 -0500
Subject: nix build houskeeping
---
.envrc-nix | 6 +++---
derivation.nix | 4 ++--
devenv.nix | 2 +-
flake.lock | 40 ++++++++++++++++++++--------------------
flake.nix | 2 +-
org/config_env.org | 16 +++++++++++++---
org/config_nix.org | 6 +++---
shell.nix | 2 +-
8 files changed, 44 insertions(+), 34 deletions(-)
diff --git a/.envrc-nix b/.envrc-nix
index f75890a..4a4c531 100644
--- a/.envrc-nix
+++ b/.envrc-nix
@@ -1,7 +1,7 @@
NIX_ENFORCE_PURITY=1
# - https://github.com/nix-community/nix-direnv
-NixDirEnvVersion="3.0.4"
-NixDirEnvSHA="sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
+NixDirEnvVersion="3.0.6"
+NixDirEnvSHA="sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "${NixDirEnvSHA}"
fi
@@ -58,7 +58,7 @@ echo '
❯❯ ${SpineBIN} -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
❯❯ ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
'
-echo "-
+echo "•
❯❯ ${SpineBIN} -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
❯❯ ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
"
diff --git a/derivation.nix b/derivation.nix
index 09bbfd0..b82c426 100644
--- a/derivation.nix
+++ b/derivation.nix
@@ -92,14 +92,14 @@ with (
);
mkDubDerivation rec {
pname = "spine";
- version = "0.16.0";
+ version = "0.17.0";
#zipfile = "spine-0.12.0-tag-0.11.2.r107.gf89a107.tar.gz";
src = fetchTarball {
url = "file:///home/ralph/grotto/repo/git.repo/projects/doc-reform/code/software/tarball/spine-0.12.0-tag-0.11.2.r107.gf89a107.tar.gz";
sha256 = "sha256:03dr7dn7kq6arw4ry7qar13iqmi1caw70imfjwi8qr7g2j4mnk2q";
};
nativeBuildInputs = with pkgs; [dub ldc];
- buildInputs = with pkgs; [nixVersions.nix_2_21 sqlite];
+ buildInputs = with pkgs; [nixVersions.latest sqlite];
meta = with pkgs.lib; {
description = "A sisu like parser & document generator";
longDescription = ''
diff --git a/devenv.nix b/devenv.nix
index d9a183d..d79f516 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -10,7 +10,7 @@ with pkgs;
# ❯❯❯ nix_related
#nix # if not on NixOS, this is needed
direnv
- nixVersions.nix_2_21 #nixVersions.latest #nixVersions.git
+ nixVersions.latest #nixVersions.latest #nixVersions.git
nix-prefetch-git
validatePkgConfig
nix-output-monitor
diff --git a/flake.lock b/flake.lock
index e86ce4e..d628f82 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
]
},
"locked": {
- "lastModified": 1720109368,
- "narHash": "sha256-uaoqQrDrfiyoha2Li35FBBnIEw9hmiXWzb39flsMBvc=",
+ "lastModified": 1733184371,
+ "narHash": "sha256-K9MQf+ZD6OntayLaJcniYvOiiBxOl7hBrbltjSMmPP4=",
"ref": "refs/heads/main",
- "rev": "d98b19a633b96dfa9e1ec23954d0da55bc1fe7e2",
- "revCount": 10,
+ "rev": "115001db9ca4382c4ddfea3a636bde30abe5c459",
+ "revCount": 11,
"type": "git",
"url": "git://git.sisudoc.org/package/dlang-nix-overlays-and-flake"
},
@@ -26,11 +26,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@@ -44,11 +44,11 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@@ -62,11 +62,11 @@
"systems": "systems_3"
},
"locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@@ -77,11 +77,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1720058333,
- "narHash": "sha256-gM2RCi5XkxmcsZ44pUkKIYBiBMfZ6u7MdcZcykmccrs=",
+ "lastModified": 1733064805,
+ "narHash": "sha256-7NbtSLfZO0q7MXPl5hzA0sbVJt6pWxxtGWbaVUDDmjs=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6842b061970bf96965d66fcc86a28e1f719aae95",
+ "rev": "31d66ae40417bb13765b0ad75dd200400e98de84",
"type": "github"
},
"original": {
@@ -107,11 +107,11 @@
]
},
"locked": {
- "lastModified": 1720107444,
- "narHash": "sha256-YGI13rUSMuDBK0VeFM4LFDmDwTbE60v3K+ji5tE43ow=",
+ "lastModified": 1733185130,
+ "narHash": "sha256-ybEmskOn1M5i2v667Vil1bKarcgADrYzqKS5aeF9/Z8=",
"ref": "refs/heads/main",
- "rev": "d7e7c79253697a7b34df04f547c70669acb67ea1",
- "revCount": 655,
+ "rev": "01b97ab40ec20a0ad73d2271b1397122e7b1bed5",
+ "revCount": 658,
"type": "git",
"url": "git://git.sisudoc.org/software/sisudoc-spine"
},
diff --git a/flake.nix b/flake.nix
index 5fef406..c082faf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,7 +20,7 @@
d-overlay,
...
}@inputs: let
- version = "0.16.0";
+ version = "0.17.0";
shell = ./shell.nix;
devEnv = ./nixDevEnv.sh;
supportedSystems = ["x86_64-linux"]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
diff --git a/org/config_env.org b/org/config_env.org
index 4216d00..c504a84 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -114,20 +114,30 @@ echo '
❯❯ ${SpineBIN} -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
❯❯ ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
'
-echo "-
+echo "•
❯❯ ${SpineBIN} -v --source --pod --epub --html --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
❯❯ ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/*
"
#+END_SRC
-*** 3.0.4
+*** 3.0.6
#+NAME: direnv-version
#+BEGIN_SRC sh
-3.0.4
+3.0.6
#+END_SRC
#+NAME: direnv-sha
+#+BEGIN_SRC sh
+sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM=
+#+END_SRC
+
+*** 3.0.4
+
+#+BEGIN_SRC sh
+3.0.4
+#+END_SRC
+
#+BEGIN_SRC sh
sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4=
#+END_SRC
diff --git a/org/config_nix.org b/org/config_nix.org
index f05e712..0d9a4f4 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -206,7 +206,7 @@ with pkgs;
# ❯❯❯ nix_related
##nix
#direnv
- #nixVersions.nix_2_21 #nixVersions.latest #nixVersions.git
+ #nixVersions.latest #nixVersions.latest #nixVersions.git
#nix-prefetch-git
#validatePkgConfig
nix-output-monitor
@@ -284,7 +284,7 @@ with pkgs;
# ❯❯❯ nix_related
#nix # if not on NixOS, this is needed
direnv
- nixVersions.nix_2_21 #nixVersions.latest #nixVersions.git
+ nixVersions.latest #nixVersions.latest #nixVersions.git
nix-prefetch-git
validatePkgConfig
nix-output-monitor
@@ -427,7 +427,7 @@ with (
sha256 = "<<spine_tarball_sha256>>";
};
nativeBuildInputs = with pkgs; [dub ldc];
- buildInputs = with pkgs; [nixVersions.nix_2_21 sqlite];
+ buildInputs = with pkgs; [nixVersions.latest sqlite];
meta = with pkgs.lib; {
description = "A sisu like parser & document generator";
longDescription = ''
diff --git a/shell.nix b/shell.nix
index e3920de..399319f 100755
--- a/shell.nix
+++ b/shell.nix
@@ -7,7 +7,7 @@ with pkgs;
# ❯❯❯ nix_related
##nix
#direnv
- #nixVersions.nix_2_21 #nixVersions.latest #nixVersions.git
+ #nixVersions.latest #nixVersions.latest #nixVersions.git
#nix-prefetch-git
#validatePkgConfig
nix-output-monitor
--
cgit v1.2.3