From 109d32b1183717ac19ee2109abb41177bf9e71ff Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 19 Oct 2020 13:38:37 -0400 Subject: project nix shell(s) --- nixDevEnv/dub/mkDub-dmd.nix | 121 +++++++++++++++++++++++++++++++ nixDevEnv/dub/mkDub-ldc.nix | 125 +++++++++++++++++++++++++++++++++ nixDevEnv/shells/dmd.nix | 17 ----- nixDevEnv/shells/ldc.nix | 21 ------ nixDevEnv/shells/shell-dmd-verNix.nix | 19 +++++ nixDevEnv/shells/shell-dmd-verUser.nix | 19 +++++ nixDevEnv/shells/shell-ldc-verNix.nix | 19 +++++ nixDevEnv/shells/shell-ldc-verUser.nix | 21 ++++++ 8 files changed, 324 insertions(+), 38 deletions(-) create mode 100644 nixDevEnv/dub/mkDub-dmd.nix create mode 100644 nixDevEnv/dub/mkDub-ldc.nix delete mode 100644 nixDevEnv/shells/dmd.nix delete mode 100644 nixDevEnv/shells/ldc.nix create mode 100644 nixDevEnv/shells/shell-dmd-verNix.nix create mode 100644 nixDevEnv/shells/shell-dmd-verUser.nix create mode 100644 nixDevEnv/shells/shell-ldc-verNix.nix create mode 100644 nixDevEnv/shells/shell-ldc-verUser.nix (limited to 'nixDevEnv') diff --git a/nixDevEnv/dub/mkDub-dmd.nix b/nixDevEnv/dub/mkDub-dmd.nix new file mode 100644 index 0000000..2600d30 --- /dev/null +++ b/nixDevEnv/dub/mkDub-dmd.nix @@ -0,0 +1,121 @@ +{ pkgs ? import {}, + stdenv ? pkgs.stdenv, + rdmd ? pkgs.rdmd, + dmd ? pkgs.dmd, + dub ? pkgs.dub }: + +with stdenv; +let + # Filter function to remove the .dub package folder from src + filterDub = name: type: let baseName = baseNameOf (toString name); in ! ( + type == "directory" && baseName == ".dub" + ); + + # Convert a GIT rev string (tag) to a simple semver version + rev-to-version = builtins.replaceStrings ["v" "refs/tags/v"] ["" ""]; + + dep2src = dubDep: pkgs.fetchgit { inherit (dubDep.fetch) url rev sha256 fetchSubmodules; }; + + # Fetch a dependency (source only for now) + fromDub = dubDep: mkDerivation rec { + name = "${src.name}-${version}"; + version = rev-to-version dubDep.fetch.rev; + nativeBuildInputs = [ rdmd dmd dub ]; + src = dep2src dubDep; + + buildPhase = '' + runHook preBuild + export HOME=$PWD + dub build -b=release + runHook postBuild + ''; + + # outputs = [ "lib" ]; + + # installPhase = '' + # runHook preInstall + # mkdir -p $out/bin + # runHook postInstall + # ''; + }; + + # Adds a local package directory (e.g. a git repository) to Dub + dub-add-local = dubDep: "dub add-local ${(fromDub dubDep).src.outPath} ${rev-to-version dubDep.fetch.rev}"; + + # The target output of the Dub package + targetOf = package: "${package.targetPath or "."}/${package.targetName or package.name}"; + + # Remove reference to build tools and library sources + disallowedReferences = deps: [ dmd rdmd dub ] ++ builtins.map dep2src deps; + + removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; + +in { + inherit fromDub; + + mkDubDerivation = lib.makeOverridable ({ + src, + nativeBuildInputs ? [], + dubJSON ? src + "/dub.json", + selections ? src + "/dub.selections.nix", + deps ? import selections, + passthru ? {}, + package ? lib.importJSON dubJSON, + ... + } @ attrs: stdenv.mkDerivation (attrs // { + + pname = package.name; + + nativeBuildInputs = [ rdmd dmd dub pkgs.removeReferencesTo ] ++ nativeBuildInputs; + disallowedReferences = disallowedReferences deps; + + passthru = passthru // { + inherit dub dmd rdmd pkgs; + }; + + src = lib.cleanSourceWith { + filter = filterDub; + src = lib.cleanSource src; + }; + + preFixup = '' + find $out/bin -type f -exec ${removeExpr (disallowedReferences deps)} '{}' + || true + ''; + + buildPhase = '' + runHook preBuild + + export HOME=$PWD + ${lib.concatMapStringsSep "\n" dub-add-local deps} + dub build -b release --combined --skip-registry=all + + runHook postBuild + ''; + + checkPhase = '' + runHook preCheck + + export HOME=$PWD + ${lib.concatMapStringsSep "\n" dub-add-local deps} + dub test --combined --skip-registry=all + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r "${targetOf package}" $out/bin + + runHook postInstall + ''; + + meta = lib.optionalAttrs (package ? description) { + description = package.description; + } // attrs.meta or {}; + } // lib.optionalAttrs (!(attrs ? version)) { + # Use name from dub.json, unless pname and version are specified + name = package.name; + })); +} diff --git a/nixDevEnv/dub/mkDub-ldc.nix b/nixDevEnv/dub/mkDub-ldc.nix new file mode 100644 index 0000000..8fe20a3 --- /dev/null +++ b/nixDevEnv/dub/mkDub-ldc.nix @@ -0,0 +1,125 @@ +{ pkgs ? import {}, + stdenv ? pkgs.stdenv, + rdmd ? pkgs.rdmd, + #dmd ? pkgs.dmd, + #gcc ? pkgs.gcc, + ldc ? pkgs.ldc, + dub ? pkgs.dub +}: + +with stdenv; +let + # Filter function to remove the .dub package folder from src + filterDub = name: type: let baseName = baseNameOf (toString name); in ! ( + type == "directory" && baseName == ".dub" + ); + + # Convert a GIT rev string (tag) to a simple semver version + rev-to-version = builtins.replaceStrings ["v" "refs/tags/v"] ["" ""]; + + dep2src = dubDep: pkgs.fetchgit { inherit (dubDep.fetch) url rev sha256 fetchSubmodules; }; + + # Fetch a dependency (source only for now) + fromDub = dubDep: mkDerivation rec { + name = "${src.name}-${version}"; + version = rev-to-version dubDep.fetch.rev; + nativeBuildInputs = [ rdmd ldc dub ]; + src = dep2src dubDep; + + buildPhase = '' + runHook preBuild + export HOME=$PWD + dub build -b=release + runHook postBuild + ''; + + # outputs = [ "lib" ]; + + # installPhase = '' + # runHook preInstall + # mkdir -p $out/bin + # runHook postInstall + # ''; + }; + + # Adds a local package directory (e.g. a git repository) to Dub + dub-add-local = dubDep: "dub add-local ${(fromDub dubDep).src.outPath} ${rev-to-version dubDep.fetch.rev}"; + + # The target output of the Dub package + targetOf = package: "${package.targetPath or "."}/${package.targetName or package.name}"; + + # Remove reference to build tools and library sources + disallowedReferences = deps: [ ldc rdmd dub ] ++ builtins.map dep2src deps; + + removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; + +in { + inherit fromDub; + + mkDubDerivation = lib.makeOverridable ({ + src, + nativeBuildInputs ? [], + dubJSON ? src + "/dub.json", + selections ? src + "/dub.selections.nix", + deps ? import selections, + passthru ? {}, + package ? lib.importJSON dubJSON, + ... + } @ attrs: stdenv.mkDerivation (attrs // { + + pname = package.name; + + nativeBuildInputs = [ rdmd ldc dub pkgs.removeReferencesTo ] ++ nativeBuildInputs; + disallowedReferences = disallowedReferences deps; + + passthru = passthru // { + inherit dub ldc rdmd pkgs; + }; + + src = lib.cleanSourceWith { + filter = filterDub; + src = lib.cleanSource src; + }; + + preFixup = '' + find $out/bin -type f -exec ${removeExpr (disallowedReferences deps)} '{}' + || true + ''; + + buildPhase = '' + runHook preBuild + + export HOME=$PWD + ${lib.concatMapStringsSep "\n" dub-add-local deps} + dub build --compiler=ldc2 --build=release --combined --skip-registry=all + #dub build -b optimize -b inline --combined --skip-registry=all + + runHook postBuild + ''; + + checkPhase = '' + runHook preCheck + + export HOME=$PWD + ${lib.concatMapStringsSep "\n" dub-add-local deps} + dub test --combined --skip-registry=all + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r "${targetOf package}" $out/bin + + runHook postInstall + ''; + + meta = lib.optionalAttrs (package ? description) { + description = package.description; + } // attrs.meta or {}; + } // lib.optionalAttrs (!(attrs ? version)) { + # Use name from dub.json, unless pname and version are specified + name = package.name; + })); +} diff --git a/nixDevEnv/shells/dmd.nix b/nixDevEnv/shells/dmd.nix deleted file mode 100644 index 0c68cc0..0000000 --- a/nixDevEnv/shells/dmd.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs ? import { overlays = []; } }: -let - dub2nix-src = fetchTarball { - url = "https://github.com/lionello/dub2nix/archive/master.tar.gz"; - }; - dub2nix = (import dub2nix-src) { inherit pkgs; }; -in pkgs.mkShell { - buildInputs = with pkgs; [ - nix - dub - dmd - rdmd - sqlite - dub2nix - nix-prefetch-git - ]; -} diff --git a/nixDevEnv/shells/ldc.nix b/nixDevEnv/shells/ldc.nix deleted file mode 100644 index 31cfcfb..0000000 --- a/nixDevEnv/shells/ldc.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs ? import { - overlays = [ - (import ./nixDevEnv/overlays/ldcVersion.nix) - ]; } -}: -let - dub2nix-src = fetchTarball { - url = "https://github.com/lionello/dub2nix/archive/master.tar.gz"; - }; - dub2nix = (import dub2nix-src) { inherit pkgs; }; -in pkgs.mkShell { - buildInputs = with pkgs; [ - nix - dub - ldc - rdmd - sqlite - dub2nix - nix-prefetch-git - ]; -} diff --git a/nixDevEnv/shells/shell-dmd-verNix.nix b/nixDevEnv/shells/shell-dmd-verNix.nix new file mode 100644 index 0000000..a673c35 --- /dev/null +++ b/nixDevEnv/shells/shell-dmd-verNix.nix @@ -0,0 +1,19 @@ +{ pkgs ? import + { overlays = [ ]; } +}: +let + dub2nix-src = fetchTarball { + url = "https://github.com/lionello/dub2nix/archive/master.tar.gz"; + }; + dub2nix = (import dub2nix-src) { inherit pkgs; }; +in pkgs.mkShell { + buildInputs = with pkgs; [ + nix + dub + dmd + rdmd + sqlite + dub2nix + nix-prefetch-git + ]; +} diff --git a/nixDevEnv/shells/shell-dmd-verUser.nix b/nixDevEnv/shells/shell-dmd-verUser.nix new file mode 100644 index 0000000..a673c35 --- /dev/null +++ b/nixDevEnv/shells/shell-dmd-verUser.nix @@ -0,0 +1,19 @@ +{ pkgs ? import + { overlays = [ ]; } +}: +let + dub2nix-src = fetchTarball { + url = "https://github.com/lionello/dub2nix/archive/master.tar.gz"; + }; + dub2nix = (import dub2nix-src) { inherit pkgs; }; +in pkgs.mkShell { + buildInputs = with pkgs; [ + nix + dub + dmd + rdmd + sqlite + dub2nix + nix-prefetch-git + ]; +} diff --git a/nixDevEnv/shells/shell-ldc-verNix.nix b/nixDevEnv/shells/shell-ldc-verNix.nix new file mode 100644 index 0000000..094bfa7 --- /dev/null +++ b/nixDevEnv/shells/shell-ldc-verNix.nix @@ -0,0 +1,19 @@ +{ pkgs ? import + { overlays = [ ]; } +}: +let + dub2nix-src = fetchTarball { + url = "https://github.com/lionello/dub2nix/archive/master.tar.gz"; + }; + dub2nix = (import dub2nix-src) { inherit pkgs; }; +in pkgs.mkShell { + buildInputs = with pkgs; [ + nix + dub + ldc + rdmd + sqlite + dub2nix + nix-prefetch-git + ]; +} diff --git a/nixDevEnv/shells/shell-ldc-verUser.nix b/nixDevEnv/shells/shell-ldc-verUser.nix new file mode 100644 index 0000000..8035327 --- /dev/null +++ b/nixDevEnv/shells/shell-ldc-verUser.nix @@ -0,0 +1,21 @@ +{ pkgs ? import + { overlays = [ + (import ../overlays/ldcVersion.nix) + ]; } +}: +let + dub2nix-src = fetchTarball { + url = "https://github.com/lionello/dub2nix/archive/master.tar.gz"; + }; + dub2nix = (import dub2nix-src) { inherit pkgs; }; +in pkgs.mkShell { + buildInputs = with pkgs; [ + nix + dub + ldc + rdmd + sqlite + dub2nix + nix-prefetch-git + ]; +} -- cgit v1.2.3