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

Merge pull request #85406 from eadwu/sourcehut/update-5

Browse Source 
sourcehut: 2020.04.16
This commit is contained in:
Dmitry Kalinkin 2020-04-18 00:02:18 -04:00 committed by GitHub
commit 68a4ca45e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 31 additions and 29 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.52.5"; version = "0.56.13";
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 = "1dwp87zsbh4a48q0pacssy329kchrd4sa47c5a1k8smbqn078424"; modSha256 = "10is7siscids9qz6jh9m1i17749dafqqkg4b3sslmxaxyn16yj97";
}; };
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 = "142aycnary6yfi0y1i3zgpyndi0756fingavcz2dnqi36pkajaaj"; sha256 = "uFoS9xaVXsZZf4neZQcUyTqKo2RshOQeifD27kaKSVE=";
}; };
patches = [ patches = [

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

@ -1,18 +1,18 @@
{ stdenv, fetchgit, fetchNodeModules, buildPythonPackage { stdenv, fetchgit, fetchNodeModules, buildPythonPackage
, pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests , pgpy, flask, bleach, misaka, humanize, html5lib, markdown, psycopg2, pygments
, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, celery, alembic , requests, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, prometheus_client
, importlib-metadata , celery, alembic, importlib-metadata
, sassc, nodejs , sassc, nodejs
, writeText }: , writeText }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "srht"; pname = "srht";
version = "0.57.2"; version = "0.59.13";
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 = "11rfpb0wf1xzrhcnpahaghmi5626snzph0vsbxlmmqx75wf0p6mf"; sha256 = "5jc6MtG/cBry05Sq51UAFzSBvKKkdNTA67UIDvJt9uU=";
}; };
node_modules = fetchNodeModules { node_modules = fetchNodeModules {
@ -36,6 +36,7 @@ buildPythonPackage rec {
bleach bleach
misaka misaka
humanize humanize
html5lib
markdown markdown
psycopg2 psycopg2
pygments pygments
@ -44,6 +45,7 @@ buildPythonPackage rec {
cryptography cryptography
beautifulsoup4 beautifulsoup4
sqlalchemy-utils sqlalchemy-utils
prometheus_client
# Unofficial runtime dependencies? # Unofficial runtime dependencies?
celery celery

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

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dispatchsrht"; pname = "dispatchsrht";
version = "0.13.3"; version = "0.14.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 = "08asayfwpzafscpli5grx1p0y1ryz7pqkznf5bd9j8ir2iyhbc10"; sha256 = "eJ+oHs9m74Q8V6fUBLOA1ksUiwdaR1/Bxlf3jcexdkA=";
}; };
patches = [ patches = [

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

@ -1,10 +1,10 @@
{ stdenv, fetchgit, buildPythonPackage { stdenv, fetchgit, buildPythonPackage
, python , python
, buildGoModule , buildGoModule
, srht, pygit2, scmsrht }: , srht, minio, pygit2, scmsrht }:
let let
version = "0.43.3"; version = "0.50.3";
buildShell = src: buildGoModule { buildShell = src: buildGoModule {
inherit src version; inherit src version;
@ -44,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 = "1f9wfyri85bq4zi9xkbfcfb69q4abh0hz7p3lghj460hh9zxc57w"; sha256 = "dmcTee3hp6ZkwwunG4ouEVmCxQ1a9LfQ7oWpHxnKumc=";
}; };
patches = [ patches = [
@ -55,6 +55,7 @@ in buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
srht srht
minio
pygit2 pygit2
scmsrht scmsrht
]; ];

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

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hgsrht"; pname = "hgsrht";
version = "0.21.1"; version = "0.26.0";
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 = "19r8zcy4xf9imqifqw3b7ylxd46i025ncns69kn5xp11damilz66"; sha256 = "kX0KZSEzYQ/hxL2vKh+mpaRuG16qbBKN2Xwp+e9pTxs=";
}; };
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.40.3"; version = "0.41.8";
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 = "1s736i5wm04pqa5k7455bdjdi7vjgvq32q1v6mdsp1w7jhgy1ags"; sha256 = "Gmt6ttupyhZhpyH/IASEt8SZGrlQmEEtV5bE11yIiXQ=";
}; };
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.14.1"; version = "0.14.7";
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 = "13yar0sa24jyiq0l4p4bgq6p5crj148f26sxwyi37g76jqba4rfi"; sha256 = "CKXWVXr2P1D6Nz9/S5rOkuOi9piy66RreQv2RQ0KSfs=";
}; };
patches = [ patches = [

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

@ -1,16 +1,16 @@
{ stdenv, fetchgit, buildPythonPackage { stdenv, fetchgit, buildPythonPackage
, python , python
, pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache , pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache
, sshpubkeys, weasyprint, prometheus_client }: , sshpubkeys, weasyprint }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "metasrht"; pname = "metasrht";
version = "0.41.10"; version = "0.42.13";
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 = "1srzrajgwq85kjryxykj708m2c98r6a84x4k4a5grwznqw3mwm6p"; sha256 = "p7WgnfOsX09YxJJclHwdIky/jYkTOxibbYmXwcmE2S4=";
}; };
nativeBuildInputs = srht.nativeBuildInputs; nativeBuildInputs = srht.nativeBuildInputs;
@ -27,7 +27,6 @@ buildPythonPackage rec {
pystache pystache
sshpubkeys sshpubkeys
weasyprint weasyprint
prometheus_client
]; ];
patches = [ patches = [

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

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pastesrht"; pname = "pastesrht";
version = "0.9.2"; version = "0.10.3";
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 = "0hiv607a7446dba524kblmpswlcz0z4i1jr49ng7g90nhpsk8dy4"; sha256 = "i1M4L5NG152zkIEFj2vDHa9lr5aE1ioToDVPpkIqemk=";
}; };
patches = [ patches = [

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

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "scmsrht"; pname = "scmsrht";
version = "0.18.1"; version = "0.19.11";
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 = "1f0h8vbbqx34v1rgzqjkgbf0z7jhnp8hdlzmrxwhs74kj6zjb134"; sha256 = "a0JIZcO/3op409t+jq4/fImuppuGqfGxBPgBh67DGHM=";
}; };
nativeBuildInputs = srht.nativeBuildInputs; nativeBuildInputs = srht.nativeBuildInputs;

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

@ -5,12 +5,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "todosrht"; pname = "todosrht";
version = "0.55.3"; version = "0.57.14";
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 = "1j82yxdnag0q6rp0rpiq3ccn5maa1k58j2f1ilcsxf1gr13pycf5"; sha256 = "nlTf7KV6vjqqVEXZ6OOZ5dAj1iHTDPYj4DnAD2hGp5c=";
}; };
patches = [ patches = [