Merge staging-next into staging
github-actions[bot]
GitHub
commit
888306cd93
|
|
@ -126,10 +126,14 @@ let
|
|||
</IfModule>
|
||||
'';
|
||||
|
||||
luaSetPaths = ''
|
||||
luaSetPaths = let
|
||||
# support both lua and lua.withPackages derivations
|
||||
luaversion = cfg.package.lua5.lua.luaversion or cfg.package.lua5.luaversion;
|
||||
in
|
||||
''
|
||||
<IfModule mod_lua.c>
|
||||
LuaPackageCPath ${cfg.package.lua5}/lib/lua/${cfg.package.lua5.lua.luaversion}/?.so
|
||||
LuaPackagePath ${cfg.package.lua5}/share/lua/${cfg.package.lua5.lua.luaversion}/?.lua
|
||||
LuaPackageCPath ${cfg.package.lua5}/lib/lua/${luaversion}/?.so
|
||||
LuaPackagePath ${cfg.package.lua5}/share/lua/${luaversion}/?.lua
|
||||
</IfModule>
|
||||
'';
|
||||
|
||||
|
|
@ -333,7 +337,7 @@ let
|
|||
|
||||
${sslConf}
|
||||
|
||||
${if cfg.package.luaSupport then luaSetPaths else ""}
|
||||
${optionalString cfg.package.luaSupport luaSetPaths}
|
||||
|
||||
# Fascist default - deny access to everything.
|
||||
<Directory />
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pueue";
|
||||
version = "0.8.2";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nukesor";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1vdlsfnqnyri0ny2g695lhivs9m25v9lsqf1valwbjv9l9vjxfqa";
|
||||
sha256 = "sha256-yOUVDq/wRY35ZQjQVwTLYHKukkKpoggN51wBDdZnhI4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0qziwb69qpbziz772np8dcb1dvxg6m506k5kl63m75z4zicgykcv";
|
||||
cargoSha256 = "sha256-56jJ8IjxWTBlaDd1CVit4RP659Mgw2j2wMWcSDYVihM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-chromecast";
|
||||
version = "0.2.8";
|
||||
version = "0.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vishen";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ehIhFqZeVidhYTgqOLlf0aMHKG0cOe6245UyOVM/nOg=";
|
||||
sha256 = "sha256-KhJMgr57pDnuFLhsbf0/4n9w0EfjuuKA46ENPLXox3A=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-idxElk4Sy7SE9G1OMRw8YH4o8orBa80qhBXPA+ar620=";
|
||||
|
|
|
|||
|
|
@ -1,31 +1,51 @@
|
|||
{ stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal
|
||||
, ttfautohint-nox
|
||||
# Custom font set options.
|
||||
# See https://typeof.net/Iosevka/customizer
|
||||
# Can be a raw TOML string, or a Nix attrset.
|
||||
|
||||
# Custom font set options.
|
||||
# See https://github.com/be5invis/Iosevka#build-your-own-style
|
||||
# Ex:
|
||||
# privateBuildPlan = {
|
||||
# family = "Iosevka Expanded";
|
||||
#
|
||||
# design = [
|
||||
# "sans"
|
||||
# "expanded"
|
||||
# ];
|
||||
# };
|
||||
# Ex:
|
||||
# privateBuildPlan = ''
|
||||
# [buildPlans.iosevka-custom]
|
||||
# family = "Iosevka Custom"
|
||||
# spacing = "normal"
|
||||
# serifs = "sans"
|
||||
#
|
||||
# [buildPlans.iosevka-custom.variants.design]
|
||||
# capital-j = "serifless"
|
||||
#
|
||||
# [buildPlans.iosevka-custom.variants.italic]
|
||||
# i = "tailed"
|
||||
# '';
|
||||
|
||||
# Or:
|
||||
# privateBuildPlan = {
|
||||
# family = "Iosevka Custom";
|
||||
# spacing = "normal";
|
||||
# serifs = "sans";
|
||||
#
|
||||
# variants = {
|
||||
# design.capital-j = "serifless";
|
||||
# italic.i = "tailed";
|
||||
# };
|
||||
# }
|
||||
, privateBuildPlan ? null
|
||||
# Extra parameters. Can be used for ligature mapping.
|
||||
# It must be a raw toml string.
|
||||
#
|
||||
# It must be a raw TOML string.
|
||||
|
||||
# Ex:
|
||||
# [[iosevka.compLig]]
|
||||
# unicode = 57808 # 0xe1d0
|
||||
# featureTag = 'XHS0'
|
||||
# sequence = "+>"
|
||||
# extraParameters = ''
|
||||
# [[iosevka.compLig]]
|
||||
# unicode = 57808 # 0xe1d0
|
||||
# featureTag = 'XHS0'
|
||||
# sequence = "+>"
|
||||
# '';
|
||||
, extraParameters ? null
|
||||
# Custom font set name. Required if any custom settings above.
|
||||
, set ? null }:
|
||||
|
||||
assert (privateBuildPlan != null) -> set != null;
|
||||
assert (extraParameters != null) -> set != null;
|
||||
|
||||
let
|
||||
# We don't know the attribute name for the Iosevka package as it
|
||||
|
|
@ -54,15 +74,21 @@ stdenv.mkDerivation rec {
|
|||
ttfautohint-nox
|
||||
];
|
||||
|
||||
privateBuildPlanJSON =
|
||||
builtins.toJSON { buildPlans.${pname} = privateBuildPlan; };
|
||||
buildPlan =
|
||||
if builtins.isAttrs privateBuildPlan
|
||||
then builtins.toJSON { buildPlans.${pname} = privateBuildPlan; }
|
||||
else privateBuildPlan;
|
||||
|
||||
inherit extraParameters;
|
||||
passAsFile = [ "privateBuildPlanJSON" "extraParameters" ];
|
||||
passAsFile = [ "buildPlan" "extraParameters" ];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
${lib.optionalString (privateBuildPlan != null) ''
|
||||
remarshal -i "$privateBuildPlanJSONPath" -o private-build-plans.toml -if json -of toml
|
||||
${lib.optionalString (builtins.isAttrs privateBuildPlan) ''
|
||||
remarshal -i "$buildPlanPath" -o private-build-plans.toml -if json -of toml
|
||||
''}
|
||||
${lib.optionalString (builtins.isString privateBuildPlan) ''
|
||||
cp "$buildPlanPath" private-build-plans.toml
|
||||
''}
|
||||
${lib.optionalString (extraParameters != null) ''
|
||||
echo -e "\n" >> params/parameters.toml
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf
|
||||
, gflags, abseil-cpp, libnsl
|
||||
, gflags, libnsl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.34.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
|
||||
version = "1.35.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
|
||||
pname = "grpc";
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
sha256 = "0p6si9i0gg885ag2x87a7jyzhgd5lhx2bh2vjj2ra1jn6y3vg6qk";
|
||||
sha256 = "0vxgp3kqxsglavzs91ybpkkh7aaywxcryacp5z3z6dpsgmw0mscd";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
patches = [
|
||||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ]
|
||||
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]
|
||||
++ lib.optionals stdenv.isLinux [ libnsl ];
|
||||
|
||||
cmakeFlags =
|
||||
|
|
@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
|
|||
"-DgRPC_SSL_PROVIDER=package"
|
||||
"-DgRPC_PROTOBUF_PROVIDER=package"
|
||||
"-DgRPC_GFLAGS_PROVIDER=package"
|
||||
"-DgRPC_ABSL_PROVIDER=package"
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@
|
|||
, "indium"
|
||||
, "insect"
|
||||
, "ionic"
|
||||
, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v3.7.1.tar.gz"}
|
||||
, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v4.5.0.tar.gz"}
|
||||
, "jake"
|
||||
, "javascript-typescript-langserver"
|
||||
, "joplin"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpcio-tools";
|
||||
version = "1.34.1";
|
||||
version = "1.35.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b411f36748f4ead33411544d785e37825598bbb8abbe79eca422e395be5a3d08";
|
||||
sha256 = "9e2a41cba9c5a20ae299d0fdd377fe231434fa04cbfbfb3807293c6ec10b03cf";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "tfsec";
|
||||
version = "0.37.3";
|
||||
version = "0.38.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tfsec";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-36yiX/uTqjiG+ZdQUQGPiLxSxIXE6ThH/LMqBGnm1d8=";
|
||||
sha256 = "sha256-ezTmtKR6ng3fuVJzLP81o0aoaqu3XPUMF0BIKFCwXdw=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/tfsec/tfsec";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "bazelisk";
|
||||
version = "1.7.4";
|
||||
version = "1.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1mc1l2g2qrg9djpyyz203a6dpx5fxllisybmhrpmikyza15w935q";
|
||||
sha256 = "sha256-jXRTj/7GJO6rSueOmw8aNg69w43lxiDbSeZR802+kws=";
|
||||
};
|
||||
|
||||
vendorSha256 = "116wy1a7gmi2w8why9hszhcybfvpwp4iq62vshb25cdcma6q4mjh";
|
||||
vendorSha256 = "sha256-fW7KHsxhBfz947Tg+O5bdtiH6xMeKmLRHX9FWQSyxVQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "pgformatter";
|
||||
version = "4.4";
|
||||
version = "5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darold";
|
||||
repo = "pgFormatter";
|
||||
rev = "v${version}";
|
||||
sha256 = "1sqjw6q005lws7qhkd26jqyb1xqmpcklzw5hk8paxxi8mzyjn0jp";
|
||||
sha256 = "10ml3va6ip501ibaykbhq8282y1j6r8bc8azc1gqxskk5jvfz1jm";
|
||||
};
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
|
|
|||
|
|
@ -128,6 +128,18 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
dbaeumer.vscode-eslint = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-eslint";
|
||||
publisher = "dbaeumer";
|
||||
version = "2.1.14";
|
||||
sha256 = "sha256-bVGmp871yu1Llr3uJ+CCosDsrxJtD4b1+CR+omMUfIQ=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
davidanson.vscode-markdownlint = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-markdownlint";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2021-02-01T22-56-52Z";
|
||||
version = "2021-02-11T08-23-43Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-cAQErFWFqyHJpTGxbzY5JCSH/ZV0ZZOWbh1lJmK8MlY=";
|
||||
sha256 = "sha256-Y2iyi+bdBCLV/MWPPsrrJFEayuQVGsvrs63kOuFljJ8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-1wnnt4QuOn+1NqZcuA43naP3KtIL5VbVr6VF3+Cu41w=";
|
||||
vendorSha256 = "sha256-7WvR6WHiaFHHBhpPoqnkr9pzFxNpLpZuaB1a/SkLBtc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pg_tileserv";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CrunchyData";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6KFYTZq126uvxQ5IOrMN+hpnAk/WtmS1Dam7w6Oif1M=";
|
||||
sha256 = "sha256-PHF8n0rjxvajyC/y2sFcdvxQdDFXkxcDZOkYT10UsE4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-qdlh9H039GwKTxOhx+dzyUHkzJbaOeuguKnBOyAPe/E=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pg_auto_failover";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "citusdata";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0x19p0b9hv1hkhwjm68cm8gskhnsl7np4si8wl0ablf6kasyl3q7";
|
||||
sha256 = "030vm83ksfi4daypr4hamvvfs4g1ckww4ldg7rrk6c6hqkppykpa";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql openssl zlib readline ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "topgrade";
|
||||
version = "6.3.2";
|
||||
version = "6.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "r-darwish";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yKNHUH+oLQ99oH3yKYQCGAfX3tOI3ghLzLUpPzU6M0k=";
|
||||
sha256 = "sha256-xrp2oGqJRhjYYZ0dDvYiUfgKM2mazOAlkJQyawDk2y4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-kSxnEIAKF5Xf/x1LgtEj1u6IchbThtp3Sti5wnezlRA=";
|
||||
cargoSha256 = "sha256-EK48mrTYgh0AgC53rvVRFfdZP/FS9LOZWr8TF13qEl0=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Foundation;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "minio-client";
|
||||
version = "2021-01-30T00-50-42Z";
|
||||
version = "2021-02-10T07-32-57Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "mc";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-6t9x2kViSUyZMbe9OFdoCFN4y/swelMVOm80YvOizwM=";
|
||||
sha256 = "sha256-dwgQ322KV1aR1RYSowHkb7Q0Pn7vuiV6Me1s6cMyaEs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-3wWUIFpNXom2MuUEDgAAEHlWRXhUzId+shZW/i5Rw4A=";
|
||||
vendorSha256 = "sha256-MXCZZZ7NGDu8NMBzfIiNdRduvj7d7nboN2r8ObGx4dQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,25 @@
|
|||
--- src/libdnf/hy-iutil.cpp 2020-12-02 07:53:42.000000000 -0800
|
||||
+++ src/libdnf/hy-iutil.cpp 2020-12-21 14:24:14.000000000 -0800
|
||||
diff --git src/libdnf/config.h src/libdnf/config.h
|
||||
index 16121f6f..737d0bc4 100644
|
||||
--- src/libdnf/config.h
|
||||
+++ src/libdnf/config.h
|
||||
@@ -18,7 +18,12 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
+
|
||||
+#ifdef __APPLE__
|
||||
+#include <stdint.h>
|
||||
+#else
|
||||
#include <bits/wordsize.h>
|
||||
+#endif
|
||||
|
||||
|
||||
#if __WORDSIZE == 32
|
||||
#include "config-32.h"
|
||||
diff --git src/libdnf/hy-iutil.cpp src/libdnf/hy-iutil.cpp
|
||||
index 497c560d..5de077fa 100644
|
||||
--- src/libdnf/hy-iutil.cpp
|
||||
+++ src/libdnf/hy-iutil.cpp
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <errno.h>
|
||||
#include <dirent.h>
|
||||
|
|
@ -9,8 +29,10 @@
|
|||
#include <pwd.h>
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
--- src/libdnf/hy-util.cpp 2020-12-02 07:53:42.000000000 -0800
|
||||
+++ src/libdnf/hy-util.cpp 2020-12-21 14:23:21.000000000 -0800
|
||||
diff --git src/libdnf/hy-util.cpp src/libdnf/hy-util.cpp
|
||||
index 295fdc1b..9d584b8a 100644
|
||||
--- src/libdnf/hy-util.cpp
|
||||
+++ src/libdnf/hy-util.cpp
|
||||
@@ -24,7 +24,20 @@
|
||||
#include <ctype.h>
|
||||
#include <sys/utsname.h>
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ gcc9Stdenv, lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check
|
||||
, pcre, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }:
|
||||
, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }:
|
||||
|
||||
gcc9Stdenv.mkDerivation rec {
|
||||
pname = "libdnf";
|
||||
version = "0.55.2";
|
||||
version = "0.58.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rpm-software-management";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0hiydwfa90nsrqk5ffa6ks1g73wnsgjgq7z7gwq9jj76a7gpfbfq";
|
||||
sha256 = "0an8giv0lm0qqc76fpmqg42ra081mlj62b9r0s1p0sgb3270l76l";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "microdnf";
|
||||
version = "3.6.0";
|
||||
version = "3.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rpm-software-management";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0a7lc3qsnblvznzsz3544l3n84184xi85zf7c3m3jhnmpmxsg39h";
|
||||
sha256 = "1is8hqckjdz1h9w44iq1ljyfs5b0qd2cyivl30ny4dv8m8zba4zv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake gettext help2man ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nfpm";
|
||||
version = "2.2.3";
|
||||
version = "2.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-F3SDcO5E0d5/aEJLdy0fJqB6brwf4C9Imtk1R5zOT5A=";
|
||||
sha256 = "sha256-EIHEdU1H5XhhzuWJUEvnKNsuNV8CBJrHBlaZlSfrSro=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-fGhe0EukTWk/4tGPiFMit7zBD4380AkgxrQ3pzImsFU=";
|
||||
vendorSha256 = "sha256-aSoryidfAfqPBpOtAXFJsq1ZcqJqpGiX3pZz5GpkKqQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, makeWrapper
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
|
|
@ -12,7 +13,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gopass";
|
||||
version = "1.11.0";
|
||||
version = "1.12.0";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
|
|
@ -20,10 +21,12 @@ buildGoModule rec {
|
|||
owner = "gopasspw";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0plg3hck6yqxcazjczx9m5palzz5h3qs5minzmmq8yzvfwi0shic";
|
||||
sha256 = "0y3dcikw6gl436mhza5j0b3lm49jzl590a9ry53rkmzrv2lqx9w6";
|
||||
};
|
||||
|
||||
vendorSha256 = "1sycbcld5qyriqb771l52drxy4vhzm4nh9q5s6kn70nq1s2a3h7x";
|
||||
vendorSha256 = "09lbkm7c361c2s87qi1wpfsqgpp3r862wcn98dzdg5j6pvpgwbag";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -47,9 +50,7 @@ buildGoModule rec {
|
|||
'';
|
||||
|
||||
postFixup = ''
|
||||
for bin in $out/bin/*; do
|
||||
wrapProgram $bin --prefix PATH : "${wrapperPath}"
|
||||
done
|
||||
wrapProgram $out/bin/gopass --prefix PATH : "${wrapperPath}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -57,6 +58,7 @@ buildGoModule rec {
|
|||
homepage = "https://www.gopass.pw/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ andir rvolosatovs ];
|
||||
changelog = "https://github.com/gopasspw/gopass/blob/v${version}/CHANGELOG.md";
|
||||
platforms = platforms.unix;
|
||||
|
||||
longDescription = ''
|
||||
|
|
|
|||
Loading…
Reference in New Issue