colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #286993 from christoph-heiss/srht-updates-next-round

Browse Source 
sourcehut: update all components
This commit is contained in:
tomberek 2024-02-10 11:52:53 -05:00 committed by GitHub
commit 6e60c8526b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 136 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/sourcehut/default.nix
View File

@ -1370,5 +1370,5 @@ in
];
meta.doc = ./default.md;
meta.maintainers = with maintainers; [ tomberek nessdoor ];
meta.maintainers = with maintainers; [ tomberek nessdoor christoph-heiss ];
}

19
pkgs/applications/version-management/sourcehut/builds.nix
View File

@ -16,28 +16,29 @@
, setuptools
}:
let
version = "0.86.10";
version = "0.89.13";
gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.39"; };
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = "builds.sr.ht";
rev = version;
hash = "sha256-frwJgwJst2/NWd8VR0KbsVwm8JfWuekkY2oIIAdh3Fw=";
hash = "sha256-JpRVRzuHB6cgk/qW1j4zF8/K1xwz3J4nZhijmz5kVWU=";
};
buildsrht-api = buildGoModule ({
inherit src version;
pname = "buildsrht-api";
modRoot = "api";
vendorHash = "sha256-2khk7j22KON4MsuvFUNKSUpouJtVIOxE0hkh63iaxZ4=";
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.29"; });
vendorHash = "sha256-kTqoUfFEoNdDDzVNJ7XIbH7tbsl5MdBL+/UDHFv7D+A=";
} // gqlgen);
buildsrht-worker = buildGoModule {
buildsrht-worker = buildGoModule ({
inherit src version;
sourceRoot = "${src.name}/worker";
pname = "buildsrht-worker";
vendorHash = "sha256-obdaeRwMhuiCV2kVwDo1c+rU/hmsbiL1IgAf7AcIpoc=";
};
modRoot = "worker";
vendorHash = "sha256-kTqoUfFEoNdDDzVNJ7XIbH7tbsl5MdBL+/UDHFv7D+A=";
} // gqlgen);
in
buildPythonPackage rec {
inherit src version;
@ -88,6 +89,6 @@ buildPythonPackage rec {
homepage = "https://git.sr.ht/~sircmpwn/builds.sr.ht";
description = "Continuous integration service for the sr.ht network";
license = licenses.agpl3Only;
maintainers = with maintainers; [ eadwu ];
maintainers = with maintainers; [ eadwu christoph-heiss ];
};
}

6
pkgs/applications/version-management/sourcehut/core.nix
View File

@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "srht";
version = "0.69.15";
version = "0.71.5";
pyproject = true;
disabled = pythonOlder "3.7";
@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "~sircmpwn";
repo = "core.sr.ht";
rev = version;
sha256 = "sha256-T9yewweqnWL3IW5PHGyAcsIWCGn1ayK2rwrHVukYpgE=";
hash = "sha256-YIoKOiTi/9X4bSiG+GvnwzvKYhbfywrv/dTjxaJOOTQ=";
fetchSubmodules = true;
};
@ -89,6 +89,6 @@ buildPythonPackage rec {
homepage = "https://git.sr.ht/~sircmpwn/srht";
description = "Core modules for sr.ht";
license = licenses.bsd3;
maintainers = with maintainers; [ eadwu ];
maintainers = with maintainers; [ eadwu christoph-heiss ];
};
}

2
pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix
View File

@ -1,5 +1,5 @@
{ unzip
, gqlgenVersion ? "0.17.20"
, gqlgenVersion ? "0.17.42"
}:
{
overrideModAttrs = (_: {

36
pkgs/applications/version-management/sourcehut/git.nix
View File

@ -13,70 +13,70 @@
, setuptools
}:
let
version = "0.84.2";
version = "0.85.7";
gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; };
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = "git.sr.ht";
rev = version;
sha256 = "sha256-sAkTsQlWtNDQ5vAhA2EeOvuJcj9A6AG8pgDyIKtr65s=";
hash = "sha256-jkESrrVE+0O2g64zzPOpqhl8DpvmosQvuF0s6Xd+lbM=";
};
gitApi = buildGoModule ({
inherit src version;
pname = "gitsrht-api";
modRoot = "api";
vendorHash = "sha256-LAYp0zgosZnFEbtxzjuTH9++0lbxhACr705HqXJz3D0=";
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0=";
} // gqlgen);
gitDispatch = buildGoModule {
gitDispatch = buildGoModule ({
inherit src version;
pname = "gitsrht-dispatch";
modRoot = "gitsrht-dispatch";
vendorHash = "sha256-EDvSZ3/g0xDSohrsAIpNhk+F0yy8tbnTW/3tURTonMc=";
vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0=";
postPatch = ''
substituteInPlace gitsrht-dispatch/main.go \
--replace /var/log/gitsrht-dispatch /var/log/sourcehut/gitsrht-dispatch
'';
};
} // gqlgen);
gitKeys = buildGoModule {
gitKeys = buildGoModule ({
inherit src version;
pname = "gitsrht-keys";
modRoot = "gitsrht-keys";
vendorHash = "sha256-9pojS69HCKVHUceyOpGtv9ewcxFD4WsOVsEzkmWJkF4=";
vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0=";
postPatch = ''
substituteInPlace gitsrht-keys/main.go \
--replace /var/log/gitsrht-keys /var/log/sourcehut/gitsrht-keys
'';
};
} // gqlgen);
gitShell = buildGoModule {
gitShell = buildGoModule ({
inherit src version;
pname = "gitsrht-shell";
modRoot = "gitsrht-shell";
vendorHash = "sha256-WqfvSPuVsOHA//86u33atMfeA11+DJhjLmWy8Ivq0NI=";
vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0=";
postPatch = ''
substituteInPlace gitsrht-shell/main.go \
--replace /var/log/gitsrht-shell /var/log/sourcehut/gitsrht-shell
'';
};
} // gqlgen);
gitUpdateHook = buildGoModule {
gitUpdateHook = buildGoModule ({
inherit src version;
pname = "gitsrht-update-hook";
modRoot = "gitsrht-update-hook";
vendorHash = "sha256-Bc3yPabS2S+qiroHFKrtkII/CfzBDYQ6xWxKHAME+Tc=";
vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0=";
postPatch = ''
substituteInPlace gitsrht-update-hook/main.go \
--replace /var/log/gitsrht-update-hook /var/log/sourcehut/gitsrht-update-hook
'';
};
} // gqlgen);
in
buildPythonPackage rec {
inherit src version;
@ -122,6 +122,6 @@ buildPythonPackage rec {
homepage = "https://git.sr.ht/~sircmpwn/git.sr.ht";
description = "Git repository hosting service for the sr.ht network";
license = licenses.agpl3Only;
maintainers = with maintainers; [ eadwu ];
maintainers = with maintainers; [ eadwu christoph-heiss ];
};
}

31
pkgs/applications/version-management/sourcehut/hg.nix
View File

@ -13,9 +13,10 @@
, setuptools
}:
buildPythonPackage rec {
pname = "hgsrht";
let
version = "0.32.4";
gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.20"; };
pyproject = true;
disabled = pythonOlder "3.7";
@ -24,24 +25,16 @@ buildPythonPackage rec {
owner = "~sircmpwn";
repo = "hg.sr.ht";
rev = version;
sha256 = "mYkA44c9wy/Iy1h1lXkVpc9gN7rQXFm4T3YBlQ1Dj60=";
hash = "sha256-mYkA44c9wy/Iy1h1lXkVpc9gN7rQXFm4T3YBlQ1Dj60=";
vc = "hg";
};
postPatch = ''
substituteInPlace Makefile \
--replace "all: api hgsrht-keys" ""
substituteInPlace hgsrht-shell \
--replace /var/log/hgsrht-shell /var/log/sourcehut/hgsrht-shell
'';
hgsrht-api = buildGoModule ({
inherit src version;
pname = "hgsrht-api";
modRoot = "api";
vendorHash = "sha256-vuOYpnF3WjA6kOe9MVSuVMhJBQqCmIex+QUBJrP+VDs=";
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
} // gqlgen);
hgsrht-keys = buildGoModule {
inherit src version;
@ -54,6 +47,18 @@ buildPythonPackage rec {
--replace /var/log/hgsrht-keys /var/log/sourcehut/hgsrht-keys
'';
};
in
buildPythonPackage rec {
inherit src version;
pname = "hgsrht";
postPatch = ''
substituteInPlace Makefile \
--replace "all: api hgsrht-keys" ""
substituteInPlace hgsrht-shell \
--replace /var/log/hgsrht-shell /var/log/sourcehut/hgsrht-shell
'';
nativeBuildInputs = [
pip
@ -83,6 +88,6 @@ buildPythonPackage rec {
homepage = "https://git.sr.ht/~sircmpwn/hg.sr.ht";
description = "Mercurial repository hosting service for the sr.ht network";
license = licenses.agpl3Only;
maintainers = with maintainers; [ eadwu ];
maintainers = with maintainers; [ eadwu christoph-heiss ];
};
}

32
pkgs/applications/version-management/sourcehut/hub.nix
View File

@ -11,30 +11,34 @@
, unzip
}:
buildPythonPackage rec {
pname = "hubsrht";
version = "0.17.2";
pyproject = true;
disabled = pythonOlder "3.7";
let
version = "0.17.5";
gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.41"; };
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = "hub.sr.ht";
rev = version;
sha256 = "sha256-A+lvRsPz5EBnM0gB4PJuxSMpELZTrK14ORxDbTKPXWg=";
hash = "sha256-GbBxK3XE+Y6Jiap0Nxa8vk4Kv6IbcdSi4NN59AeKwjA=";
};
postPatch = ''
substituteInPlace Makefile --replace "all: api" ""
'';
hubsrht-api = buildGoModule ({
inherit src version;
pname = "hubsrht-api";
modRoot = "api";
vendorHash = "sha256-K5EmZ4U+xItTR85+SCwhwg5KUGLkKHo9Nr2pkvmJpfo=";
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
vendorHash = "sha256-wmuM0SxQbohTDaU8zmkw1TQTmqhOy1yAl1jRWk6TKL8=";
} // gqlgen);
in
buildPythonPackage rec {
inherit src version;
pname = "hubsrht";
pyproject = true;
disabled = pythonOlder "3.7";
postPatch = ''
substituteInPlace Makefile --replace "all: api" ""
'';
nativeBuildInputs = [
pip
@ -67,6 +71,6 @@ buildPythonPackage rec {
homepage = "https://git.sr.ht/~sircmpwn/hub.sr.ht";
description = "Project hub service for the sr.ht network";
license = licenses.agpl3Only;
maintainers = with maintainers; [ eadwu ];
maintainers = with maintainers; [ eadwu christoph-heiss ];
};
}

24
pkgs/applications/version-management/sourcehut/lists.nix
View File

@ -14,26 +14,30 @@
, setuptools
}:
buildPythonPackage rec {
pname = "listssrht";
version = "0.57.8";
pyproject = true;
disabled = pythonOlder "3.7";
let
version = "0.57.14";
gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.36"; };
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = "lists.sr.ht";
rev = version;
sha256 = "sha256-nQZRSTAyTWxcPHrRVCZ5TgcrNgrlxBFc1vRds0cQwA0=";
hash = "sha256-rzOxlat7Lbgt0Wl6vvnAC+fS3MynFVKFvVdIdxgA5e0=";
};
listssrht-api = buildGoModule ({
inherit src version;
pname = "listssrht-api";
modRoot = "api";
vendorHash = "sha256-E5Zzft9ANJT/nhhCuenZpdo3t9QYLmA+AyDyrbGectE=";
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
vendorHash = "sha256-OWgrPvXVlvJPcoABP0ZxKzoYFhU44j/I44sBBRbd6KY=";
} // gqlgen);
in
buildPythonPackage rec {
inherit src version;
pname = "listssrht";
pyproject = true;
disabled = pythonOlder "3.7";
postPatch = ''
substituteInPlace Makefile \
@ -69,6 +73,6 @@ buildPythonPackage rec {
homepage = "https://git.sr.ht/~sircmpwn/lists.sr.ht";
description = "Mailing list service for the sr.ht network";
license = licenses.agpl3Only;
maintainers = with maintainers; [ eadwu ];
maintainers = with maintainers; [ eadwu christoph-heiss ];
};
}

32
pkgs/applications/version-management/sourcehut/man.nix
View File

@ -11,30 +11,34 @@
, setuptools
}:
buildPythonPackage rec {
pname = "mansrht";
version = "0.16.1";
pyproject = true;
disabled = pythonOlder "3.7";
let
version = "0.16.3";
gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.36"; };
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = "man.sr.ht";
rev = version;
sha256 = "sha256-94G9/Kzt1gaQ2CaXtsJYCB6W5OTdn27XhVdpNJ9a5cE=";
hash = "sha256-o1A3LmwH6WgpFqjKyL3UTru9q7TgKdOdbKZfJHR6fCA=";
};
postPatch = ''
substituteInPlace Makefile --replace "all: api" ""
'';
mansrht-api = buildGoModule ({
inherit src version;
pname = "mansrht-api";
modRoot = "api";
vendorHash = "sha256-K5EmZ4U+xItTR85+SCwhwg5KUGLkKHo9Nr2pkvmJpfo=";
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
vendorHash = "sha256-6AzKWytdyuofCFaDEdeO24mv1mtpnQEJydrjVWGY2eU=";
} // gqlgen);
in
buildPythonPackage rec {
inherit src version;
pname = "mansrht";
pyproject = true;
disabled = pythonOlder "3.7";
postPatch = ''
substituteInPlace Makefile --replace "all: api" ""
'';
nativeBuildInputs = [
pip
@ -61,6 +65,6 @@ buildPythonPackage rec {
homepage = "https://git.sr.ht/~sircmpwn/man.sr.ht";
description = "Wiki service for the sr.ht network";
license = licenses.agpl3Only;
maintainers = with maintainers; [ eadwu ];
maintainers = with maintainers; [ eadwu christoph-heiss ];
};
}

12
pkgs/applications/version-management/sourcehut/meta.nix
View File

@ -18,22 +18,22 @@
, setuptools
}:
let
version = "0.64.8";
version = "0.68.5";
gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.36"; };
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = "meta.sr.ht";
rev = version;
hash = "sha256-eiNvoy68PvjZ3iwdeNPjsXJjxAXb2PMF1/HvJquWa/U=";
hash = "sha256-mwUqBzi7nMTZL7uwv7hBjGkO8U3krXXpvfUCaYHgHBU=";
};
metasrht-api = buildGoModule ({
inherit src version;
pname = "metasrht-api";
modRoot = "api";
vendorHash = "sha256-D3stDSb99uXze49kKZgGrAq5Zmg6hkIzIpsQKlnKVtE=";
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
vendorHash = "sha256-4T1xnHDjxsIyddA51exNwwz6ZWeuT7N8LBsCJ7c8sRI=";
} // gqlgen);
in
buildPythonPackage rec {
pname = "metasrht";
@ -80,6 +80,6 @@ buildPythonPackage rec {
homepage = "https://git.sr.ht/~sircmpwn/meta.sr.ht";
description = "Account management service for the sr.ht network";
license = licenses.agpl3Only;
maintainers = with maintainers; [ eadwu ];
maintainers = with maintainers; [ eadwu christoph-heiss ];
};
}

8
pkgs/applications/version-management/sourcehut/pages.nix
View File

@ -6,13 +6,13 @@
buildGoModule (rec {
pname = "pagessrht";
version = "0.13.0";
version = "0.15.4";
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = "pages.sr.ht";
rev = version;
sha256 = "sha256-vUN6c6cyhcLI8bKrFYKoxlBQ29VS/bowpSfBRmi47wg=";
hash = "sha256-3kdQVIL7xaIPu2elxj1k+4/y75bd+OKP5+VPSniF7w8=";
};
postPatch = ''
@ -20,7 +20,7 @@ buildGoModule (rec {
--replace "all: server" ""
'';
vendorHash = "sha256-GKuHkUqSVBLN3k8YsFtxdmdHFkqKo9YZqDk2GBmbfWo=";
vendorHash = "sha256-DP+6rxjiXzs0RbSuMD20XwO/+v7QXCNgXj2LxZ96lWE=";
postInstall = ''
mkdir -p $out/share/sql/
@ -31,7 +31,7 @@ buildGoModule (rec {
homepage = "https://git.sr.ht/~sircmpwn/pages.sr.ht";
description = "Web hosting service for the sr.ht network";
license = licenses.agpl3Only;
maintainers = with maintainers; [ eadwu ];
maintainers = with maintainers; [ eadwu christoph-heiss ];
};
# There is no ./loaders but this does not cause troubles
# to go generate

7
pkgs/applications/version-management/sourcehut/paste.nix
View File

@ -13,12 +13,13 @@
let
version = "0.15.2";
gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.20"; };
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = "paste.sr.ht";
rev = version;
sha256 = "sha256-ZZzcd14Jbo1MfET7B56X/fl9xWXpCJ8TuKrGVgJwZfQ=";
hash = "sha256-ZZzcd14Jbo1MfET7B56X/fl9xWXpCJ8TuKrGVgJwZfQ=";
};
pastesrht-api = buildGoModule ({
@ -26,7 +27,7 @@ let
pname = "pastesrht-api";
modRoot = "api";
vendorHash = "sha256-jiE73PUPSHxtWp7XBdH4mJw95pXmZjCl4tk2wQUf2M4=";
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
} // gqlgen);
in
buildPythonPackage rec {
inherit src version;
@ -66,6 +67,6 @@ buildPythonPackage rec {
homepage = "https://git.sr.ht/~sircmpwn/paste.sr.ht";
description = "Ad-hoc text file hosting service for the sr.ht network";
license = licenses.agpl3Only;
maintainers = with maintainers; [ eadwu nessdoor ];
maintainers = with maintainers; [ eadwu nessdoor christoph-heiss ];
};
}

4
pkgs/applications/version-management/sourcehut/scm.nix
View File

@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "~sircmpwn";
repo = "scm.sr.ht";
rev = version;
sha256 = "sha256-058dOEYJDY3jtxH1VkV1CFq5CZTkauSnTWg57DCnNtw=";
hash = "sha256-058dOEYJDY3jtxH1VkV1CFq5CZTkauSnTWg57DCnNtw=";
};
nativeBuildInputs = [
@ -44,6 +44,6 @@ buildPythonPackage rec {
homepage = "https://git.sr.ht/~sircmpwn/scm.sr.ht";
description = "Shared support code for sr.ht source control services.";
license = licenses.agpl3Only;
maintainers = with maintainers; [ eadwu ];
maintainers = with maintainers; [ eadwu christoph-heiss ];
};
}

34
pkgs/applications/version-management/sourcehut/todo.nix
View File

@ -12,31 +12,35 @@
, setuptools
}:
buildPythonPackage rec {
pname = "todosrht";
version = "0.74.6";
pyproject = true;
disabled = pythonOlder "3.7";
let
version = "0.75.6";
gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.36"; };
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = "todo.sr.ht";
rev = version;
sha256 = "sha256-j12pCGfKf6+9R8NOBIrH2V4OuSMuncU6S1AMWFVoHts=";
hash = "sha256-BPJ1M9dX+xNIw++VZ0Si/rjnfI9BY95TE2o+u7JRVAU=";
};
postPatch = ''
substituteInPlace Makefile \
--replace "all: api" ""
'';
todosrht-api = buildGoModule ({
inherit src version;
pname = "todosrht-api";
modRoot = "api";
vendorHash = "sha256-rvfG5F6ez8UM0dYVhKfzwtb7ZEJlaKMBAfKDbo3Aofc=";
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
vendorHash = "sha256-vTKIJFE8AFR2eZFwG9ba6FWPW02og3ZVcrsqUnOkJIQ=";
} // gqlgen);
in
buildPythonPackage rec {
inherit src version;
pname = "todosrht";
pyproject = true;
disabled = pythonOlder "3.7";
postPatch = ''
substituteInPlace Makefile \
--replace "all: api" ""
'';
nativeBuildInputs = [
setuptools
@ -69,6 +73,6 @@ buildPythonPackage rec {
homepage = "https://todo.sr.ht/~sircmpwn/todo.sr.ht";
description = "Ticket tracking service for the sr.ht network";
license = licenses.agpl3Only;
maintainers = with maintainers; [ eadwu ];
maintainers = with maintainers; [ eadwu christoph-heiss ];
};
}