diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/applications/version-management/sourcehut/core.nix | |
parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/version-management/sourcehut/core.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/version-management/sourcehut/core.nix | 45 |
1 files changed, 36 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix b/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix index 69f8a7d4e458..d359d524eb29 100644 --- a/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix +++ b/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix @@ -1,24 +1,48 @@ -{ lib, fetchgit, fetchNodeModules, buildPythonPackage -, pgpy, flask, bleach, humanize, html5lib, markdown, psycopg2, pygments -, requests, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, prometheus_client -, celery, alembic, importlib-metadata, mistletoe -, sassc, nodejs -, writeText }: +{ lib +, fetchgit +, fetchNodeModules +, buildPythonPackage +, pgpy +, flask +, bleach +, misaka +, humanize +, html5lib +, markdown +, psycopg2 +, pygments +, requests +, sqlalchemy +, cryptography +, beautifulsoup4 +, sqlalchemy-utils +, prometheus_client +, celery +, alembic +, importlib-metadata +, mistletoe +, minio +, sassc +, nodejs +, redis +, writeText +}: buildPythonPackage rec { pname = "srht"; - version = "0.65.2"; + version = "0.67.4"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/core.sr.ht"; rev = version; - sha256 = "1jfp1vc8mink3c7ccacgnqx8hpkck82ipxiql38q1y9l8xcsah03"; + sha256 = "sha256-XvzFfcBK5Mq8p7xEBAF/eupUE1kkUBh5k+ByM/WA9bc="; + fetchSubmodules = true; }; node_modules = fetchNodeModules { src = "${src}/srht"; nodejs = nodejs; - sha256 = "0gwa2xb75g7fclrsr7r131kj8ri5gmhd96yw1iws5pmgsn2rlqi1"; + sha256 = "sha256-IWKahdWv3qJ5DNyb1GB9JWYkZxghn6wzZe68clYXij8="; }; patches = [ @@ -34,6 +58,7 @@ buildPythonPackage rec { pgpy flask bleach + misaka humanize html5lib markdown @@ -51,6 +76,8 @@ buildPythonPackage rec { celery alembic importlib-metadata + minio + redis ]; PKGVER = version; |