diff --git a/pkgs/by-name/hy/hyx/package.nix b/pkgs/by-name/hy/hyx/package.nix index e41f9bbfceb2..a33f619af291 100644 --- a/pkgs/by-name/hy/hyx/package.nix +++ b/pkgs/by-name/hy/hyx/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, memstreamHook }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "hyx"; @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { --replace "-Wl,-z,relro,-z,now -fpic -pie" "" ''; - buildInputs = lib.optional (stdenv.system == "x86_64-darwin") memstreamHook; - installPhase = '' install -vD hyx $out/bin/hyx ''; diff --git a/pkgs/by-name/no/notemap/package.nix b/pkgs/by-name/no/notemap/package.nix index 0611665d6618..040f26752b51 100644 --- a/pkgs/by-name/no/notemap/package.nix +++ b/pkgs/by-name/no/notemap/package.nix @@ -3,7 +3,6 @@ , fetchzip , pkg-config , libressl -, memstreamHook }: stdenv.mkDerivation rec { @@ -21,8 +20,6 @@ stdenv.mkDerivation rec { buildInputs = [ libressl - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - memstreamHook ]; meta = { diff --git a/pkgs/by-name/te/telescope/package.nix b/pkgs/by-name/te/telescope/package.nix index 801cae0b123c..7f1f23d07ad4 100644 --- a/pkgs/by-name/te/telescope/package.nix +++ b/pkgs/by-name/te/telescope/package.nix @@ -9,7 +9,6 @@ , ncurses , autoreconfHook , buildPackages -, memstreamHook }: stdenv.mkDerivation rec { @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { libgrapheme libressl ncurses - ] ++ lib.optional stdenv.hostPlatform.isDarwin memstreamHook; + ]; configureFlags = [ "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" diff --git a/pkgs/by-name/ti/tintin/package.nix b/pkgs/by-name/ti/tintin/package.nix index 6f56512b1da2..a5959098d8aa 100644 --- a/pkgs/by-name/ti/tintin/package.nix +++ b/pkgs/by-name/ti/tintin/package.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, lib, zlib, pcre -, memorymappingHook, memstreamHook +, memorymappingHook , gnutls }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib pcre gnutls ] - ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ]; + ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook ]; preConfigure = '' cd src diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 6afae4dcc963..1e6569a44dc6 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -14,7 +14,6 @@ , installShellFiles , writeSupport ? stdenv.hostPlatform.isLinux , shadowSupport ? stdenv.hostPlatform.isLinux -, memstreamHook , gitUpdater }: @@ -90,8 +89,7 @@ stdenv.mkDerivation rec { ++ lib.optionals pamSupport [ pam ] ++ lib.optionals capabilitiesSupport [ libcap_ng ] ++ lib.optionals ncursesSupport [ ncurses ] - ++ lib.optionals systemdSupport [ systemd ] - ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memstreamHook ]; + ++ lib.optionals systemdSupport [ systemd ]; doCheck = false; # "For development purpose only. Don't execute on production system!" diff --git a/pkgs/by-name/xf/xfitter/package.nix b/pkgs/by-name/xf/xfitter/package.nix index e509f3a005f7..d6d1705054b8 100644 --- a/pkgs/by-name/xf/xfitter/package.nix +++ b/pkgs/by-name/xf/xfitter/package.nix @@ -18,7 +18,7 @@ , qcdnum , root , zlib -, memorymappingHook, memstreamHook +, memorymappingHook }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ 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 memstreamHook ] + ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook ] ++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc ; diff --git a/pkgs/development/libraries/memstream/default.nix b/pkgs/development/libraries/memstream/default.nix deleted file mode 100644 index 7877718e6d35..000000000000 --- a/pkgs/development/libraries/memstream/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "memstream"; - version = "0.1"; - - src = fetchurl { - url = "https://piumarta.com/software/memstream/memstream-${version}.tar.gz"; - sha256 = "0kvdb897g7nyviaz72arbqijk2g2wa61cmi3l5yh48rzr49r3a3a"; - }; - - postPatch = '' - substituteInPlace Makefile \ - --replace-fail 'cc' '$(CC)' - ''; - - dontConfigure = true; - - postBuild = '' - $AR rcs libmemstream.a memstream.o - ''; - - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - checkPhase = '' - runHook preCheck - - ./test | grep "This is a test of memstream" - - runHook postCheck - ''; - - installPhase = '' - runHook preInstall - - install -D libmemstream.a "$out"/lib/libmemstream.a - install -D memstream.h "$out"/include/memstream.h - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://www.piumarta.com/software/memstream/"; - description = "memstream.c is an implementation of the POSIX function open_memstream() for BSD and BSD-like operating systems"; - license = licenses.mit; - maintainers = with maintainers; [ veprbl ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/memstream/setup-hook.sh b/pkgs/development/libraries/memstream/setup-hook.sh deleted file mode 100644 index 09aabe748841..000000000000 --- a/pkgs/development/libraries/memstream/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -useMemstream () { - export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-include memstream.h"; - export NIX_LDFLAGS="${NIX_LDFLAGS-}${NIX_LDFLAGS:+ }-lmemstream"; -} - -postHooks+=(useMemstream) diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 0b30312c480e..1271cd8a0b21 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -19,7 +19,6 @@ jbig2dec, libjpeg_turbo, gumbo, - memstreamHook, # dependencies mupdf, @@ -75,7 +74,7 @@ buildPythonPackage rec { jbig2dec libjpeg_turbo gumbo - ] ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memstreamHook ]; + ]; propagatedBuildInputs = [ mupdf-cxx ]; diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index f41d3b34971a..1ad1a0682b81 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -3,7 +3,6 @@ , fetchurl , nixosTests , pkg-config -, memstreamHook , CoreAudio , libobjc , libjack2 @@ -31,9 +30,7 @@ stdenv.mkDerivation rec { ./configure-compat.patch ]; - nativeBuildInputs = [ pkg-config ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ memstreamHook ]; - + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 ncurses diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d28db7363fe1..eedc995e5431 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 + 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"; microcodeAmd = microcode-amd; # Added 2024-09-08 microcodeIntel = microcode-intel; # Added 2024-09-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6018ed75c44d..08afcabfe14d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10360,12 +10360,6 @@ with pkgs; propagatedBuildInputs = [ memorymapping ]; } ../development/libraries/memorymapping/setup-hook.sh; - memstream = callPackage ../development/libraries/memstream { }; - memstreamHook = makeSetupHook { - name = "memstream-hook"; - propagatedBuildInputs = [ memstream ]; - } ../development/libraries/memstream/setup-hook.sh; - mergerfs = callPackage ../tools/filesystems/mergerfs { }; mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { };