Merge commit 'db88608d8c811a93b74c99cfa1224952afc78200'

Conflicts:
	nixpkgs/nixos/modules/config/update-users-groups.pl

1 files changed, 16 insertions, 8 deletions

diff --git a/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix b/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix
index ddab0046b660..0cc510ce7313 100644
--- a/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gtkdatabox/default.nix
@@ -1,22 +1,30 @@
-{ lib, stdenv, fetchurl, pkg-config, gtk2 }:
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, gtk3
+, pango
+, cairo
+}:
 
 stdenv.mkDerivation rec {
-  name = "gtkdatabox-0.9.3.1";
+  pname = "gtkdatabox";
+  version = "1.0.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gtkdatabox/${name}.tar.gz";
-    sha256 = "1rdxnjgh6v3yjqgsfmamyzpfxckzchps4kqvvz88nifmd7ckhjfh";
+    url = "mirror://sourceforge/gtkdatabox/${pname}-${version}.tar.gz";
+    sha256 = "1qykm551bx8j8pfgxs60l2vhpi8lv4r8va69zvn2594lchh71vlb";
   };
 
   nativeBuildInputs = [ pkg-config ];
 
-  propagatedBuildInputs = [ gtk2 ];
+  propagatedBuildInputs = [ gtk3 pango cairo ];
 
   meta = {
     description = "GTK widget for displaying large amounts of numerical data";
-
-    license = lib.licenses.lgpl2;
-
+    homepage = "https://gtkdatabox.sourceforge.io/";
+    license = lib.licenses.lgpl2Only;
     platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ yl3dy ];
   };
 }