git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #145311 from lionello/fix-ldc-aarch64-darwin
commitd73feaf03efaa1ee9883b20cd4ed31c44e8f7eac authorSandro <sandro.jaeckel@gmail.com> dateThu 11 Nov 2021, 13:07 (5 years ago) parentbe1a733dbcbf26
3 files changed+9−8
compare with master
unifiedsplit
pkgs/development/compilers/ldc/binary.nix+3−3 pkgs/development/compilers/ldc/bootstrap.nix+5−4 pkgs/development/compilers/ldc/generic.nix+1−1
pkgs/development/compilers/ldc/binary.nix+3−3
@@ -3,8 +3,8 @@
33
44let
55 inherit (stdenv) hostPlatform;
6− OS = if stdenv.hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
7− ARCH = toString hostPlatform.parsed.cpu.name;
6+ OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
7+ ARCH = if hostPlatform.isDarwin && hostPlatform.isAarch64 then "arm64" else hostPlatform.parsed.cpu.name;
88in stdenv.mkDerivation {
99 pname = "ldc-bootstrap";
1010 inherit version;
@@ -37,6 +37,6 @@ in stdenv.mkDerivation {
3737 # from https://github.com/ldc-developers/ldc/blob/master/LICENSE
3838 license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
3939 maintainers = with maintainers; [ ThomasMader lionello ];
40− platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
40+ platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
4141 };
4242}
pkgs/development/compilers/ldc/bootstrap.nix+5−4
@@ -1,10 +1,11 @@
11{ callPackage }:
22callPackage ./binary.nix {
3− version = "1.19.0";
3+ version = "1.25.0";
44 hashes = {
55 # 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..
6− osx-x86_64 = "1bp3xkh9zp64dzq8isanib1gacb3nfbl70qv15qygwk1zan6zgy7";
7− linux-x86_64 = "146grr2lwarfk13wgkpyb77xb6b3as1is2rf4s2hipqjmc8biy1h";
8− linux-aarch64 = "1fv6jshfvi15m7masgxq1hgp216qjd5amizrqdf26vhrq3a08li3";
6+ osx-x86_64 = "1xaqxf1lz8kdb0n5iycfpxpvabf1zy0akg14kg554sm85xnsf8pa";
7+ linux-x86_64 = "1shzdq564jg3ga1hwrvpx30lpszc6pqndqndr5mqmc352znkiy5i";
8+ linux-aarch64 = "04i4xxwhq02d98r3qrrnv5dbd4xr4d7ph3zv94z2m58z3vgphdjh";
9+ osx-arm64 = "0b0cpgzn23clggx0cvdaja29q7w7ihkmjbnf1md03h9h5nzp9z1v";
910 };
1011}
pkgs/development/compilers/ldc/generic.nix+1−1
@@ -132,6 +132,6 @@ stdenv.mkDerivation rec {
132132 # from https://github.com/ldc-developers/ldc/blob/master/LICENSE
133133 license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
134134 maintainers = with maintainers; [ ThomasMader lionello ];
135− platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
135+ platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ];
136136 };
137137}