From f60d559f39de24cac97266f1455ff1260b692b1f Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Sat, 23 Jan 2021 13:56:31 -0500
Subject: dub default.nix

---
 org/spine_build_scaffold.org | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'org')

diff --git a/org/spine_build_scaffold.org b/org/spine_build_scaffold.org
index e06bbc6..5bd2a6b 100644
--- a/org/spine_build_scaffold.org
+++ b/org/spine_build_scaffold.org
@@ -2708,7 +2708,7 @@ toc
 *** dub (using ldc rather than dmd) overlay REFERENCE :overlay:
 
 #+BEGIN_SRC nix :NO-tangle ~/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix
-{ stdenv, fetchFromGitHub, curl, libevent, rsync , ldc ? null, dcompiler ? ldc }:
+{ lib, stdenv, fetchFromGitHub, curl, libevent, rsync, ldc ? null, dcompiler ? ldc }:
 
 assert dcompiler != null;
 
@@ -2722,7 +2722,7 @@ stdenv.mkDerivation rec {
     owner = "dlang";
     repo = "dub";
     rev = "v${version}";
-    sha256 = "vqn6QlPMFc/sVbwHeU/eQ/1jB3KRW5PABMDUQDXkRBk=";
+    sha256 = "06a4whsl1m600k096nwif83n7za3vr7pj1xwapncy5fcad1gmady";
     # nix-prefetch-url https://github.com/dlang/dub/archive/v1.23.0.tar.gz
   };
 
@@ -2766,18 +2766,24 @@ stdenv.mkDerivation rec {
     export HOME=$TMP
     #rm -rf test/*
     rm -rf test/issue502-root-import
-    rm test/issue990-download-optional-selected.sh
-    rm test/timeout.sh
     rm test/issue674-concurrent-dub.sh
     rm test/issue672-upgrade-optional.sh
+    rm test/issue990-download-optional-selected.sh
+    rm test/issue877-auto-fetch-package-on-run.sh
+    rm test/issue1037-better-dependency-messages.sh
+    # rm test/issue1040-run-with-ver.sh
+    rm test/issue1416-maven-repo-pkg-supplier.sh
+    rm test/issue1180-local-cache-broken.sh
     rm test/issue1574-addcommand.sh
     rm test/issue1524-maven-upgrade-dependency-tree.sh
-    rm test/issue1416-maven-repo-pkg-supplier.sh
-    rm test/issue1037-better-dependency-messages.sh
-    rm test/interactive-remove.sh
+    rm test/issue1773-lint.sh
+    rm test/ddox.sh
     rm test/fetchzip.sh
     rm test/feat663-search.sh
-    rm test/ddox.sh
+    rm -rf test/git-dependency
+    rm test/interactive-remove.sh
+    rm test/timeout.sh
+    rm test/version-spec.sh
     rm test/0-init-multi.sh
     rm test/4-describe-data-1-list.sh
     rm test/4-describe-data-3-zero-delim.sh
@@ -2790,13 +2796,13 @@ stdenv.mkDerivation rec {
     rm test/issue103-single-file-package.sh
     rm test/issue1040-run-with-ver.sh
     rm test/issue1091-bogus-rebuild.sh
-    rm test/issue1180-local-cache-broken.sh
+    # rm test/issue1180-local-cache-broken.sh
     rm test/issue1194-warn-wrong-subconfig.sh
     rm test/issue1277.sh
     rm test/issue1372-ignore-files-in-hidden-dirs.sh
     rm test/issue1447-build-settings-vars.sh
     rm test/issue1531-toolchain-requirements.sh
-    rm test/issue1773-lint.sh
+    # rm test/issue1773-lint.sh
     rm test/issue346-redundant-flags.sh
     rm test/issue361-optional-deps.sh
     rm test/issue564-invalid-upgrade-dependency.sh
@@ -2806,12 +2812,12 @@ stdenv.mkDerivation rec {
     rm test/issue813-fixed-dependency.sh
     rm test/issue813-pure-sub-dependency.sh
     rm test/issue820-extra-fields-after-convert.sh
-    rm test/issue877-auto-fetch-package-on-run.sh
+    # rm test/issue877-auto-fetch-package-on-run.sh
     rm test/issue923-subpackage-deps.sh
     rm test/single-file-sdl-default-name.sh
     rm test/subpackage-common-with-sourcefile-globbing.sh
     rm test/issue934-path-dep.sh
-    rm test/version-spec.sh
+    # rm test/version-spec.sh
     rm -rf test/1-dynLib-simple
     rm -rf test/1-exec-simple-package-json
     rm -rf test/1-exec-simple
@@ -2855,7 +2861,7 @@ stdenv.mkDerivation rec {
     #cp $NIX_BUILD_TOP/dub $out/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Package and build manager for D applications and libraries";
     homepage = "https://code.dlang.org/";
     license = licenses.mit;
-- 
cgit v1.2.3