diff options
| author | Lionello Lunesu <lio+git@lunesu.com> | 2021-11-09 21:49:54 -0800 |
|---|---|---|
| committer | Lionello Lunesu <lio+git@lunesu.com> | 2021-11-09 21:56:30 -0800 |
| commit | dbcbf262506692963ed5d87c6125783c90aa6ede (patch) | |
| tree | 1eb05287cf5752df76e28e52fd2a14900a71c73f | |
| parent | f86959efea52f49260c52a8cb156355a54b560fd (diff) | |
| download | nixpkgs-dbcbf262506692963ed5d87c6125783c90aa6ede.tar nixpkgs-dbcbf262506692963ed5d87c6125783c90aa6ede.tar.gz nixpkgs-dbcbf262506692963ed5d87c6125783c90aa6ede.tar.bz2 nixpkgs-dbcbf262506692963ed5d87c6125783c90aa6ede.tar.lz nixpkgs-dbcbf262506692963ed5d87c6125783c90aa6ede.tar.xz nixpkgs-dbcbf262506692963ed5d87c6125783c90aa6ede.tar.zst nixpkgs-dbcbf262506692963ed5d87c6125783c90aa6ede.zip | |
ldc-bootstrap: 1.19.0 -> 1.25.0
This also enables building on aarch64-darwin.
| -rw-r--r-- | pkgs/development/compilers/ldc/binary.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/ldc/bootstrap.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/compilers/ldc/generic.nix | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/development/compilers/ldc/binary.nix b/pkgs/development/compilers/ldc/binary.nix index 7b43a2c2e8d..05928d396c8 100644 --- a/pkgs/development/compilers/ldc/binary.nix +++ b/pkgs/development/compilers/ldc/binary.nix @@ -3,8 +3,8 @@ let inherit (stdenv) hostPlatform; - OS = if stdenv.hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; - ARCH = toString hostPlatform.parsed.cpu.name; + OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; + ARCH = if hostPlatform.isDarwin && hostPlatform.isAarch64 then "arm64" else hostPlatform.parsed.cpu.name; in stdenv.mkDerivation { pname = "ldc-bootstrap"; inherit version; @@ -37,6 +37,6 @@ in stdenv.mkDerivation { # from https://github.com/ldc-developers/ldc/blob/master/LICENSE license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; maintainers = with maintainers; [ ThomasMader lionello ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/ldc/bootstrap.nix b/pkgs/development/compilers/ldc/bootstrap.nix index fde4c842684..18c656b27f2 100644 --- a/pkgs/development/compilers/ldc/bootstrap.nix +++ b/pkgs/development/compilers/ldc/bootstrap.nix @@ -1,10 +1,11 @@ { callPackage }: callPackage ./binary.nix { - version = "1.19.0"; + version = "1.25.0"; hashes = { # Get these from `nix-prefetch-url https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc.. - osx-x86_64 = "1bp3xkh9zp64dzq8isanib1gacb3nfbl70qv15qygwk1zan6zgy7"; - linux-x86_64 = "146grr2lwarfk13wgkpyb77xb6b3as1is2rf4s2hipqjmc8biy1h"; - linux-aarch64 = "1fv6jshfvi15m7masgxq1hgp216qjd5amizrqdf26vhrq3a08li3"; + osx-x86_64 = "1xaqxf1lz8kdb0n5iycfpxpvabf1zy0akg14kg554sm85xnsf8pa"; + linux-x86_64 = "1shzdq564jg3ga1hwrvpx30lpszc6pqndqndr5mqmc352znkiy5i"; + linux-aarch64 = "04i4xxwhq02d98r3qrrnv5dbd4xr4d7ph3zv94z2m58z3vgphdjh"; + osx-arm64 = "0b0cpgzn23clggx0cvdaja29q7w7ihkmjbnf1md03h9h5nzp9z1v"; }; } diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix index f79fb24a56b..93ee83cb0ab 100644 --- a/pkgs/development/compilers/ldc/generic.nix +++ b/pkgs/development/compilers/ldc/generic.nix @@ -132,6 +132,6 @@ stdenv.mkDerivation rec { # from https://github.com/ldc-developers/ldc/blob/master/LICENSE license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; maintainers = with maintainers; [ ThomasMader lionello ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } |