From e33586bdacc060dbb5f53853a95025060250c159 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Tue, 27 May 2025 14:07:48 +0200 Subject: [PATCH 1/8] updfparser: Update src URL --- pkgs/by-name/up/updfparser/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/up/updfparser/package.nix b/pkgs/by-name/up/updfparser/package.nix index 93f6143964b0..7e0ed9efd053 100644 --- a/pkgs/by-name/up/updfparser/package.nix +++ b/pkgs/by-name/up/updfparser/package.nix @@ -10,9 +10,8 @@ stdenv.mkDerivation rec { rev = "c5ce75b9eea8ebb2746b13eeb0f335813c615115"; src = fetchzip { - url = "https://indefero.soutade.fr/p/updfparser/source/download/${rev}/"; hash = "sha256-RT7mvu43Izp0rHhKq4wR4kt0TDfzHvB2NGMR+fxO5UM="; - extension = "zip"; + url = "https://forge.soutade.fr/soutade/updfparser/archive/${rev}.tar.gz"; }; makeFlags = [ From 1622902267ec658a71a151799d1f237d463fcbde Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Tue, 27 May 2025 14:12:14 +0200 Subject: [PATCH 2/8] updfparser: unstable-2023-08-08 -> unstable-2023-03-24 --- pkgs/by-name/up/updfparser/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/up/updfparser/package.nix b/pkgs/by-name/up/updfparser/package.nix index 7e0ed9efd053..4ead9b3cdb9a 100644 --- a/pkgs/by-name/up/updfparser/package.nix +++ b/pkgs/by-name/up/updfparser/package.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { name = "updfparser"; - version = "unstable-2023-08-08"; - rev = "c5ce75b9eea8ebb2746b13eeb0f335813c615115"; + version = "unstable-2024-03-24"; + rev = "6060d123441a06df699eb275ae5ffdd50409b8f3"; src = fetchzip { - hash = "sha256-RT7mvu43Izp0rHhKq4wR4kt0TDfzHvB2NGMR+fxO5UM="; url = "https://forge.soutade.fr/soutade/updfparser/archive/${rev}.tar.gz"; + hash = "sha256-HD73WGZ4e/3T7vQmwU/lRADtvsInFG62uqvJmF773Rk="; }; makeFlags = [ From 6325ef64df2065516dc7f1479298214c2fa3bae3 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Tue, 27 May 2025 14:17:36 +0200 Subject: [PATCH 3/8] libgourou: Update src URL --- pkgs/by-name/li/libgourou/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libgourou/package.nix b/pkgs/by-name/li/libgourou/package.nix index cc669b512030..7956656e104c 100644 --- a/pkgs/by-name/li/libgourou/package.nix +++ b/pkgs/by-name/li/libgourou/package.nix @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { version = "0.8.2"; src = fetchzip { - url = "https://indefero.soutade.fr/p/libgourou/source/download/v${version}/"; sha256 = "sha256-adkrvBCgN07Ir+J3JFCy+X9p9609lj1w8nElrlHXTxc"; - extension = "zip"; + url = "https://forge.soutade.fr/soutade/libgourou/archive/v${version}.tar.gz"; }; postPatch = '' From 64aa7ba7f0721c42d67aa55e2066e8d1d808772d Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Tue, 27 May 2025 14:17:55 +0200 Subject: [PATCH 4/8] libgourou: 0.8.2 -> 0.8.7 --- pkgs/by-name/li/libgourou/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libgourou/package.nix b/pkgs/by-name/li/libgourou/package.nix index 7956656e104c..f55f52edd4b4 100644 --- a/pkgs/by-name/li/libgourou/package.nix +++ b/pkgs/by-name/li/libgourou/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libgourou"; - version = "0.8.2"; + version = "0.8.7"; src = fetchzip { - sha256 = "sha256-adkrvBCgN07Ir+J3JFCy+X9p9609lj1w8nElrlHXTxc"; url = "https://forge.soutade.fr/soutade/libgourou/archive/v${version}.tar.gz"; + hash = "sha256-Tkft/pe3lH07pmyVibTEutIIvconUWDH1ZVN3qV4sSY="; }; postPatch = '' From 78e4af9c32fe5c95c8b7bb9d2395b9b17d33474b Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Mon, 2 Jun 2025 11:49:34 +0200 Subject: [PATCH 5/8] libgourou: Refactor to use fetchFromGitea, replace rec with finalAttrs --- pkgs/by-name/li/libgourou/package.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/libgourou/package.nix b/pkgs/by-name/li/libgourou/package.nix index f55f52edd4b4..59fc3f7ded25 100644 --- a/pkgs/by-name/li/libgourou/package.nix +++ b/pkgs/by-name/li/libgourou/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchzip, + fetchFromGitea, pugixml, updfparser, curl, @@ -10,12 +10,15 @@ installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgourou"; version = "0.8.7"; - src = fetchzip { - url = "https://forge.soutade.fr/soutade/libgourou/archive/v${version}.tar.gz"; + src = fetchFromGitea { + domain = "forge.soutade.fr"; + owner = "soutade"; + repo = "libgourou"; + tag = "v${finalAttrs.version}"; hash = "sha256-Tkft/pe3lH07pmyVibTEutIIvconUWDH1ZVN3qV4sSY="; }; @@ -46,7 +49,7 @@ stdenv.mkDerivation rec { runHook preInstall install -Dt $out/include include/libgourou*.h install -Dt $out/lib libgourou.so - install -Dt $out/lib libgourou.so.${version} + install -Dt $out/lib libgourou.so.${finalAttrs.version} install -Dt $out/lib libgourou.a install -Dt $out/bin utils/acsmdownloader install -Dt $out/bin utils/adept_{activate,loan_mgt,remove} @@ -62,4 +65,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; broken = stdenv.hostPlatform.isDarwin; }; -} +}) From 7219c97de67d17de1c6755d27f5347cc36aa772c Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Mon, 2 Jun 2025 11:51:19 +0200 Subject: [PATCH 6/8] libgourou: Update homepage URL --- pkgs/by-name/li/libgourou/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libgourou/package.nix b/pkgs/by-name/li/libgourou/package.nix index 59fc3f7ded25..b790d56deb29 100644 --- a/pkgs/by-name/li/libgourou/package.nix +++ b/pkgs/by-name/li/libgourou/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Implementation of Adobe's ADEPT protocol for ePub/PDF DRM"; - homepage = "https://indefero.soutade.fr/p/libgourou"; + homepage = "https://forge.soutade.fr/soutade/libgourou"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ autumnal ]; platforms = platforms.all; From c8fc4ffd1d5ca5b74e03b466c9f348f8f2bb391c Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Mon, 2 Jun 2025 11:51:50 +0200 Subject: [PATCH 7/8] updfparser: Refactor to use fetchFromGitea, replace rec with finalAttrs --- pkgs/by-name/up/updfparser/package.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/up/updfparser/package.nix b/pkgs/by-name/up/updfparser/package.nix index 4ead9b3cdb9a..c82d453e7a81 100644 --- a/pkgs/by-name/up/updfparser/package.nix +++ b/pkgs/by-name/up/updfparser/package.nix @@ -1,16 +1,19 @@ { lib, stdenv, - fetchzip, + fetchFromGitea, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { name = "updfparser"; - version = "unstable-2024-03-24"; + version = "0-unstable-2024-03-24"; rev = "6060d123441a06df699eb275ae5ffdd50409b8f3"; - src = fetchzip { - url = "https://forge.soutade.fr/soutade/updfparser/archive/${rev}.tar.gz"; + src = fetchFromGitea { + inherit (finalAttrs) rev; + domain = "forge.soutade.fr"; + owner = "soutade"; + repo = "updfparser"; hash = "sha256-HD73WGZ4e/3T7vQmwU/lRADtvsInFG62uqvJmF773Rk="; }; @@ -34,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ autumnal ]; platforms = platforms.all; }; -} +}) From 6d6550b6c496973cc28b79af5e329ab19389c8ab Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Mon, 2 Jun 2025 11:52:45 +0200 Subject: [PATCH 8/8] updfparser: Update homepage URL --- pkgs/by-name/up/updfparser/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/up/updfparser/package.nix b/pkgs/by-name/up/updfparser/package.nix index c82d453e7a81..d90095be538b 100644 --- a/pkgs/by-name/up/updfparser/package.nix +++ b/pkgs/by-name/up/updfparser/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Very simple PDF parser"; - homepage = "https://indefero.soutade.fr/p/updfparser"; + homepage = "https://forge.soutade.fr/soutade/updfparser"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ autumnal ]; platforms = platforms.all;