diff options
Diffstat (limited to 'nix-overlays')
| -rw-r--r-- | nix-overlays/README | 15 | ||||
| -rw-r--r-- | nix-overlays/dub/default.nix | 4 | ||||
| -rw-r--r-- | nix-overlays/ldc/generic.nix | 4 |
3 files changed, 13 insertions, 10 deletions
diff --git a/nix-overlays/README b/nix-overlays/README index 722d613..44e1585 100644 --- a/nix-overlays/README +++ b/nix-overlays/README @@ -24,7 +24,7 @@ of publishing, in some cases with additional fixes. nix overlays for (updates nixpkgs, more recent versions of): - ldc ( 1.30.0 -> 1.32.2 ) - - dub ( 1.23.0 -> 1.30.0 ) [for nix versions 1.31.0 ... 1.33.0 broken] + - dub ( 1.23.0 -> 1.33.1 ) [for nix versions 1.31.0 ... 1.33.0 broken] - dtools ( 2.095.1 -> 2.103.1 ) - dmd ( 2.100.2 -> 2.104.0 ) KO ✗ @@ -97,13 +97,13 @@ not yet provided in nixpkgs with gcc12, no attempt made - https://github.com/D-Programming-GDC/gdc ** build tool -*** dub ( 1.23.0 -> 1.30.0 ) +*** dub ( 1.23.0 -> 1.33.1 ) - https://code.dlang.org/packages/dub - https://github.com/dlang/dub - https://github.com/dlang/dub/releases - nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.30.0.tar.gz + nix-prefetch-url --unpack https://github.com/dlang/dub/archive/refs/tags/v1.33.1.tar.gz - https://github.com/dlang/dub/issues - version in nixpkgs: @@ -111,9 +111,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 -> 1.33.1 ) + + 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 -> 2.103.1 ) @@ -151,3 +152,5 @@ It is possible to compare the changes made by the overlays here directly against 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 diff --git a/nix-overlays/dub/default.nix b/nix-overlays/dub/default.nix index 0ebc576..3993f8d 100644 --- a/nix-overlays/dub/default.nix +++ b/nix-overlays/dub/default.nix @@ -4,7 +4,7 @@ assert dcompiler != null; stdenv.mkDerivation rec { pname = "dub"; - version = "1.30.0"; + version = "1.33.1"; enableParallelBuilding = true; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "dlang"; repo = "dub"; rev = "v${version}"; - sha256 = "sha256-iVl7bjblvIxvrUX7Phq6h4AIAmZjNVkGYYFA1hhsE7c="; + sha256 = "sha256-QFgUsO04VRXBDjGI5QQs7u9XrexG7/V34TMgJP1D8yA="; }; #postUnpack = '' diff --git a/nix-overlays/ldc/generic.nix b/nix-overlays/ldc/generic.nix index 979d78c..f88f448 100644 --- a/nix-overlays/ldc/generic.nix +++ b/nix-overlays/ldc/generic.nix @@ -1,5 +1,5 @@ { 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 { } @@ -54,7 +54,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 |