summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.envrc-nix12
-rw-r--r--README6
-rw-r--r--README.md6
-rw-r--r--derivation.nix2
-rw-r--r--flake.nix5
-rw-r--r--nix-overlays/README12
-rw-r--r--nix-overlays/dmd/default.nix6
-rw-r--r--nix-overlays/ldc/default.nix4
-rw-r--r--org/config_env.org12
-rw-r--r--org/config_nix.org3
-rw-r--r--org/nixpkgs_overlays_d_related.org58
-rw-r--r--org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org2
-rw-r--r--org/spine_info.org10
-rw-r--r--views/version.txt2
14 files changed, 92 insertions, 48 deletions
diff --git a/.envrc-nix b/.envrc-nix
index a98cf57..6da2e86 100644
--- a/.envrc-nix
+++ b/.envrc-nix
@@ -16,11 +16,11 @@ PATH_add result/bin
use flake .
#use flake .#default
echo '
-- consider running:
+• consider running:
❯❯ nix flake show
❯❯ nix flake update && nix flake check && nix flake show
-- for a dev shell (development environment):
+• for a dev shell (development environment):
❯❯ nix develop
❯❯ nix develop ".#" --print-build-logs -c zsh
❯❯ nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
@@ -28,11 +28,11 @@ echo '
❯❯ nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
❯❯ nix develop ".#dsh-overlay-ldc-dub" --print-build-logs -c zsh
-- to build project:
+• to build project:
❯❯ nix build --print-build-logs
❯❯ nix build ".#" --print-build-logs
-- to build project (for build dependencies select appropriate dev env & build):
+• to build project (for build dependencies select appropriate dev env & build):
❯❯ nix build ".#spine-search-nixpkgs-dmd" --print-build-logs
❯❯ nix build ".#spine-search-overlay-dmd" --print-build-logs
@@ -40,7 +40,7 @@ echo '
❯❯ nix build ".#spine-search-nixpkgs-ldc" --print-build-logs
❯❯ nix build ".#spine-search-overlay-ldc" --print-build-logs
-- to build using dub on nix (get dependencies by setting your development environment):
+• to build using dub on nix (get dependencies by setting your development environment):
❯❯ nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
❯❯ dub run --compiler=dmd --config=dmd --combined --skip-registry=all
@@ -48,7 +48,7 @@ echo '
❯❯ nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
❯❯ dub run --compiler=ldmd2 --config=ldmd2 --combined --skip-registry=all
-- for develop environment & build options
+• for develop environment & build options
❯❯ nix flake show
❯❯ nix flake update && nix flake check && nix flake show
diff --git a/README b/README
index 0db6faf..2a3d115 100644
--- a/README
+++ b/README
@@ -101,9 +101,9 @@ Make a directory and clone the sisudoc-spine project
mkdir ~/git.sisudoc
cd ~/git.sisudoc
- git clone git://git.sisudoc.org/software/sisudoc-spine && \
- git clone git://git.sisudoc.org/software/sisudoc-spine-search-cgi && \
- git clone git://git.sisudoc.org/markup/sisudoc-spine-samples
+ git clone --depth=1 git://git.sisudoc.org/software/sisudoc-spine && \
+ git clone --depth=1 git://git.sisudoc.org/software/sisudoc-spine-search-cgi && \
+ git clone --depth=1 git://git.sisudoc.org/markup/sisudoc-spine-samples
such a relative directory layout will be assumed in the examples that provided
diff --git a/README.md b/README.md
index 711d75c..c9feb7d 100644
--- a/README.md
+++ b/README.md
@@ -84,9 +84,9 @@ Make a directory and clone the sisudoc-spine project
mkdir ~/git.sisudoc
cd ~/git.sisudoc
- git clone git://git.sisudoc.org/software/sisudoc-spine && \
- git clone git://git.sisudoc.org/software/sisudoc-spine-search-cgi && \
- git clone git://git.sisudoc.org/markup/sisudoc-spine-samples
+ git clone --depth=1 git://git.sisudoc.org/software/sisudoc-spine && \
+ git clone --depth=1 git://git.sisudoc.org/software/sisudoc-spine-search-cgi && \
+ git clone --depth=1 git://git.sisudoc.org/markup/sisudoc-spine-samples
such a relative directory layout will be assumed in the examples that provided
diff --git a/derivation.nix b/derivation.nix
index eb08f56..495cefd 100644
--- a/derivation.nix
+++ b/derivation.nix
@@ -110,7 +110,7 @@ with (
];
meta = with pkgs-nix.lib; {
pname = "spine-search";
- version = "0.16.0";
+ version = "0.17.0";
homepage = "https://sisudoc.org";
description = "cgi sqlite search form for document object search";
longDescription = ''
diff --git a/flake.nix b/flake.nix
index 2a6115c..1df2424 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,9 +12,10 @@
nixpkgs,
flake-utils,
d-overlay,
- } @ inputs: let
+ ...
+ }@inputs: let
pname = "spine_search";
- version = "0.16.0";
+ version = "0.17.0";
shell = ./shell.nix;
devEnv = ./nixDevEnv.sh;
supportedSystems = ["x86_64-linux"];
diff --git a/nix-overlays/README b/nix-overlays/README
index e10dd07..44e76b6 100644
--- a/nix-overlays/README
+++ b/nix-overlays/README
@@ -16,11 +16,11 @@ compiler and build tools: ldc, dub and dtools, than exist in nixpkgs at the time
of publishing, in some cases with additional fixes.
nix overlays for (updates nixpkgs, more recent versions of):
- - ldc ( 1.30.0 -> 1.38.0 )
+ - ldc ( 1.30.0 -> 1.39.0 )
- dub ( 1.23.0 -> 1.36.0 ) [for nix versions 1.31.0 ... 1.33.0 broken]
- dtools ( 2.095.1 -> 2.103.1 )
- - dmd ( 2.106.1 -> 2.108.0 )
+ - dmd ( 2.106.1 -> 2.109.0 )
- gdc [not yet available]
dlang-nix-flakes.org --❯
@@ -47,26 +47,26 @@ search nixpkgs here:
- https://search.nixos.org/packages?channel=unstable&from=0&size=100&sort=relevance&query=
** compilers
-*** ldc OK ✓ ( 1.30.0 -> 1.38.0 )
+*** ldc OK ✓ ( 1.30.0 -> 1.39.0 )
- https://wiki.dlang.org/LDC
- https://github.com/ldc-developers/ldc
- https://github.com/ldc-developers/ldc/releases
- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.38.0.tar.gz
+ nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.39.0.tar.gz
- https://github.com/ldc-developers/ldc/issues
- version in nixpkgs:
- https://search.nixos.org/packages?channel=unstable&show=ldc&from=0&size=100&sort=relevance&type=packages&query=ldc
-*** dmd OK ✓ ( 2.100.2 -> 2.108.0 )
+*** dmd OK ✓ ( 2.100.2 -> 2.109.0 )
- https://dlang.org/
- https://wiki.dlang.org/LDC
- https://github.com/dlang/dmd
- https://github.com/dlang/dmd/tags
- nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.108.0.tar.gz
+ nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.109.0.tar.gz
- https://github.com/dlang/dmd/pulls
- version in nixpkgs:
diff --git a/nix-overlays/dmd/default.nix b/nix-overlays/dmd/default.nix
index 9f3f5a2..155a950 100644
--- a/nix-overlays/dmd/default.nix
+++ b/nix-overlays/dmd/default.nix
@@ -1,5 +1,5 @@
import ./generic.nix {
- version = "2.108.0";
- dmdHash = "sha256-tlWcFgKtXzfqMMkOq4ezhZHdYCXFckjN5+m6jO4VH0U=";
- phobosHash = "sha256-uU8S4rABOfhpKh+MvSbclkbdf0hrsuKF8SIpWMnPpfU=";
+ version = "2.109.0";
+ dmdHash = "sha256-unAZgyZyT6qomlj6pdlOx4h1SKuDjutl1/0FM9AhBWc=";
+ phobosHash = "sha256-b91FeluFqhmjHd1wwkyq98QzIlwjE646xNj2n6hP3aM=";
}
diff --git a/nix-overlays/ldc/default.nix b/nix-overlays/ldc/default.nix
index a6ef777..1f18529 100644
--- a/nix-overlays/ldc/default.nix
+++ b/nix-overlays/ldc/default.nix
@@ -1,4 +1,4 @@
import ./generic.nix {
- version = "1.38.0";
- sha256 = "sha256-ymI47+Ai40zTB2dB+KBwxqN3GWNRxhlJpIpIyZN5844=";
+ version = "1.39.0";
+ sha256 = "sha256-g5usNvYHMxjjbwsWN2fgO9vT9X2ZJWuXSUrEObWaRWI=";
}
diff --git a/org/config_env.org b/org/config_env.org
index dab1d81..5e3e0b2 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -72,11 +72,11 @@ PATH_add result/bin
use flake .
#use flake .#default
echo '
-- consider running:
+• consider running:
❯❯ nix flake show
❯❯ nix flake update && nix flake check && nix flake show
-- for a dev shell (development environment):
+• for a dev shell (development environment):
❯❯ nix develop
❯❯ nix develop ".#" --print-build-logs -c zsh
❯❯ nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
@@ -84,11 +84,11 @@ echo '
❯❯ nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
❯❯ nix develop ".#dsh-overlay-ldc-dub" --print-build-logs -c zsh
-- to build project:
+• to build project:
❯❯ nix build --print-build-logs
❯❯ nix build ".#" --print-build-logs
-- to build project (for build dependencies select appropriate dev env & build):
+• to build project (for build dependencies select appropriate dev env & build):
❯❯ nix build ".#spine-search-nixpkgs-dmd" --print-build-logs
❯❯ nix build ".#spine-search-overlay-dmd" --print-build-logs
@@ -96,7 +96,7 @@ echo '
❯❯ nix build ".#spine-search-nixpkgs-ldc" --print-build-logs
❯❯ nix build ".#spine-search-overlay-ldc" --print-build-logs
-- to build using dub on nix (get dependencies by setting your development environment):
+• to build using dub on nix (get dependencies by setting your development environment):
❯❯ nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
❯❯ dub run --compiler=dmd --config=dmd --combined --skip-registry=all
@@ -104,7 +104,7 @@ echo '
❯❯ nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
❯❯ dub run --compiler=ldmd2 --config=ldmd2 --combined --skip-registry=all
-- for develop environment & build options
+• for develop environment & build options
❯❯ nix flake show
❯❯ nix flake update && nix flake check && nix flake show
diff --git a/org/config_nix.org b/org/config_nix.org
index 3eb9498..9582909 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -39,7 +39,8 @@
nixpkgs,
flake-utils,
d-overlay,
- } @ inputs: let
+ ...
+ }@inputs: let
pname = "spine_search";
version = "<<spine_version>>";
shell = ./shell.nix;
diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org
index 80cbc1b..5eedd71 100644
--- a/org/nixpkgs_overlays_d_related.org
+++ b/org/nixpkgs_overlays_d_related.org
@@ -328,7 +328,8 @@ direnv fetchurl https://raw.githubusercontent.com/nix-community/nix-direnv/${Nix
self,
nixpkgs,
flake-utils,
- } @ inputs: let
+ ...
+ }@inputs: let
name = "dev-dub";
shell = ./shell.nix;
devEnv = ./nixDevEnv.sh; # ./.envrc;
@@ -497,7 +498,7 @@ will automatically build the default development shell, perhaps unecessary
pkgs.callPackage ./shell.nix {}
#+END_SRC
-* nixpkgs overlays ( written to ./dlang-nix-flakes/nix-overlays/ )
+* nixpkgs overlays ( written to ../dlang-nix-flakes/nix-overlays/ )
** ldc OK ✓
*** info
**** links
@@ -783,17 +784,38 @@ sha256 = "<<ldc_hash>>";
#+NAME: ldc_version
#+BEGIN_SRC nix
-<<ldc_version_1_38_0>>
+<<ldc_version_1_39_0>>
#+END_SRC
#+NAME: ldc_hash
#+BEGIN_SRC nix
-<<ldc_hash_1_38_0>>
+<<ldc_hash_1_39_0>>
#+END_SRC
#+NAME: ldc_llvm_set
#+BEGIN_SRC nix
-<<ldc_llvm_set_1_38_0>>
+<<ldc_llvm_set_1_39_0>>
+#+END_SRC
+
+**** 1.39 OK ✓
+***** 1.39.0 OK ✓
+
+- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.39.0.tar.gz
+- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz
+
+#+NAME: ldc_version_1_39_0
+#+BEGIN_SRC nix
+1.39.0
+#+END_SRC
+
+#+NAME: ldc_hash_1_39_0
+#+BEGIN_SRC nix
+sha256-g5usNvYHMxjjbwsWN2fgO9vT9X2ZJWuXSUrEObWaRWI=
+#+END_SRC
+
+#+NAME: ldc_llvm_set_1_39_0
+#+BEGIN_SRC nix
+llvm_18
#+END_SRC
**** 1.38 OK ✓
@@ -1390,17 +1412,37 @@ stdenv.mkDerivation {
#+NAME: dmd_version
#+BEGIN_SRC nix
-<<dmd_version_2_108_0>>
+<<dmd_version_2_109_0>>
#+END_SRC
#+NAME: dmd_hash
#+BEGIN_SRC nix
-<<dmd_hash_2_108_0>>
+<<dmd_hash_2_109_0>>
#+END_SRC
#+NAME: phobos_hash
#+BEGIN_SRC nix
-<<phobos_hash_2_108_0>>
+<<phobos_hash_2_109_0>>
+#+END_SRC
+
+**** 2.109.0 OK ✓
+
+- nix-prefetch-url --unpack https://github.com/dlang/dmd/archive/refs/tags/v2.109.0.tar.gz
+- nix-prefetch-url --unpack https://github.com/dlang/phobos/archive/refs/tags/v2.109.0.tar.gz
+
+#+NAME: dmd_version_2_109_0
+#+BEGIN_SRC nix
+2.109.0
+#+END_SRC
+
+#+NAME: dmd_hash_2_109_0
+#+BEGIN_SRC nix
+sha256-unAZgyZyT6qomlj6pdlOx4h1SKuDjutl1/0FM9AhBWc=
+#+END_SRC
+
+#+NAME: phobos_hash_2_109_0
+#+BEGIN_SRC nix
+sha256-b91FeluFqhmjHd1wwkyq98QzIlwjE646xNj2n6hP3aM=
#+END_SRC
**** 2.108.0 OK ✓
diff --git a/org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org b/org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org
index ed7def8..28ead23 100644
--- a/org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org
+++ b/org/sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org
@@ -98,7 +98,7 @@
#+NAME: spine_project_version_part_minor
#+BEGIN_SRC org
-16
+17
#+END_SRC
*** patch
diff --git a/org/spine_info.org b/org/spine_info.org
index 8283292..f37e66c 100644
--- a/org/spine_info.org
+++ b/org/spine_info.org
@@ -206,9 +206,9 @@ Make a directory and clone the sisudoc-spine project
mkdir ~/git.sisudoc
cd ~/git.sisudoc
- git clone git://git.sisudoc.org/software/sisudoc-spine && \
- git clone git://git.sisudoc.org/software/sisudoc-spine-search-cgi && \
- git clone git://git.sisudoc.org/markup/sisudoc-spine-samples
+ git clone --depth=1 git://git.sisudoc.org/software/sisudoc-spine && \
+ git clone --depth=1 git://git.sisudoc.org/software/sisudoc-spine-search-cgi && \
+ git clone --depth=1 git://git.sisudoc.org/markup/sisudoc-spine-samples
such a relative directory layout will be assumed in the examples that provided
@@ -382,7 +382,7 @@ web-server is configured to find it.
- license
- dependency information
-#+HEADER: :tangle "./COPYRIGHT"
+#+HEADER: :tangle "../org/COPYRIGHT"
#+HEADER: :noweb yes
#+BEGIN_SRC text
- Name: spine - SiSU Spine, Doc Reform
@@ -395,7 +395,7 @@ web-server is configured to find it.
*** doc (markup samples) ./doc
-#+HEADER: :NO-tangle "../doc/COPYRIGHT"
+#+HEADER: :tangle-NO "../doc/COPYRIGHT"
#+HEADER: :noweb yes
#+BEGIN_SRC text
<<data>>
diff --git a/views/version.txt b/views/version.txt
index 6509480..fecec3f 100644
--- a/views/version.txt
+++ b/views/version.txt
@@ -4,7 +4,7 @@ struct Version {
int minor;
int patch;
}
-enum _ver = Version(0, 16, 0);
+enum _ver = Version(0, 17, 0);
version (Posix) {
version (DigitalMars) {
} else version (LDC) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 14:51:53 +0000