From df74d3720a5a153595b19e51cf5bfa87bdef00ef Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sat, 16 Jun 2018 10:09:12 -0700 Subject: [PATCH] remmina: 1.2.0-rcgit.24 -> 1.2.30.1 The project moved to GitLab. Add @ryantm and @melsigl as maintainers. Melsigl from https://github.com/NixOS/nixpkgs/pull/41549 Closes #41549 --- maintainers/maintainer-list.nix | 5 +++++ .../networking/remote/remmina/default.nix | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 246a6d06cec..3480c634af8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2453,6 +2453,11 @@ github = "meisternu"; name = "Matt Miemiec"; }; + melsigl = { + email = "melanie.bianca.sigl@gmail.com"; + github = "melsigl"; + name = "Melanie B. Sigl"; + }; metabar = { email = "softs@metabarcoding.org"; name = "Celine Mercier"; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 6d32036def5..6b0ddb37120 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapGAppsHook +{ stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook , glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, spice-protocol, spice-gtk, epoxy, at-spi2-core -, openssl, gsettings-desktop-schemas +, openssl, gsettings-desktop-schemas, json-glib # The themes here are soft dependencies; only icons are missing without them. , hicolor-icon-theme, adwaita-icon-theme }: let - version = "1.2.0-rcgit.24"; + version = "1.2.30.1"; desktopItem = makeDesktopItem { name = "remmina"; @@ -25,11 +25,11 @@ let in stdenv.mkDerivation { name = "remmina-${version}"; - src = fetchFromGitHub { - owner = "FreeRDP"; + src = fetchFromGitLab { + owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "1x7kygl9a5nh7rf2gfrk0wwv23mbw7rrjms402l3zp1w53hrhwmg"; + sha256 = "1jz20yv84a8m9gm9fsz0jii8ag90v1scmbkkx9gk38ax5il7ilvn"; }; nativeBuildInputs = [ pkgconfig ]; @@ -39,7 +39,7 @@ in stdenv.mkDerivation { pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret spice-protocol spice-gtk epoxy at-spi2-core - openssl hicolor-icon-theme adwaita-icon-theme ]; + openssl hicolor-icon-theme adwaita-icon-theme json-glib ]; cmakeFlags = [ "-DWITH_VTE=OFF" @@ -64,9 +64,9 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { license = stdenv.lib.licenses.gpl2; - homepage = http://remmina.sourceforge.net/; + homepage = https://gitlab.com/Remmina/Remmina; description = "Remote desktop client written in GTK+"; - maintainers = []; + maintainers = with maintainers; [ melsigl ryantm ]; platforms = platforms.linux; }; }