From f17e590355d664dac73048f5b07c93bb4364f02b Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 5 Oct 2024 19:37:01 +0100 Subject: [PATCH] memorymapping{,Hook}: drop --- .../science/physics/crystfel/default.nix | 3 -- .../science/physics/xfitter/default.nix | 2 - .../compilers/chicken/5/overrides.nix | 4 +- .../libraries/memorymapping/default.nix | 45 ------------------- .../libraries/memorymapping/setup-hook.sh | 6 --- .../python-modules/rdkit/default.nix | 3 +- pkgs/games/tintin/default.nix | 4 +- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 6 --- 9 files changed, 5 insertions(+), 70 deletions(-) delete mode 100644 pkgs/development/libraries/memorymapping/default.nix delete mode 100644 pkgs/development/libraries/memorymapping/setup-hook.sh diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix index a8f2b65b669f2..5c29d9b6f4d52 100644 --- a/pkgs/applications/science/physics/crystfel/default.nix +++ b/pkgs/applications/science/physics/crystfel/default.nix @@ -31,7 +31,6 @@ , gtk3 , gdk-pixbuf , argp-standalone -, memorymappingHook , withGui ? true , withBitshuffle ? true }: @@ -211,8 +210,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withGui [ gtk3 gdk-pixbuf ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ argp-standalone - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [ - memorymappingHook ] ++ lib.optionals withBitshuffle [ hdf5-external-filter-plugins ]; diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index d6d1705054b8b..86dcd3d809d44 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -18,7 +18,6 @@ , qcdnum , root , zlib -, memorymappingHook }: stdenv.mkDerivation rec { @@ -40,7 +39,6 @@ stdenv.mkDerivation rec { buildInputs = [ apfel blas ceres-solver lhapdf lapack libyaml root qcdnum gsl yaml-cpp zlib ] ++ lib.optionals ("5" == lib.versions.major root.version) [ apfelgrid applgrid ] - ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook ] ++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc ; diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index ec465aa8d7834..7519fa3852c8c 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -106,9 +106,7 @@ in plot = addToBuildInputs pkgs.plotutils; postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql; rocksdb = addToBuildInputs pkgs.rocksdb_8_3; - scheme2c-compatibility = old: - addToNativeBuildInputs (lib.optionals (stdenv.system == "x86_64-darwin") [ pkgs.memorymappingHook ]) - (addPkgConfig old); + scheme2c-compatibility = addPkgConfig; sdl-base = old: ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL old) // # needed for sdl-config to be in PATH diff --git a/pkgs/development/libraries/memorymapping/default.nix b/pkgs/development/libraries/memorymapping/default.nix deleted file mode 100644 index 1b3c17bc4f8c6..0000000000000 --- a/pkgs/development/libraries/memorymapping/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "memorymapping"; - version = "unstable-2014-02-20"; - - src = fetchFromGitHub { - owner = "NimbusKit"; - repo = "memorymapping"; - rev = "fc285afe13cb9d56a40c647b8ed6d6bd40636af7"; - sha256 = "sha256-9u/QvK9TDsKxcubINH2OAbx5fXXkKF0+YT7LoLDaF0M="; - }; - - dontConfigure = true; - - buildPhase = '' - runHook preBuild - - $CC -c src/fmemopen.c - $AR rcs libmemorymapping.a fmemopen.o - sed -e '1i#include ' -i src/fmemopen.h - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -D libmemorymapping.a "$out"/lib/libmemorymapping.a - install -D src/fmemopen.h "$out"/include/fmemopen.h - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://nimbuskit.github.io/memorymapping/"; - description = "fmemopen for Mac OS and iOS"; - license = licenses.asl20; - maintainers = with maintainers; [ veprbl ]; - # Uses BSD-style funopen() to implement glibc-style fmemopen(). - # Add more BSDs if you need to. - platforms = platforms.darwin; - broken = stdenv.hostPlatform.isAarch64; - }; -} diff --git a/pkgs/development/libraries/memorymapping/setup-hook.sh b/pkgs/development/libraries/memorymapping/setup-hook.sh deleted file mode 100644 index 5ee3470fe3705..0000000000000 --- a/pkgs/development/libraries/memorymapping/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -useMemorymapping () { - export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-include fmemopen.h"; - export NIX_LDFLAGS="${NIX_LDFLAGS-}${NIX_LDFLAGS:+ }-lmemorymapping"; -} - -postHooks+=(useMemorymapping) diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index ec98f19c271f5..fd66dd16cb904 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -17,7 +17,6 @@ numpy, pandas, pillow, - memorymappingHook, }: let external = { @@ -96,7 +95,7 @@ buildPythonPackage rec { eigen inchi maeparser - ] ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook ]; + ]; dependencies = [ numpy diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index a5959098d8aa4..3dc7884f1f676 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchFromGitHub, lib, zlib, pcre -, memorymappingHook , gnutls }: @@ -14,8 +13,7 @@ stdenv.mkDerivation rec { hash = "sha256-AfWw9CMBAzTTsrZXDEoOdpvUofIQfLCW7hRgSb7LB00="; }; - buildInputs = [ zlib pcre gnutls ] - ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook ]; + buildInputs = [ zlib pcre gnutls ]; preConfigure = '' cd src diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7086a12cd988b..89afb0219e5a8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -765,6 +765,8 @@ mapAliases { mcomix3 = mcomix; # Added 2022-06-05 mdt = md-tui; # Added 2024-09-03 meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2024-10-17 + memorymapping = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05 + memorymappingHook = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05 memstream = throw "memstream has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05 memstreamHook = throw "memstream has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05 mhwaveedit = throw "'mkwaveedit' has been removed due to lack of maintenance upstream. Consider using 'audacity' or 'tenacity' instead"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbca0a2abf987..5ea349fe12cdf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21721,12 +21721,6 @@ with pkgs; mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { }; - memorymapping = callPackage ../development/libraries/memorymapping { }; - memorymappingHook = makeSetupHook { - name = "memorymapping-hook"; - propagatedBuildInputs = [ memorymapping ]; - } ../development/libraries/memorymapping/setup-hook.sh; - memray = callPackage ../development/tools/memray { }; menu-cache = callPackage ../development/libraries/menu-cache { };