memorymapping{,Hook}: drop

This commit is contained in:
Emily
2024-11-18 00:14:01 +00:00
parent 726bfb7ca4
commit 874d326aca
7 changed files with 5 additions and 19 deletions
@@ -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 ];
+1 -3
View File
@@ -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
-2
View File
@@ -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
;
@@ -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
@@ -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
+2
View File
@@ -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";
-6
View File
@@ -10354,12 +10354,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;
mergerfs = callPackage ../tools/filesystems/mergerfs { };
mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { };