diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/by-name/at/ats2/package.nix similarity index 69% rename from pkgs/development/compilers/ats2/default.nix rename to pkgs/by-name/at/ats2/package.nix index 2dad47c08abc..339d9e6b7e31 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/by-name/at/ats2/package.nix @@ -1,6 +1,11 @@ -{ lib, stdenv, fetchurl, gmp -, withEmacsSupport ? true -, withContrib ? true }: +{ + lib, + stdenv, + fetchurl, + gmp, + withEmacsSupport ? true, + withContrib ? true, +}: let versionPkg = "0.4.2"; @@ -10,15 +15,13 @@ let hash = "sha256-m0hfBLsaNiLaIktcioK+ZtWUsWht3IDSJ6CzgJmS06c="; }; - postInstallContrib = lib.optionalString withContrib - '' + postInstallContrib = lib.optionalString withContrib '' local contribDir=$out/lib/ats2-postiats-*/ ; mkdir -p $contribDir ; tar -xzf "${contrib}" --strip-components 1 -C $contribDir ; ''; - postInstallEmacs = lib.optionalString withEmacsSupport - '' + postInstallEmacs = lib.optionalString withEmacsSupport '' local siteLispDir=$out/share/emacs/site-lisp/ats2 ; mkdir -p $siteLispDir ; install -m 0644 -v ./utils/emacs/*.el $siteLispDir ; @@ -49,20 +52,25 @@ stdenv.mkDerivation rec { "CCOMP=${stdenv.cc.targetPrefix}cc" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; + setupHook = let hookFiles = [ ./setup-hook.sh ] ++ lib.optional withContrib ./setup-contrib-hook.sh; in - builtins.toFile "setupHook.sh" - (lib.concatMapStringsSep "\n" builtins.readFile hookFiles); + builtins.toFile "setupHook.sh" (lib.concatMapStringsSep "\n" builtins.readFile hookFiles); postInstall = postInstallContrib + postInstallEmacs; meta = with lib; { description = "Functional programming language with dependent types"; - homepage = "http://www.ats-lang.org"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ttuegel bbarker ]; + homepage = "http://www.ats-lang.org"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ + thoughtpolice + ttuegel + bbarker + ]; }; } diff --git a/pkgs/development/compilers/ats2/setup-contrib-hook.sh b/pkgs/by-name/at/ats2/setup-contrib-hook.sh similarity index 100% rename from pkgs/development/compilers/ats2/setup-contrib-hook.sh rename to pkgs/by-name/at/ats2/setup-contrib-hook.sh diff --git a/pkgs/development/compilers/ats2/setup-hook.sh b/pkgs/by-name/at/ats2/setup-hook.sh similarity index 100% rename from pkgs/development/compilers/ats2/setup-hook.sh rename to pkgs/by-name/at/ats2/setup-hook.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bd69239d32e..3c6f48ca7d59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14166,7 +14166,6 @@ with pkgs; aspectj = callPackage ../development/compilers/aspectj { }; ats = callPackage ../development/compilers/ats { }; - ats2 = callPackage ../development/compilers/ats2 { }; ats-acc = callPackage ../development/tools/ats-acc { };