From 16098eb53eefb2d9d4e46c309bc6f9447fb535c1 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Wed, 11 Jun 2025 19:22:25 +0200 Subject: [PATCH 1/3] fractal: 11.1 -> 11.2 --- pkgs/by-name/fr/fractal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix index 29dd523723e3..6f61d6172d59 100644 --- a/pkgs/by-name/fr/fractal/package.nix +++ b/pkgs/by-name/fr/fractal/package.nix @@ -30,19 +30,19 @@ stdenv.mkDerivation rec { pname = "fractal"; - version = "11.1"; + version = "11.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "fractal"; tag = version; - hash = "sha256-G8vJvoOVVQ9cPnwoxNoKrQwGNxnA78HG285iSy6lSjk="; + hash = "sha256-UE0TRC9DeP+fl85fzuQ8/3ioIPdeSqsJWnW1olB1gmo="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-yxo1ZSOqjh2lrdmiCrKQGFHpSPRgye64rFNZpghZqI0="; + hash = "sha256-I+1pGZWxn9Q/CL8D6VxsaO3H4EdBek4wyykvNgCNRZI="; }; patches = [ From 48d6ed970c0481a0b75a096e2e165a2fb4f98d58 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Wed, 11 Jun 2025 19:15:29 +0200 Subject: [PATCH 2/3] fractal: set meta.homepage correctly --- pkgs/by-name/fr/fractal/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix index 6f61d6172d59..af8963ff3b6f 100644 --- a/pkgs/by-name/fr/fractal/package.nix +++ b/pkgs/by-name/fr/fractal/package.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { meta = { description = "Matrix group messaging app"; - homepage = "https://gitlab.gnome.org/GNOME/fractal"; + homepage = "https://gitlab.gnome.org/World/fractal"; changelog = "https://gitlab.gnome.org/World/fractal/-/releases/${version}"; license = lib.licenses.gpl3Plus; teams = [ lib.teams.gnome ]; From c755f940520f19f02dbe1fb724e9c60d6173254c Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Wed, 11 Jun 2025 20:27:10 +0200 Subject: [PATCH 3/3] fractal: `finalAttrs` -> `rec` --- pkgs/by-name/fr/fractal/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix index af8963ff3b6f..8b8fc47635d4 100644 --- a/pkgs/by-name/fr/fractal/package.nix +++ b/pkgs/by-name/fr/fractal/package.nix @@ -28,7 +28,7 @@ glycin-loaders, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fractal"; version = "11.2"; @@ -36,12 +36,12 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "fractal"; - tag = version; + tag = finalAttrs.version; hash = "sha256-UE0TRC9DeP+fl85fzuQ8/3ioIPdeSqsJWnW1olB1gmo="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; + inherit (finalAttrs) src; hash = "sha256-I+1pGZWxn9Q/CL8D6VxsaO3H4EdBek4wyykvNgCNRZI="; }; @@ -110,10 +110,10 @@ stdenv.mkDerivation rec { meta = { description = "Matrix group messaging app"; homepage = "https://gitlab.gnome.org/World/fractal"; - changelog = "https://gitlab.gnome.org/World/fractal/-/releases/${version}"; + changelog = "https://gitlab.gnome.org/World/fractal/-/releases/${finalAttrs.version}"; license = lib.licenses.gpl3Plus; teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; mainProgram = "fractal"; }; -} +})