Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ATS2: add support for Darwin platform with a GCC toolchain #89283

Closed
wants to merge 1 commit into from
Closed

ATS2: add support for Darwin platform with a GCC toolchain #89283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,6 +950,12 @@
githubId = 354741;
name = "Austin Butler";
};
avanov = {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please put this into a separate commit with the message maintainers: add avanov.

email = "maxim.avanov@gmail.com";
github = "avanov";
githubId = 601955;
name = "Maxim Avanov";
};
avaq = {
email = "nixpkgs@account.avaq.it";
github = "avaq";
Expand Down
10 changes: 5 additions & 5 deletions pkgs/development/compilers/ats2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
, withContrib ? true }:

let
versionPkg = "0.4.1" ;
versionPkg = "0.4.2" ;

contrib = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz";
sha256 = "184m4hz2xszhcfc6w9fw9qibhmcvgjmikwfwkb345xypr59jm93d";
sha256 = "19ykjacq1cx04z981p3dd2qr9mb6ps18lp2b4bd24dhspc25yj4v";
};

postInstallContrib = lib.optionalString withContrib
Expand All @@ -31,7 +31,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-gmp-${version}.tgz";
sha256 = "0c4nqp6yzmpj0mcpg7ibmwyqi8hjw3sza8myvy4nzq3fa6wldy5l";
sha256 = "100vgrninbshq3rs57psl9aqi2bphrjfbizmmrjhs5yzh0a4zikk";
};

buildInputs = [ gmp ];
Expand All @@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
description = "Functional programming language with dependent types";
homepage = "http://www.ats-lang.org";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice ttuegel bbarker ];
platforms = platforms.linux ++ platforms.darwin;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
platforms = platforms.linux ++ platforms.darwin;
platforms = platforms.unix;

maintainers = with maintainers; [ thoughtpolice ttuegel bbarker avanov ];
};
}
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10127,7 +10127,9 @@ in
aspectj = callPackage ../development/compilers/aspectj { };

ats = callPackage ../development/compilers/ats { };
ats2 = callPackage ../development/compilers/ats2 { };
ats2 = callPackage ../development/compilers/ats2 {
stdenv = if stdenv.isDarwin then gccStdenv else stdenv;
};

avra = callPackage ../development/compilers/avra { };

Expand Down