From edb5aee09b39368d36f80130684f3ed5d507a56f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 12 Nov 2024 16:44:33 +0100 Subject: [PATCH] i3: fetch source from github --- .../window-managers/i3/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 6f233314e9c1..e9d44fae06a0 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,5 +1,5 @@ { - fetchurl, + fetchFromGitHub, lib, stdenv, pkg-config, @@ -33,15 +33,18 @@ docbook_xsl, findXMLCatalogs, nixosTests, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "i3"; version = "4.24"; - src = fetchurl { - url = "https://i3wm.org/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-W679Dl548br7eshd7qQrzTy/5l8SeaqW9+SWYWN6yYE="; + src = fetchFromGitHub { + owner = "i3"; + repo = "i3"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-2tuhfB/SMN+osCBfZtw/yDPhNNEhBH4Qo6dexpqVWYk="; }; nativeBuildInputs = [ @@ -141,8 +144,11 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; - passthru.tests = { - inherit (nixosTests) i3wm; + passthru = { + updateScript = nix-update-script { }; + tests = { + inherit (nixosTests) i3wm; + }; }; meta = {