From 564c0bebded5e073511b7feeb9c8c66612387319 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 18 Jan 2023 19:06:00 +0800 Subject: [PATCH 1/3] xneur: format with nixpkgs-fmt --- pkgs/applications/misc/xneur/default.nix | 43 +++++++++++++++++++----- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 2d8af0465a77..2f02231536df 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,9 +1,23 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, xorg, pcre, gst_all_1, glib -, xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }: +{ stdenv +, lib +, fetchurl +, fetchpatch +, intltool +, pkg-config +, wrapGAppsHook +, enchant +, gdk-pixbuf +, glib +, gst_all_1 +, libnotify +, pcre +, xorg +, xosd +}: stdenv.mkDerivation { - pname = "xneur"; - version = "0.20.0"; + pname = "xneur"; + version = "0.20.0"; src = fetchurl { url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/xneur_0.20.0.orig.tar.gz"; @@ -11,14 +25,25 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - pkg-config intltool wrapGAppsHook + intltool + pkg-config + wrapGAppsHook ]; buildInputs = [ - xorg.libX11 xorg.libXtst pcre gst_all_1.gstreamer glib - xosd xorg.libXext xorg.libXi libnotify - enchant gdk-pixbuf - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + enchant + gdk-pixbuf + glib + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gstreamer + libnotify + pcre + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXtst + xosd ]; patches = [ From ed0995f446c83c75a4bc1c38203d6aac6c1bee2a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 18 Jan 2023 19:08:33 +0800 Subject: [PATCH 2/3] xneur: build with enchant2 We are trying to remove enchant1 from Nixpkgs. Since there is no new release we pull the patch from debian to build this with enchant2. --- pkgs/applications/misc/xneur/default.nix | 9 ++++++++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 2f02231536df..eab545cf0818 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -2,6 +2,7 @@ , lib , fetchurl , fetchpatch +, autoreconfHook , intltool , pkg-config , wrapGAppsHook @@ -25,6 +26,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ + autoreconfHook intltool pkg-config wrapGAppsHook @@ -52,10 +54,15 @@ stdenv.mkDerivation { url = "https://salsa.debian.org/debian/xneur/-/raw/da38ad9c8e1bf4e349f5ed4ad909f810fdea44c9/debian/patches/gcc-10.patch"; sha256 = "0pc17a4sdrnrc4z7gz28889b9ywqsm5mzm6m41h67j2f5zh9k3fy"; }) + (fetchpatch { + name = "enchant2.patch"; + url = "https://salsa.debian.org/debian/xneur/-/raw/695b0fea56cde4ff6cf0f3988218c5cb9d7ff5ae/debian/patches/enchant2.patch"; + sha256 = "02a3kkfzdvs5f8dfm6j5x3jcn5j8qah9ykfymp6ffqsf4fijp65n"; + }) ]; postPatch = '' - sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure + sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure.ac ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b005def9fda..b193d7efc87a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33710,9 +33710,7 @@ with pkgs; xmind = callPackage ../applications/misc/xmind { }; - xneur = callPackage ../applications/misc/xneur { - enchant = enchant1; - }; + xneur = callPackage ../applications/misc/xneur { }; gxneur = callPackage ../applications/misc/gxneur { inherit (gnome2) libglade GConf; From 6c1b113f4f08dcc5f7530fed4e41c75b8f9acaca Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 18 Jan 2023 12:27:45 +0800 Subject: [PATCH 3/3] enchant1: remove Unmaintained. --- pkgs/development/libraries/enchant/1.x.nix | 24 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 pkgs/development/libraries/enchant/1.x.nix diff --git a/pkgs/development/libraries/enchant/1.x.nix b/pkgs/development/libraries/enchant/1.x.nix deleted file mode 100644 index 79f896bef385..000000000000 --- a/pkgs/development/libraries/enchant/1.x.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, aspell, pkg-config, glib, hunspell, hspell }: - -stdenv.mkDerivation rec { - version = "1.6.1"; - pname = "enchant"; - - src = fetchurl { - url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${pname}-${version}.tar.gz"; - sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ aspell glib hunspell hspell ]; - - meta = with lib; { - description = "Generic spell checking library"; - homepage = "https://abiword.github.io/enchant"; - platforms = platforms.unix; - badPlatforms = [ "x86_64-darwin" ]; - license = licenses.lgpl21; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5506b451ddb1..39f375fa9947 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -420,6 +420,7 @@ mapAliases ({ emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18 enblendenfuse = throw "'enblendenfuse' has been renamed to/replaced by 'enblend-enfuse'"; # Converted to throw 2022-02-22 + enchant1 = throw "enchant1 has been removed from nixpkgs, as it was unmaintained"; # Added 2023-01-18 encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06 envdir = throw "envdir has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b193d7efc87a..7d46862b27b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19251,8 +19251,6 @@ with pkgs; emanote = haskell.lib.compose.justStaticExecutables haskellPackages.emanote; - enchant1 = callPackage ../development/libraries/enchant/1.x.nix { }; - enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; enchant = enchant2;