From 3d78a7541b6bdeca09496c92387fc74f77b70962 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 15 Dec 2022 19:55:49 -0500 Subject: nix and build housekeeping --- makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'makefile') diff --git a/makefile b/makefile index 770cc7e..7f4eb38 100644 --- a/makefile +++ b/makefile @@ -50,7 +50,7 @@ data/pod/un_contracts_international_sale_of_goods_convention_1980 \ data/pod/viral_spiral.david_bollier # SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND = \ # find data/sisudir/media/text -name *.ss[tm] | sort | xargs -# +# # SiSU_MARKUP_SAMPLES_DIR = \ # data/sisudir/media/text/accelerando.charles_stross.sst \ # data/sisudir/media/text/alices_adventures_in_wonderland.lewis_carroll.sst \ @@ -78,7 +78,7 @@ data/pod/viral_spiral.david_bollier # data/sisudir/media/text/two_bits.christopher_kelty.sst \ # data/sisudir/media/text/un_contracts_international_sale_of_goods_convention_1980.sst \ # data/sisudir/media/text/viral_spiral.david_bollier.sst -# +# Date := `date "+%Y%m%d"` SpineBIN := "${SpineBIN}" # './result/bin' SpineOUT := "${SpineOUT}" # '/srv/www/spine' @@ -446,13 +446,13 @@ depends_set: depends_get # markup_samples: # find data/pod -name pod.manifest | cut -f 1-3 -d / | sort; \ # find data/sisudir/media/text -name *.ss[tm] | sort -# +# # markup_pod_samples: # find data/pod -name pod.manifest | cut -f 1-3 -d / | sort -# +# # markup_dir_samples: # find data/sisudir/media/text -name *.ss[tm] | sort -# +# version_tag: echo "DRV=0.12.0; git tag -f doc-reform_v$$\{DRV} -m\"doc-reform $$\{DRV}\" HEAD" && \ echo "git tag -f doc-reform_v0.12.0 -m\"doc-reform spine-0.12.0\" HEAD" @@ -1156,7 +1156,7 @@ nix-shell-pure: # nix-shell (with local tools, presumably latest dlang compiler & build tools (ldc & dub)) nix-shell-updated: - nix-shell -I nixpkgs=/nixpkgs-ra/nixpkgs --pure + nix-shell -I nixpkgs=/nix/nixpkgs --pure # shell.nix (with shebang) shell: @@ -1198,7 +1198,7 @@ _flake-show-derivation: nix show-derivation |jq; nix-develop: - nix develop -f default.nix -I nixpkgs=/nixpkgs-ra/nixpkgs + nix develop -f default.nix -I nixpkgs=/nix/nixpkgs # nix flake show flake-show: _flake-show-package _flake-show-name _flake-show-derivation @@ -1217,7 +1217,7 @@ flake-build-debug: # nix-build spine (with local tools, presumably latest dlang compiler & build tools (ldc & dub)) flake-build-use-tools-new: - nix build --print-build-logs -I nixpkgs=/nixpkgs-ra/nixpkgs + nix build --print-build-logs -I nixpkgs=/nix/nixpkgs # tangle-build-flake flake-tangle-build: org-tangle flake-build -- cgit v1.2.3