aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
Diffstat (limited to 'org')
-rw-r--r--org/config_nix.org12
-rw-r--r--org/nixpkgs_overlays_d_related.org51
2 files changed, 43 insertions, 20 deletions
diff --git a/org/config_nix.org b/org/config_nix.org
index 41efed4..2ef18e5 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -80,6 +80,9 @@
inherit devEnv;
buildInputs = [sqlite];
nativeBuildInputs = [dub ldc gnumake]; # [ dub dmd ]; [ dub ldc ]; [ dub gdc ];
+ preBuild = ''
+ export HOME=$(pwd)
+ '';
buildPhase = ''
runHook preBuild
for DC_ in dmd ldmd2 ldc2 gdc gdmd; do
@@ -106,6 +109,9 @@
inherit devEnv;
buildInputs = [sqlite];
nativeBuildInputs = [dub dmd gnumake];
+ preBuild = ''
+ export HOME=$(pwd)
+ '';
buildPhase = ''
runHook preBuild
dub build --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all
@@ -125,6 +131,9 @@
inherit devEnv;
buildInputs = [sqlite];
nativeBuildInputs = [dub ldc gnumake];
+ preBuild = ''
+ export HOME=$(pwd)
+ '';
buildPhase = ''
runHook preBuild
dub build --cache=local --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all
@@ -144,6 +153,9 @@
inherit devEnv;
buildInputs = with pkgs; [sqlite];
nativeBuildInputs = with pkgs; [dub ldc gnumake];
+ preBuild = ''
+ export HOME=$(pwd)
+ '';
buildPhase = ''
runHook preBuild
dub build --cache=local --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all
diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org
index 5c9dfc0..cb40228 100644
--- a/org/nixpkgs_overlays_d_related.org
+++ b/org/nixpkgs_overlays_d_related.org
@@ -1,6 +1,6 @@
-*- mode: org -*-
#+TITLE: D nix, dev shells with overlays
-#+DESCRIPTION: dlang related nixpkgs of interest (dlang cvompilers & tools)
+#+DESCRIPTION: dlang related nixpkgs of interest (dlang compilers & tools)
#+FILETAGS: :nixos:nixpkgs:dlang:compiler:
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
@@ -30,13 +30,6 @@
,#+COPYRIGHT: Copyright (C) 2015 - 2023 Ralph Amissah
,#+LANGUAGE: en
,#+STARTUP: content hideblocks hidestars noindent entitiespretty
-,#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
-,#+PROPERTY: header-args :exports code
-,#+PROPERTY: header-args+ :noweb yes
-,#+PROPERTY: header-args+ :eval no
-,#+PROPERTY: header-args+ :results no
-,#+PROPERTY: header-args+ :cache no
-,#+PROPERTY: header-args+ :padline no
,* README for D related overlays
,** dlang-nix-overlays
@@ -134,9 +127,10 @@ not yet provided in nixpkgs with gcc12, no attempt made
- dub nixpkg overlay is updated and runs most dub tests correctly
-- dub from v1.31.0 FAILS to build packages with nix tools that previous version
- of dub built (from v1.23.0 to v1.30.0 which is currently in nixpkgs); FAILURE
- is from v1.31.0 through v1.32.1 (which is current at the time of this commit)
+- dub OK ✓ ( 1.30.0 -> <<dub_version>> )
+
+ from v1.31.0 requires seeting of pwd in buildPhase else fails to build
+ packages with nix tools that previous version of dub built;
,** tools
,*** dtools OK ✓ ( 2.095.1 -> <<dtools_version>> )
@@ -175,6 +169,7 @@ what is currently available in nixpkgs.
- https://search.nixos.org/packages?channel=unstable&size=100&sort=relevance&query=
+nix flake update && nix flake check --show-trace && nix flake info && echo "" && nix flake show
#+END_SRC
** .gitignore
@@ -471,7 +466,7 @@ will automatically build the default development shell, perhaps unecessary
#+HEADER: :tangle-NO "../nix-overlays/default.nix"
#+HEADER: :tangle-mode (identity #o755)
-#+HEADER: :shebang #!/usr/bin/env -S nix-build
+#+HEADER: :shebang "#!/usr/bin/env -S nix-build"
#+BEGIN_SRC nix
{pkgs ? import <nixpkgs> {}}:
pkgs.callPackage ./shell.nix {}
@@ -875,7 +870,7 @@ sha256-/bs3bwgkLZF5IqaiKnc5gCF/r6MQBG/F1kWUkK8j2s0=
**** links
- https://dlang.org/
- - https://wiki.dlang.org/LDC
+ - https://wiki.dlang.org/DMD
- https://github.com/dlang/dmd
- https://github.com/dlang/dmd/tags
@@ -1305,7 +1300,7 @@ sha256-qXvY1ECN4mPwOGgOE1FWwvxoRvlSww3tGLWgBdhzAKo=
sha256-kTHRaAKG7cAGb4IE/NGHWaZ8t7ZceKj03l6E8wLzJzs=
#+END_SRC
-** dub OK KO ✗ ISSUE (>= 1.31.0)
+** dub OK
*** info
**** links
@@ -1424,15 +1419,29 @@ stdenv.mkDerivation rec {
#+NAME: dub_version
#+BEGIN_SRC nix
-<<dub_version_1_30_0>>
+<<dub_version_1_33_1>>
#+END_SRC
#+NAME: dub_hash
#+BEGIN_SRC nix
-<<dub_hash_1_30_0>>
+<<dub_hash_1_33_1>>
#+END_SRC
-**** 1.33.0 OK ✓ KO ✗ ISSUE
+**** 1.33.1 OK ✓
+
+- nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.33.1.tar.gz
+
+#+NAME: dub_version_1_33_1
+#+BEGIN_SRC nix
+1.33.1
+#+END_SRC
+
+#+NAME: dub_hash_1_33_1
+#+BEGIN_SRC nix
+sha256-QFgUsO04VRXBDjGI5QQs7u9XrexG7/V34TMgJP1D8yA=
+#+END_SRC
+
+**** 1.33.0 OK ✓
- nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.33.0.tar.gz
@@ -1446,7 +1455,7 @@ stdenv.mkDerivation rec {
sha256-4Mha7WF6cg3DIccfpvOnheuvgfziv/7wo8iFsPXO4yY=
#+END_SRC
-**** 1.32.1 OK ✓ KO ✗ ISSUE
+**** 1.32.1 OK ✓
- nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.32.1.tar.gz
@@ -1462,7 +1471,7 @@ sha256-5pW3Fu3PQ1ZLJnsuh7fPpEBNbVQgGfFyiuMrAVOJKQA=
- ISSUES from 1.31.0 continuing
-**** 1.31.1 OK ✓ KO ✗ ISSUE
+**** 1.31.1 OK ✓
- nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.31.1.tar.gz
@@ -1478,10 +1487,12 @@ sha256-dp64D51ypowXS1+EYKRXh5hpa3rMmiotvKO2FW+i92w=
- ISSUES from 1.31.0 continuing
-**** 1.31.0 OK ✓ KO ✗ ISSUE
+**** 1.31.0 OK ✓ NOTE
- nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.31.0.tar.gz
+behavior change in dub requiring the setting of pwd in buildPhase
+
#+NAME: dub_version_1_31_0
#+BEGIN_SRC nix
1.31.0