From 73450ebccf101dc7263106057af6fa90b8737e7a Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sun, 24 Nov 2024 15:22:54 +0100 Subject: [PATCH 1/2] lan-mouse: reformat --- pkgs/by-name/la/lan-mouse/package.nix | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix index b9bf9b2ddb02..a6f9e88d1c9e 100644 --- a/pkgs/by-name/la/lan-mouse/package.nix +++ b/pkgs/by-name/la/lan-mouse/package.nix @@ -1,15 +1,16 @@ -{ stdenv -, rustPlatform -, fetchFromGitHub -, lib -, darwin -, glib -, gtk4 -, libadwaita -, libX11 -, libXtst -, pkg-config -, wrapGAppsHook4 +{ + stdenv, + rustPlatform, + fetchFromGitHub, + lib, + darwin, + glib, + gtk4, + libadwaita, + libX11, + libXtst, + pkg-config, + wrapGAppsHook4, }: rustPlatform.buildRustPackage rec { @@ -35,8 +36,7 @@ rustPlatform.buildRustPackage rec { libadwaita libX11 libXtst - ] - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.CoreGraphics; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.CoreGraphics; cargoHash = "sha256-pDdpmZPaClU8KjFHO7v3FDQp9D83GQN+SnFg53q2fjs="; From 2fe2ad56a458ce26027ca86a2f66b615022827be Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sun, 24 Nov 2024 15:23:38 +0100 Subject: [PATCH 2/2] =?UTF-8?q?lan-mouse:=200.9.1=20=E2=86=92=200.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Diff: https://github.com/feschber/lan-mouse/compare/v0.9.1...v0.10.0 --- pkgs/by-name/la/lan-mouse/package.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix index a6f9e88d1c9e..3fb188f666fb 100644 --- a/pkgs/by-name/la/lan-mouse/package.nix +++ b/pkgs/by-name/la/lan-mouse/package.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, lib, - darwin, glib, gtk4, libadwaita, @@ -15,17 +14,27 @@ rustPlatform.buildRustPackage rec { pname = "lan-mouse"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "feschber"; repo = "lan-mouse"; rev = "v${version}"; - hash = "sha256-BadpYZnZJcifhe916/X+OGvTQ4FQeTLnoy0gP/i5cLA="; + hash = "sha256-ofiNgJbmf35pfRvZB3ZmMkCJuM7yYgNL+Dd5mZZqyNk="; + }; + + # lan-mouse uses `git` to determine the version at build time and + # has Cargo set the `GIT_DESCRIBE` environment variable. To improve + # build reproducibility, we define the variable based on the package + # version instead. + prePatch = '' + rm build.rs + ''; + env = { + GIT_DESCRIBE = "${version}-nixpkgs"; }; nativeBuildInputs = [ - glib # needed in both {b,nativeB}uildInptus pkg-config wrapGAppsHook4 ]; @@ -36,9 +45,9 @@ rustPlatform.buildRustPackage rec { libadwaita libX11 libXtst - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.CoreGraphics; + ]; - cargoHash = "sha256-pDdpmZPaClU8KjFHO7v3FDQp9D83GQN+SnFg53q2fjs="; + cargoHash = "sha256-RP3Jw0b2h8KJlVdd8X/AkkmGdRlIfG2tkPtUKohDxvA="; meta = { description = "Software KVM switch for sharing a mouse and keyboard with multiple hosts through the network";