memorymapping{,Hook}: drop

NixOS · Nov 6, 2024 · f17e590 · f17e590
1 parent d6294c6
commit f17e590
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 70 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/pkgs/development/libraries/memorymapping/setup-hook.sh b/pkgs/development/libraries/memorymapping/setup-hook.sh
diff --git 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
@@ -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
@@ -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
@@ -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 { };