From 189f39e774c0924b0307955356f9c8322281db58 Mon Sep 17 00:00:00 2001 From: Igor Rzegocki Date: Sun, 29 Dec 2024 20:10:55 +0100 Subject: [PATCH 1/3] workrave: migrate to pkgs/by-name --- .../wo/workrave/package.nix} | 14 ++++++-------- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 6 insertions(+), 13 deletions(-) rename pkgs/{applications/misc/workrave/default.nix => by-name/wo/workrave/package.nix} (92%) diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/by-name/wo/workrave/package.nix similarity index 92% rename from pkgs/applications/misc/workrave/default.nix rename to pkgs/by-name/wo/workrave/package.nix index 5a0f4cd51acf..d885d579cd7b 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/by-name/wo/workrave/package.nix @@ -26,12 +26,10 @@ dbus, dbus-glib, gdome2, - gstreamer, - gst-plugins-base, - gst-plugins-good, + gst_all_1, libsigcxx, boost, - jinja2, + python3Packages, }: stdenv.mkDerivation rec { @@ -54,7 +52,7 @@ stdenv.mkDerivation rec { libtool pkg-config wrapGAppsHook3 - jinja2 + python3Packages.jinja2 gobject-introspection ]; @@ -74,9 +72,9 @@ stdenv.mkDerivation rec { dbus dbus-glib gdome2 - gstreamer - gst-plugins-base - gst-plugins-good + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good libsigcxx boost ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2d42a1fdc98..f2036862232f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15986,11 +15986,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - workrave = callPackage ../applications/misc/workrave { - inherit (python3Packages) jinja2; - inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; - }; - worldengine-cli = python3Packages.worldengine; wpsoffice = libsForQt5.callPackage ../applications/office/wpsoffice { }; From 7c3253213116df7029c494bb26c29116b0494ae3 Mon Sep 17 00:00:00 2001 From: Igor Rzegocki Date: Sun, 29 Dec 2024 20:11:13 +0100 Subject: [PATCH 2/3] workrave: remove meta.broken (it compiles fine on aarch64 now) --- pkgs/by-name/wo/workrave/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/wo/workrave/package.nix b/pkgs/by-name/wo/workrave/package.nix index d885d579cd7b..8394c19a0b9f 100644 --- a/pkgs/by-name/wo/workrave/package.nix +++ b/pkgs/by-name/wo/workrave/package.nix @@ -84,7 +84,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Program to help prevent Repetitive Strain Injury"; mainProgram = "workrave"; longDescription = '' From bfdd7b19299a9c31037395fe53ad809dd4546e24 Mon Sep 17 00:00:00 2001 From: Igor Rzegocki Date: Sun, 29 Dec 2024 20:12:23 +0100 Subject: [PATCH 3/3] gdome2: remove gdome2 --- pkgs/by-name/gd/gdome2/fno-common.patch | 11 ----- pkgs/by-name/gd/gdome2/package.nix | 52 ----------------------- pkgs/by-name/gd/gdome2/xml-document.patch | 11 ----- pkgs/by-name/wo/workrave/package.nix | 2 - pkgs/top-level/aliases.nix | 1 + 5 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 pkgs/by-name/gd/gdome2/fno-common.patch delete mode 100644 pkgs/by-name/gd/gdome2/package.nix delete mode 100644 pkgs/by-name/gd/gdome2/xml-document.patch diff --git a/pkgs/by-name/gd/gdome2/fno-common.patch b/pkgs/by-name/gd/gdome2/fno-common.patch deleted file mode 100644 index f9dc93c48fcf..000000000000 --- a/pkgs/by-name/gd/gdome2/fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ -On gcc-10 -fno-common is the default which forbids miltiple definitions. ---- a/libgdome/xpath/gdome-xpath-xpnsresolv.h -+++ b/libgdome/xpath/gdome-xpath-xpnsresolv.h -@@ -42,6 +42,6 @@ void gdome_xpath_xpnsresolv_ref (GdomeXPathNSResolver *self, GdomeException *exc - void gdome_xpath_xpnsresolv_unref (GdomeXPathNSResolver *self, GdomeException *exc); - GdomeDOMString * gdome_xpath_xpnsresolv_lookupNamespaceURI( GdomeXPathNSResolver *self, GdomeDOMString *prefix, GdomeException *exc); - --const GdomeXPathNSResolverVtab gdome_xpath_xpnsresolv_vtab; -+extern const GdomeXPathNSResolverVtab gdome_xpath_xpnsresolv_vtab; - - #endif /* GDOME_XPNSRESOLV_FILE */ diff --git a/pkgs/by-name/gd/gdome2/package.nix b/pkgs/by-name/gd/gdome2/package.nix deleted file mode 100644 index 463e87073f85..000000000000 --- a/pkgs/by-name/gd/gdome2/package.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - glib, - libxml2, - gtk-doc, -}: - -let - pname = "gdome2"; - version = "0.8.1"; -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://gdome2.cs.unibo.it/tarball/${pname}-${version}.tar.gz"; - sha256 = "0hyms5s3hziajp3qbwdwqjc2xcyhb783damqg8wxjpwfxyi81fzl"; - }; - - hardeningDisable = [ "format" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - glib - libxml2 - gtk-doc - ]; - propagatedBuildInputs = [ - glib - libxml2 - ]; - patches = [ - ./xml-document.patch - ./fno-common.patch - ]; - - meta = with lib; { - homepage = "http://gdome2.cs.unibo.it/"; - description = "DOM C library developed for the Gnome project"; - mainProgram = "gdome-config"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ - prikhi - roconnor - ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/gd/gdome2/xml-document.patch b/pkgs/by-name/gd/gdome2/xml-document.patch deleted file mode 100644 index 7567d1049fc0..000000000000 --- a/pkgs/by-name/gd/gdome2/xml-document.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libgdome/gdomecore/gdome-xml-documentt.c 2003-07-13 14:47:54.000000000 +0400 -+++ b/libgdome/gdomecore/gdome-xml-documentt.c 2013-07-02 14:09:18.304613703 +0400 -@@ -342,7 +342,7 @@ - } - xmlNodeDumpOutput (out_buff, NULL, (xmlNode *)is, 0, 0, NULL); - xmlOutputBufferFlush(out_buff); -- ret = g_strndup (out_buff->buffer->content, out_buff->buffer->use); -+ ret = g_strndup (xmlBufContent(out_buff), xmlBufUse(out_buff)); - (void)xmlOutputBufferClose(out_buff); - - return gdome_xml_str_mkref_own (ret); diff --git a/pkgs/by-name/wo/workrave/package.nix b/pkgs/by-name/wo/workrave/package.nix index 8394c19a0b9f..8f1322c323e9 100644 --- a/pkgs/by-name/wo/workrave/package.nix +++ b/pkgs/by-name/wo/workrave/package.nix @@ -25,7 +25,6 @@ cairomm, dbus, dbus-glib, - gdome2, gst_all_1, libsigcxx, boost, @@ -71,7 +70,6 @@ stdenv.mkDerivation rec { cairomm dbus dbus-glib - gdome2 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a368b2933e36..4dc915cde728 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -438,6 +438,7 @@ mapAliases { gcj = gcj6; # Added 2024-09-13 gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15 + gdome2 = throw "'gdome2' has been removed from nixpkgs, as it is umaintained and obsolete"; # Added 2024-12-29 geos_3_11 = throw "geos_3_11 has been removed from nixpgks. Please use a more recent 'geos' instead."; gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11