flake.nix minor

5 files changed, 42 insertions, 50 deletions

diff --git a/dub.json b/dub.json
index 2671128..ed1f2b0 100644
--- a/dub.json
+++ b/dub.json
@@ -16,7 +16,7 @@
   "buildTypes": {
     "dmd": {
       "dflags":                [ "-J=views", "-I=src/doc_reform" ],
-      "buildOptions":          [ "inline", "verbose"  ],
+      "buildOptions":          [ "inline", "verbose" ],
       "buildRequirements":     [ "allowWarnings" ]
     },
     "ldc2": {
@@ -26,7 +26,7 @@
     },
     "ldmd2": {
       "dflags":                [ "-O2", "-boundscheck=on", "-J=views", "-I=src/doc_reform", "-color=on" ],
-      "buildOptions":          [ "optimize", "inline", "verbose"  ],
+      "buildOptions":          [ "optimize", "inline", "verbose" ],
       "buildRequirements":     [ "allowWarnings" ]
     },
     "gdc": {
@@ -47,14 +47,14 @@
   },
   "subPackages": [
     {
-      "name":        "d2sqlite3",
-      "description": "A thin wrapper around SQLite 3",
-      "homepage":    "https://github.com/dlang-community/d2sqlite3",
-      "authors":     [ "Nicolas Sicard", "Other contributors: see Github repo" ],
-      "copyright":   "Copyright 2011-18 Nicolas Sicard",
-      "license":     "BSL-1.0",
-      "sourcePaths": [ "./src/ext_depends/d2sqlite3/source" ],
-      "importPaths": [ "./src/ext_depends/d2sqlite3/source" ],
+      "name":           "d2sqlite3",
+      "description":    "A thin wrapper around SQLite 3",
+      "homepage":       "https://github.com/dlang-community/d2sqlite3",
+      "authors":        [ "Nicolas Sicard", "Other contributors: see Github repo" ],
+      "copyright":      "Copyright 2011-18 Nicolas Sicard",
+      "license":        "BSL-1.0",
+      "sourcePaths":    [ "./src/ext_depends/d2sqlite3/source" ],
+      "importPaths":    [ "./src/ext_depends/d2sqlite3/source" ],
       "configurations": [
         {
           "name":                "d2sqlite3",
diff --git a/flake.lock b/flake.lock
index 19189dc..4cc7325 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1687709756,
-        "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1688956120,
-        "narHash": "sha256-7geHGr2aLpQvwGgaZlTLPHMVFxvFzAuB35mZYsKgLpQ=",
+        "lastModified": 1689078114,
+        "narHash": "sha256-osG8BrX5RpKJ7wH+vI6auOU+ctvNOblT4XXCgknK47c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2169d3b0bce0daa64d05abbdf9da552a7b8c22a7",
+        "rev": "b6cc7ff8fee93789bc871a267ab876c3fca042cb",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index f784f98..af79655 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,6 +31,9 @@
       ];
       inherit system;
     };
+    preBuild = ''
+      export HOME=$(pwd)
+    '';
     installPhase = ''
       runHook preInstall
       mkdir -p $out/bin
@@ -57,9 +60,6 @@
           inherit devEnv;
           buildInputs = [sqlite];
           nativeBuildInputs = [dub ldc gnumake]; # [ dub dmd ]; [ dub ldc ]; [ dub gdc ];
-          preBuild = ''
-            export HOME=$(pwd)
-          '';
           buildPhase = ''
             runHook preBuild
             for DC_ in dmd ldmd2 ldc2 gdc gdmd; do
@@ -72,6 +72,7 @@
             dub build --cache=local --compiler=$DC --build=$DC_ --combined --skip-registry=all
             runHook postBuild
           '';
+          inherit preBuild;
           inherit checkPhase;
           inherit installPhase;
           inherit postInstall;
@@ -86,14 +87,12 @@
           inherit devEnv;
           buildInputs = [sqlite];
           nativeBuildInputs = [dub dmd gnumake];
-          preBuild = ''
-            export HOME=$(pwd)
-          '';
           buildPhase = ''
             runHook preBuild
             dub build --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all
             runHook postBuild
           '';
+          inherit preBuild;
           inherit checkPhase;
           inherit installPhase;
           inherit postInstall;
@@ -108,14 +107,12 @@
           inherit devEnv;
           buildInputs = [sqlite];
           nativeBuildInputs = [dub ldc gnumake];
-          preBuild = ''
-            export HOME=$(pwd)
-          '';
           buildPhase = ''
             runHook preBuild
             dub build --cache=local --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all
             runHook postBuild
           '';
+          inherit preBuild;
           inherit checkPhase;
           inherit installPhase;
           inherit postInstall;
@@ -130,14 +127,12 @@
           inherit devEnv;
           buildInputs = with pkgs; [sqlite];
           nativeBuildInputs = with pkgs; [dub ldc gnumake];
-          preBuild = ''
-            export HOME=$(pwd)
-          '';
           buildPhase = ''
             runHook preBuild
             dub build --cache=local --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all
             runHook postBuild
           '';
+          inherit preBuild;
           inherit checkPhase;
           inherit installPhase;
           inherit postInstall;
@@ -157,6 +152,7 @@
         #    dub build --cache=local --compiler=$(type -P gdc) --build=gdc --combined --skip-registry=all
         #    runHook postBuild
         #  '';
+        #  inherit preBuild;
         #  inherit checkPhase;
         #  inherit installPhase;
         #  inherit postInstall;
diff --git a/org/config_dub.org b/org/config_dub.org
index 6f107fa..cab6c2b 100644
--- a/org/config_dub.org
+++ b/org/config_dub.org
@@ -65,7 +65,7 @@
   "buildTypes": {
     "dmd": {
       "dflags":                [ "-J=views", "-I=src/doc_reform" ],
-      "buildOptions":          [ "inline", "verbose"  ],
+      "buildOptions":          [ "inline", "verbose" ],
       "buildRequirements":     [ "allowWarnings" ]
     },
     "ldc2": {
@@ -75,7 +75,7 @@
     },
     "ldmd2": {
       "dflags":                [ "-O2", "-boundscheck=on", "-J=views", "-I=src/doc_reform", "-color=on" ],
-      "buildOptions":          [ "optimize", "inline", "verbose"  ],
+      "buildOptions":          [ "optimize", "inline", "verbose" ],
       "buildRequirements":     [ "allowWarnings" ]
     },
     "gdc": {
@@ -96,14 +96,14 @@
   },
   "subPackages": [
     {
-      "name":        "d2sqlite3",
-      "description": "A thin wrapper around SQLite 3",
-      "homepage":    "https://github.com/dlang-community/d2sqlite3",
-      "authors":     [ "Nicolas Sicard", "Other contributors: see Github repo" ],
-      "copyright":   "Copyright 2011-18 Nicolas Sicard",
-      "license":     "BSL-1.0",
-      "sourcePaths": [ "./src/ext_depends/d2sqlite3/source" ],
-      "importPaths": [ "./src/ext_depends/d2sqlite3/source" ],
+      "name":           "d2sqlite3",
+      "description":    "A thin wrapper around SQLite 3",
+      "homepage":       "https://github.com/dlang-community/d2sqlite3",
+      "authors":        [ "Nicolas Sicard", "Other contributors: see Github repo" ],
+      "copyright":      "Copyright 2011-18 Nicolas Sicard",
+      "license":        "BSL-1.0",
+      "sourcePaths":    [ "./src/ext_depends/d2sqlite3/source" ],
+      "importPaths":    [ "./src/ext_depends/d2sqlite3/source" ],
       "configurations": [
         {
           "name":                "d2sqlite3",
diff --git a/org/config_nix.org b/org/config_nix.org
index 2ef18e5..8e2a830 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -54,6 +54,9 @@
       ];
       inherit system;
     };
+    preBuild = ''
+      export HOME=$(pwd)
+    '';
     installPhase = ''
       runHook preInstall
       mkdir -p $out/bin
@@ -80,9 +83,6 @@
           inherit devEnv;
           buildInputs = [sqlite];
           nativeBuildInputs = [dub ldc gnumake]; # [ dub dmd ]; [ dub ldc ]; [ dub gdc ];
-          preBuild = ''
-            export HOME=$(pwd)
-          '';
           buildPhase = ''
             runHook preBuild
             for DC_ in dmd ldmd2 ldc2 gdc gdmd; do
@@ -95,6 +95,7 @@
             dub build --cache=local --compiler=$DC --build=$DC_ --combined --skip-registry=all
             runHook postBuild
           '';
+          inherit preBuild;
           inherit checkPhase;
           inherit installPhase;
           inherit postInstall;
@@ -109,14 +110,12 @@
           inherit devEnv;
           buildInputs = [sqlite];
           nativeBuildInputs = [dub dmd gnumake];
-          preBuild = ''
-            export HOME=$(pwd)
-          '';
           buildPhase = ''
             runHook preBuild
             dub build --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all
             runHook postBuild
           '';
+          inherit preBuild;
           inherit checkPhase;
           inherit installPhase;
           inherit postInstall;
@@ -131,14 +130,12 @@
           inherit devEnv;
           buildInputs = [sqlite];
           nativeBuildInputs = [dub ldc gnumake];
-          preBuild = ''
-            export HOME=$(pwd)
-          '';
           buildPhase = ''
             runHook preBuild
             dub build --cache=local --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all
             runHook postBuild
           '';
+          inherit preBuild;
           inherit checkPhase;
           inherit installPhase;
           inherit postInstall;
@@ -153,14 +150,12 @@
           inherit devEnv;
           buildInputs = with pkgs; [sqlite];
           nativeBuildInputs = with pkgs; [dub ldc gnumake];
-          preBuild = ''
-            export HOME=$(pwd)
-          '';
           buildPhase = ''
             runHook preBuild
             dub build --cache=local --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all
             runHook postBuild
           '';
+          inherit preBuild;
           inherit checkPhase;
           inherit installPhase;
           inherit postInstall;
@@ -180,6 +175,7 @@
         #    dub build --cache=local --compiler=$(type -P gdc) --build=gdc --combined --skip-registry=all
         #    runHook postBuild
         #  '';
+        #  inherit preBuild;
         #  inherit checkPhase;
         #  inherit installPhase;
         #  inherit postInstall;