From 5277e7def7b167021ae49a3d101926b40b98e745 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 8 Jul 2023 16:02:11 -0400 Subject: flake nix build dub, set HOME, dub >= 1.31.0 fix - fixes dub >= 1.31.0 build failure, attempted to build in /homeless-shelter --- org/config_nix.org | 12 +++++++ org/nixpkgs_overlays_d_related.org | 68 ++++++++++++++++++++++++++++---------- 2 files changed, 62 insertions(+), 18 deletions(-) (limited to 'org') diff --git a/org/config_nix.org b/org/config_nix.org index fbec722..fb282b3 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -88,6 +88,9 @@ inherit devEnv; buildInputs = [sqlite]; nativeBuildInputs = [dub ldc gnumake]; + preBuild = '' + export HOME=$(pwd) + ''; buildPhase = '' runHook preBuild for DC_ in dmd ldmd2 ldc2 gdc gdmd; do @@ -114,6 +117,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 @@ -133,6 +139,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 @@ -152,6 +161,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 9ca42d2..76b93d9 100644 --- a/org/nixpkgs_overlays_d_related.org +++ b/org/nixpkgs_overlays_d_related.org @@ -134,9 +134,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 -> <> ) + + 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 -> <> ) @@ -175,6 +176,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 @@ -247,10 +249,10 @@ fi echo ' .envrc-local echo ❯❯ - ❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c zsh + ❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c $SHELL ❯❯ nix develop - ❯❯ nix develop -c zsh + ❯❯ nix develop -c $SHELL ❯❯ nix develop ".#dsh-overlay-ldc" --print-build-logs ❯❯ nix build @@ -459,7 +461,7 @@ with pkgs; #echo ' # shell.nix echo ❯❯ - # ❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c zsh + # ❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c $SHELL #' ''; } @@ -471,7 +473,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 {}}: pkgs.callPackage ./shell.nix {} @@ -510,7 +512,7 @@ import ./generic.nix { #+HEADER: :tangle "../nix-overlays/ldc/generic.nix" #+BEGIN_SRC nix { version, sha256 }: -{ lib, stdenv, fetchurl, cmake, ninja, llvm_15, curl, tzdata +{ lib, stdenv, fetchurl, cmake, ninja, llvm_14, curl, tzdata , libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, runCommand, targetPackages , ldcBootstrap ? callPackage ./bootstrap.nix { } @@ -565,7 +567,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - cmake ldcBootstrap lit lit.python llvm_15.dev makeWrapper ninja unzip + cmake ldcBootstrap lit lit.python llvm_14.dev makeWrapper ninja unzip ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation @@ -772,9 +774,23 @@ sha256 = "<>"; <> #+END_SRC +**** 1.33.0-beta2 + +- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.33.0-beta2.tar.gz + +#+NAME: ldc_version_1_33_0-beta2 +#+BEGIN_SRC nix +1.33.0-beta2 +#+END_SRC + +#+NAME: ldc_hash_1_33_0-beta2 +#+BEGIN_SRC nix +sha256-ICtIrLItQsvhCHFh3l7Ki1x154xI6ygmAbw+pmlFTlY= +#+END_SRC + **** 1.33.0-beta1 -- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.32.1.tar.gz +- nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.33.0-beta1.tar.gz #+NAME: ldc_version_1_33_0-beta1 #+BEGIN_SRC nix @@ -861,7 +877,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 @@ -1291,7 +1307,7 @@ sha256-qXvY1ECN4mPwOGgOE1FWwvxoRvlSww3tGLWgBdhzAKo= sha256-kTHRaAKG7cAGb4IE/NGHWaZ8t7ZceKj03l6E8wLzJzs= #+END_SRC -** dub OK KO ✗ ISSUE (>= 1.31.0) +** dub OK *** info **** links @@ -1410,15 +1426,29 @@ stdenv.mkDerivation rec { #+NAME: dub_version #+BEGIN_SRC nix -<> +<> #+END_SRC #+NAME: dub_hash #+BEGIN_SRC nix -<> +<> +#+END_SRC + +**** 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 -**** 1.33.0 OK ✓ KO ✗ ISSUE +#+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 @@ -1432,7 +1462,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 @@ -1448,7 +1478,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 @@ -1464,10 +1494,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 -- cgit v1.2.3