summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@secure.mailbox.org>2017-09-11 05:09:57 -0500
committerGitHub <noreply@github.com>2017-09-11 05:09:57 -0500
commita7ebdf137159c5c084bbb603e7c70364e7843dba (patch)
treefb13fa1640b0c4d2bb89f398420662567e5f5cc4
parent6299659da65649302734b65333106933d06f98c6 (diff)
parent01b4c3c13b9e17c3074e62e683f1da84ee458c5b (diff)
Merge pull request #29129 from jokogr/u/sddm-0.15.0
sddm: 0.14.0 -> 0.15.0
-rw-r--r--pkgs/applications/display-managers/sddm/default.nix13
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 920e5ba9abd29..97f05f6a433c0 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -5,13 +5,7 @@
 
 let
 
-  version = "0.14.0";
-
-  /* Fix display of user avatars. */
-  patchFixUserAvatars = fetchpatch {
-    url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch;
-    sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms";
-  };
+  version = "0.15.0";
 
 in mkDerivation rec {
   name = "sddm-${version}";
@@ -20,12 +14,11 @@ in mkDerivation rec {
     owner = "sddm";
     repo = "sddm";
     rev = "v${version}";
-    sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj";
+    sha256 = "1wissgl7wd7fblq8ghz8n2fr6wqip7h88p9fiarfpvi1918fgng8";
   };
 
   patches =
-    copyPathsToStore (lib.readPathsFromFile ./. ./series)
-    ++ [ patchFixUserAvatars ];
+    copyPathsToStore (lib.readPathsFromFile ./. ./series);
 
   postPatch =
     # Module Qt5::Test must be included in `find_package` before it is used.