From 039893032ec0535ac8d9e143c36e086bd4b84f0d Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:23:08 +0800 Subject: [PATCH 01/14] vinagre: remove --- pkgs/by-name/vi/vinagre/package.nix | 70 ----------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 pkgs/by-name/vi/vinagre/package.nix diff --git a/pkgs/by-name/vi/vinagre/package.nix b/pkgs/by-name/vi/vinagre/package.nix deleted file mode 100644 index cf5b182ed6b1..000000000000 --- a/pkgs/by-name/vi/vinagre/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchpatch, - pkg-config, - gtk3, - gnome, - adwaita-icon-theme, - vte, - libxml2, - gtk-vnc, - intltool, - libsecret, - itstool, - wrapGAppsHook3, - librsvg, -}: - -stdenv.mkDerivation rec { - pname = "vinagre"; - version = "3.22.0"; - - src = fetchurl { - url = "mirror://gnome/sources/vinagre/${lib.versions.majorMinor version}/vinagre-${version}.tar.xz"; - hash = "sha256-zRzbrMolyNHev4R0VRVe55jD5nogkD34sijU7OVQXoI="; - }; - - patches = [ - # Pull fix pending upstream inclusion for -fno-common toolchain support: - # https://gitlab.gnome.org/Archive/vinagre/-/merge_requests/8 - (fetchpatch { - name = "fno-common.patch"; - url = "https://gitlab.gnome.org/Archive/vinagre/-/commit/c51662cf4338516773d64776c3c92796917ff2bd.diff"; - hash = "sha256-KEdNcOMOFzu6BDRNQDqAic0PX6DunSZ4Nr9JOFJjyH4="; - }) - ]; - - nativeBuildInputs = [ - pkg-config - intltool - itstool - wrapGAppsHook3 - ]; - - buildInputs = [ - gtk3 - vte - libxml2 - gtk-vnc - libsecret - adwaita-icon-theme - librsvg - ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; - - passthru = { - updateScript = gnome.updateScript { packageName = "vinagre"; }; - }; - - meta = with lib; { - description = "Remote desktop viewer for GNOME"; - mainProgram = "vinagre"; - homepage = "https://gitlab.gnome.org/Archive/vinagre"; - license = licenses.gpl2Plus; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 19bfd3ff3eef..aaaa2359ce1e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1603,6 +1603,7 @@ mapAliases ({ vikunja-frontend = throw "'vikunja-frontend' has been replaced by 'vikunja'"; # Added 2024-02-19 vimHugeX = vim-full; # Added 2022-12-04 vim_configurable = vim-full; # Added 2022-12-04 + vinagre = throw "'vinagre' has been removed as it has been archived upstream. Consider using 'gnome-connections' or 'remmina' instead"; # Added 2024-09-14 vinegar = throw "'vinegar' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23 virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2023-09-10 virtmanager-qt = throw "'virtmanager-qt' has been renamed to/replaced by 'virt-manager-qt'"; # Converted to throw 2023-09-10 From c92c230c35527fd713905dbd2e355396d7aff45d Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:26:31 +0800 Subject: [PATCH 02/14] gnome-hexgl: remove --- pkgs/games/gnome-hexgl/default.nix | 44 ------------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 pkgs/games/gnome-hexgl/default.nix diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix deleted file mode 100644 index 41cc79f26c2e..000000000000 --- a/pkgs/games/gnome-hexgl/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, ninja -, meson -, pkg-config -, gthree -, gsound -, libepoxy -, gtk3 -}: - -stdenv.mkDerivation rec { - pname = "gnome-hexgl"; - version = "unstable-2020-07-24"; - - src = fetchFromGitHub { - owner = "alexlarsson"; - repo = "gnome-hexgl"; - rev = "f47a351055a235730795341dcd6b2397cc4bfa0c"; - sha256 = "yZWGymaSUfnCP8VAEdDH64w0muSnRK/XPi1/IqTrE4k="; - }; - - nativeBuildInputs = [ - ninja - meson - pkg-config - ]; - - buildInputs = [ - gthree - gsound - libepoxy - gtk3 - ]; - - meta = with lib; { - description = "Gthree port of HexGL"; - mainProgram = "gnome-hexgl"; - homepage = "https://github.com/alexlarsson/gnome-hexgl"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index aaaa2359ce1e..548d8930055d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -563,6 +563,7 @@ mapAliases ({ gnatcoll-db2ada = gnatPackages.gnatcoll-db2ada; # Added 2024-02-25 gnatinspect = gnatPackages.gnatinspect; # Added 2024-02-25 gnome-firmware-updater = gnome-firmware; # added 2022-04-14 + gnome-hexgl = throw "'gnome-hexgl' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2023-09-10 gnome-resources = resources; # added 2023-12-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7af2a949ef06..9a9a97cdd5e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35042,8 +35042,6 @@ with pkgs; gamepad-tool = callPackage ../games/gamepad-tool { }; - gnome-hexgl = callPackage ../games/gnome-hexgl { }; - gotypist = callPackage ../games/gotypist { }; heroic-unwrapped = callPackage ../games/heroic { From d49f90a01c2243068513277d45334f8ef65ff774 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:30:23 +0800 Subject: [PATCH 03/14] gmtp: remove --- pkgs/applications/misc/gmtp/default.nix | 39 ------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 pkgs/applications/misc/gmtp/default.nix diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix deleted file mode 100644 index e3a33cace9cb..000000000000 --- a/pkgs/applications/misc/gmtp/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libmtp, libid3tag, flac, libvorbis, gtk3 -, gsettings-desktop-schemas, wrapGAppsHook3 -}: - -let version = "1.3.11"; in - -stdenv.mkDerivation { - pname = "gmtp"; - inherit version; - - src = fetchurl { - url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz"; - sha256 = "04q6byyq002fhzkc2rkkahwh5b6272xakaj4m3vwm8la8jf0r0ss"; - }; - - nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; - buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ]; - - enableParallelBuilding = true; - - # Workaround build failure on -fno-common toolchains: - # ld: gmtp-preferences.o:src/main.h:72: multiple definition of - # `scrolledwindowMain'; gmtp-about.o:src/main.h:72: first defined here - # TODO: can be removed when 1.4.0 is released. - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preFixup = '' - gappsWrapperArgs+=(--add-flags "--datapath $out/share"); - ''; - - meta = { - description = "Simple MP3 and Media player client for UNIX and UNIX like systems"; - mainProgram = "gmtp"; - homepage = "https://gmtp.sourceforge.io"; - platforms = lib.platforms.linux; - maintainers = [ ]; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 548d8930055d..6a35aeab9af5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -520,6 +520,7 @@ mapAliases ({ gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 + gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a9a97cdd5e8..6b4283cd705e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30365,8 +30365,6 @@ with pkgs; gmpc = callPackage ../applications/audio/gmpc { }; - gmtp = callPackage ../applications/misc/gmtp { }; - gnomecast = callPackage ../applications/video/gnomecast { }; gnome-recipes = callPackage ../applications/misc/gnome-recipes { }; From 27fc947777ba42ae791347c48a07b4480097a487 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:35:04 +0800 Subject: [PATCH 04/14] mp3info: remove --- pkgs/applications/audio/mp3info/default.nix | 46 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 pkgs/applications/audio/mp3info/default.nix diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix deleted file mode 100644 index 86c1f87f5227..000000000000 --- a/pkgs/applications/audio/mp3info/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ fetchurl, lib, stdenv, ncurses, pkg-config, gtk2 }: - -stdenv.mkDerivation rec { - pname = "mp3info"; - version = "0.8.5a"; - - src = fetchurl { - url = "ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/${pname}/${pname}-${version}.tgz"; - sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses gtk2 ]; - - hardeningDisable = [ "format" ]; - - configurePhase = - '' sed -i Makefile \ - -e "s|^prefix=.*$|prefix=$out|g ; - s|/bin/rm|rm|g ; - s|/usr/bin/install|install|g" - ''; - - preInstall = - '' mkdir -p "$out/bin" - mkdir -p "$out/man/man1" - ''; - - meta = { - description = "MP3 technical info viewer and ID3 1.x tag editor"; - - longDescription = - '' MP3Info is a little utility used to read and modify the ID3 tags of - MP3 files. MP3Info can also display various techincal aspects of an - MP3 file including playing time, bit-rate, sampling frequency and - other attributes in a pre-defined or user-specifiable output format. - ''; - - homepage = "http://www.ibiblio.org/mp3info/"; - - license = lib.licenses.gpl2Plus; - - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6a35aeab9af5..4d1f88c21c9e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1016,6 +1016,7 @@ mapAliases ({ moz-phab = mozphab; # Added 2022-08-09 mozart-binary = throw "'mozart-binary' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 + mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 mpd_clientlib = libmpdclient; # Added 2021-02-11 mpdevil = plattenalbum; # Added 2024-05-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b4283cd705e..e42f6d5f82b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31775,8 +31775,6 @@ with pkgs; mp3gain = callPackage ../applications/audio/mp3gain { }; - mp3info = callPackage ../applications/audio/mp3info { }; - mp3splt = callPackage ../applications/audio/mp3splt { }; mp3val = callPackage ../applications/audio/mp3val { }; From 50713e031f80040e74eef4bc50bf6d01c6159228 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:54:38 +0800 Subject: [PATCH 05/14] gmtk: remove --- pkgs/development/libraries/gmtk/default.nix | 32 ------------------- .../libraries/gmtk/fix-paths.patch | 20 ------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 pkgs/development/libraries/gmtk/default.nix delete mode 100644 pkgs/development/libraries/gmtk/fix-paths.patch diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix deleted file mode 100644 index 6f2906a8234e..000000000000 --- a/pkgs/development/libraries/gmtk/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{lib, stdenv, substituteAll, fetchFromGitHub, libtool, pkg-config, intltool, glib, gtk3 -, libpulseaudio, mplayer, gnome_mplayer }: - -stdenv.mkDerivation rec { - pname = "gmtk"; - version = "1.0.9"; - - src = fetchFromGitHub { - owner = "kdekorte"; - repo = "gmtk"; - rev = "v${version}"; - sha256 = "1zb5m1y1gckal3140gvx31572a6xpccwfmdwa1w5lx2wdq1pwk1i"; - }; - - nativeBuildInputs = [ libtool pkg-config intltool ]; - buildInputs = [ glib gtk3 libpulseaudio ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - mplayer = "${mplayer}/bin/mplayer"; - }) - ]; - - meta = with lib; { - description = "Common functions for gnome-mplayer and gecko-mediaplayer"; - homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; - license = licenses.gpl2; - maintainers = gnome_mplayer.meta.maintainers; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gmtk/fix-paths.patch b/pkgs/development/libraries/gmtk/fix-paths.patch deleted file mode 100644 index 64738300aba4..000000000000 --- a/pkgs/development/libraries/gmtk/fix-paths.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/gmtk_media_player.c -+++ b/src/gmtk_media_player.c -@@ -2449,7 +2449,7 @@ - player->minimum_mplayer = detect_mplayer_features(player); - - if (player->mplayer_binary == NULL || !g_file_test(player->mplayer_binary, G_FILE_TEST_EXISTS)) { -- argv[argn++] = g_strdup_printf("mplayer"); -+ argv[argn++] = g_strdup_printf("@mplayer@"); - } else { - argv[argn++] = g_strdup_printf("%s", player->mplayer_binary); - } -@@ -4135,7 +4135,7 @@ - return ret; - - if (player->mplayer_binary == NULL || !g_file_test(player->mplayer_binary, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", player->mplayer_binary); - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4d1f88c21c9e..a323daad49ac 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -520,6 +520,7 @@ mapAliases ({ gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 + gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e42f6d5f82b2..77e8d00a7e34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30312,8 +30312,6 @@ with pkgs; glowing-bear = callPackage ../applications/networking/irc/glowing-bear { }; - gmtk = callPackage ../development/libraries/gmtk { }; - gmu = callPackage ../applications/audio/gmu { }; gnaural = callPackage ../applications/audio/gnaural { }; From 6abef67bb487ad81774c6cf5f2c255f8e138a32b Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:37:31 +0800 Subject: [PATCH 06/14] gnome_mplayer: remove --- .../video/gnome-mplayer/default.nix | 39 --------- .../video/gnome-mplayer/fix-paths.patch | 87 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 128 deletions(-) delete mode 100644 pkgs/applications/video/gnome-mplayer/default.nix delete mode 100644 pkgs/applications/video/gnome-mplayer/fix-paths.patch diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix deleted file mode 100644 index 3d6b281ef07b..000000000000 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{lib, stdenv, substituteAll, fetchFromGitHub, pkg-config, gettext, glib, gtk3, gmtk, dbus, dbus-glib -, libnotify, libpulseaudio, mplayer, wrapGAppsHook3 }: - -stdenv.mkDerivation rec { - pname = "gnome-mplayer"; - version = "1.0.9"; - - src = fetchFromGitHub { - owner = "kdekorte"; - repo = "gnome-mplayer"; - rev = "v${version}"; - sha256 = "0qvy9fllvg1mad6y1j79iaqa6khs0q2cb0z62yfg4srbr07fi8xr"; - }; - - nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ]; - buildInputs = [ glib gtk3 gmtk dbus dbus-glib libnotify libpulseaudio ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - mencoder = "${mplayer}/bin/mencoder"; - mplayer = "${mplayer}/bin/mplayer"; - }) - ]; - - # Workaround build failure on -fno-common toolchains: - # ld: mpris-interface.o:src/playlist.h:32: multiple definition of - # `plclose'; gui.o:src/playlist.h:32: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - meta = with lib; { - description = "Gnome MPlayer, a simple GUI for MPlayer"; - mainProgram = "gnome-mplayer"; - homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/video/gnome-mplayer/fix-paths.patch b/pkgs/applications/video/gnome-mplayer/fix-paths.patch deleted file mode 100644 index ede4991c4662..000000000000 --- a/pkgs/applications/video/gnome-mplayer/fix-paths.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/src/gui.c -+++ b/src/gui.c -@@ -7470,7 +7470,7 @@ - filename = g_strdup_printf("%s/00000001.jpg", dirname); - g_free(basepath); - // run mplayer and try to get the first frame and convert it to a jpeg -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - av[ac++] = g_strdup_printf("-vo"); - av[ac++] = g_strdup_printf("jpeg:outdir=%s", dirname); - av[ac++] = g_strdup_printf("-ao"); ---- a/src/property_page_common.c -+++ b/src/property_page_common.c -@@ -80,7 +80,7 @@ - MetaData *ret; - ret = g_new0(MetaData, 1); - -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - av[ac++] = g_strdup_printf("-vo"); - av[ac++] = g_strdup_printf("null"); - av[ac++] = g_strdup_printf("-ao"); ---- a/src/support.c -+++ b/src/support.c -@@ -566,7 +566,7 @@ - } else { - playlist = FALSE; - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -728,7 +728,7 @@ - playlist = FALSE; - // run mplayer and try to get the first frame and convert it to a jpeg - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -825,7 +825,7 @@ - playlist = FALSE; - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -1251,7 +1251,7 @@ - gm_log(verbose, G_LOG_LEVEL_INFO, "getting file metadata for %s", name); - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -1532,7 +1532,7 @@ - return 0; - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -1597,7 +1597,7 @@ - - if (control_id == 0) { - ac = 0; -- av[ac++] = g_strdup_printf("mencoder"); -+ av[ac++] = g_strdup_printf("@mencoder@"); - av[ac++] = g_strdup_printf("-ovc"); - av[ac++] = g_strdup_printf("copy"); - av[ac++] = g_strdup_printf("-oac"); -@@ -2830,7 +2830,7 @@ - gboolean ret = TRUE; - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a323daad49ac..a62f97668656 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -567,6 +567,7 @@ mapAliases ({ gnome-firmware-updater = gnome-firmware; # added 2022-04-14 gnome-hexgl = throw "'gnome-hexgl' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 + gnome_mplayer = throw "'gnome_mplayer' has been removed due to lack of maintenance upstream. Consider using 'celluloid' instead"; # Added 2024-09-14 gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2023-09-10 gnome-resources = resources; # added 2023-12-10 gnome_user_docs = throw "'gnome_user_docs' has been renamed to/replaced by 'gnome-user-docs'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77e8d00a7e34..0836ec8f476a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30316,8 +30316,6 @@ with pkgs; gnaural = callPackage ../applications/audio/gnaural { }; - gnome_mplayer = callPackage ../applications/video/gnome-mplayer { }; - gnumeric = callPackage ../applications/office/gnumeric { }; gnunet = callPackage ../applications/networking/p2p/gnunet { }; From 578b246a0788ecd34dcb845ad2bf56ee32824196 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:41:11 +0800 Subject: [PATCH 07/14] gtkperf: remove --- .../tools/misc/gtkperf/bench.patch | 60 ------------------- .../tools/misc/gtkperf/default.nix | 26 -------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 pkgs/development/tools/misc/gtkperf/bench.patch delete mode 100644 pkgs/development/tools/misc/gtkperf/default.nix diff --git a/pkgs/development/tools/misc/gtkperf/bench.patch b/pkgs/development/tools/misc/gtkperf/bench.patch deleted file mode 100644 index 3d00a03e9a58..000000000000 --- a/pkgs/development/tools/misc/gtkperf/bench.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- gtkperf/src/callbacks.c 2005-10-30 11:33:42.000000000 +0000 -+++ gtkperf-patched/src/callbacks.c 2008-05-23 23:41:17.000000000 +0100 -@@ -219,6 +219,13 @@ - } - - -+void -+on_cmdline_test(char *optarg) -+{ -+ appdata->test_type = atoi(optarg); -+} -+ -+ - /* Initialize appdata */ - void - setup_appdata(AppData * appdata_in) -@@ -398,7 +405,7 @@ - appdata->pixbuf_drawing = gdk_pixbuf_new_from_file (filename, NULL); - - gtk_combo_box_set_active (GTK_COMBO_BOX (appdata->combobox_testtype), -- 0); -+ appdata->test_type); - - /* create end mark to info textview */ - GtkTextIter iter; ---- gtkperf/src/callbacks.h 2005-10-30 10:21:23.000000000 +0000 -+++ gtkperf-patched/src/callbacks.h 2008-05-23 23:22:30.000000000 +0100 -@@ -13,6 +13,7 @@ - void on_cmdline_run_all (); - void on_cmdline_help () ; - void on_cmdline_count (char *optarg) ; -+void on_cmdline_test (char *optarg) ; - void on_window_main_show (AppData * data); - - gboolean ---- gtkperf/src/main.c 2005-10-30 11:26:42.000000000 +0000 -+++ gtkperf-patched/src/main.c 2008-05-23 23:44:02.000000000 +0100 -@@ -65,9 +65,10 @@ - {"help", 0, 0, 0}, - {"automatic", 0, 0, 0}, - {"count", 1, 0, 0}, -+ {"test", 1, 0, 0}, - {0, 0, 0, 0} - }; -- c = getopt_long (argc, argv, "hac:", -+ c = getopt_long (argc, argv, "hac:t:", - long_options, &option_index); - if (c == -1) - break; -@@ -104,6 +105,10 @@ - on_cmdline_count(optarg); - break; - -+ case 't': -+ on_cmdline_test(optarg); -+ break; -+ - default: - case 'h': - on_cmdline_help (); diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix deleted file mode 100644 index 0d3da390847a..000000000000 --- a/pkgs/development/tools/misc/gtkperf/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, gtk2, pkg-config, libintl }: - -stdenv.mkDerivation rec { - pname = "gtkperf"; - version = "0.40.0"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}_${lib.versions.majorMinor version}.tar.gz"; - sha256 = "0yxj3ap3yfi76vqg6xjvgc16nfi9arm9kp87s35ywf10fd73814p"; - }; - - hardeningDisable = [ "format" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 libintl ]; - - # https://openbenchmarking.org/innhold/7e9780c11550d09aa67bdba71248facbe2d781db - patches = [ ./bench.patch ]; - - meta = with lib; { - description = "Application designed to test GTK performance"; - mainProgram = "gtkperf"; - homepage = "https://gtkperf.sourceforge.net/"; - license = with licenses; [ gpl2 ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a62f97668656..08ef844b4c5f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -644,6 +644,7 @@ mapAliases ({ grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11 gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 gtkcord4 = dissent; # Added 2024-03-10 + gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gtkpod = throw "'gtkpod' was removed due to one of its dependencies, 'anjuta' being unmaintained"; # Added 2024-01-16 guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09 guile-disarchive = disarchive; # Added 2023-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0836ec8f476a..da9beb6548b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8441,8 +8441,6 @@ with pkgs; gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; - gtkperf = callPackage ../development/tools/misc/gtkperf { }; - gtkradiant = callPackage ../applications/misc/gtkradiant { }; gtk-frdp = callPackage ../development/libraries/gtk-frdp { }; From 9af58a2f4f7114954d6689290b2adf34efe6e895 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:44:17 +0800 Subject: [PATCH 08/14] gnome-dictionary: remove --- pkgs/by-name/gn/gnome-dictionary/package.nix | 86 -------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 86 deletions(-) delete mode 100644 pkgs/by-name/gn/gnome-dictionary/package.nix diff --git a/pkgs/by-name/gn/gnome-dictionary/package.nix b/pkgs/by-name/gn/gnome-dictionary/package.nix deleted file mode 100644 index f0b600f58dc1..000000000000 --- a/pkgs/by-name/gn/gnome-dictionary/package.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, meson -, ninja -, pkg-config -, desktop-file-utils -, appstream-glib -, libxslt -, libxml2 -, gettext -, itstool -, wrapGAppsHook3 -, docbook_xsl -, docbook_xml_dtd_43 -, gnome -, adwaita-icon-theme -, gtk3 -, glib -, gsettings-desktop-schemas -}: - -stdenv.mkDerivation rec { - pname = "gnome-dictionary"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.major version}/gnome-dictionary-${version}.tar.xz"; - hash = "sha256-LmUMKkzqjMTQLUpYPEVsu8nRhx6RjH3E3ggd7R2DDbU="; - }; - - patches = [ - # Fix test dependencies with meson 0.57, can be removed on next bump - # We need to explicitly depend on the generated files. - (fetchpatch { - url = "https://gitlab.gnome.org/Archive/gnome-dictionary/-/commit/87c026cfe4acbcfc62d15950f88a71d8d9678c7e.patch"; - hash = "sha256-tKesWeOK3OqOxrXm4dZvCZHHdTD7AQbYDjtYDCsLd3A="; - }) - # Fix build with meson 0.61, can be removed on next bump - # data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments. - (fetchpatch { - url = "https://gitlab.gnome.org/Archive/gnome-dictionary/-/commit/cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68.patch"; - hash = "sha256-cIRM6ACqsnEo2JWYvr6EBye5o0BudugZMShCe1U5hz8="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - wrapGAppsHook3 - libxml2 - gettext - itstool - desktop-file-utils - appstream-glib - libxslt - docbook_xsl - docbook_xml_dtd_43 - ]; - - buildInputs = [ - gtk3 - glib - gsettings-desktop-schemas - adwaita-icon-theme - ]; - - doCheck = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-dictionary"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/Archive/gnome-dictionary"; - description = "Dictionary is the GNOME application to look up definitions"; - mainProgram = "gnome-dictionary"; - maintainers = [ ]; - license = licenses.gpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 08ef844b4c5f..7a416164e879 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -564,6 +564,7 @@ mapAliases ({ gnatcoll-xref = gnatPackages.gnatcoll-xref; # Added 2024-02-25 gnatcoll-db2ada = gnatPackages.gnatcoll-db2ada; # Added 2024-02-25 gnatinspect = gnatPackages.gnatinspect; # Added 2024-02-25 + gnome-dictionary = throw "'gnome-dictionary' has been removed as it has been archived upstream. Consider using 'wordbook' instead"; # Added 2024-09-14 gnome-firmware-updater = gnome-firmware; # added 2022-04-14 gnome-hexgl = throw "'gnome-hexgl' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 From 8d9d116f351dba71e459a0ddf40d8d7b76d54704 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 22:02:33 +0800 Subject: [PATCH 09/14] psensor: remove --- pkgs/tools/system/psensor/default.nix | 51 --------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 pkgs/tools/system/psensor/default.nix diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix deleted file mode 100644 index 3d0fa0d62ac2..000000000000 --- a/pkgs/tools/system/psensor/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv -, lib -, fetchurl -, pkg-config -, lm_sensors -, libgtop -, libatasmart -, gtk3 -, libnotify -, udisks2 -, libXNVCtrl -, wrapGAppsHook3 -, libappindicator -}: - -stdenv.mkDerivation rec { - pname = "psensor"; - - version = "1.2.1"; - - src = fetchurl { - url = "https://wpitchoune.net/psensor/files/psensor-${version}.tar.gz"; - sha256 = "1ark901va79gfq5p8h8dqypjgm3f8crmj37520q3slwz2rfphkq8"; - }; - - nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; - - buildInputs = [ - lm_sensors - libgtop - libatasmart - gtk3 - libnotify - udisks2 - libappindicator - ]; - - preConfigure = '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXNVCtrl}/include -Wno-error" - NIX_LDFLAGS="$NIX_LDFLAGS -L${libXNVCtrl}/lib" - ''; - - meta = with lib; { - description = "Graphical hardware monitoring application for Linux"; - homepage = "https://wpitchoune.net/psensor/"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ ]; - mainProgram = "psensor"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7a416164e879..9caad6509e41 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1282,6 +1282,7 @@ mapAliases ({ protonup = protonup-ng; # Added 2022-11-06 proxmark3-rrg = proxmark3; # Added 2023-07-25 proxmark3-unstable = throw "removed in favor of rfidresearchgroup fork"; # Added 2023-07-25 + psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14 pyls-black = throw "pyls-black has been removed from nixpkgs. Use python-lsp-black instead."; # Added 2023-01-09 pyls-mypy = throw "pyls-mypy has been removed from nixpkgs. Use pylsp-mypy instead."; # Added 2023-01-09 pygmentex = throw "'pygmentex' has been renamed to/replaced by 'texlive.bin.pygmentex'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da9beb6548b8..0b0110bd8bfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11682,10 +11682,6 @@ with pkgs; psudohash = callPackage ../tools/security/psudohash { }; - psensor = callPackage ../tools/system/psensor { - libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; - }; - pubs = callPackage ../tools/misc/pubs { }; pulldown-cmark = callPackage ../tools/typesetting/pulldown-cmark { }; From dae90a0d29343bbb9ffc5d3f7bcfb816fca3e639 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 22:05:32 +0800 Subject: [PATCH 10/14] gmpc: remove --- pkgs/applications/audio/gmpc/default.nix | 67 ------------------- .../gmpc/libmpd-11.8.17-remove-strndup.patch | 15 ----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 pkgs/applications/audio/gmpc/default.nix delete mode 100644 pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix deleted file mode 100644 index e3f5f4580d6f..000000000000 --- a/pkgs/applications/audio/gmpc/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, fetchurl -, libtool -, intltool -, pkg-config -, glib -, gtk2 -, curl -, libmpdclient -, libsoup -, gob2 -, vala -, libunique -, libSM -, libICE -, sqlite -, hicolor-icon-theme -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "gmpc"; - version = "11.8.16"; - - libmpd = stdenv.mkDerivation { - pname = "libmpd"; - version = "11.8.17"; - src = fetchurl { - url = "https://download.sarine.nl/Programs/gmpc/${lib.versions.majorMinor version}/libmpd-${version}.tar.gz"; - sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y"; - }; - patches = [ ./libmpd-11.8.17-remove-strndup.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib ]; - }; - - src = fetchurl { - url = "http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz"; - sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; - }; - - nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook3 ]; - buildInputs = [ - glib - gtk2 - curl - libmpdclient - libsoup - libunique - libmpd - libSM - libICE - sqlite - hicolor-icon-theme - ]; - - meta = with lib; { - homepage = "https://gmpclient.org"; - description = "GTK2 frontend for Music Player Daemon"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} -# TODO: what is this libmpd derivation embedded above? diff --git a/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch b/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch deleted file mode 100644 index ad4fdc02ef3e..000000000000 --- a/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/libmpd-internal.h b/src/libmpd-internal.h -index c84c3a4..51be441 100644 ---- a/src/libmpd-internal.h -+++ b/src/libmpd-internal.h -@@ -206,10 +206,6 @@ int mpd_unlock_conn(MpdObj *mi); - MpdData * mpd_misc_sort_tag_list(MpdData *data); - - --#ifndef HAVE_STRNDUP --char * strndup (const char *s, size_t n); --#endif -- - int mpd_server_get_allowed_commands(MpdObj *mi); - typedef enum _MpdSearchType { - MPD_SEARCH_TYPE_NONE, diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9caad6509e41..bb96a8f8455d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -520,6 +520,7 @@ mapAliases ({ gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 + gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14 gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b0110bd8bfe..a4014bbb166b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30353,8 +30353,6 @@ with pkgs; gqview = callPackage ../applications/graphics/gqview { }; - gmpc = callPackage ../applications/audio/gmpc { }; - gnomecast = callPackage ../applications/video/gnomecast { }; gnome-recipes = callPackage ../applications/misc/gnome-recipes { }; From 68467caab1361c1c55d00678398eef53fccf8155 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 22:16:59 +0800 Subject: [PATCH 11/14] xprite-editor: remove --- pkgs/tools/misc/xprite-editor/default.nix | 47 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 pkgs/tools/misc/xprite-editor/default.nix diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/pkgs/tools/misc/xprite-editor/default.nix deleted file mode 100644 index f5581bd354c1..000000000000 --- a/pkgs/tools/misc/xprite-editor/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, rustPlatform -, gtk3 -, AppKit -, pkg-config -, python3 -}: - -rustPlatform.buildRustPackage rec { - pname = "xprite-editor-unstable"; - version = "2019-09-22"; - - src = fetchFromGitHub { - owner = "rickyhan"; - repo = "xprite-editor"; - rev = "7f899dff982642927024540e4bafd74e4ea5e52a"; - sha256 = "1k6k8y8gg1vdmyjz27q689q9rliw0rrnzwlpjcd4vlc6swaq9ahx"; - fetchSubmodules = true; - # Rename unicode file name which leads to different checksums on HFS+ - # vs. other filesystems because of unicode normalization. - postFetch = '' - mv $out/config/palettes/Sweet\ Guaran*.hex $out/config/palettes/Sweet\ Guarana.hex - ''; - }; - - buildInputs = lib.optionals stdenv.isLinux [ gtk3 ] - ++ lib.optionals stdenv.isDarwin [ AppKit ]; - - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config python3 ]; - - cargoHash = "sha256-k53nSYBIJJHPivz6IvF5t0eZVkTvj1ZT3RyHdoy5MXw="; - - cargoBuildFlags = [ "--bin" "xprite-native" ]; - - meta = with lib; { - # error[E0034]: multiple applicable items in scope - # multiple `clamp` found - # https://github.com/NixOS/nixpkgs/issues/146949 - broken = true; - homepage = "https://github.com/rickyhan/xprite-editor"; - description = "Pixel art editor"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bb96a8f8455d..c62857b2c216 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1676,6 +1676,7 @@ mapAliases ({ xmlada = gnatPackages.xmlada; # Added 2024-02-25 xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15 xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18 + xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14 xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = xvfb-run; # Added 2021-05-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4014bbb166b..4458f5e4120b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14225,10 +14225,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - xprite-editor = callPackage ../tools/misc/xprite-editor { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; - xq-xml = callPackage ../tools/text/xml/xq { }; xsecurelock = callPackage ../tools/X11/xsecurelock { }; From 646ef5a89cf9d549b98157eaeba3f8dd79c8993f Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 22:23:04 +0800 Subject: [PATCH 12/14] aumix: remove --- pkgs/applications/audio/aumix/default.nix | 49 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 pkgs/applications/audio/aumix/default.nix diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix deleted file mode 100644 index ef0560fdc2ad..000000000000 --- a/pkgs/applications/audio/aumix/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, gettext -, ncurses -, gtkGUI ? false -, pkg-config -, gtk2 -}: - -stdenv.mkDerivation rec { - pname = "aumix"; - version = "2.9.1"; - - src = fetchurl { - url = "http://www.jpj.net/~trevor/aumix/releases/aumix-${version}.tar.bz2"; - sha256 = "0a8fwyxnc5qdxff8sl2sfsbnvgh6pkij4yafiln0fxgg6bal7knj"; - }; - - patches = [ - # Pull Gentoo fix for -fno-common toolchains. Upstream does not - # seem to have the contacts - (fetchpatch { - name = "fno-common.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/aumix/files/aumix-2.9.1-fno-common.patch?id=496c9ec7355f06f6d1d19be780a6981503e6df1f"; - sha256 = "0qwylhx1hawsmx1pc7ykrjq9phksc73dq9rss6ggq15n3ggnc95y"; - }) - ]; - - nativeBuildInputs = lib.optionals gtkGUI [ pkg-config ]; - - buildInputs = [ gettext ncurses ] - ++ lib.optionals gtkGUI [ gtk2 ]; - - configureFlags = lib.optionals (!gtkGUI) ["--without-gtk"]; - - meta = with lib; { - description = "Audio mixer for X and the console"; - longDescription = '' - Aumix adjusts an audio mixer from X, the console, a terminal, - the command line or a script. - ''; - homepage = "http://www.jpj.net/~trevor/aumix.html"; - license = licenses.gpl2Plus; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c62857b2c216..4dba8d534b76 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -138,6 +138,7 @@ mapAliases ({ atomPackages = throw "'atomPackages' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06 auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02 + aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14 authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19 avldrums-lv2 = x42-avldrums; # Added 2020-03-29 avrlibcCross = avrlibc; # Added 2024-09-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4458f5e4120b..32e83cb21e68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28822,10 +28822,6 @@ with pkgs; armcord = callPackage ../applications/networking/instant-messengers/armcord { }; - aumix = callPackage ../applications/audio/aumix { - gtkGUI = false; - }; - autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { }; From 4b37f165fda99debcb8230cf06164de28b09049b Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 22:29:08 +0800 Subject: [PATCH 13/14] mhwaveedit: remove --- .../applications/audio/mhwaveedit/default.nix | 40 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 pkgs/applications/audio/mhwaveedit/default.nix diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix deleted file mode 100644 index 5714de0ee7b4..000000000000 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, SDL, alsa-lib, autoreconfHook, gtk2, libjack2, ladspaH -, ladspaPlugins, libsamplerate, libsndfile, pkg-config, libpulseaudio, lame -, vorbis-tools }: - -stdenv.mkDerivation rec { - pname = "mhwaveedit"; - version = "1.4.24"; - - src = fetchFromGitHub { - owner = "magnush"; - repo = "mhwaveedit"; - rev = "v${version}"; - sha256 = "037pbq23kh8hsih994x2sv483imglwcrqrx6m8visq9c46fi0j1y"; - }; - - nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; - - preAutoreconf = "(cd docgen && sh gendocs.sh)"; - - buildInputs = [ - SDL alsa-lib gtk2 libjack2 ladspaH libsamplerate libsndfile libpulseaudio - ]; - - configureFlags = [ "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa" ]; - - postInstall = '' - wrapProgram $out/bin/mhwaveedit \ - --prefix PATH : ${lame}/bin/ \ - --prefix PATH : ${vorbis-tools}/bin/ - ''; - - meta = with lib; { - description = "Graphical program for editing, playing and recording sound files"; - mainProgram = "mhwaveedit"; - homepage = "https://github.com/magnush/mhwaveedit"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4dba8d534b76..57da02c21e62 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -984,6 +984,7 @@ mapAliases ({ mdt = md-tui; # Added 2024-09-03 meme = meme-image-generator; # Added 2021-04-21 mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 + 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 microsoft_gsl = microsoft-gsl; # Added 2023-05-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32e83cb21e68..897b92d3b779 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31595,10 +31595,6 @@ with pkgs; metersLv2 = callPackage ../applications/audio/meters_lv2 { }; - mhwaveedit = callPackage ../applications/audio/mhwaveedit { - autoreconfHook = buildPackages.autoreconfHook269; - }; - michabo = libsForQt5.callPackage ../applications/misc/michabo { }; mid2key = callPackage ../applications/audio/mid2key { }; From 19808ce7f0bc4cc694d3ef99c9edd7ae7388aa74 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 22:37:30 +0800 Subject: [PATCH 14/14] l3afpad: remove --- pkgs/applications/editors/l3afpad/default.nix | 26 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/applications/editors/l3afpad/default.nix diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix deleted file mode 100644 index bcf20e4af55d..000000000000 --- a/pkgs/applications/editors/l3afpad/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, intltool, pkg-config, gtk3, fetchFromGitHub -, autoreconfHook, wrapGAppsHook3 }: - -stdenv.mkDerivation rec { - version = "unstable-2022-02-14"; - pname = "l3afpad"; - - src = fetchFromGitHub { - owner = "stevenhoneyman"; - repo = pname; - rev = "16f22222116b78b7f6a6fd83289937cdaabed624"; - sha256 = "sha256-ly2w9jmRlprm/PnyC0LYjrxBVK+J0DLiSpzuTUMZpWA="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook3 intltool ]; - buildInputs = [ gtk3 ]; - - meta = with lib; { - description = "Simple text editor forked from Leafpad using GTK+ 3.x"; - homepage = "https://github.com/stevenhoneyman/l3afpad"; - platforms = platforms.linux; - maintainers = [ ]; - license = licenses.gpl2; - mainProgram = "l3afpad"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 57da02c21e62..d206e71f3170 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -769,6 +769,7 @@ mapAliases ({ ### L ### + l3afpad = throw "'l3afpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-09-14 larynx = piper-tts; # Added 2023-05-09 LASzip = laszip; # Added 2024-06-12 LASzip2 = laszip_2; # Added 2024-06-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 897b92d3b779..7fa21dc916ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9792,8 +9792,6 @@ with pkgs; leafpad = callPackage ../applications/editors/leafpad { }; - l3afpad = callPackage ../applications/editors/l3afpad { }; - leanblueprint = with python3Packages; toPythonApplication leanblueprint; leanify = callPackage ../tools/misc/leanify { };