diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2025-06-07 08:58:44 -0400 | 
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2025-06-07 10:50:05 -0400 | 
| commit | 311d82d0f73e60e537f7c2f2f535586945ce0e06 (patch) | |
| tree | f8a3776bcd3592b687623f8f1a19611c0dfd9ca3 | |
| parent | org ready ldc-1.41.0-beta1; flake using ldc-1.40.1 (diff) | |
ldc-1.41.0 overlay; nix direnv 3.0.7
- related updates to files
- notes on updating these added (.org)
| -rw-r--r-- | .envrc-nix | 8 | ||||
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | flake.nix | 8 | ||||
| -rw-r--r-- | nix-overlays/README | 6 | ||||
| -rw-r--r-- | nix-overlays/ldc/package.nix | 4 | ||||
| -rw-r--r-- | org/nix-develop-dlang-shared.org | 80 | 
6 files changed, 85 insertions, 27 deletions
| @@ -1,7 +1,7 @@  NIX_ENFORCE_PURITY=1  # - https://github.com/nix-community/nix-direnv -NixDirEnvVersion="3.0.6" -NixDirEnvSHA="sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM=" +NixDirEnvVersion="3.0.7" +NixDirEnvSHA="sha256-bn8WANE5a91RusFmRI7kS751ApelG02nMcwRekC/qzc="  if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "${NixDirEnvSHA}"  fi @@ -26,7 +26,7 @@ echo '    • nix develop using nixpkgs      ❯❯ nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh      ❯❯ nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh -  • nix develop using package overlays: (dmd-2.111.0, ldc-1.40.1, dub-1.39.0, dtools-2.110.0) +  • nix develop using package overlays: (dmd-2.111.0, ldc-1.41.0, dub-1.39.0, dtools-2.110.0)      ❯❯ nix develop ".#dsh-overlay-dmd-dub" --print-build-logs -c zsh      ❯❯ nix develop ".#dsh-overlay-ldc-dub" --print-build-logs -c zsh    ❯❯ nix flake show @@ -40,7 +40,7 @@ echo '    • nix build using nixpkgs      ❯❯ nix build ".#spine-nixpkgs-dmd" --print-build-logs      ❯❯ nix build ".#spine-nixpkgs-ldc" --print-build-logs -  • nix build using package overlays: (dmd-2.111.0, ldc-1.40.1, dub-1.39.0, dtools-2.110.0) +  • nix build using package overlays: (dmd-2.111.0, ldc-1.41.0, dub-1.39.0, dtools-2.110.0)      ❯❯ nix build ".#spine-overlay-dmd" --print-build-logs      ❯❯ nix build ".#spine-overlay-ldc" --print-build-logs @@ -2,11 +2,11 @@    "nodes": {      "nixpkgs": {        "locked": { -        "lastModified": 1744536153, -        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", +        "lastModified": 1749213349, +        "narHash": "sha256-UAaWOyQhdp7nXzsbmLVC67fo+QetzoTm9hsPf9X3yr4=",          "owner": "NixOS",          "repo": "nixpkgs", -        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", +        "rev": "a4ff0e3c64846abea89662bfbacf037ef4b34207",          "type": "github"        },        "original": { @@ -21,7 +21,7 @@        runHook postCheck      '';      localOverlay = (final: prev: { -      ldc = prev.callPackage ./nix-overlays/ldc {  };       # -> ok 1.40.1 +      ldc = prev.callPackage ./nix-overlays/ldc {  };       # -> ok 1.41.0        dmd = prev.callPackage ./nix-overlays/dmd {  };       # -> ok 2.111.0        dub = prev.callPackage ./nix-overlays/dub {  };       # -> ? 1.39.0        dtools = prev.callPackage ./nix-overlays/dtools {  }; # -> ok 2.110.0 @@ -155,7 +155,7 @@          spine-overlay-ldc = stdenv.mkDerivation {            inherit pname;            inherit version; -          #name = "spine-0.18.0 ldc-1.40.1 dub-1.39.0"; +          #name = "spine-0.18.0 ldc-1.41.0 dub-1.39.0";            meta.mainProgram = "spine-ldc";            executable = true;            src = self; @@ -215,7 +215,7 @@      in        with pkgs-nix; {          dsh-overlay = mkShell { -          name = "spine-0.18.0 base dev shell, ldc-1.40.1, dub-1.39.0 - dtools-2.110.0"; +          name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.39.0 - dtools-2.110.0";            inherit shell;            inherit devEnv;            packages = with pkgs-ovl; [ @@ -268,7 +268,7 @@            inherit shellHook;          };          dsh-overlay-ldc-dub = mkShell { -          name = "spine-0.18.0 base dev shell, ldc-1.40.1, dub-1.39.0 - dtools-2.110.0"; +          name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.39.0 - dtools-2.110.0";            inherit shell;            inherit devEnv;            packages = with pkgs-ovl; [ diff --git a/nix-overlays/README b/nix-overlays/README index 56a23e9..59b02ca 100644 --- a/nix-overlays/README +++ b/nix-overlays/README @@ -16,7 +16,7 @@ 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.40.1 ) +  - ldc     ( 1.30.0 -> 1.41.0 )    - dub     ( 1.23.0 -> 1.39.0 ) [for nix versions 1.31.0 ... 1.33.0 broken]    - dtools  ( 2.095.1 -> 2.110.0 ) @@ -47,13 +47,13 @@ search nixpkgs here:  - https://search.nixos.org/packages?channel=unstable&from=0&size=100&sort=relevance&query=  ** compilers -*** ldc OK ✓ ( 1.30.0 -> 1.40.1 ) +*** ldc OK ✓ ( 1.30.0 -> 1.41.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.40.1.tar.gz +    nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.41.0.tar.gz    - https://github.com/ldc-developers/ldc/issues  - version in nixpkgs: diff --git a/nix-overlays/ldc/package.nix b/nix-overlays/ldc/package.nix index 39b510a..ff2089b 100644 --- a/nix-overlays/ldc/package.nix +++ b/nix-overlays/ldc/package.nix @@ -31,13 +31,13 @@ in  stdenv.mkDerivation (finalAttrs: {    pname = "ldc"; -  version = "1.40.1"; +  version = "1.41.0";    src = fetchFromGitHub {      owner = "ldc-developers";      repo = "ldc";      rev = "v${finalAttrs.version}"; -    hash = "sha256-WdnwdH25A5oMNNY3uWG2hxnaAT+S1hNuP7LElH3uuuk="; +    hash = "sha256-6LcpY3LSFK4KgEiGrFp/LONu5Vr+/+vI04wEEpF3s+s=";      fetchSubmodules = true;    }; diff --git a/org/nix-develop-dlang-shared.org b/org/nix-develop-dlang-shared.org index 1d8fe34..451c53c 100644 --- a/org/nix-develop-dlang-shared.org +++ b/org/nix-develop-dlang-shared.org @@ -17,20 +17,51 @@  * nix  ** direnv +*** NOTES to update direnv in .envrc-nix + +- https://github.com/nix-community/nix-direnv + +check for latest version: + +- https://github.com/nix-community/nix-direnv/releases + +update direnv version and sha hash: +- emacs org/nix-develop-dlang-shared.org + +re-tangle file: + +- emacs org/config_env.org +  updates: .envrc-nix + +update flake.lock: +- nix flake update && nix flake check && nix flake show +  *** version SET  #+NAME: direnv-version  #+BEGIN_SRC org -<<direnv_version_3_0_6>> +<<direnv_version_3_0_7>>  #+END_SRC  #+NAME: direnv-hash  #+BEGIN_SRC org -<<direnv_hash_3_0_6>> +<<direnv_hash_3_0_7>>  #+END_SRC  *** versions +**** 3.0.7 + +#+NAME: direnv_version_3_0_7 +#+BEGIN_SRC org +3.0.7 +#+END_SRC + +#+NAME: direnv_hash_3_0_7 +#+BEGIN_SRC org +sha256-bn8WANE5a91RusFmRI7kS751ApelG02nMcwRekC/qzc= +#+END_SRC +  **** 3.0.6  #+NAME: direnv_version_3_0_6 @@ -81,8 +112,35 @@ sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U=  * dlang  ** ldc +*** NOTES to update ldc + +check for latest version: + +update ldc version and sha hash: +- emacs ./org/nix-develop-dlang-shared.org + +re-tangle files: +- emacs ./org/nixpkgs_overlays_d_related.org +  updates: nix-overlays/ldc/package.nix +- emacs ./org/config_nix.org +  updates: flake.nix +- emacs ./org/config_env.org +  updates: .envrc-nix + +update flake.lock: +- nix flake update && nix flake check && nix flake show + +build: +- nix build ".#spine-overlay-ldc" --print-build-logs -- https://github.com/ldc-developers/ldc/releases +adjust nix overlay if required (to get started): +- git clone --depth 1 https://github.com/NixOS/nixpkgs +- find ./nixpkgs/pkgs/ -type d -name "ldc" +  ./nixpkgs/pkgs/by-name/ld/ldc +- compare with overlay: +  ./nix-overlays/ldc +- overlay is tangled from: +  emacs ./org/nixpkgs_overlays_d_related.org  *** version SET  **** version & sha256 nix composite @@ -97,34 +155,34 @@ sha256 = "<<ldc-hash>>";  #+NAME: ldc-version  #+BEGIN_SRC org -<<ldc_version_1_40_1>> +<<ldc_version_1_41_0>>  #+END_SRC  #+NAME: ldc-hash  #+BEGIN_SRC org -<<ldc_hash_1_40_1>> +<<ldc_hash_1_41_0>>  #+END_SRC  #+NAME: ldc-llvm-set  #+BEGIN_SRC org -<<ldc_llvm_set_1_40_1>> +<<ldc_llvm_set_1_41_0>>  #+END_SRC  *** versions -**** 1.41 -***** 1.41.0 beta1 OK ✓ +**** 1.41 OK ✓ +***** 1.41.0 OK ✓ - - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.41.0-beta1.tar.gz + - nix-prefetch-url --unpack https://github.com/ldc-developers/ldc/archive/refs/tags/v1.41.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_41_0  #+BEGIN_SRC nix -1.41.0-beta1 +1.41.0  #+END_SRC  #+NAME: ldc_hash_1_41_0  #+BEGIN_SRC nix -sha256-FSdBOVkHdEJ7flKTyjkE0MCEUIMOXRv4uBn8OKPPdn4= +sha256-6LcpY3LSFK4KgEiGrFp/LONu5Vr+/+vI04wEEpF3s+s=  #+END_SRC  #+NAME: ldc_llvm_set_1_41_0 | 
