diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-11-18 13:05:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-18 13:05:22 +0100 |
commit | 9635686059656b6461c534f435404335f9a9a6c9 (patch) | |
tree | 31da4e16dd241ce9128dbe5ae8253633619bc40b /pkgs/applications | |
parent | ad0958bf7df05b97d3d09e802e3698076afa95fa (diff) | |
parent | 86f2d455cb792cea24da7fe076c5a3cabc744eed (diff) |
Merge pull request #104074 from jtojnar/more-gnome-updates
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/backup/deja-dup/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix | 21 |
2 files changed, 7 insertions, 18 deletions
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index c65d5bbc09aa..e4898baca54e 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "deja-dup"; - version = "42.4"; + version = "42.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "c4E6mHYVb8TWVTVlmHidcLa9ebHJ27iStsNNLJhY8vY="; + sha256 = "1xgsd9a9y36lv6f2vjw2nxi9zj2zl1gv6rcyzkqajf91vgmxwf8k"; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index a6e74443f291..bc0657f7b1a7 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchurl -, fetchpatch -, pkgconfig +, pkg-config , dconf , telepathy-glib , python3 @@ -11,31 +10,21 @@ stdenv.mkDerivation rec { pname = "telepathy-mission-control"; - version = "5.16.5"; + version = "5.16.6"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz"; - sha256 = "00xxv38cfdirnfvgyd56m60j0nkmsv5fz6p2ydyzsychicxl6ssc"; + sha256 = "0ibs575pfr0wmhfcw6ln6iz7gw2y45l3bah11rksf6g9jlwsxy1d"; }; - patches = [ - # Fix property name (new GLib is stricter) - # https://github.com/NixOS/nixpkgs/pull/81626#issuecomment-601494939 - # https://gitlab.gnome.org/GNOME/polari/-/merge_requests/141 - (fetchpatch { - url = "https://github.com/TelepathyIM/telepathy-mission-control/commit/d8dab08fe8db137c6bbd8bbdc3d9b01d98c48910.patch"; - sha256 = "1rchl0lyfj5c3yhl63spzvx9b6ny3967dlq4hgp9qhqn0zjra3sb"; - }) - ]; - buildInputs = [ python3 ]; # ToDo: optional stuff missing nativeBuildInputs = [ - pkgconfig + pkg-config libxslt makeWrapper ]; @@ -57,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An account manager and channel dispatcher for the Telepathy framework"; homepage = "https://telepathy.freedesktop.org/components/telepathy-mission-control/"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; |