aboutsummaryrefslogtreecommitdiffhomepage
path: root/org/config_nix.org
diff options
context:
space:
mode:
Diffstat (limited to 'org/config_nix.org')
-rw-r--r--org/config_nix.org83
1 files changed, 55 insertions, 28 deletions
diff --git a/org/config_nix.org b/org/config_nix.org
index a255712..633846f 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -153,6 +153,7 @@
spine-overlay-dmd = stdenv.mkDerivation {
inherit pname;
inherit version;
+ #name = "spine-<<spine_version>> dmd-<<dmd_version>> dub-<<dub_version>>";
meta.mainProgram = "spine-dmd";
executable = true;
src = self;
@@ -176,6 +177,7 @@
spine-overlay-ldc = stdenv.mkDerivation {
inherit pname;
inherit version;
+ #name = "spine-<<spine_version>> ldc-<<ldc_version>> dub-<<dub_version>>";
meta.mainProgram = "spine-ldc";
executable = true;
src = self;
@@ -235,7 +237,7 @@
in
with pkgs-nix; {
dsh-overlay = mkShell {
- name = "spine base dev shell";
+ name = "spine-<<spine_version>> base dev shell, ldc-<<ldc_version>>, dub-<<dub_version>>";
inherit shell;
inherit devEnv;
packages = with pkgs-ovl; [
@@ -248,7 +250,7 @@
inherit shellHook;
};
dsh-nixpkgs-dmd-dub = mkShell {
- name = "spine base dev shell";
+ name = "spine-<<spine_version>> base dev shell";
inherit shell;
inherit devEnv;
packages = [
@@ -260,7 +262,7 @@
inherit shellHook;
};
dsh-nixpkgs-ldc-dub = mkShell {
- name = "spine base dev shell";
+ name = "spine-<<spine_version>> base dev shell";
inherit shell;
inherit devEnv;
packages = [
@@ -272,7 +274,7 @@
inherit shellHook;
};
dsh-overlay-dmd-dub = mkShell {
- name = "spine base dev shell";
+ name = "spine-<<spine_version>> base dev shell, dmd-<<dmd_version>>, dub-<<dub_version>>";
inherit shell;
inherit devEnv;
packages = with pkgs-ovl; [
@@ -284,7 +286,7 @@
inherit shellHook;
};
dsh-overlay-ldc-dub = mkShell {
- name = "spine base dev shell";
+ name = "spine-<<spine_version>> base dev shell, ldc-<<ldc_version>>, dub-<<dub_version>>";
inherit shell;
inherit devEnv;
packages = with pkgs-ovl; [
@@ -296,7 +298,7 @@
inherit shellHook;
};
dsh-epub = mkShell {
- name = "spine dev shell for epub output";
+ name = "spine-<<spine_version>> dev shell for epub output";
inherit shell;
inherit devEnv;
packages = [
@@ -324,7 +326,7 @@
inherit shellHook;
};
dsh-html = mkShell {
- name = "spine dev shell for html output";
+ name = "spine-<<spine_version>> dev shell for html output";
inherit shell;
inherit devEnv;
packages = [
@@ -344,7 +346,7 @@
inherit shellHook;
};
dsh-latex-pdf = mkShell {
- name = "spine dev shell for latex & pdf output";
+ name = "spine-<<spine_version>> dev shell for latex & pdf output";
inherit shell;
inherit devEnv;
packages = [
@@ -360,7 +362,7 @@
inherit shellHook;
};
dsh-sqlite = mkShell {
- name = "spine dev shell for latex & pdf output";
+ name = "spine-<<spine_version>> dev shell for sqlite3 output";
inherit shell;
inherit devEnv;
packages = [
@@ -373,7 +375,7 @@
inherit shellHook;
};
dsh-i18n = mkShell {
- name = "spine dev shell internationalization, po4a";
+ name = "spine-<<spine_version>> dev shell for internationalization, po4a";
inherit shell;
inherit devEnv;
packages = [
@@ -645,15 +647,6 @@ installPhase = ''
'';
#+END_SRC
-** variables used SET
-*** spine project VERSION :version:set:project:
-
-#+NAME: spine_version
-#+HEADER: :noweb yes
-#+BEGIN_SRC emacs-lisp
-<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>>
-#+END_SRC
-
*** nixpkgs path / url
- nixpkgs_url_github
@@ -1028,7 +1021,49 @@ postInstall:
echo `ls -la $${out}/bin/spine`
#+END_SRC
-** empty sha56 hash
+** versions
+*** spine project VERSION :version:set:project:
+
+#+NAME: spine_version
+#+HEADER: :noweb yes
+#+BEGIN_SRC emacs-lisp
+<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>>
+#+END_SRC
+
+*** dlang overlays
+**** ldc
+
+#+NAME: ldc_version
+#+HEADER: :noweb yes
+#+BEGIN_SRC emacs-lisp
+<<./nix-develop-dlang-shared.org:ldc-version()>>
+#+END_SRC
+
+**** dmd
+
+#+NAME: dmd_version
+#+HEADER: :noweb yes
+#+BEGIN_SRC emacs-lisp
+<<./nix-develop-dlang-shared.org:dmd-version()>>
+#+END_SRC
+
+**** dub
+
+#+NAME: dub_version
+#+HEADER: :noweb yes
+#+BEGIN_SRC emacs-lisp
+<<./nix-develop-dlang-shared.org:dub-version()>>
+#+END_SRC
+
+**** dtools
+
+#+NAME: dtools_version
+#+HEADER: :noweb yes
+#+BEGIN_SRC emacs-lisp
+<<./nix-develop-dlang-shared.org:dtools-version()>>
+#+END_SRC
+
+*** empty sha56 hash
#+NAME: blank_hash
#+BEGIN_SRC nix
@@ -1040,11 +1075,3 @@ sha256-0000000000000000000000000000000000000000000=
sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
#+END_SRC
-** version info SET VERSION :version:set:project:
-*** spine project VERSION :version:set:project:
-
-#+NAME: spine_version
-#+HEADER: :noweb yes
-#+BEGIN_SRC emacs-lisp
-<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>>
-#+END_SRC