From 1c62bcd50ca9e2c5e31938f1af053af201bf02f8 Mon Sep 17 00:00:00 2001 From: colin Date: Tue, 1 Nov 2022 01:15:36 -0700 Subject: [PATCH] lightdm-mobile-greeter: update git rev & remove the Cargo.lock patch Raatty was kind enough to upstream the Cargo.lock fix. --- .../cargo_lock-fix_lightdm_rs_url.patch | 28 ------------------- pkgs/lightdm-mobile-greeter/default.nix | 14 ++++------ 2 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 pkgs/lightdm-mobile-greeter/cargo_lock-fix_lightdm_rs_url.patch diff --git a/pkgs/lightdm-mobile-greeter/cargo_lock-fix_lightdm_rs_url.patch b/pkgs/lightdm-mobile-greeter/cargo_lock-fix_lightdm_rs_url.patch deleted file mode 100644 index 9a29cf43..00000000 --- a/pkgs/lightdm-mobile-greeter/cargo_lock-fix_lightdm_rs_url.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit c2a3a5eff2edc95108a21fc02c420a8aaa19accd -Author: colin -Date: Tue Oct 25 20:59:20 2022 -0700 - - Cargo.lock: update lightdm-rs URLs - -diff --git a/Cargo.lock b/Cargo.lock -index 1051644..72d09e6 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -362,7 +362,7 @@ dependencies = [ - [[package]] - name = "light-dm-sys" - version = "0.0.1" --source = "git+https://raatty.club:3000/raatty/lightdm-rs.git#a3c669583bb932e2b25372048b1e9dbda1f10e11" -+source = "git+https://git.raatty.club/raatty/lightdm-rs.git#a3c669583bb932e2b25372048b1e9dbda1f10e11" - dependencies = [ - "gio-sys", - "glib-sys", -@@ -374,7 +374,7 @@ dependencies = [ - [[package]] - name = "lightdm" - version = "0.1.0" --source = "git+https://raatty.club:3000/raatty/lightdm-rs.git#a3c669583bb932e2b25372048b1e9dbda1f10e11" -+source = "git+https://git.raatty.club/raatty/lightdm-rs.git#a3c669583bb932e2b25372048b1e9dbda1f10e11" - dependencies = [ - "gio", - "gio-sys", diff --git a/pkgs/lightdm-mobile-greeter/default.nix b/pkgs/lightdm-mobile-greeter/default.nix index d8abc470..6580b45a 100644 --- a/pkgs/lightdm-mobile-greeter/default.nix +++ b/pkgs/lightdm-mobile-greeter/default.nix @@ -11,20 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "lightdm-mobile-greeter"; - version = "6"; + version = "2022-10-30"; src = fetchFromGitea { domain = "git.raatty.club"; owner = "raatty"; repo = "lightdm-mobile-greeter"; - rev = "${version}"; - hash = "sha256-uqsYOHRCOmd3tpJdndZFQ/tznZ660NhB+gE2154kJuM="; + rev = "8c8d6dfce62799307320c8c5a1f0dd5c8c18e4d3"; + hash = "sha256-SrAR2+An3BN/doFl/s8PcYZMUHLfVPXKZOo6ndO60nY="; }; - cargoHash = "sha256-JV8NQdZAG4EetRHwbi0dD0uIOUkn5hvzry+5WB7TCO4="; - - cargoPatches = [ - ./cargo_lock-fix_lightdm_rs_url.patch - ]; + cargoHash = "sha256-NZ0jOkEBNa5oOydfyKm0XQB/vkAvBv9wHBbnM9egQFQ="; buildInputs = [ gtk3 @@ -49,7 +45,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A simple log in screen for use on touch screens."; - homepage = "https://git.uninsane.org/colin/lightdm-mobile-greeter"; + homepage = "https://git.raatty.club/raatty/lightdm-mobile-greeter"; maintainers = with maintainers; [ colinsane ]; platforms = platforms.linux; license = licenses.mit;