diff options
| -rw-r--r-- | .envrc | 1 | ||||
| -rw-r--r-- | flake.nix | 205 | ||||
| -rw-r--r-- | makefile | 16 | ||||
| -rw-r--r-- | org/config_make.org | 16 | ||||
| -rw-r--r-- | org/config_nix.org | 41 |
5 files changed, 123 insertions, 156 deletions
@@ -7,7 +7,6 @@ if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then # source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "sha256-0000000000000000000000000000000000000000000=" source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "sha256-5EwyKnkJNQeXrRkYbwwRBcXbibosCJqyIUuz9Xq+LRc=" fi -# reload when these files change watch_file flake.lock watch_file flake.nix nix flake update && nix flake check --show-trace && nix flake show @@ -4,22 +4,59 @@ inputs.flake-utils.url = "github:numtide/flake-utils"; outputs = { self, nixpkgs, flake-utils }: let + pname = "spine"; version = "0.12.0"; - supportedSystems = [ "x86_64-linux" ]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + shell = ./shell.nix; # ./default.nix; + devEnv = ./shell.nix; # ./default.nix; + supportedSystems = [ "x86_64-linux" ]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; forAllSystems = nixpkgs.lib.genAttrs supportedSystems; nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); # nixpkgs instantiated for supported system types. + checkPhase = '' + runHook preCheck + dub test --combined --skip-registry=all + runHook postCheck + ''; + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -m755 ./bin/spine $out/bin/spine + runHook postInstall + ''; + postInstall = '' + echo `ls -la $out/bin/spine` + echo " + nix build or nix develop? (suggestions): + - nix build + nix build .#default --print-build-logs + nix flake update; nix build .#default --print-build-logs + nix build --print-build-logs + - nix run + nix run .#default --print-build-logs + nix run default.nix --print-build-logs + - nix shell + nix shell .#default --print-build-logs --command spine -v + - nix develop + nix develop --profile .#default --print-build-logs --command spine -v + nix develop ; eval \"$buildPhase\" + nix develop --build -f derivation.nix -I .envrc --print-build-logs + - nix profile install . --print-build-logs + spine -v + nix-instantiate | nix show-derivation | jq + " + $out/bin/spine -v + ''; in { packages = forAllSystems (system: let pkgs = nixpkgsFor.${system}; in with pkgs; { default = stdenv.mkDerivation { - pname = "spine"; + inherit pname; inherit version; meta.mainProgram = "spine"; executable = true; src = self; - #shell = ./shell.nix; # ./default.nix; - #devEnv = ./shell.nix; # ./default.nix; + inherit shell; + inherit devEnv; buildInputs = [ sqlite ]; nativeBuildInputs = [ dub dmd ldc gdc gnumake ]; # [ dub dmd ]; [ dub ldc ]; [ dub gdc ]; buildPhase = '' @@ -34,47 +71,18 @@ dub build --compiler=$DC --build=$DC_ --combined --skip-registry=all runHook postBuild ''; - checkPhase = '' - runHook preCheck - dub test --combined --skip-registry=all - runHook postCheck - ''; - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -m755 ./bin/spine $out/bin/spine - runHook postInstall - ''; - postInstall = '' - echo `ls -la $out/bin/spine` - echo " - nix build or nix develop? (suggestions): - - nix build - nix build .#default --print-build-logs - nix flake update; nix build .#default --print-build-logs - nix build --print-build-logs - - nix run - nix run .#default --print-build-logs - nix run default.nix --print-build-logs - - nix shell - nix shell .#default --print-build-logs --command spine -v - - nix develop - nix develop --profile .#default --print-build-logs --command spine -v - nix develop ; eval \"$buildPhase\" - nix develop --build -f derivation.nix -I .envrc --print-build-logs - - nix profile install . --print-build-logs - spine -v - nix-instantiate | nix show-derivation | jq - " - $out/bin/spine -v - ''; + inherit checkPhase; + inherit installPhase; + inherit postInstall; }; spine-dmd = stdenv.mkDerivation { - pname = "spine"; + inherit pname; inherit version; meta.mainProgram = "spine-dmd"; executable = true; src = self; + inherit shell; + inherit devEnv; buildInputs = [ sqlite ]; nativeBuildInputs = [ dub dmd gnumake ]; buildPhase = '' @@ -82,47 +90,18 @@ dub build --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all runHook postBuild ''; - checkPhase = '' - runHook preCheck - dub test --combined --skip-registry=all - runHook postCheck - ''; - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -m755 ./bin/spine $out/bin/spine - runHook postInstall - ''; - postInstall = '' - echo `ls -la $out/bin/spine` - echo " - nix build or nix develop? (suggestions): - - nix build - nix build .#default --print-build-logs - nix flake update; nix build .#default --print-build-logs - nix build --print-build-logs - - nix run - nix run .#default --print-build-logs - nix run default.nix --print-build-logs - - nix shell - nix shell .#default --print-build-logs --command spine -v - - nix develop - nix develop --profile .#default --print-build-logs --command spine -v - nix develop ; eval \"$buildPhase\" - nix develop --build -f derivation.nix -I .envrc --print-build-logs - - nix profile install . --print-build-logs - spine -v - nix-instantiate | nix show-derivation | jq - " - $out/bin/spine -v - ''; + inherit checkPhase; + inherit installPhase; + inherit postInstall; }; spine-ldc = stdenv.mkDerivation { - pname = "spine"; + inherit pname; inherit version; meta.mainProgram = "spine-ldc"; executable = true; src = self; + inherit shell; + inherit devEnv; buildInputs = [ sqlite ]; nativeBuildInputs = [ dub ldc gnumake ]; buildPhase = '' @@ -130,47 +109,18 @@ dub build --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all runHook postBuild ''; - checkPhase = '' - runHook preCheck - dub test --combined --skip-registry=all - runHook postCheck - ''; - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -m755 ./bin/spine $out/bin/spine - runHook postInstall - ''; - postInstall = '' - echo `ls -la $out/bin/spine` - echo " - nix build or nix develop? (suggestions): - - nix build - nix build .#default --print-build-logs - nix flake update; nix build .#default --print-build-logs - nix build --print-build-logs - - nix run - nix run .#default --print-build-logs - nix run default.nix --print-build-logs - - nix shell - nix shell .#default --print-build-logs --command spine -v - - nix develop - nix develop --profile .#default --print-build-logs --command spine -v - nix develop ; eval \"$buildPhase\" - nix develop --build -f derivation.nix -I .envrc --print-build-logs - - nix profile install . --print-build-logs - spine -v - nix-instantiate | nix show-derivation | jq - " - $out/bin/spine -v - ''; + inherit checkPhase; + inherit installPhase; + inherit postInstall; }; spine-gdc = stdenv.mkDerivation { - pname = "spine"; + inherit pname; inherit version; meta.mainProgram = "spine-gdc"; executable = true; src = self; + inherit shell; + inherit devEnv; buildInputs = [ sqlite ]; nativeBuildInputs = [ dub gdc gnumake ]; buildPhase = '' @@ -178,40 +128,9 @@ dub build --compiler=$(type -P gdc) --build=gdc --combined --skip-registry=all runHook postBuild ''; - checkPhase = '' - runHook preCheck - dub test --combined --skip-registry=all - runHook postCheck - ''; - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -m755 ./bin/spine $out/bin/spine - runHook postInstall - ''; - postInstall = '' - echo `ls -la $out/bin/spine` - echo " - nix build or nix develop? (suggestions): - - nix build - nix build .#default --print-build-logs - nix flake update; nix build .#default --print-build-logs - nix build --print-build-logs - - nix run - nix run .#default --print-build-logs - nix run default.nix --print-build-logs - - nix shell - nix shell .#default --print-build-logs --command spine -v - - nix develop - nix develop --profile .#default --print-build-logs --command spine -v - nix develop ; eval \"$buildPhase\" - nix develop --build -f derivation.nix -I .envrc --print-build-logs - - nix profile install . --print-build-logs - spine -v - nix-instantiate | nix show-derivation | jq - " - $out/bin/spine -v - ''; + inherit checkPhase; + inherit installPhase; + inherit postInstall; }; #vendorSha256 = "sha256-0Q00000000000000000000000000000000000000000="; }); @@ -93,6 +93,22 @@ deps := "`ls -gx './src/ext_depends'`" dirs_loc := "`ls -gx '.'`" #dirs := "`ls -gx {{gwd}}`" +nix-devshell: + echo -ne "\n- nix flake update && nix flake check --show-trace && nix flake show && nix develop .#devShell\n\n- nix build .#default --print-build-logs\n- nix build .#spine-dmd --print-build-logs\n- nix build .#spine-ldc --print-build-logs\n- nix build .#spine-gdc --print-build-logs\n\n"; \ + nix flake update && nix flake check --show-trace && nix flake show && nix develop .#devShell + +nix-build-default: + nix build .#default --print-build-logs + +nix-build-dmd: + nix build .#spine-dmd --print-build-logs + +nix-build-ldc: + nix build .#spine-ldc --print-build-logs + +nix-build-gdc: + nix build .#spine-gdc --print-build-logs + buildPhase: HOME=$${PWD}; \ for DC_ in dmd ldmd2 gdmd; do \ diff --git a/org/config_make.org b/org/config_make.org index 421892c..9dca7f9 100644 --- a/org/config_make.org +++ b/org/config_make.org @@ -252,6 +252,22 @@ markup_dir_samples: #+NAME: make_set_nix #+BEGIN_SRC makefile +nix-devshell: + echo -ne "\n- nix flake update && nix flake check --show-trace && nix flake show && nix develop .#devShell\n\n- nix build .#default --print-build-logs\n- nix build .#spine-dmd --print-build-logs\n- nix build .#spine-ldc --print-build-logs\n- nix build .#spine-gdc --print-build-logs\n\n"; \ + nix flake update && nix flake check --show-trace && nix flake show && nix develop .#devShell + +nix-build-default: + nix build .#default --print-build-logs + +nix-build-dmd: + nix build .#spine-dmd --print-build-logs + +nix-build-ldc: + nix build .#spine-ldc --print-build-logs + +nix-build-gdc: + nix build .#spine-gdc --print-build-logs + buildPhase: HOME=$${PWD}; \ for DC_ in dmd ldmd2 gdmd; do \ diff --git a/org/config_nix.org b/org/config_nix.org index dd8c548..c036a14 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -44,7 +44,6 @@ if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then # source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "sha256-0000000000000000000000000000000000000000000=" source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "sha256-5EwyKnkJNQeXrRkYbwwRBcXbibosCJqyIUuz9Xq+LRc=" fi -# reload when these files change watch_file flake.lock watch_file flake.nix nix flake update && nix flake check --show-trace && nix flake show @@ -119,22 +118,26 @@ export PROG_VER_DECLARED="`cat ./views/version.txt | grep --color=never "enum" | inputs.flake-utils.url = "github:numtide/flake-utils"; outputs = { self, nixpkgs, flake-utils }: let + pname = "spine"; version = "<<spine_version_set>>"; - supportedSystems = [ "x86_64-linux" ]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + shell = ./shell.nix; # ./default.nix; + devEnv = ./shell.nix; # ./default.nix; + supportedSystems = [ "x86_64-linux" ]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; forAllSystems = nixpkgs.lib.genAttrs supportedSystems; nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); # nixpkgs instantiated for supported system types. + <<flake_phases_other_than_build>> in { packages = forAllSystems (system: let pkgs = nixpkgsFor.${system}; in with pkgs; { default = stdenv.mkDerivation { - pname = "spine"; + inherit pname; inherit version; meta.mainProgram = "spine"; executable = true; src = self; - #shell = ./shell.nix; # ./default.nix; - #devEnv = ./shell.nix; # ./default.nix; + inherit shell; + inherit devEnv; buildInputs = [ sqlite ]; nativeBuildInputs = [ dub dmd ldc gdc gnumake ]; # [ dub dmd ]; [ dub ldc ]; [ dub gdc ]; buildPhase = '' @@ -149,14 +152,18 @@ export PROG_VER_DECLARED="`cat ./views/version.txt | grep --color=never "enum" | dub build --compiler=$DC --build=$DC_ --combined --skip-registry=all runHook postBuild ''; - <<flake_phases_other_than_build>> + inherit checkPhase; + inherit installPhase; + inherit postInstall; }; spine-dmd = stdenv.mkDerivation { - pname = "spine"; + inherit pname; inherit version; meta.mainProgram = "spine-dmd"; executable = true; src = self; + inherit shell; + inherit devEnv; buildInputs = [ sqlite ]; nativeBuildInputs = [ dub dmd gnumake ]; buildPhase = '' @@ -164,14 +171,18 @@ export PROG_VER_DECLARED="`cat ./views/version.txt | grep --color=never "enum" | dub build --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all runHook postBuild ''; - <<flake_phases_other_than_build>> + inherit checkPhase; + inherit installPhase; + inherit postInstall; }; spine-ldc = stdenv.mkDerivation { - pname = "spine"; + inherit pname; inherit version; meta.mainProgram = "spine-ldc"; executable = true; src = self; + inherit shell; + inherit devEnv; buildInputs = [ sqlite ]; nativeBuildInputs = [ dub ldc gnumake ]; buildPhase = '' @@ -179,14 +190,18 @@ export PROG_VER_DECLARED="`cat ./views/version.txt | grep --color=never "enum" | dub build --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all runHook postBuild ''; - <<flake_phases_other_than_build>> + inherit checkPhase; + inherit installPhase; + inherit postInstall; }; spine-gdc = stdenv.mkDerivation { - pname = "spine"; + inherit pname; inherit version; meta.mainProgram = "spine-gdc"; executable = true; src = self; + inherit shell; + inherit devEnv; buildInputs = [ sqlite ]; nativeBuildInputs = [ dub gdc gnumake ]; buildPhase = '' @@ -194,7 +209,9 @@ export PROG_VER_DECLARED="`cat ./views/version.txt | grep --color=never "enum" | dub build --compiler=$(type -P gdc) --build=gdc --combined --skip-registry=all runHook postBuild ''; - <<flake_phases_other_than_build>> + inherit checkPhase; + inherit installPhase; + inherit postInstall; }; #vendorSha256 = "sha256-0Q00000000000000000000000000000000000000000="; }); |