diff options
| -rw-r--r-- | nixDevEnv/overlays/ldcVersion.nix | 4 | ||||
| -rw-r--r-- | nixDevEnv/shells/shell-ldc-verUser.nix | 6 | ||||
| -rw-r--r-- | org/spine_build_scaffold.org | 15 |
3 files changed, 13 insertions, 12 deletions
diff --git a/nixDevEnv/overlays/ldcVersion.nix b/nixDevEnv/overlays/ldcVersion.nix index 688394d..5990004 100644 --- a/nixDevEnv/overlays/ldcVersion.nix +++ b/nixDevEnv/overlays/ldcVersion.nix @@ -1,7 +1,7 @@ self: super: rec { pname = "ldc"; - version = "1.23.0"; - sha256 = "1fdgj222x29as466vdxy9c0m82zzlsb7vnvvh89n2riszcrx463d"; + version = "1.24.0"; + sha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx"; ldc = super.ldc.overrideAttrs(oldAttrs: rec { inherit pname version sha256; name = "${pname}-${version}"; diff --git a/nixDevEnv/shells/shell-ldc-verUser.nix b/nixDevEnv/shells/shell-ldc-verUser.nix index 8035327..9d2c3e1 100644 --- a/nixDevEnv/shells/shell-ldc-verUser.nix +++ b/nixDevEnv/shells/shell-ldc-verUser.nix @@ -1,8 +1,4 @@ -{ pkgs ? import <nixpkgs> - { overlays = [ - (import ../overlays/ldcVersion.nix) - ]; } -}: +{ pkgs ? import <nixpkgs> {}, }: let dub2nix-src = fetchTarball { url = "https://github.com/lionello/dub2nix/archive/master.tar.gz"; diff --git a/org/spine_build_scaffold.org b/org/spine_build_scaffold.org index a10929b..8f89a4a 100644 --- a/org/spine_build_scaffold.org +++ b/org/spine_build_scaffold.org @@ -1812,9 +1812,7 @@ in pkgs.mkShell { - ln -sf nixDevEnv/dub/mkDub-ldc.nix mkDub.nix #+BEGIN_SRC nix :tangle ../nixDevEnv/shells/shell-ldc-verUser.nix -{ pkgs ? import <nixpkgs> - <<nix_shell_overlay_user_version_ldc>> -}: +{ pkgs ? import <nixpkgs> {}, }: let <<nix_shell_dub2nix>> in pkgs.mkShell { @@ -1822,6 +1820,14 @@ in pkgs.mkShell { } #+END_SRC +- overlay header + +#+BEGIN_SRC nix +{ pkgs ? import <nixpkgs> + <<nix_shell_overlay_user_version_ldc>> +}: +#+END_SRC + *** parts **** dub2nix @@ -1866,7 +1872,6 @@ use if working overlay: ]; } #+END_SRC - **** build inputs #+NAME: nix_shell_buildInputs_dmd @@ -2285,6 +2290,7 @@ self: super: rec { - https://github.com/ldc-developers/ldc/releases/tag/v1.24.0 - nix-prefetch-url https://github.com/ldc-developers/ldc/releases/download/v1.24.0/ldc-1.24.0-src.tar.gz +#+NAME: ldc_version_info #+BEGIN_SRC nix version = "1.24.0"; sha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx"; @@ -2298,7 +2304,6 @@ sha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx"; - https://github.com/ldc-developers/ldc/releases/tag/v1.23.0 - nix-prefetch-url https://github.com/ldc-developers/ldc/releases/download/v1.23.0/ldc-1.23.0-src.tar.gz -#+NAME: ldc_version_info #+BEGIN_SRC nix version = "1.23.0"; sha256 = "1fdgj222x29as466vdxy9c0m82zzlsb7vnvvh89n2riszcrx463d"; |