Merge pull request #156109 from greaka/master

This commit is contained in:
Sandro 2022-01-23 04:09:53 +01:00 committed by GitHub
commit a70ee41f2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions

View file

@ -1,16 +1,17 @@
{ lib, fetchurl, makeWrapper, runCommand, callPackage }: { lib, fetchurl, makeWrapper, runCommand, callPackage }:
let let
version = "1.3.1"; version = "1.3.4";
programs = callPackage ./programs.nix {}; programs = callPackage ./programs.nix { };
webapp = fetchurl { webapp = fetchurl {
url = "https://github.com/root-gg/plik/releases/download/${version}/plik-${version}-linux-amd64.tar.gz"; url = "https://github.com/root-gg/plik/releases/download/${version}/plik-${version}-linux-amd64.tar.gz";
sha256 = "KN6cp29KKdGamYnfL3jYltx0EDx6syDPfV0jShOk7Zw="; sha256 = "1qp96va5l0m7jp4g007bhgcpf4ydg3cpg2x9wa9rkpp9k1svdhjy";
}; };
in { in
{
inherit (programs) plik plikd-unwrapped; inherit (programs) plik plikd-unwrapped;

View file

@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub, fetchurl, makeWrapper, runCommand }: { lib, buildGoModule, fetchFromGitHub, fetchurl, makeWrapper, runCommand }:
let let
version = "1.3.1"; version = "1.3.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "root-gg"; owner = "root-gg";
repo = "plik"; repo = "plik";
rev = version; rev = version;
sha256 = "C/1Uwjsqd9n3WSXlnlq9K3EJHkLOSavS9cPqF2UqmGo="; sha256 = "0kmcidnjw26vnxx9h3swcg72i507awg89s4nfxw6rwbyw36iiiqf";
}; };
vendorSha256 = "klmWXC3tkoOcQHhiQZjR2C5jqaRJqMQOLtVxZ0cFq/Y="; vendorSha256 = null;
meta = with lib; { meta = with lib; {
homepage = "https://plik.root.gg/"; homepage = "https://plik.root.gg/";
@ -18,7 +18,8 @@ let
maintainers = with maintainers; [ freezeboy ]; maintainers = with maintainers; [ freezeboy ];
license = licenses.mit; license = licenses.mit;
}; };
in { in
{
plik = buildGoModule { plik = buildGoModule {
pname = "plik"; pname = "plik";