From 28c562471290a8513c99059d964289312b2c0589 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Fri, 17 May 2024 23:54:51 -0400
Subject: nix flake and nix env
---
.envrc-nix | 2 --
devenv.nix | 3 ++-
flake.lock | 14 +++++++-------
flake.nix | 4 ++--
org/config_env.org | 2 --
org/config_nix.org | 13 ++++++++-----
shell.nix | 2 +-
7 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/.envrc-nix b/.envrc-nix
index 7201c78..06d405b 100644
--- a/.envrc-nix
+++ b/.envrc-nix
@@ -39,9 +39,7 @@ echo '
❯❯ nix build ".#" --print-build-logs
- to build project:
- ❯❯ nix build ".#spine-nixpkgs-dmd" --print-build-logs
❯❯ nix build ".#spine-overlay-dmd" --print-build-logs
- ❯❯ nix build ".#spine-nixpkgs-ldc" --print-build-logs
❯❯ nix build ".#spine-overlay-ldc" --print-build-logs
- to build using dub (on nix or otherwise):
diff --git a/devenv.nix b/devenv.nix
index d005382..d9a183d 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -16,7 +16,7 @@ with pkgs;
nix-output-monitor
nix-tree
jq
- alejandra
+ #alejandra
git
# ❯❯❯ dev
gnumake
@@ -25,6 +25,7 @@ with pkgs;
# ❯❯ package manager
dub
# ❯❯ compiler
+ #dmd
ldc
# ❯❯❯ sqlite search related
sqlite
diff --git a/flake.lock b/flake.lock
index f877747..bb674b3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -77,11 +77,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1715530780,
- "narHash": "sha256-bBz4/T/zBzv9Xi5XUlFDeosmSNppLaCQTizMKSksAvk=",
+ "lastModified": 1715897893,
+ "narHash": "sha256-OrvqfRNUTKNg25z7+mCLV2PAnAjvdj/Z7HeS1g5OB7E=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3281bec7174f679eabf584591e75979a258d8c40",
+ "rev": "ea77cefecb0ab07e61d6bde3e24c7ae6820b96d5",
"type": "github"
},
"original": {
@@ -107,11 +107,11 @@
]
},
"locked": {
- "lastModified": 1715403195,
- "narHash": "sha256-Ijqvy9Pb9NRITFk4QF/wCYdLEC8gDagz1m1pcJHtcVY=",
+ "lastModified": 1716003729,
+ "narHash": "sha256-ehqK0OuY7Y2AzeksoUwpYVytkbHUJ94h2lhgucZD8Yw=",
"ref": "refs/heads/main",
- "rev": "0452f31c4c6a75e400125b11daca3da9c26512c2",
- "revCount": 639,
+ "rev": "19286de980fa8d905ae6500cbdd2fe672095a3cb",
+ "revCount": 642,
"type": "git",
"url": "git://git.sisudoc.org/software/sisudoc-spine"
},
diff --git a/flake.nix b/flake.nix
index f2908a3..eb6d89e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,9 +30,9 @@
pkgs = nixpkgsFor.${system};
in {
default = spine.packages.${system}.default;
- spine-nixpkgs-dmd = spine.packages.${system}.spine-nixpkgs-dmd;
+ #spine-nixpkgs-dmd = spine.packages.${system}.spine-nixpkgs-dmd;
spine-overlay-dmd = spine.packages.${system}.spine-overlay-dmd;
- spine-nixpkgs-ldc = spine.packages.${system}.spine-nixpkgs-ldc;
+ #spine-nixpkgs-ldc = spine.packages.${system}.spine-nixpkgs-ldc;
spine-overlay-ldc = spine.packages.${system}.spine-overlay-ldc;
#vendorSha256 = "sha256-0Q00000000000000000000000000000000000000000=";
});
diff --git a/org/config_env.org b/org/config_env.org
index a482da8..ecf4ee5 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -95,9 +95,7 @@ echo '
❯❯ nix build ".#" --print-build-logs
- to build project:
- ❯❯ nix build ".#spine-nixpkgs-dmd" --print-build-logs
❯❯ nix build ".#spine-overlay-dmd" --print-build-logs
- ❯❯ nix build ".#spine-nixpkgs-ldc" --print-build-logs
❯❯ nix build ".#spine-overlay-ldc" --print-build-logs
- to build using dub (on nix or otherwise):
diff --git a/org/config_nix.org b/org/config_nix.org
index 2485dab..52e16e6 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -4,7 +4,7 @@
#+FILETAGS: :spine:build:tools:
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
-#+COPYRIGHT: Copyright (C) 2015 - 2023 Ralph Amissah
+#+COPYRIGHT: Copyright (C) 2015 - 2024 Ralph Amissah
#+LANGUAGE: en
#+STARTUP: show4levels hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
@@ -55,9 +55,9 @@
pkgs = nixpkgsFor.${system};
in {
default = spine.packages.${system}.default;
- spine-nixpkgs-dmd = spine.packages.${system}.spine-nixpkgs-dmd;
+ #spine-nixpkgs-dmd = spine.packages.${system}.spine-nixpkgs-dmd;
spine-overlay-dmd = spine.packages.${system}.spine-overlay-dmd;
- spine-nixpkgs-ldc = spine.packages.${system}.spine-nixpkgs-ldc;
+ #spine-nixpkgs-ldc = spine.packages.${system}.spine-nixpkgs-ldc;
spine-overlay-ldc = spine.packages.${system}.spine-overlay-ldc;
#vendorSha256 = "sha256-0Q00000000000000000000000000000000000000000=";
});
@@ -205,7 +205,7 @@ with pkgs;
# ❯❯❯ nix_related
##nix
#direnv
- #nixVersions.unstable #nixFlakes
+ #nixVersions.nix_2_21 #nixVersions.latest #nixVersions.git
#nix-prefetch-git
#validatePkgConfig
nix-output-monitor
@@ -254,6 +254,8 @@ with pkgs;
}
#+END_SRC
+** default.nix :default:
+
#+HEADER: :tangle ../default.nix
#+HEADER: :tangle-mode (identity #o755)
#+HEADER: :shebang "#!/usr/bin/env -S nix-build"
@@ -287,7 +289,7 @@ with pkgs;
nix-output-monitor
nix-tree
jq
- alejandra
+ #alejandra
git
# ❯❯❯ dev
gnumake
@@ -296,6 +298,7 @@ with pkgs;
# ❯❯ package manager
dub
# ❯❯ compiler
+ #dmd
ldc
# ❯❯❯ sqlite search related
sqlite
diff --git a/shell.nix b/shell.nix
index b63acfc..e3920de 100755
--- a/shell.nix
+++ b/shell.nix
@@ -7,7 +7,7 @@ with pkgs;
# ❯❯❯ nix_related
##nix
#direnv
- #nixVersions.unstable #nixFlakes
+ #nixVersions.nix_2_21 #nixVersions.latest #nixVersions.git
#nix-prefetch-git
#validatePkgConfig
nix-output-monitor
--
cgit v1.2.3