diff options
| -rw-r--r-- | dub.json | 8 | ||||
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | flake.nix | 20 | ||||
| -rw-r--r-- | org/config_dub.org | 8 | ||||
| -rw-r--r-- | org/config_nix.org | 20 |
5 files changed, 30 insertions, 38 deletions
@@ -16,7 +16,7 @@ "buildTypes": { "dmd": { "dflags": [ "-J=views", "-I=src" ], - "buildOptions": [ "inline", "verbose" ], + "buildOptions": [ "inline", "verbose" ], "buildRequirements": [ "allowWarnings" ] }, "ldc2": { @@ -26,7 +26,7 @@ }, "ldmd2": { "dflags": [ "-O2", "-boundscheck=on", "-J=views", "-I=src", "-color=on" ], - "buildOptions": [ "optimize", "inline", "verbose" ], + "buildOptions": [ "optimize", "inline", "verbose" ], "buildRequirements": [ "allowWarnings" ] }, "gdc": { @@ -41,8 +41,8 @@ } }, "dependencies": { - "spine_search:arsd.cgi": "*", - "spine_search:d2sqlite3": "*" + "spine_search:arsd.cgi": "*", + "spine_search:d2sqlite3": "*" }, "subPackages": [ { @@ -41,11 +41,11 @@ "systems": "systems_2" }, "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": { @@ -56,11 +56,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688894907, - "narHash": "sha256-U7hEDDhzAhLp6T+DEUbfwAsL+BtqFFGn+S1pa/0XrZY=", + "lastModified": 1689078114, + "narHash": "sha256-osG8BrX5RpKJ7wH+vI6auOU+ctvNOblT4XXCgknK47c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4ddf98349c793377c76806ebfbdfb2b96dd4ef5d", + "rev": "b6cc7ff8fee93789bc871a267ab876c3fca042cb", "type": "github" }, "original": { @@ -37,6 +37,9 @@ ]; inherit system; }; + preBuild = '' + export HOME=$(pwd) + ''; installPhase = '' runHook preInstall mkdir -p $out/share/cgi-bin @@ -61,9 +64,6 @@ inherit devEnv; buildInputs = [sqlite]; nativeBuildInputs = [dub ldc gnumake]; - preBuild = '' - export HOME=$(pwd) - ''; buildPhase = '' runHook preBuild for DC_ in dmd ldmd2 ldc2 gdc gdmd; do @@ -76,6 +76,7 @@ dub build --cache=local --compiler=$DC --build=$DC_ --combined --skip-registry=all runHook postBuild ''; + inherit preBuild; inherit checkPhase; inherit installPhase; inherit postInstall; @@ -90,14 +91,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; @@ -112,14 +111,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; @@ -134,14 +131,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; @@ -161,6 +156,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 d8e39f3..e6b2697 100644 --- a/org/config_dub.org +++ b/org/config_dub.org @@ -54,7 +54,7 @@ "buildTypes": { "dmd": { "dflags": [ "-J=views", "-I=src" ], - "buildOptions": [ "inline", "verbose" ], + "buildOptions": [ "inline", "verbose" ], "buildRequirements": [ "allowWarnings" ] }, "ldc2": { @@ -64,7 +64,7 @@ }, "ldmd2": { "dflags": [ "-O2", "-boundscheck=on", "-J=views", "-I=src", "-color=on" ], - "buildOptions": [ "optimize", "inline", "verbose" ], + "buildOptions": [ "optimize", "inline", "verbose" ], "buildRequirements": [ "allowWarnings" ] }, "gdc": { @@ -79,8 +79,8 @@ } }, "dependencies": { - "spine_search:arsd.cgi": "*", - "spine_search:d2sqlite3": "*" + "spine_search:arsd.cgi": "*", + "spine_search:d2sqlite3": "*" }, "subPackages": [ { diff --git a/org/config_nix.org b/org/config_nix.org index fb282b3..048b25b 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -64,6 +64,9 @@ ]; inherit system; }; + preBuild = '' + export HOME=$(pwd) + ''; installPhase = '' runHook preInstall mkdir -p $out/share/cgi-bin @@ -88,9 +91,6 @@ inherit devEnv; buildInputs = [sqlite]; nativeBuildInputs = [dub ldc gnumake]; - preBuild = '' - export HOME=$(pwd) - ''; buildPhase = '' runHook preBuild for DC_ in dmd ldmd2 ldc2 gdc gdmd; do @@ -103,6 +103,7 @@ dub build --cache=local --compiler=$DC --build=$DC_ --combined --skip-registry=all runHook postBuild ''; + inherit preBuild; inherit checkPhase; inherit installPhase; inherit postInstall; @@ -117,14 +118,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; @@ -139,14 +138,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; @@ -161,14 +158,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; @@ -188,6 +183,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; |