Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
	pkgs/development/python-modules/bambi/default.nix
	pkgs/development/python-modules/jaxopt/default.nix

4 files changed, 0 insertions, 211 deletions

diff --git a/pkgs/misc/base16-shell-preview/default.nix b/pkgs/misc/base16-shell-preview/default.nix
deleted file mode 100644
index bd1c8508023df..0000000000000
--- a/pkgs/misc/base16-shell-preview/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, python3Packages
-, fetchPypi
-}:
-
-let
-  pname = "base16-shell-preview";
-  version = "1.0.0";
-in
-python3Packages.buildPythonApplication {
-  inherit pname version;
-
-  src = fetchPypi {
-    inherit version;
-    pname = "${lib.replaceStrings ["-"] ["_"] pname}";
-    hash = "sha256-retnbxjdjo+NeA1B0+jpM9kToAX/Rh0ze0yNF9AfDiU=";
-  };
-
-  # If enabled, it will attempt to run '__init__.py, failing by trying to write
-  # at "/homeless-shelter" as HOME
-  doCheck = false;
-
-  meta = {
-    homepage = "https://github.com/nvllsvm/base16-shell-preview";
-    description = "Browse and preview Base16 Shell themes in your terminal";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
-  };
-}
diff --git a/pkgs/misc/scimark/default.nix b/pkgs/misc/scimark/default.nix
deleted file mode 100644
index 5726556e687fe..0000000000000
--- a/pkgs/misc/scimark/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, unzip
-}:
-
-stdenv.mkDerivation rec {
-  pname = "scimark";
-  version = "4c";
-
-  src = fetchurl {
-    url = "https://math.nist.gov/scimark2/${pname}${version}.zip";
-    hash = "sha256-kcg5vKYp0B7+bC/CmFMO/tMwxf9q6nvuFv0vRSy3MbE=";
-  };
-
-  nativeBuildInputs = [
-    unzip
-  ];
-
-  dontConfigure = true;
-
-  installPhase = ''
-    install -d $out/bin/
-    install scimark4 $out/bin/
-  '';
-
-  meta = with lib; {
-    homepage = "https://math.nist.gov/scimark2/index.html";
-    description = "Scientific and numerical computing benchmark (ANSI C version)";
-    license = licenses.publicDomain;
-    maintainers = with maintainers; [ AndersonTorres ];
-    mainProgram = "scimark4";
-    platforms = platforms.all;
-  };
-}
-# TODO [ AndersonTorres ]: Java version
diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
deleted file mode 100644
index 1ec3b6905a657..0000000000000
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ /dev/null
@@ -1,108 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, coreutils
-, gdk-pixbuf
-, gdk-pixbuf-xlib
-, gettext
-, gle
-, gtk3
-, intltool
-, libGL
-, libGLU
-, libX11
-, libXext
-, libXft
-, libXi
-, libXinerama
-, libXrandr
-, libXt
-, libXxf86vm
-, libxml2
-, makeWrapper
-, pam
-, perlPackages
-, pkg-config
-, systemd
-, forceInstallAllHacks ? false
-, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "xscreensaver";
-  version = "6.06";
-
-  src = fetchurl {
-    url = "https://www.jwz.org/xscreensaver/xscreensaver-${finalAttrs.version}.tar.gz";
-    hash = "sha256-9TT6uFqDbeW4vo6R/CG4DKfWpO2ThuviB9S+ek50mac=";
-  };
-
-  nativeBuildInputs = [
-    intltool
-    makeWrapper
-    pkg-config
-  ];
-
-  buildInputs = [
-    gdk-pixbuf
-    gdk-pixbuf-xlib
-    gettext
-    gle
-    gtk3
-    libGL
-    libGLU
-    libX11
-    libXext
-    libXft
-    libXi
-    libXinerama
-    libXrandr
-    libXt
-    libXxf86vm
-    libxml2
-    pam
-    perlPackages.LWPProtocolHttps
-    perlPackages.MozillaCA
-    perlPackages.perl
-  ]
-  ++ lib.optional withSystemd systemd;
-
-  preConfigure = ''
-    # Fix installation paths for GTK resources.
-    sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
-      -i driver/Makefile.in po/Makefile.in.in
-  '';
-
-  configureFlags = [
-    "--with-app-defaults=${placeholder "out"}/share/xscreensaver/app-defaults"
-  ];
-
-  # "marbling" has NEON code that mixes signed and unsigned vector types
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch "-flax-vector-conversions";
-
-  postInstall = ''
-    for bin in $out/bin/*; do
-      wrapProgram "$bin" \
-        --prefix PATH : "$out/libexec/xscreensaver" \
-        --prefix PATH : "${lib.makeBinPath [ coreutils perlPackages.perl ]}" \
-        --prefix PERL5LIB ':' $PERL5LIB
-    done
-  ''
-  + lib.optionalString forceInstallAllHacks ''
-    make -j$NIX_BUILD_CORES -C hacks/glx dnalogo
-    cat hacks/Makefile.in \
-      | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -j$NIX_BUILD_CORES -C hacks
-    cat hacks/glx/Makefile.in \
-      | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -j$NIX_BUILD_CORES -C hacks/glx
-    cp -f $(find hacks -type f -perm -111 "!" -name "*.*" ) "$out/libexec/xscreensaver"
-  '';
-
-  meta = {
-    homepage = "https://www.jwz.org/xscreensaver/";
-    description = "A set of screensavers";
-    downloadPage = "https://www.jwz.org/xscreensaver/download.html";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ raskin AndersonTorres ];
-    platforms = lib.platforms.unix;
-  };
-})
diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix
deleted file mode 100644
index 23529f6b0a185..0000000000000
--- a/pkgs/misc/sound-of-sorting/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, pkg-config
-, SDL2
-, wxGTK32
-, darwin
-}:
-
-stdenv.mkDerivation {
-  pname = "sound-of-sorting";
-  version = "unstable-2022-10-12";
-
-  src = fetchFromGitHub {
-    owner = "bingmann";
-    repo = "sound-of-sorting";
-    rev = "5cfcaf752593c8cbcf52555dd22745599a7d8b1b";
-    hash = "sha256-cBrTvFoz6WZIsh5qPPiWxQ338Z0OfcIefiI8CZF6nn8=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [
-    wxGTK32
-    SDL2
-  ]
-  ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ;
-
-  meta = {
-    description = "Audibilization and Visualization of Sorting Algorithms";
-    homepage = "https://panthema.net/2013/sound-of-sorting/";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
-    platforms = lib.platforms.unix;
-  };
-}