From 661442fd0944edefc12a1bd045d4f89b0bbb845b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 19 Dec 2025 10:53:47 -0600 Subject: [PATCH] =?UTF-8?q?dee:=201.2.7+17.10.20170616-4ubuntu3=20?= =?UTF-8?q?=E2=86=92=201.2.7+17.10.20170616-8build1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dee/0001-Fix-build-with-Vala-0.54.patch | 29 ------------------- pkgs/by-name/de/dee/package.nix | 11 ++----- 2 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 pkgs/by-name/de/dee/0001-Fix-build-with-Vala-0.54.patch diff --git a/pkgs/by-name/de/dee/0001-Fix-build-with-Vala-0.54.patch b/pkgs/by-name/de/dee/0001-Fix-build-with-Vala-0.54.patch deleted file mode 100644 index 4ad8ec8ffc73..000000000000 --- a/pkgs/by-name/de/dee/0001-Fix-build-with-Vala-0.54.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7bc49f8edd9a49d675ee5b163ab61b405e2d0258 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar -Date: Thu, 7 Oct 2021 21:42:26 +0200 -Subject: [PATCH] Fix build with Vala 0.54 - -Vala codegen now emits constructor methods so we need to skip @new -so that we can use a custom one from our VAPI overrides. - -https://gitlab.gnome.org/GNOME/vala/-/commit/472765b90cd98c1a628975d20005c46352d665f8 ---- - vapi/Dee-1.0.metadata | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/vapi/Dee-1.0.metadata b/vapi/Dee-1.0.metadata -index 7e80de0..793ffd8 100644 ---- a/vapi/Dee-1.0.metadata -+++ b/vapi/Dee-1.0.metadata -@@ -1,6 +1,8 @@ - GListResultSet skip - GListResultSetClass skip - -+Filter -+ .new skip - FilterModel - .filter unowned - Model --- -2.33.0 - diff --git a/pkgs/by-name/de/dee/package.nix b/pkgs/by-name/de/dee/package.nix index 69ec8aa6c712..b8c0cb1c5c59 100644 --- a/pkgs/by-name/de/dee/package.nix +++ b/pkgs/by-name/de/dee/package.nix @@ -14,7 +14,7 @@ gtk-doc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dee"; version = "unstable-2017-06-16"; @@ -26,16 +26,11 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.launchpad.net/ubuntu/+source/dee"; - rev = "import/1.2.7+17.10.20170616-4ubuntu3"; - sha256 = "09blrdj7229vscp4mkg0fabmcvc6jdpamvblrq86rbky7j2nnwlk"; + rev = "applied/1.2.7+17.10.20170616-8build1"; + hash = "sha256-ttfppqb0t8cOhWaB97uyD9heVZKlBKYF2zD6yRwPyos="; }; patches = [ - "${src}/debian/patches/gtkdocize.patch" - "${src}/debian/patches/strict-prototype.patch" - "${src}/debian/patches/vapi-skip-properties.patch" - ./0001-Fix-build-with-Vala-0.54.patch - # Fixes glib 2.62 deprecations (fetchpatch { name = "dee-1.2.7-deprecated-g_type_class_add_private.patch";