From ac7f80ce0132a03d4b9042fe65173f1a14cc9e31 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 24 Dec 2024 12:17:11 +0100 Subject: [PATCH] gmp4: drop No more usages in nixpkgs. --- pkgs/development/libraries/gmp/4.3.2.nix | 95 ------------------- .../libraries/gmp/need-size-t.patch | 18 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 4 files changed, 1 insertion(+), 114 deletions(-) delete mode 100644 pkgs/development/libraries/gmp/4.3.2.nix delete mode 100644 pkgs/development/libraries/gmp/need-size-t.patch diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix deleted file mode 100644 index 00dbd620e3f22..0000000000000 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - m4, - cxx ? true, -}: - -let - self = stdenv.mkDerivation rec { - pname = "gmp"; - version = "4.3.2"; - - src = fetchurl { - url = "mirror://gnu/gmp/gmp-${version}.tar.bz2"; - sha256 = "0x8prpqi9amfcmi7r4zrza609ai9529pjaq0h4aw51i867064qck"; - }; - - #outputs TODO: split $cxx due to libstdc++ dependency - # maybe let ghc use a version with *.so shared with rest of nixpkgs and *.a added - # - see #5855 for related discussion - outputs = [ - "out" - "dev" - "info" - ]; - passthru.static = self.out; - - nativeBuildInputs = [ m4 ]; - - # Prevent the build system from using sub-architecture-specific - # instructions (e.g., SSE2 on i686). - # - # This is not a problem for Apple machines, which are all alike. In - # addition, `configfsf.guess' would return `i386-apple-darwin10.2.0' on - # `x86_64-darwin', leading to a 32-bit ABI build, which is undesirable. - preConfigure = - if !stdenv.hostPlatform.isDarwin then - "ln -sf configfsf.guess config.guess" - else - ''echo "Darwin host is `./config.guess`."''; - - configureFlags = - [ - (lib.enableFeature cxx "cxx") - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "ac_cv_build=x86_64-apple-darwin13.4.0" - "ac_cv_host=x86_64-apple-darwin13.4.0" - ]; - - # The test t-lucnum_ui fails (on Linux/x86_64) when built with GCC 4.8. - # Newer versions of GMP don't have that issue anymore. - doCheck = false; - - meta = { - branch = "4"; - description = "GNU multiple precision arithmetic library"; - - longDescription = '' - GMP is a free library for arbitrary precision arithmetic, operating - on signed integers, rational numbers, and floating point numbers. - There is no practical limit to the precision except the ones implied - by the available memory in the machine GMP runs on. GMP has a rich - set of functions, and the functions have a regular interface. - - The main target applications for GMP are cryptography applications - and research, Internet security applications, algebra systems, - computational algebra research, etc. - - GMP is carefully designed to be as fast as possible, both for small - operands and for huge operands. The speed is achieved by using - fullwords as the basic arithmetic type, by using fast algorithms, - with highly optimised assembly code for the most common inner loops - for a lot of CPUs, and by a general emphasis on speed. - - GMP is faster than any other bignum library. The advantage for GMP - increases with the operand sizes for many operations, since GMP uses - asymptotically faster algorithms. - ''; - - homepage = "https://gmplib.org/"; - license = lib.licenses.lgpl3Plus; - - maintainers = [ ]; - platforms = lib.platforms.all; - badPlatforms = [ "x86_64-darwin" ]; - # never built on aarch64-darwin, aarch64-linux since first introduction in nixpkgs - broken = - (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) - || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); - }; - }; -in -self diff --git a/pkgs/development/libraries/gmp/need-size-t.patch b/pkgs/development/libraries/gmp/need-size-t.patch deleted file mode 100644 index c4ba086182a90..0000000000000 --- a/pkgs/development/libraries/gmp/need-size-t.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/gmp-h.in b/gmp-h.in -index 7deb67a..240d663 100644 ---- a/gmp-h.in -+++ b/gmp-h.in -@@ -46,13 +46,11 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ - #ifndef __GNU_MP__ - #define __GNU_MP__ 5 - --#define __need_size_t /* tell gcc stddef.h we only want size_t */ - #if defined (__cplusplus) - #include /* for size_t */ - #else - #include /* for size_t */ - #endif --#undef __need_size_t - - /* Instantiated by configure. */ - #if ! defined (__GMP_WITHIN_CONFIGURE) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 05c5d2924793b..74f5e65ce3cb3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -472,6 +472,7 @@ mapAliases { glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08 glxinfo = mesa-demos; # Added 2024-07-04 gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2024-10-17 + gmp4 = throw "'gmp4' is end-of-life, consider using 'gmp' instead"; # Added 2024-12-24 gnatboot11 = gnat-bootstrap11; gnatboot12 = gnat-bootstrap12; gnatboot = gnat-bootstrap; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 854752910dd75..725a1a5dc8e3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9221,7 +9221,6 @@ with pkgs; gmime3 = callPackage ../development/libraries/gmime/3.nix { }; gmime = gmime2; - gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions gmp6 = callPackage ../development/libraries/gmp/6.x.nix { }; gmp = gmp6; gmpxx = gmp.override { cxx = true; };