From 31c1a6613354ecb774e28f80dfcdbbd1e0eba51c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 7 May 2021 20:46:05 +0200 Subject: [PATCH] avian: remove ZHF #122042 Doesn't compile anymore[1] and isn't supported by upstream[2]. [1] https://hydra.nixos.org/build/142613769 [2] https://github.com/ReadyTalk/avian/blob/0871979b298add320ca63f65060acb7532c8a0dd/README.md --- pkgs/development/compilers/avian/default.nix | 43 -------------------- pkgs/top-level/aliases.nix | 6 +++ pkgs/top-level/all-packages.nix | 5 --- 3 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 pkgs/development/compilers/avian/default.nix diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix deleted file mode 100644 index d39aa2806a45..000000000000 --- a/pkgs/development/compilers/avian/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }: - -stdenv.mkDerivation rec { - pname = "avian"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "readytalk"; - repo = "avian"; - rev = "v${version}"; - sha256 = "1j2y45cpqk3x6a743mgpg7z3ivwm7qc9jy6xirvay7ah1qyxmm48"; - }; - - buildInputs = [ zlib jdk ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Foundation ]; - - NIX_CFLAGS_COMPILE = "-Wno-error"; - - postPatch = '' - substituteInPlace makefile \ - --replace 'g++' 'c++' \ - --replace 'gcc' 'cc' - ''; - - installPhase = '' - mkdir -p $out/bin - cp build/*/avian $out/bin/ - cp build/*/avian-dynamic $out/bin/ - ''; - - meta = { - description = "Lightweight Java virtual machine"; - longDescription = '' - Avian is a lightweight virtual machine and class library designed - to provide a useful subset of Java’s features, suitable for - building self-contained applications. - ''; - homepage = "https://readytalk.github.io/avian/"; - license = lib.licenses.isc; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.earldouglas ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7002cc928ee3..c7f7d36cbf0c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -971,6 +971,12 @@ mapAliases ({ posix_man_pages = man-pages-posix; # Added 2021-04-15 + /* Cleanup before 21.11, Added 2021-05-07 */ + avian = throw '' + The package doesn't compile anymore on NixOS and both development + & maintenance is abandoned by upstream. + ''; + /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: https://github.com/NixOS/nixpkgs/pull/101369 */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbe7c06ea87a..8b0e720e7509 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10137,11 +10137,6 @@ in avra = callPackage ../development/compilers/avra { }; - avian = callPackage ../development/compilers/avian { - inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - bigloo = callPackage ../development/compilers/bigloo { }; binaryen = callPackage ../development/compilers/binaryen { };