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

Merge pull request #76677 from eadwu/sourcehut/update-4

Browse Source 
sourcehut/update-4
This commit is contained in:
Dmitry Kalinkin 2020-02-15 06:07:26 -05:00 committed by GitHub
commit 018fac1dc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 53 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,14 +4,14 @@
, srht, redis, celery, pyyaml, markdown }: , srht, redis, celery, pyyaml, markdown }:
let let
version = "0.48.0"; version = "0.52.5";
buildWorker = src: buildGoModule { buildWorker = src: buildGoModule {
inherit src version; inherit src version;
pname = "builds-sr-ht-worker"; pname = "builds-sr-ht-worker";
goPackagePath = "git.sr.ht/~sircmpwn/builds.sr.ht/worker"; goPackagePath = "git.sr.ht/~sircmpwn/builds.sr.ht/worker";
modSha256 = "1jm259ncw8dgqp0fqbjn30c4y3v3vwqj41gfh99jx30bwlmpgfax"; modSha256 = "1dwp87zsbh4a48q0pacssy329kchrd4sa47c5a1k8smbqn078424";
}; };
in buildPythonPackage rec { in buildPythonPackage rec {
inherit version; inherit version;
@ -20,7 +20,7 @@ in buildPythonPackage rec {
src = fetchgit { src = fetchgit {
url = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; url = "https://git.sr.ht/~sircmpwn/builds.sr.ht";
rev = version; rev = version;
sha256 = "1z5bxsn67cqffixqsrnska86mw0a6494650wbi6dbp10z03870bs"; sha256 = "142aycnary6yfi0y1i3zgpyndi0756fingavcz2dnqi36pkajaaj";
}; };
patches = [ patches = [

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

@ -1,24 +1,24 @@
{ stdenv, fetchgit, fetchNodeModules, buildPythonPackage { stdenv, fetchgit, fetchNodeModules, buildPythonPackage
, pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests , pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests
, sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic , sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, celery, alembic
, importlib-metadata , importlib-metadata
, sassc, nodejs , sassc, nodejs
, writeText }: , writeText }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "srht"; pname = "srht";
version = "0.54.4"; version = "0.57.2";
src = fetchgit { src = fetchgit {
url = "https://git.sr.ht/~sircmpwn/core.sr.ht"; url = "https://git.sr.ht/~sircmpwn/core.sr.ht";
rev = version; rev = version;
sha256 = "0flxvn178hqd8ljz89ddis80zfnmzgimv4506w4dg2flbwzywy7z"; sha256 = "11rfpb0wf1xzrhcnpahaghmi5626snzph0vsbxlmmqx75wf0p6mf";
}; };
node_modules = fetchNodeModules { node_modules = fetchNodeModules {
src = "${src}/srht"; src = "${src}/srht";
nodejs = nodejs; nodejs = nodejs;
sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p"; sha256 = "0gwa2xb75g7fclrsr7r131kj8ri5gmhd96yw1iws5pmgsn2rlqi1";
}; };
patches = [ patches = [
@ -41,7 +41,7 @@ buildPythonPackage rec {
pygments pygments
requests requests
sqlalchemy sqlalchemy
flask_login cryptography
beautifulsoup4 beautifulsoup4
sqlalchemy-utils sqlalchemy-utils
@ -57,17 +57,7 @@ buildPythonPackage rec {
cp -r ${node_modules} srht/node_modules cp -r ${node_modules} srht/node_modules
''; '';
preCheck = let dontUseSetuptoolsCheck = true;
config = writeText "config.ini" ''
[webhooks]
private-key=K6JupPpnr0HnBjelKTQUSm3Ro9SgzEA2T2Zv472OvzI=
[meta.sr.ht]
origin=http://meta.sr.ht.local
'';
in ''
cp -f ${config} config.ini
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://git.sr.ht/~sircmpwn/srht; homepage = https://git.sr.ht/~sircmpwn/srht;

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

@ -1,15 +1,15 @@
{ stdenv, fetchgit, buildPythonPackage { stdenv, fetchgit, buildPythonPackage
, python , python
, srht, pyyaml, PyGithub, cryptography }: , srht, pyyaml, PyGithub }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "dispatchsrht"; pname = "dispatchsrht";
version = "0.12.3"; version = "0.13.3";
src = fetchgit { src = fetchgit {
url = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht"; url = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht";
rev = version; rev = version;
sha256 = "0lpc8jpyz1rg3g98546wlhr27b15g32lds77hl42aixv5f5b8lc9"; sha256 = "08asayfwpzafscpli5grx1p0y1ryz7pqkznf5bd9j8ir2iyhbc10";
}; };
patches = [ patches = [
@ -22,7 +22,6 @@ buildPythonPackage rec {
srht srht
pyyaml pyyaml
PyGithub PyGithub
cryptography
]; ];
preBuild = '' preBuild = ''

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

@ -4,23 +4,39 @@
, srht, pygit2, scmsrht }: , srht, pygit2, scmsrht }:
let let
version = "0.35.6"; version = "0.43.3";
buildShell = src: buildGoModule { buildShell = src: buildGoModule {
inherit src version; inherit src version;
pname = "git-srht-shell"; pname = "gitsrht-shell";
goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-shell"; goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-shell";
modSha256 = "1v4npijqgv09ssrxf1y1b3syb2fs7smy7k9rcj3ynsfrn9xgfd9y"; modSha256 = "0lxxxzh39bviab71kfsqqr217338yxn5l2zkak55r6qqs6iz4ccv";
}; };
buildDispatcher = src: buildGoModule { buildDispatcher = src: buildGoModule {
inherit src version; inherit src version;
pname = "git-srht-dispatcher"; pname = "gitsrht-dispatcher";
goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-dispatch"; goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-dispatch";
modSha256 = "1lmgmlin460g09dph2hw6yz25d4agqwjhrjv0qqsis7df9qpf3i1"; modSha256 = "1lmgmlin460g09dph2hw6yz25d4agqwjhrjv0qqsis7df9qpf3i1";
}; };
buildKeys = src: buildGoModule {
inherit src version;
pname = "gitsrht-keys";
goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-keys";
modSha256 = "1pfcw9n63zhlxm9kd3bxa2zqmzd8mgl7yl2ck055j56v3k929w3f";
};
buildUpdateHook = src: buildGoModule {
inherit src version;
pname = "gitsrht-update-hook";
goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-update-hook";
modSha256 = "0p8qd6hpgmnlfqk5vw6l41dqs7qjhf6xijzj5iv6wv1cf362b4wp";
};
in buildPythonPackage rec { in buildPythonPackage rec {
inherit version; inherit version;
pname = "gitsrht"; pname = "gitsrht";
@ -28,7 +44,7 @@ in buildPythonPackage rec {
src = fetchgit { src = fetchgit {
url = "https://git.sr.ht/~sircmpwn/git.sr.ht"; url = "https://git.sr.ht/~sircmpwn/git.sr.ht";
rev = version; rev = version;
sha256 = "0j8caqbzdqkgc1bdhzz4k5hgh8lhsghfgwf46d19ryf83d8ggxqc"; sha256 = "1f9wfyri85bq4zi9xkbfcfb69q4abh0hz7p3lghj460hh9zxc57w";
}; };
patches = [ patches = [
@ -52,6 +68,8 @@ in buildPythonPackage rec {
mkdir -p $out/bin mkdir -p $out/bin
cp ${buildShell "${src}/gitsrht-shell"}/bin/gitsrht-shell $out/bin/gitsrht-shell cp ${buildShell "${src}/gitsrht-shell"}/bin/gitsrht-shell $out/bin/gitsrht-shell
cp ${buildDispatcher "${src}/gitsrht-dispatch"}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch cp ${buildDispatcher "${src}/gitsrht-dispatch"}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch
cp ${buildKeys "${src}/gitsrht-keys"}/bin/gitsrht-keys $out/bin/gitsrht-keys
cp ${buildUpdateHook "${src}/gitsrht-update-hook"}/bin/gitsrht-update-hook $out/bin/gitsrht-update-hook
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hgsrht"; pname = "hgsrht";
version = "0.16.2"; version = "0.21.1";
src = fetchhg { src = fetchhg {
url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht"; url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht";
rev = version; rev = version;
sha256 = "02bzy31zplnlqg8rcls5n65q1h920lhy6f51w89w1kskdw7r2mhy"; sha256 = "19r8zcy4xf9imqifqw3b7ylxd46i025ncns69kn5xp11damilz66";
}; };
patches = [ patches = [

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

@ -1,15 +1,15 @@
{ stdenv, fetchgit, buildPythonPackage { stdenv, fetchgit, buildPythonPackage
, python , python
, srht, asyncpg, unidiff, aiosmtpd, pygit2, emailthreads }: , srht, asyncpg, aiosmtpd, pygit2, emailthreads }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "listssrht"; pname = "listssrht";
version = "0.38.3"; version = "0.40.3";
src = fetchgit { src = fetchgit {
url = "https://git.sr.ht/~sircmpwn/lists.sr.ht"; url = "https://git.sr.ht/~sircmpwn/lists.sr.ht";
rev = version; rev = version;
sha256 = "020s6kglm7620pjn2j7fxvaqd5lpz7y7x0wf014jsrm71l6w0rla"; sha256 = "1s736i5wm04pqa5k7455bdjdi7vjgvq32q1v6mdsp1w7jhgy1ags";
}; };
patches = [ patches = [
@ -22,7 +22,6 @@ buildPythonPackage rec {
srht srht
pygit2 pygit2
asyncpg asyncpg
unidiff
aiosmtpd aiosmtpd
emailthreads emailthreads
]; ];

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

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mansrht"; pname = "mansrht";
version = "0.13.5"; version = "0.14.1";
src = fetchgit { src = fetchgit {
url = "https://git.sr.ht/~sircmpwn/man.sr.ht"; url = "https://git.sr.ht/~sircmpwn/man.sr.ht";
rev = version; rev = version;
sha256 = "1hfxhczppn8yng6m3kdzj9rn6zjhwpm6dq3pzaiaii92b3d4cyh3"; sha256 = "13yar0sa24jyiq0l4p4bgq6p5crj148f26sxwyi37g76jqba4rfi";
}; };
patches = [ patches = [

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

@ -5,12 +5,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "metasrht"; pname = "metasrht";
version = "0.37.0"; version = "0.41.10";
src = fetchgit { src = fetchgit {
url = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; url = "https://git.sr.ht/~sircmpwn/meta.sr.ht";
rev = version; rev = version;
sha256 = "1jf3h2v27cbam8bwiw3x35319pzp0r651p8mfhw150jvskyvmkmr"; sha256 = "1srzrajgwq85kjryxykj708m2c98r6a84x4k4a5grwznqw3mwm6p";
}; };
nativeBuildInputs = srht.nativeBuildInputs; nativeBuildInputs = srht.nativeBuildInputs;

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

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pastesrht"; pname = "pastesrht";
version = "0.7.3"; version = "0.9.2";
src = fetchgit { src = fetchgit {
url = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; url = "https://git.sr.ht/~sircmpwn/paste.sr.ht";
rev = version; rev = version;
sha256 = "15689gk37djcwdjb636d97k0il2zpdpksb95l9l4d43wipd7x5qi"; sha256 = "0hiv607a7446dba524kblmpswlcz0z4i1jr49ng7g90nhpsk8dy4";
}; };
patches = [ patches = [

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

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "scmsrht"; pname = "scmsrht";
version = "0.16.0"; version = "0.18.1";
src = fetchgit { src = fetchgit {
url = "https://git.sr.ht/~sircmpwn/scm.sr.ht"; url = "https://git.sr.ht/~sircmpwn/scm.sr.ht";
rev = version; rev = version;
sha256 = "0jny8ihn49n7bpw5nhdrfha78yzpxp277l50y1lj142r59kwmh22"; sha256 = "1f0h8vbbqx34v1rgzqjkgbf0z7jhnp8hdlzmrxwhs74kj6zjb134";
}; };
nativeBuildInputs = srht.nativeBuildInputs; nativeBuildInputs = srht.nativeBuildInputs;
@ -25,22 +25,7 @@ buildPythonPackage rec {
export PKGVER=${version} export PKGVER=${version}
''; '';
# No actual? tests but seems like it needs this anyway dontUseSetuptoolsCheck = true;
preCheck = let
config = writeText "config.ini" ''
[webhooks]
private-key=K6JupPpnr0HnBjelKTQUSm3Ro9SgzEA2T2Zv472OvzI=
[builds.sr.ht]
origin=http://builds.sr.ht.local
oauth-client-id=
[meta.sr.ht]
origin=http://meta.sr.ht.local
'';
in ''
cp -f ${config} config.ini
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://git.sr.ht/~sircmpwn/git.sr.ht; homepage = https://git.sr.ht/~sircmpwn/git.sr.ht;

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

@ -5,12 +5,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "todosrht"; pname = "todosrht";
version = "0.51.13"; version = "0.55.3";
src = fetchgit { src = fetchgit {
url = "https://git.sr.ht/~sircmpwn/todo.sr.ht"; url = "https://git.sr.ht/~sircmpwn/todo.sr.ht";
rev = version; rev = version;
sha256 = "19gywq5j7wlpk7j2whm2ivz0z0i3j50n7k7bx29pghndl7l43c18"; sha256 = "1j82yxdnag0q6rp0rpiq3ccn5maa1k58j2f1ilcsxf1gr13pycf5";
}; };
patches = [ patches = [
@ -31,33 +31,13 @@ buildPythonPackage rec {
export SRHT_PATH=${srht}/${python.sitePackages}/srht export SRHT_PATH=${srht}/${python.sitePackages}/srht
''; '';
# pytest tests fail
checkInputs = [ checkInputs = [
pytest pytest
factory_boy factory_boy
]; ];
installCheckPhase = let dontUseSetuptoolsCheck = true;
config = writeText "config.ini" ''
[webhooks]
private-key=K6JupPpnr0HnBjelKTQUSm3Ro9SgzEA2T2Zv472OvzI=
[todo.sr.ht]
origin=http://todo.sr.ht.local
oauth-client-id=
oauth-client-secret=
[todo.sr.ht::mail]
posting-domain=
[meta.sr.ht]
origin=http://meta.sr.ht.local
'';
in ''
cp -f ${config} config.ini
# pytest tests fail
# pytest tests/
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://todo.sr.ht/~sircmpwn/todo.sr.ht; homepage = https://todo.sr.ht/~sircmpwn/todo.sr.ht;