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

Merge pull request #70255 from eadwu/sourcehut/update-1

Browse Source 
sourcehut.*: 2019.10.02
This commit is contained in:
Dmitry Kalinkin 2019-10-09 12:50:58 -04:00 committed by GitHub
commit a7b3728c64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 53 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
, srht, redis, celery, pyyaml, markdown }: , srht, redis, celery, pyyaml, markdown }:
let let
version = "0.45.13"; version = "0.47.8";
buildWorker = src: buildGoModule { buildWorker = src: buildGoModule {
inherit src version; inherit src 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 = "002pcj2a98gbmv77a10449w1q6iqhqjz4fim8hm4qm7vn6bwp0hz"; sha256 = "0agnxf118nlfykxbja8mnk4cal56rb2z8mhvyphnxm0ac28iq6jx";
}; };
patches = [ patches = [

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

@ -6,12 +6,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "srht"; pname = "srht";
version = "0.52.13"; version = "0.54.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 = "0i7gd2rkq4y4lffxsgb3mql9ddmk3vqckan29w266imrqs6p8c0z"; sha256 = "1m9nblm0ygjjdzcf79jk5v8p74dgyby15mqkggw9i3smz9r3afim";
}; };
node_modules = fetchNodeModules { node_modules = fetchNodeModules {
@ -55,7 +55,6 @@ buildPythonPackage rec {
cp -r ${node_modules} srht/node_modules cp -r ${node_modules} srht/node_modules
''; '';
# No actual? tests but seems like it needs this anyway
preCheck = let preCheck = let
config = writeText "config.ini" '' config = writeText "config.ini" ''
[webhooks] [webhooks]
@ -65,17 +64,13 @@ buildPythonPackage rec {
origin=http://meta.sr.ht.local origin=http://meta.sr.ht.local
''; '';
in '' in ''
# Validation needs config option(s) cp -f ${config} config.ini
# webhooks <- ( private-key )
# meta.sr.ht <- ( origin )
cp ${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;
description = "Core modules for sr.ht"; description = "Core modules for sr.ht";
license = licenses.bsd3; license = licenses.bsd3;
broken = true;
maintainers = with maintainers; [ eadwu ]; maintainers = with maintainers; [ eadwu ];
}; };
} }

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

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dispatchsrht"; pname = "dispatchsrht";
version = "0.11.0"; version = "0.11.1";
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 = "1kahl2gy5a5li79djwkzkglkw2s7pl4d29bzqp8c53r0xvx4sqkz"; sha256 = "1bi7vn0yr326mf2c63f2fahdlrx2c6a8d6p6bzy2ym2835qfcc0v";
}; };
patches = [ patches = [

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

@ -4,7 +4,7 @@
, srht, pygit2, scmsrht }: , srht, pygit2, scmsrht }:
let let
version = "0.32.3"; version = "0.33.1";
buildDispatcher = src: buildGoModule { buildDispatcher = src: buildGoModule {
inherit src version; inherit src version;
@ -20,7 +20,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 = "0grycmblhm9dnhcf1kcmn6bclgb9znahk2026dan58m9j9pja5vw"; sha256 = "0vwjkpvgscr01xhbzmhizqmg1wjhnj7jw9qcsv0s190fqach7ml8";
}; };
patches = [ patches = [
@ -40,7 +40,6 @@ in buildPythonPackage rec {
export SRHT_PATH=${srht}/${python.sitePackages}/srht export SRHT_PATH=${srht}/${python.sitePackages}/srht
''; '';
# TODO: Remove redundant mkdir?
postInstall = '' postInstall = ''
mkdir -p $out/bin mkdir -p $out/bin
cp ${buildDispatcher "${src}/gitsrht-dispatch"}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch cp ${buildDispatcher "${src}/gitsrht-dispatch"}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch

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

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hgsrht"; pname = "hgsrht";
version = "0.13.0"; version = "0.15.2";
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 = "0qkknvja0pyk69fvzqafj3x8hi5miw22nmksvifbrjcqph8jknqg"; sha256 = "097ikrr8bks4lag1lbaznj0zr1c56lmm5lgm5rfjq0k20l7n2bk0";
}; };
patches = [ patches = [

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

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "listssrht"; pname = "listssrht";
version = "0.36.3"; version = "0.38.1";
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 = "1q2z2pjwz4zifsrkxab9b9jh1vzayjqych1cx3i4859f1swl2gwa"; sha256 = "02nfl9xnqx0p98kmcy8bzdwzlnl57k5a04i6gnvimc84c11a9chz";
}; };
patches = [ patches = [

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

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mansrht"; pname = "mansrht";
version = "0.12.4"; version = "0.13.5";
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 = "1csnw71yh5zw7l17xmmxyskwiqbls0ynbbjrg45y5k1i3622mhiy"; sha256 = "1hfxhczppn8yng6m3kdzj9rn6zjhwpm6dq3pzaiaii92b3d4cyh3";
}; };
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.34.3"; version = "0.35.2";
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 = "1yj3npw1vlqawzj6q1mh6qryx009dg5prja9fn6rasfmxjn2gr7v"; sha256 = "10x00lydnrcgk7s27fddbrdb8bwc5ivwlpswkcrsi302qcjdff9w";
}; };
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.5.1"; version = "0.5.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 = "0bzw03hcwi1pw16kliqjsr7kphqq3qw0pbpdjqkcs7jdr0a59vny"; sha256 = "16d0qviw3qifyqn94fj03mwxd65abf8bhrvn1fn6ramaq8zpx794";
}; };
patches = [ patches = [

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

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "scmsrht"; pname = "scmsrht";
version = "0.13.3"; version = "0.14.2";
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 = "0bapddgfqrs27y6prd6kwpz6jdlr33zdqr6ci6ixi584a7z8z7d6"; sha256 = "1xi4l1ycdglfm22ybawh5nbwgday0nfb1vqsjqvp2y7ysizwdxc1";
}; };
nativeBuildInputs = srht.nativeBuildInputs; nativeBuildInputs = srht.nativeBuildInputs;
@ -39,11 +39,7 @@ buildPythonPackage rec {
origin=http://meta.sr.ht.local origin=http://meta.sr.ht.local
''; '';
in '' in ''
# Validation needs config option(s) cp -f ${config} config.ini
# webhooks <- ( private-key )
# meta.sr.ht <- ( origin )
# builds.sr.ht <- ( origin, oauth-client-id )
cp ${config} config.ini
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -1,15 +1,16 @@
{ stdenv, fetchgit, buildPythonPackage { stdenv, fetchgit, buildPythonPackage
, python , python
, srht, redis, alembic, pystache }: , srht, redis, alembic, pystache
, pytest, factory_boy, writeText }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "todosrht"; pname = "todosrht";
version = "0.46.8"; version = "0.51.11";
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 = "17nqqy81535jnkidjiqv8v2301w5wzbbvx4czib69aagw1l85gnn"; sha256 = "0x4aray1dappalmn2f4wqrhpa5k1idccnafbfhsnfi6nj718i33a";
}; };
patches = [ patches = [
@ -30,8 +31,33 @@ buildPythonPackage rec {
export SRHT_PATH=${srht}/${python.sitePackages}/srht export SRHT_PATH=${srht}/${python.sitePackages}/srht
''; '';
# Tests require a network connection checkInputs = [
doCheck = false; pytest
factory_boy
];
installCheckPhase = let
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;