From 2bae40120ebd3a35961fd65d7d50a627f53602ca Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 22 Aug 2025 14:47:00 +0200 Subject: [PATCH 1/2] code-browser: remove --- .../editors/code-browser/default.nix | 79 ------------------- pkgs/top-level/aliases.nix | 3 + pkgs/top-level/all-packages.nix | 4 - 3 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 pkgs/applications/editors/code-browser/default.nix diff --git a/pkgs/applications/editors/code-browser/default.nix b/pkgs/applications/editors/code-browser/default.nix deleted file mode 100644 index 4528c6a33687..000000000000 --- a/pkgs/applications/editors/code-browser/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - copper, - python3, - pkg-config, - withQt ? false, - qtbase ? null, - wrapQtAppsHook ? null, - withGtk2 ? false, - gtk2, - withGtk3 ? false, - gtk3, - mkDerivation ? stdenv.mkDerivation, -}: -let - onlyOneEnabled = xs: 1 == builtins.length (builtins.filter lib.id xs); -in -assert onlyOneEnabled [ - withQt - withGtk2 - withGtk3 -]; -mkDerivation rec { - pname = "code-browser"; - version = "8.0"; - src = fetchurl { - url = "https://tibleiz.net/download/code-browser-${version}-src.tar.gz"; - sha256 = "sha256-beCp4lx4MI1+hVgWp2h3piE/zu51zfwQdB5g7ImgmwY="; - }; - postPatch = '' - substituteInPlace Makefile --replace "LFLAGS=-no-pie" "LFLAGS=-no-pie -L." - patchShebangs . - '' - + lib.optionalString withQt '' - substituteInPlace libs/copper-ui/Makefile --replace "moc -o" "${qtbase.dev}/bin/moc -o" - substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: qt" - '' - + lib.optionalString withGtk2 '' - substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: gtk2" - '' - + lib.optionalString withGtk3 '' - substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: gtk" - ''; - nativeBuildInputs = [ - copper - python3 - pkg-config - ] - ++ lib.optionals withGtk2 [ gtk2 ] - ++ lib.optionals withGtk3 [ gtk3 ] - ++ lib.optionals withQt [ - qtbase - wrapQtAppsHook - ]; - buildInputs = - lib.optionals withQt [ qtbase ] - ++ lib.optionals withGtk2 [ gtk2 ] - ++ lib.optionals withGtk3 [ gtk3 ]; - makeFlags = [ - "prefix=$(out)" - "COPPER=${copper}/bin/copper-elf64" - "with-local-libs" - ] - ++ lib.optionals withQt [ - "QINC=${qtbase.dev}/include" - "UI=qt" - ] - ++ lib.optionals withGtk2 [ "UI=gtk2" ] - ++ lib.optionals withGtk3 [ "UI=gtk" ]; - - meta = with lib; { - description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code"; - homepage = "https://tibleiz.net/code-browser/"; - license = licenses.gpl2; - platforms = platforms.x86_64; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 19f5a0cdd10d..4905caf4369d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -619,6 +619,9 @@ mapAliases { cloudlogoffline = throw "cloudlogoffline has been removed"; # added 2025-05-18 clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 CoinMP = coinmp; # Added 2024-06-12 + code-browser-gtk = throw "'code-browser-gtk' has been removed, as it was broken since 22.11"; # Added 2025-08-22 + code-browser-gtk2 = throw "'code-browser-gtk2' has been removed, as it was broken since 22.11"; # Added 2025-08-22 + code-browser-qt = throw "'code-browser-qt' has been removed, as it was broken since 22.11"; # Added 2025-08-22 collada-dom = opencollada; # added 2024-02-21 colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea1ae4d38951..0e416f0e8d5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2615,10 +2615,6 @@ with pkgs; cask-server = libsForQt5.callPackage ../applications/misc/cask-server { }; - code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; }; - code-browser-gtk2 = callPackage ../applications/editors/code-browser { withGtk2 = true; }; - code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk3 = true; }; - cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert; ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; From cdafc1530792f4f1ca0fd3d4f98c41d84e8827f8 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 22 Aug 2025 14:47:06 +0200 Subject: [PATCH 2/2] copper: remove --- pkgs/by-name/co/copper/package.nix | 34 ------------------------------ pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 pkgs/by-name/co/copper/package.nix diff --git a/pkgs/by-name/co/copper/package.nix b/pkgs/by-name/co/copper/package.nix deleted file mode 100644 index d6b24177d291..000000000000 --- a/pkgs/by-name/co/copper/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - libffi, -}: -stdenv.mkDerivation rec { - pname = "copper"; - version = "4.6"; - src = fetchurl { - url = "https://tibleiz.net/download/copper-${version}-src.tar.gz"; - sha256 = "sha256-tyxAMJp4H50eBz8gjt2O3zj5fq6nOIXKX47wql8aUUg="; - }; - buildInputs = [ - libffi - ]; - postPatch = '' - patchShebangs . - ''; - buildPhase = '' - make BACKEND=elf64 boot-elf64 - make BACKEND=elf64 COPPER=stage3/copper-elf64 copper-elf64 - ''; - installPhase = '' - make BACKEND=elf64 install prefix=$out - ''; - meta = with lib; { - description = "Simple imperative language, statically typed with type inference and genericity"; - homepage = "https://tibleiz.net/copper/"; - license = licenses.bsd2; - platforms = platforms.x86_64; - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4905caf4369d..bb86ffe4175a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -627,6 +627,7 @@ mapAliases { colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19 colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15 connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27 + copper = throw "'copper' has been removed, as it was broken since 22.11"; # Added 2025-08-22 cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07 coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01