nix-build cleanup, external sources localized

- clean up as external sources kept locally, in
  ./src/ext_depends/
- remove dub2nix dependency, no longer needed/used

4 files changed, 0 insertions, 144 deletions

diff --git a/nix/dub.selections.nix b/nix/dub.selections.nix
deleted file mode 100644
index 9316b60..0000000
--- a/nix/dub.selections.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file was generated by https://github.com/lionello/dub2nix v0.2.3
-[ ]
diff --git a/nix/mkDub.nix b/nix/mkDub.nix
deleted file mode 100644
index 2121166..0000000
--- a/nix/mkDub.nix
+++ /dev/null
@@ -1,108 +0,0 @@
-{ pkgs ? import <nixpkgs> {},
-  stdenv ? pkgs.stdenv,
-  lib ? pkgs.lib,
-  ldc ? null,
-  dcompiler ? pkgs.ldc,
-  dub ? pkgs.dub
-}:
-assert dcompiler != null;
-with stdenv lib;
-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 = [ dcompiler dub ];
-    src = dep2src dubDep;
-    buildPhase = ''
-      runHook preBuild
-      export HOME=$NIX_BUILD_TOP
-      #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: [ dcompiler 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 + "/nix/dub.selections.nix",
-    deps ? import selections,
-    passthru ? {},
-    package ? lib.importJSON dubJSON,
-    ...
-  } @ attrs: stdenv.mkDerivation (attrs // {
-    pname = package.name;
-    nativeBuildInputs = [ dcompiler dub pkgs.removeReferencesTo ] ++ nativeBuildInputs;
-    disallowedReferences = disallowedReferences deps;
-    passthru = passthru // {
-      inherit dub dcompiler 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}
-      for dc_ in dmd ldmd2 gdmd; do
-        echo "- check for D compiler $dc_"
-        dc=$(type -P $dc_ || echo "")
-        if [ ! "$dc" == "" ]; then
-          break
-        fi
-      done
-      if [ "$dc" == "" ]; then
-        exit "Error: could not find D compiler"
-      fi
-      echo "$dc_ used as D compiler to build $pname"
-      dub build --compiler=$dc --build=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/nix/pkglst/shell-pkgs.nix b/nix/pkglst/shell-pkgs.nix
deleted file mode 100644
index b11ae94..0000000
--- a/nix/pkglst/shell-pkgs.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-let
-  dub2nix-src = ./src/build_depends/dub2nix/.;
-  dub2nix = (import dub2nix-src) { inherit pkgs; };
-in
-with pkgs; [
-  nixFlakes
-  rund
-  dub
-  ldc
-  sqlite
-  nix-prefetch-git
-  validatePkgConfig
-  jq
-  git
-]
diff --git a/nix/shell/shell_spine.nix b/nix/shell/shell_spine.nix
deleted file mode 100755
index 766f6ee..0000000
--- a/nix/shell/shell_spine.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-pkgs.mkShell {
-  buildInputs = with pkgs; [
-    (import ../pkglst/shell-pkgs.nix { inherit pkgs; })
-  ];
-  buildPhase = "nix build -f default.nix";
-  shellHook = ''
-    if [[ -e ".envrc" ]]; then
-      source .envrc
-    fi
-    nix-build
-    RUN="./result/bin/spine --very-verbose --theme-light --html --epub --sqlite-discrete --output=/tmp/www ./data/pod/sisu-spine-markup"
-    $RUN
-    echo "built spine ... @ ./result/bin/spine"
-    echo "& (tested with) run:"
-    echo "  $RUN"
-  '';
-}