diff --git a/pkgs/by-name/gp/gparted/package.nix b/pkgs/by-name/gp/gparted/package.nix index 2d5307de45f2..06d4651b4782 100644 --- a/pkgs/by-name/gp/gparted/package.nix +++ b/pkgs/by-name/gp/gparted/package.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "gparted"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { url = "mirror://sourceforge/gparted/gparted-${version}.tar.gz"; - sha256 = "sha256-m59Rs85JTdy1mlXhrmZ5wJQ2YE4zHb9aU21g3tbG6ls="; + sha256 = "sha256-hK47mXPkQ6IXXweqDcKs7q2xUB4PiVPOyDsOwzR7fVI="; }; # Tries to run `pkexec --version` to get version. @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { $out/share/polkit-1/actions/org.gnome.gparted.policy ''; - meta = with lib; { + meta = { description = "Graphical disk partitioning tool"; longDescription = '' GNOME Partition Editor for creating, reorganizing, and deleting disk @@ -104,8 +104,8 @@ stdenv.mkDerivation rec { while preserving the partition contents. ''; homepage = "https://gparted.org"; - license = licenses.gpl2Plus; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; mainProgram = "gparted"; }; } diff --git a/pkgs/by-name/gp/gparted/polkit.patch b/pkgs/by-name/gp/gparted/polkit.patch index a42ed785de94..b9162452d9a1 100644 --- a/pkgs/by-name/gp/gparted/polkit.patch +++ b/pkgs/by-name/gp/gparted/polkit.patch @@ -1,12 +1,11 @@ -diff -ru old/gparted-1.0.0/configure gparted-1.0.0/configure ---- old/gparted-1.0.0/configure 2019-05-29 12:02:13.000000000 -0400 -+++ gparted-1.0.0/configure 2019-08-08 18:09:52.792795781 -0400 -@@ -16145,7 +16145,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkexec >= $PKEXEC_REQUIRED_VERSION" >&5 - $as_echo_n "checking for pkexec >= $PKEXEC_REQUIRED_VERSION... " >&6; } +--- old/gparted-1.0.0/configure 2025-01-30 18:31:10.000000000 +0100 ++++ gparted-1.0.0/configure 2025-02-06 14:07:24.264733753 +0100 +@@ -17041,7 +17041,7 @@ + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pkexec >= $PKEXEC_REQUIRED_VERSION" >&5 + printf %s "checking for pkexec >= $PKEXEC_REQUIRED_VERSION... " >&6; } PKEXEC_REQUIRED_INT=`echo "$PKEXEC_REQUIRED_VERSION" | $AWK -F. '{print $1 * 10000 + $2}'` -PKEXEC_VERSION_OUTPUT=`pkexec --version 2> /dev/null` || +PKEXEC_VERSION_OUTPUT='pkexec version @polkit_version@' || - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 - $as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 + printf "%s\n" "not found" >&6; } if test "x$PKEXEC_VERSION_OUTPUT" != 'x'; then