From 58565c90f4979f422ae79b1694d504b3ebeae304 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 25 Jun 2024 18:52:58 +0530 Subject: [PATCH 1/4] networkmanager: 1.46.0 -> 1.46.2 --- pkgs/tools/networking/networkmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 3c338ddc10cb..3e7f1011d7b4 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -60,11 +60,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.46.0"; + version = "1.46.2"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - hash = "sha256-ciZJ4lNiaTszQ3FHOAKnKbDsnuKDN1CWkF+GiAjnQGg="; + hash = "sha256-2x3VI7Dp69lo3jVXEk4te4ZDZFq1g69uWs9UyQQC6kc="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; From 234425f832e7e41e030aca237a188c8c34b23a11 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 25 Jun 2024 10:15:39 +0530 Subject: [PATCH 2/4] gnome.gnome-sudoku: 46.1 -> 46.2 (cherry picked from commit 206ac69058afffc0b50bc4687a8460c404ec1a8b) --- pkgs/desktops/gnome/games/gnome-sudoku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 4c84e0053b27..95941a08cb79 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "46.1"; + version = "46.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-ObtDHxCjH1Vq9im2aFyG1Qyknymhuv6GIZwgwVUQcKY="; + hash = "sha256-K8wzwpHkTVJEj9saRwqKsJ9TxCMEBPbuCoakir8qNGw="; }; nativeBuildInputs = [ From 783cebe2a8db7b6ca107901bf61b42bc9fa2fa93 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 25 Jun 2024 10:15:19 +0530 Subject: [PATCH 3/4] networkmanager-openvpn: 1.10.2 -> 1.12.0 (cherry picked from commit 5a9f212903b0daa5a481ca5dc7725bd80560aabc) --- pkgs/tools/networking/networkmanager/openvpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix index aeaf57a137a3..d968bf747d7f 100644 --- a/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "NetworkManager-openvpn"; - version = "1.10.2"; + version = "1.12.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager-openvpn/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "YvDyqHgiIbkj8hKsKo67wQAu/WqQ7pRdrUrftW0HbSE="; + sha256 = "kD/UwK69KqescMnYwr7Y35ImVdItdkUUQDVmrom36IY="; }; patches = [ From 740768f1cfc4d5476d96da5b843850c8af012109 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 25 Jun 2024 19:58:27 +0530 Subject: [PATCH 4/4] networkmanager-openvpn: move to finalAttrs, add homepage and changelog, format with nixfmt-rfc-style (cherry picked from commit 5e80a8b3dbcf710f2c6ad527336cc6635dd13770) --- .../networkmanager/openvpn/default.nix | 77 ++++++++++--------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix index d968bf747d7f..a7d7aa0732a0 100644 --- a/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -1,30 +1,31 @@ -{ stdenv -, lib -, fetchurl -, substituteAll -, openvpn -, gettext -, libxml2 -, pkg-config -, file -, networkmanager -, libsecret -, glib -, gtk3 -, gtk4 -, withGnome ? true -, gnome -, kmod -, libnma -, libnma-gtk4 +{ + stdenv, + lib, + fetchurl, + substituteAll, + openvpn, + gettext, + libxml2, + pkg-config, + file, + networkmanager, + libsecret, + glib, + gtk3, + gtk4, + withGnome ? true, + gnome, + kmod, + libnma, + libnma-gtk4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "NetworkManager-openvpn"; version = "1.12.0"; src = fetchurl { - url = "mirror://gnome/sources/NetworkManager-openvpn/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/NetworkManager-openvpn/${lib.versions.majorMinor finalAttrs.version}/NetworkManager-openvpn-${finalAttrs.version}.tar.xz"; sha256 = "kD/UwK69KqescMnYwr7Y35ImVdItdkUUQDVmrom36IY="; }; @@ -42,17 +43,19 @@ stdenv.mkDerivation rec { libxml2 ]; - buildInputs = [ - openvpn - networkmanager - glib - ] ++ lib.optionals withGnome [ - gtk3 - gtk4 - libsecret - libnma - libnma-gtk4 - ]; + buildInputs = + [ + openvpn + networkmanager + glib + ] + ++ lib.optionals withGnome [ + gtk3 + gtk4 + libsecret + libnma + libnma-gtk4 + ]; configureFlags = [ "--with-gnome=${if withGnome then "yes" else "no"}" @@ -63,16 +66,18 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "NetworkManager-openvpn"; attrPath = "networkmanager-openvpn"; versionPolicy = "odd-unstable"; }; networkManagerPlugin = "VPN/nm-openvpn-service.name"; }; - meta = with lib; { + meta = { description = "NetworkManager's OpenVPN plugin"; + homepage = "https://gitlab.gnome.org/GNOME/NetworkManager-openvpn"; + changelog = "https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/-/blob/main/NEWS"; inherit (networkmanager.meta) maintainers platforms; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; -} +})