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 = [ diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 22d774f086bc..381dc1582f92 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.48.0"; + version = "1.48.2"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - hash = "sha256-/IC5Qt444ylGjm/B37QKrWp40C3fa47DH5rMZGC4cj8="; + hash = "sha256-PZBxzGKWTd8OMfXQbwYD4XVouMlRFK4ndwNYGt1ahqE="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix index aeaf57a137a3..a7d7aa0732a0 100644 --- a/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -1,31 +1,32 @@ -{ 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.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="; + url = "mirror://gnome/sources/NetworkManager-openvpn/${lib.versions.majorMinor finalAttrs.version}/NetworkManager-openvpn-${finalAttrs.version}.tar.xz"; + sha256 = "kD/UwK69KqescMnYwr7Y35ImVdItdkUUQDVmrom36IY="; }; patches = [ @@ -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; }; -} +})