From ab0ba275fe234cbeaf225d67a699dd73063ae7fe Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 13 Sep 2024 19:10:19 +0100 Subject: [PATCH] cloog{,ppl}: drop These are no longer used after the removal of old GCCs. --- .../libraries/cloog-ppl/default.nix | 72 ------------------- .../libraries/cloog-ppl/fix-ppl-version.patch | 16 ----- pkgs/development/libraries/cloog/0.18.0.nix | 65 ----------------- pkgs/development/libraries/cloog/default.nix | 67 ----------------- pkgs/top-level/aliases.nix | 3 + pkgs/top-level/all-packages.nix | 10 --- 6 files changed, 3 insertions(+), 230 deletions(-) delete mode 100644 pkgs/development/libraries/cloog-ppl/default.nix delete mode 100644 pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch delete mode 100644 pkgs/development/libraries/cloog/0.18.0.nix delete mode 100644 pkgs/development/libraries/cloog/default.nix diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix deleted file mode 100644 index 3a6f926b3f32..000000000000 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ fetchurl, lib, stdenv, ppl, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "cloog-ppl"; - version = "0.15.11"; - - src = fetchurl { - url = "mirror://gcc/infrastructure/${pname}-${version}.tar.gz"; - sha256 = "0psdm0bn5gx60glfh955x5b3b23zqrd92idmjr0b00dlnb839mkw"; - }; - - propagatedBuildInputs = [ ppl ]; - - nativeBuildInputs = [ autoreconfHook ]; - - patches = [ ./fix-ppl-version.patch ]; - - configureFlags = [ "--with-ppl=${ppl}" ]; - - preAutoreconf = '' - touch NEWS ChangeLog AUTHORS - ''; - - doCheck = true; - - meta = { - description = "CLooG-PPL, the Chunky Loop Generator"; - mainProgram = "cloog"; - - longDescription = '' - CLooG is a free software library to generate code for scanning - Z-polyhedra. That is, it finds a code (e.g., in C, FORTRAN...) that - reaches each integral point of one or more parameterized polyhedra. - CLooG has been originally written to solve the code generation problem - for optimizing compilers based on the polytope model. Nevertheless it - is used now in various area e.g., to build control automata for - high-level synthesis or to find the best polynomial approximation of a - function. CLooG may help in any situation where scanning polyhedra - matters. While the user has full control on generated code quality, - CLooG is designed to avoid control overhead and to produce a very - effective code. - ''; - - # CLooG-PPL is actually a port of GLooG from PolyLib to PPL. - homepage = "http://www.cloog.org/"; - - license = lib.licenses.gpl2Plus; - - maintainers = [ ]; - - /* Leads to an ICE on Cygwin: - - make[3]: Entering directory `/tmp/nix-build-9q5gw5m37q5l4f0kjfv9ar8fsc9plk27-ppl-0.10.2.drv-1/ppl-0.10.2/src' - /bin/sh ../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c -o Box.lo Box.cc - libtool: compile: g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c Box.cc -DDLL_EXPORT -DPIC -o .libs/Box.o - In file included from checked.defs.hh:595, - from Checked_Number.defs.hh:27, - from Coefficient.types.hh:15, - from Coefficient.defs.hh:26, - from Box.defs.hh:28, - from Box.cc:24: - checked.inlines.hh: In function `Parma_Polyhedra_Library::Result Parma_Polyhedra_Library::Checked::input_generic(Type&, std::istream&, Parma_Polyhedra_Library::Rounding_Dir)': - checked.inlines.hh:607: internal compiler error: in invert_truthvalue, at fold-const.c:2719 - Please submit a full bug report, - with preprocessed source if appropriate. - See for instructions. - make[3]: *** [Box.lo] Error 1 - - */ - platforms = lib.platforms.unix; # Once had cygwin problems - }; -} diff --git a/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch b/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch deleted file mode 100644 index 8440d839411b..000000000000 --- a/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -rupN src/configure.in cloog-ppl-0.15.11/configure.in ---- src/configure.in 2014-04-13 13:33:43.349392305 +0200 -+++ cloog-ppl-0.15.11/configure.in 2014-04-13 13:34:12.695379888 +0200 -@@ -337,11 +337,7 @@ if test "x$with_ppl" != "x" -a "x$with_p - [AC_MSG_ERROR(Can't find PPL headers.)]) - - AC_MSG_CHECKING([for version 0.10 (or later revision) of PPL]) -- AC_TRY_COMPILE([#include "ppl_c.h"],[ -- #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 -- choke me -- #endif -- ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) -+ AC_MSG_RESULT([yes]) - - LIBS="$LIBS -lppl_c -lppl -lgmpxx" - AC_DEFINE([CLOOG_PPL_BACKEND], 1, [Use the PPL backend]) diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix deleted file mode 100644 index a1ba3aaf93f3..000000000000 --- a/pkgs/development/libraries/cloog/0.18.0.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ fetchurl, lib, stdenv, gmp, isl }: - -stdenv.mkDerivation rec { - pname = "cloog"; - version = "0.18.0"; - - src = fetchurl { - url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./cloog-${version}.tar.gz"; - sha256 = "1c4aa8dde7886be9cbe0f9069c334843b21028f61d344a2d685f88cb1dcf2228"; - }; - - buildInputs = [ gmp ]; - - propagatedBuildInputs = [ isl ]; - - configureFlags = [ "--with-isl=system" ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = { - description = "Library that generates loops for scanning polyhedra"; - mainProgram = "cloog"; - - longDescription = '' - CLooG is a free software library to generate code for scanning - Z-polyhedra. That is, it finds a code (e.g., in C, FORTRAN...) that - reaches each integral point of one or more parameterized polyhedra. - CLooG has been originally written to solve the code generation problem - for optimizing compilers based on the polytope model. Nevertheless it - is used now in various area e.g., to build control automata for - high-level synthesis or to find the best polynomial approximation of a - function. CLooG may help in any situation where scanning polyhedra - matters. While the user has full control on generated code quality, - CLooG is designed to avoid control overhead and to produce a very - effective code. - ''; - - homepage = "http://www.cloog.org/"; - - license = lib.licenses.gpl2Plus; - - /* Leads to an ICE on Cygwin: - - make[3]: Entering directory `/tmp/nix-build-9q5gw5m37q5l4f0kjfv9ar8fsc9plk27-ppl-0.10.2.drv-1/ppl-0.10.2/src' - /bin/sh ../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c -o Box.lo Box.cc - libtool: compile: g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c Box.cc -DDLL_EXPORT -DPIC -o .libs/Box.o - In file included from checked.defs.hh:595, - from Checked_Number.defs.hh:27, - from Coefficient.types.hh:15, - from Coefficient.defs.hh:26, - from Box.defs.hh:28, - from Box.cc:24: - checked.inlines.hh: In function `Parma_Polyhedra_Library::Result Parma_Polyhedra_Library::Checked::input_generic(Type&, std::istream&, Parma_Polyhedra_Library::Rounding_Dir)': - checked.inlines.hh:607: internal compiler error: in invert_truthvalue, at fold-const.c:2719 - Please submit a full bug report, - with preprocessed source if appropriate. - See for instructions. - make[3]: *** [Box.lo] Error 1 - - */ - platforms = lib.platforms.unix; # Once had cygwin problems - }; -} diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix deleted file mode 100644 index 3ae266c61cdd..000000000000 --- a/pkgs/development/libraries/cloog/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ fetchurl, lib, stdenv, gmp, isl }: - -stdenv.mkDerivation rec { - pname = "cloog"; - version = "0.18.4"; - - src = fetchurl { - url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${pname}-${version}.tar.gz"; - sha256 = "03km1aqaiy3sbqc2f046ms9x0mlmacxlvs5rxsvjj8nf20vxynij"; - }; - - buildInputs = [ gmp ]; - - propagatedBuildInputs = [ isl ]; - - configureFlags = [ "--with-isl=system" ]; - - enableParallelBuilding = true; - # Breaks the test cases as it reuses 'cloog_temp' file name for different tests. - enableParallelChecking = false; - - doCheck = true; - - meta = { - description = "Library that generates loops for scanning polyhedra"; - mainProgram = "cloog"; - - longDescription = '' - CLooG is a free software library to generate code for scanning - Z-polyhedra. That is, it finds a code (e.g., in C, FORTRAN...) that - reaches each integral point of one or more parameterized polyhedra. - CLooG has been originally written to solve the code generation problem - for optimizing compilers based on the polytope model. Nevertheless it - is used now in various area e.g., to build control automata for - high-level synthesis or to find the best polynomial approximation of a - function. CLooG may help in any situation where scanning polyhedra - matters. While the user has full control on generated code quality, - CLooG is designed to avoid control overhead and to produce a very - effective code. - ''; - - homepage = "http://www.cloog.org/"; - - license = lib.licenses.gpl2Plus; - - /* Leads to an ICE on Cygwin: - - make[3]: Entering directory `/tmp/nix-build-9q5gw5m37q5l4f0kjfv9ar8fsc9plk27-ppl-0.10.2.drv-1/ppl-0.10.2/src' - /bin/sh ../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c -o Box.lo Box.cc - libtool: compile: g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c Box.cc -DDLL_EXPORT -DPIC -o .libs/Box.o - In file included from checked.defs.hh:595, - from Checked_Number.defs.hh:27, - from Coefficient.types.hh:15, - from Coefficient.defs.hh:26, - from Box.defs.hh:28, - from Box.cc:24: - checked.inlines.hh: In function `Parma_Polyhedra_Library::Result Parma_Polyhedra_Library::Checked::input_generic(Type&, std::istream&, Parma_Polyhedra_Library::Rounding_Dir)': - checked.inlines.hh:607: internal compiler error: in invert_truthvalue, at fold-const.c:2719 - Please submit a full bug report, - with preprocessed source if appropriate. - See for instructions. - make[3]: *** [Box.lo] Error 1 - - */ - platforms = lib.platforms.unix; # Once had cygwin problems - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 59f337607331..516b4ab6794e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -243,6 +243,9 @@ mapAliases ({ citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 + cloog = throw "cloog has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 + cloog_0_18_0 = throw "cloog_0_18_0 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 + cloogppl = throw "cloogppl has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 clpm = throw "'clpm' has been removed from nixpkgs"; # Added 2024-04-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7ceea009780..853bbcf60669 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6754,16 +6754,6 @@ with pkgs; clolcat = callPackage ../tools/misc/clolcat { }; - cloog = callPackage ../development/libraries/cloog { - isl = isl_0_14; - }; - - cloog_0_18_0 = callPackage ../development/libraries/cloog/0.18.0.nix { - isl = isl_0_11; - }; - - cloogppl = callPackage ../development/libraries/cloog-ppl { }; - cloud-utils = callPackage ../tools/misc/cloud-utils { }; cloudlist = callPackage ../tools/security/cloudlist { };