aboutsummaryrefslogtreecommitdiffhomepage
path: root/org/spine_build_scaffold.org
diff options
context:
space:
mode:
Diffstat (limited to 'org/spine_build_scaffold.org')
-rw-r--r--org/spine_build_scaffold.org72
1 files changed, 36 insertions, 36 deletions
diff --git a/org/spine_build_scaffold.org b/org/spine_build_scaffold.org
index 02a2dd5..a646763 100644
--- a/org/spine_build_scaffold.org
+++ b/org/spine_build_scaffold.org
@@ -1002,23 +1002,23 @@ tangle_maker:
#+NAME: make_nix_project_shell
#+BEGIN_SRC makefile
nixsh_dmd_nixpkg:
- ln -sf nixDevEnv/shells/shell-dmd-verNix.nix shell.nix; \
- ln -sf nixDevEnv/dub/mkDub-dmd.nix mkDub.nix; \
+ ln -sf nixEnv/shells/shell-dmd-verNix.nix shell.nix; \
+ ln -sf nixEnv/dub/mkDub-dmd.nix mkDub.nix; \
ls -la shell.nix mkDub.nix | cut -d " " -f 9-; \
nix-shell;
nixsh_dmd_user:
- ln -sf nixDevEnv/shells/shell-dmd-verUser.nix shell.nix; \
- ln -sf nixDevEnv/dub/mkDub-dmd.nix mkDub.nix; \
+ ln -sf nixEnv/shells/shell-dmd-verUser.nix shell.nix; \
+ ln -sf nixEnv/dub/mkDub-dmd.nix mkDub.nix; \
ls -la shell.nix mkDub.nix | cut -d " " -f 9-; \
nix-shell;
nixsh_ldc_nixpkg:
- ln -sf nixDevEnv/shells/shell-ldc-verNix.nix shell.nix; \
- ln -sf nixDevEnv/dub/mkDub-ldc.nix mkDub.nix; \
+ ln -sf nixEnv/shells/shell-ldc-verNix.nix shell.nix; \
+ ln -sf nixEnv/dub/mkDub-ldc.nix mkDub.nix; \
ls -la shell.nix mkDub.nix | cut -d " " -f 9-; \
nix-shell;
nixsh_ldc_user:
- ln -sf nixDevEnv/shells/shell-ldc-verUser.nix shell.nix; \
- ln -sf nixDevEnv/dub/mkDub-ldc.nix mkDub.nix; \
+ ln -sf nixEnv/shells/shell-ldc-verUser.nix shell.nix; \
+ ln -sf nixEnv/dub/mkDub-ldc.nix mkDub.nix; \
ls -la shell.nix mkDub.nix | cut -d " " -f 9-; \
nix-shell;
#+END_SRC
@@ -1809,59 +1809,59 @@ fi
** shells shell.nix SELECT :shell:
*** dmd shell :dmd:
-- ln -sf nixDevEnv/shells/shell-dmd-verNix.nix shell.nix
-- ln -sf nixDevEnv/shells/shell-dmd-verUser.nix shell.nix
+- ln -sf nixEnv/shells/shell-dmd-verNix.nix shell.nix
+- ln -sf nixEnv/shells/shell-dmd-verUser.nix shell.nix
-- ln -sf nixDevEnv/dub/mkDub-dmd.nix mkDub.nix
+- ln -sf nixEnv/dub/mkDub-dmd.nix mkDub.nix
**** nixpkg
-- ln -sf nixDevEnv/shells/shell-dmd-verNix.nix shell.nix
-- ln -sf nixDevEnv/dub/mkDub-dmd.nix mkDub.nix
+- ln -sf nixEnv/shells/shell-dmd-verNix.nix shell.nix
+- ln -sf nixEnv/dub/mkDub-dmd.nix mkDub.nix
-#+BEGIN_SRC nix :tangle ../nixDevEnv/shells/shell-dmd-verNix.nix
+#+BEGIN_SRC nix :tangle ../nixEnv/shells/shell-dmd-verNix.nix
{ pkgs ? import <nixpkgs> {} }:
<<nix_shell_mkshell_with_buildInputs_dmd>>
#+END_SRC
**** user
-- ln -sf nixDevEnv/shells/shell-dmd-verUser.nix shell.nix
-- ln -sf nixDevEnv/dub/mkDub-dmd.nix mkDub.nix
+- ln -sf nixEnv/shells/shell-dmd-verUser.nix shell.nix
+- ln -sf nixEnv/dub/mkDub-dmd.nix mkDub.nix
-#+BEGIN_SRC nix :tangle ../nixDevEnv/shells/shell-dmd-verUser.nix
+#+BEGIN_SRC nix :tangle ../nixEnv/shells/shell-dmd-verUser.nix
<<nix_shell_overlay_user_version_dmd>>
<<nix_shell_mkshell_with_buildInputs_dmd>>
#+END_SRC
*** ldc shell :ldc:
-- ln -sf nixDevEnv/shells/shell-ldc-verNix.nix shell.nix
-- ln -sf nixDevEnv/shells/shell-ldc-verUser.nix shell.nix
+- ln -sf nixEnv/shells/shell-ldc-verNix.nix shell.nix
+- ln -sf nixEnv/shells/shell-ldc-verUser.nix shell.nix
-- ln -sf nixDevEnv/dub/mkDub-ldc.nix mkDub.nix
+- ln -sf nixEnv/dub/mkDub-ldc.nix mkDub.nix
**** nixpkg
-- ln -sf nixDevEnv/shells/shell-ldc-verNix.nix shell.nix
-- ln -sf nixDevEnv/dub/mkDub-ldc.nix mkDub.nix
+- ln -sf nixEnv/shells/shell-ldc-verNix.nix shell.nix
+- ln -sf nixEnv/dub/mkDub-ldc.nix mkDub.nix
-#+BEGIN_SRC nix :tangle ../nixDevEnv/shells/shell-ldc-verNix.nix
+#+BEGIN_SRC nix :tangle ../nixEnv/shells/shell-ldc-verNix.nix
{ pkgs ? import <nixpkgs> {} }:
<<nix_shell_mkshell_with_buildInputs_ldc>>
#+END_SRC
**** user
-- ln -sf nixDevEnv/shells/shell-ldc-verUser.nix shell.nix
-- ln -sf nixDevEnv/dub/mkDub-ldc.nix mkDub.nix
+- ln -sf nixEnv/shells/shell-ldc-verUser.nix shell.nix
+- ln -sf nixEnv/dub/mkDub-ldc.nix mkDub.nix
-#+BEGIN_SRC nix :tangle ../nixDevEnv/shells/shell-ldc-verUser.nix
+#+BEGIN_SRC nix :tangle ../nixEnv/shells/shell-ldc-verUser.nix
<<nix_shell_overlay_user_version_ldc>>
<<nix_shell_mkshell_with_buildInputs_ldc>>
#+END_SRC
-***** (import ./nixDevEnv/overlays/ldcVersion.nix)
+***** (import ./nixEnv/overlays/ldcVersion.nix)
#+NAME: nix_shell_overlay_user_version_ldc
#+BEGIN_SRC nix
@@ -1900,7 +1900,7 @@ dub2nix = (import dub2nix-src) { inherit pkgs; };
{ overlays = [ ]; }
#+END_SRC
-***** (import ./nixDevEnv/overlays/dmdVersion.nix)
+***** (import ./nixEnv/overlays/dmdVersion.nix)
no working overlay, default none:
@@ -1938,7 +1938,7 @@ pkgs.mkShell {
**** build inputs ldc
-#+BEGIN_SRC nix :tangle ../nixDevEnv/shells/packages-ldc.nix
+#+BEGIN_SRC nix :tangle ../nixEnv/shells/packages-ldc.nix
{ pkgs ? import <nixpkgs> {} }:
let
dub2nix-src = fetchTarball {
@@ -1961,7 +1961,7 @@ with pkgs; [
#+BEGIN_SRC nix
{ pkgs ? import <nixpkgs> {
overlays = [
- (import ./nixDevEnv/overlays/ldcVersion.nix)
+ (import ./nixEnv/overlays/ldcVersion.nix)
]; }
}:
let
@@ -2033,7 +2033,7 @@ aria2c https://raw.githubusercontent.com/lionello/dub2nix/master/mkDub.nix
*** mkDub dmd
-#+BEGIN_SRC nix :tangle ../nixDevEnv/dub/mkDub-dmd.nix
+#+BEGIN_SRC nix :tangle ../nixEnv/dub/mkDub-dmd.nix
{ pkgs ? import <nixpkgs> {},
stdenv ? pkgs.stdenv,
rdmd ? pkgs.rdmd,
@@ -2159,7 +2159,7 @@ in {
*** mkDub ldc HACK
-#+BEGIN_SRC nix :tangle ../nixDevEnv/dub/mkDub-ldc.nix
+#+BEGIN_SRC nix :tangle ../nixEnv/dub/mkDub-ldc.nix
{ pkgs ? import <nixpkgs> {},
stdenv ? pkgs.stdenv,
ldc ? pkgs.ldc,
@@ -2287,7 +2287,7 @@ in {
*** compilers (latest versions) [version information set elsewhere]
**** ldcVersion.nix overlay :ldc:version:
-#+BEGIN_SRC nix :tangle ../nixDevEnv/overlays/ldcVersion.nix
+#+BEGIN_SRC nix :tangle ../nixEnv/overlays/ldcVersion.nix
self: super: rec {
ldc = super.ldc.overrideAttrs(oldAttrs: rec {
pname = "ldc";
@@ -2308,7 +2308,7 @@ self: super: rec {
no working overlay, tangle to work on
-#+BEGIN_SRC nix :NO-tangle ../nixDevEnv/overlays/dmdVersion.nix
+#+BEGIN_SRC nix :NO-tangle ../nixEnv/overlays/dmdVersion.nix
self: super: rec {
pname = "dmd";
<<dmd_version_info>>
@@ -2399,8 +2399,8 @@ year = "2020";
!misc
!misc/**
!*.nix
-!nixDevEnv
-!nixDevEnv/**
+!nixEnv
+!nixEnv/**
!.envrc
!src
!src/**
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 03:11:18 +0000