Unverified Commit 9ff2e65e authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

Merge pull request #322324 from JohnRTitor/gnome-updates

GNOME updates 2024-06-25
parents 860772f4 5e80a8b3
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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 = [
+2 −2
Original line number Diff line number Diff line
@@ -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" ];
+43 −38
Original line number Diff line number Diff line
{ 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,11 +43,13 @@ stdenv.mkDerivation rec {
    libxml2
  ];

  buildInputs = [
  buildInputs =
    [
      openvpn
      networkmanager
      glib
  ] ++ lib.optionals withGnome [
    ]
    ++ lib.optionals withGnome [
      gtk3
      gtk4
      libsecret
@@ -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;
  };
}
})