From 21da4a7f0eb55467ff5887e3d0e258d26deab16d Mon Sep 17 00:00:00 2001 From: atagen Date: Sat, 18 Jan 2025 12:43:56 +1100 Subject: [PATCH 1/3] sirula: 1.0.0-unstable -> 1.1.0 update to 1.1.0, switch to useFetchCargoVendor, fix lib antipatterns --- pkgs/by-name/si/sirula/package.nix | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/si/sirula/package.nix b/pkgs/by-name/si/sirula/package.nix index 0088cd00b1ba..abdef781f0a9 100644 --- a/pkgs/by-name/si/sirula/package.nix +++ b/pkgs/by-name/si/sirula/package.nix @@ -9,21 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "sirula"; - version = "1.0.0-unstable-2023-09-02"; + version = "1.1.0"; src = fetchFromGitHub { owner = "DorianRudolph"; - repo = pname; - rev = "b15efe85ef1fe50849a33e5919d53d05f4f66090"; - hash = "sha256-S0WbqY49nKaBUMWfgDKZxFLJuk7uFcnTfV8s86V0Zxs="; + repo = "sirula"; + tag = "v${version}"; + hash = "sha256-rBaH2cIIaRoaw8Os60s4MknZywzDuGLagJiAvEYU4m8="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "osstrtools-0.2.2" = "sha256-Co4pcikfN4vtIVK7ZsRGCWMAhMJWNNVZe/AdN1nMlmQ="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-7trHMGTWtf4IT7efyKIXM7n4x6j7n2V3I7ZXSSwvzys="; nativeBuildInputs = [ pkg-config ]; @@ -32,11 +28,11 @@ rustPlatform.buildRustPackage rec { gtk-layer-shell ]; - meta = with lib; { + meta = { description = "Simple app launcher for wayland written in rust"; homepage = "https://github.com/DorianRudolph/sirula"; - license = with licenses; [ gpl3Plus ]; + license = [ lib.licenses.gpl3Plus ]; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } From 2d2b75968dee68b734bf39576e98ee614164096c Mon Sep 17 00:00:00 2001 From: atagen Date: Sat, 18 Jan 2025 12:47:45 +1100 Subject: [PATCH 2/3] sirula: add update script --- pkgs/by-name/si/sirula/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/si/sirula/package.nix b/pkgs/by-name/si/sirula/package.nix index abdef781f0a9..9b804d8c1328 100644 --- a/pkgs/by-name/si/sirula/package.nix +++ b/pkgs/by-name/si/sirula/package.nix @@ -1,4 +1,5 @@ { + nix-update-script, lib, fetchFromGitHub, rustPlatform, @@ -28,6 +29,8 @@ rustPlatform.buildRustPackage rec { gtk-layer-shell ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Simple app launcher for wayland written in rust"; homepage = "https://github.com/DorianRudolph/sirula"; From e22fb5eb86f5266f23c38c22b09c16129636b07a Mon Sep 17 00:00:00 2001 From: atagen Date: Sat, 18 Jan 2025 12:48:04 +1100 Subject: [PATCH 3/3] sirula: add maintainer atagen --- pkgs/by-name/si/sirula/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/si/sirula/package.nix b/pkgs/by-name/si/sirula/package.nix index 9b804d8c1328..38ccc847fdf5 100644 --- a/pkgs/by-name/si/sirula/package.nix +++ b/pkgs/by-name/si/sirula/package.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { description = "Simple app launcher for wayland written in rust"; homepage = "https://github.com/DorianRudolph/sirula"; license = [ lib.licenses.gpl3Plus ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.atagen ]; platforms = lib.platforms.linux; }; }