Merge pull request #116178 from logan12358/use-fetchFromSourcehut

aerc, asuka, scdoc, wev, wlsunset, wshowkeys: use fetchFromSourceHut
This commit is contained in:
Sandro 2021-03-13 16:54:35 +01:00 committed by GitHub
commit 34405e2ca5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 24 deletions

View File

@ -1,12 +1,14 @@
{ lib, stdenv, rustPlatform, fetchurl, pkg-config, ncurses, openssl, Security }: { lib, stdenv, rustPlatform, fetchFromSourcehut, pkg-config, ncurses, openssl, Security }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "asuka"; pname = "asuka";
version = "0.8.1"; version = "0.8.1";
src = fetchurl { src = fetchFromSourcehut {
url = "https://git.sr.ht/~julienxx/${pname}/archive/${version}.tar.gz"; owner = "~julienxx";
sha256 = "07i80qmdpwfdgwrk1gzs10wln91v23qjrsk0x134xf5mjnakxc06"; repo = pname;
rev = version;
sha256 = "1y8v4qc5dng3v9k0bky1xlf3qi9pk2vdsi29lff4ha5310467f0k";
}; };
cargoSha256 = "0p0x4ch04kydg76bfal5zqzr9hvn5268wf3k2v9h7g8r4y8xqlhw"; cargoSha256 = "0p0x4ch04kydg76bfal5zqzr9hvn5268wf3k2v9h7g8r4y8xqlhw";

View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchurl { lib, buildGoModule, fetchFromSourcehut
, ncurses, notmuch, scdoc , ncurses, notmuch, scdoc
, python3, w3m, dante , python3, w3m, dante
}: }:
@ -7,9 +7,11 @@ buildGoModule rec {
pname = "aerc"; pname = "aerc";
version = "0.5.2"; version = "0.5.2";
src = fetchurl { src = fetchFromSourcehut {
url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz"; owner = "~sircmpwn";
sha256 = "h7kiRA5TuZ8mDSMymWU33stFLIOMd06TQLYzKW+faO4="; repo = pname;
rev = version;
sha256 = "1ja639qry8h2d6y7qshf62ypkzs2rzady59p81scqh8nx0g9bils";
}; };
runVend = true; runVend = true;

View File

@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchFromSourcehut }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "scdoc"; pname = "scdoc";
version = "1.11.1"; version = "1.11.1";
src = fetchurl { src = fetchFromSourcehut {
url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; owner = "~sircmpwn";
sha256 = "007pm3gspvya58cwb12wpnrm9dq5p28max2s0b2y9rq80nqgqag5"; repo = pname;
rev = version;
sha256 = "1g37j847j3h4a4qbbfbr6vvsxpifj9v25jgv25nd71d1n0dxlhvk";
}; };
postPatch = '' postPatch = ''

View File

@ -1,6 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchFromSourcehut
, pkg-config , pkg-config
, scdoc , scdoc
, wayland , wayland
@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
pname = "wev"; pname = "wev";
version = "1.0.0"; version = "1.0.0";
src = fetchurl { src = fetchFromSourcehut {
url = "https://git.sr.ht/~sircmpwn/wev/archive/${version}.tar.gz"; owner = "~sircmpwn";
sha256 = "0vlxdkb59v6nb10j28gh1a56sx8jk7ak7liwzv911kpmygnls03g"; repo = pname;
rev = version;
sha256 = "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms";
}; };
nativeBuildInputs = [ pkg-config scdoc wayland ]; nativeBuildInputs = [ pkg-config scdoc wayland ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, meson, pkg-config, ninja, wayland { lib, stdenv, fetchFromSourcehut, meson, pkg-config, ninja, wayland
, wayland-protocols , wayland-protocols
}: }:
@ -6,9 +6,11 @@ stdenv.mkDerivation rec {
pname = "wlsunset"; pname = "wlsunset";
version = "0.1.0"; version = "0.1.0";
src = fetchurl { src = fetchFromSourcehut {
url = "https://git.sr.ht/~kennylevinsen/wlsunset/archive/${version}.tar.gz"; owner = "~kennylevinsen";
sha256 = "0g7mk14hlbwbhq6nqr84452sbgcja3hdxsqf0vws4njhfjgqiv3q"; repo = pname;
rev = version;
sha256 = "12snizvf49y40cirhr2brgyldhsykv4k2gnln2sdrajqzhrc98v6";
}; };
nativeBuildInputs = [ meson pkg-config ninja wayland ]; nativeBuildInputs = [ meson pkg-config ninja wayland ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl { lib, stdenv, fetchFromSourcehut
, meson, pkg-config, wayland, ninja , meson, pkg-config, wayland, ninja
, cairo, libinput, pango, wayland-protocols, libxkbcommon , cairo, libinput, pango, wayland-protocols, libxkbcommon
}: }:
@ -10,9 +10,11 @@ in stdenv.mkDerivation rec {
pname = "wshowkeys-unstable"; pname = "wshowkeys-unstable";
inherit version; inherit version;
src = fetchurl { src = fetchFromSourcehut {
url = "https://git.sr.ht/~sircmpwn/wshowkeys/archive/${commit}.tar.gz"; owner = "~sircmpwn";
sha256 = "0iplmw13jmc8d3m307kc047zq8yqwm42kw9fpm270562i3p0qk4d"; repo = "wshowkeys";
rev = commit;
sha256 = "10kafdja5cwbypspwhvaxjz3hvf51vqjzbgdasl977193cvxgmbs";
}; };
nativeBuildInputs = [ meson pkg-config wayland ninja ]; nativeBuildInputs = [ meson pkg-config wayland ninja ];