about summary refs log tree commit diff
path: root/pkgs/applications/display-managers
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-08-01 14:04:05 +0800
committerBobby Rong <rjl931189261@126.com>2022-08-01 14:23:23 +0800
commit2d37d649bc2e26deb5384770255d99391de2ef24 (patch)
treed40769a9a67300ffcf2694b3624ad13e0c489a20 /pkgs/applications/display-managers
parent2f758fd347588ff3f61e1eb36702963bd2e213ab (diff)
lightdm: 1.30.0 -> 1.32.0
https://github.com/canonical/lightdm/compare/1.30.0...1.32.0
Diffstat (limited to 'pkgs/applications/display-managers')
-rw-r--r--pkgs/applications/display-managers/lightdm/default.nix20
1 files changed, 4 insertions, 16 deletions
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index fa49e761753b0..34e890f38726b 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -33,15 +33,15 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "lightdm";
-  version = "1.30.0";
+  version = "1.32.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchFromGitHub {
-    owner = "CanonicalLtd";
+    owner = "canonical";
     repo = pname;
     rev = version;
-    sha256 = "0i1yygmjbkdjnqdl9jn8zsa1mfs2l19qc4k2capd8q1ndhnjm2dx";
+    sha256 = "sha256-ttNlhWD0Ran4d3QvZ+PxbFbSUGMkfrRm+hJdQxIDJvM=";
   };
 
   nativeBuildInputs = [
@@ -77,18 +77,6 @@ stdenv.mkDerivation rec {
       sha256 = "06f7iabagrsiws2l75sx2jyljknr9js7ydn151p3qfi104d1541n";
     })
 
-    # Don't use etc/dbus-1/system.d
-    (fetchpatch {
-      url = "https://github.com/canonical/lightdm/commit/a99376f5f51aa147aaf81287d7ce70db76022c47.patch";
-      sha256 = "1zyx1qqajrmqcf9hbsapd39gmdanswd9l78rq7q6rdy4692il3yn";
-    })
-
-    # https://github.com/canonical/lightdm/pull/104
-    (fetchpatch {
-      url = "https://github.com/canonical/lightdm/commit/03f218981733e50d810767f9d04e42ee156f7feb.patch";
-      sha256 = "07w18m2gpk29z6ym4y3lzsmg5dk3ffn39sq6lac26ap7narf4ma7";
-    })
-
     # Hardcode plymouth to fix transitions.
     # For some reason it can't find `plymouth`
     # even when it's in PATH in environment.systemPackages.
@@ -134,7 +122,7 @@ stdenv.mkDerivation rec {
 
 
   meta = {
-    homepage = "https://github.com/CanonicalLtd/lightdm";
+    homepage = "https://github.com/canonical/lightdm";
     description = "A cross-desktop display manager";
     platforms = platforms.linux;
     license = licenses.gpl3;