Merge branch 'staging-next' into staging
This commit is contained in:
@@ -13,11 +13,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "0.8.4";
|
||||
version = "0.8.6-2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
|
||||
sha256 = "04rjlyi465pkg75pql3rfzmfj9zf8pfnxynz110x1wkqnvqmsxgw";
|
||||
sha256 = "1m7sql2y2kj94gr607n48m0h4b3rijyzvxrssyizv75spmxr4d5r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clevis";
|
||||
version = "13";
|
||||
version = "14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latchset";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1p522jjksxmdwjjxa32z2ij1g81ygpkmcx998d07g8pb6rfnknjy";
|
||||
sha256 = "1j8id67jk3ikim2xh7vjg7j2ayrpm1a4n8v3n8r8pnr4rhqy76fd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig asciidoc ];
|
||||
|
||||
@@ -2,27 +2,22 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jwt-cli";
|
||||
version = "3.1.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mike-engel";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0pmxis3m3madwnmswz9hn0i8fz6a9bg11slgrrwql7mx23ijqf6y";
|
||||
sha256 = "07mnkr7hi29fyyyn7llb30p4ndiqz4gf1lnhm44qm09alaxmfvws";
|
||||
};
|
||||
|
||||
cargoSha256 = "165g1v0c8jxs8ddm8ld0hh7k8mvk3566ig43pf99hnw009fg1yc2";
|
||||
|
||||
patches = [
|
||||
# to fix `cargo test -- --test-threads $NIX_BUILD_CORES`
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mike-engel/jwt-cli/commit/df87111f3084abdecce5d58ad031edb6e7fef94a.patch";
|
||||
sha256 = "1vjk7wy8ddkz9wjkiayag61gklrq59m7bwlaiyinjp4n15gx0j1k";
|
||||
})
|
||||
];
|
||||
cargoSha256 = "0jkzy7ssg9v9phhlldq6s4rfs3sn17y2r1k0jr10g9j15lzixa04";
|
||||
|
||||
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = "$out/bin/jwt --version";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Super fast CLI tool to decode and encode JWTs";
|
||||
homepage = "https://github.com/mike-engel/jwt-cli";
|
||||
|
||||
@@ -6,13 +6,13 @@ let
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "lesspass-cli";
|
||||
version = "9.0.0";
|
||||
version = "9.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = repo;
|
||||
repo = repo;
|
||||
rev = version;
|
||||
sha256 = "1mdv0c0fn4d72iigy8hz4s7kf7q3pg4gjjadxwxyjwsalapnsapk";
|
||||
sha256 = "126zk248s9r72qk9b8j27yvb8gglw49kazwz0sd69b5kkxvhz2dh";
|
||||
};
|
||||
sourceRoot = "source/cli";
|
||||
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sops";
|
||||
version = "3.6.0";
|
||||
version = "3.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "mozilla";
|
||||
repo = pname;
|
||||
sha256 = "01skk6vdfki4a88z0snl1pby09im406qhnsfa0d2l8gp6nz8pq6j";
|
||||
sha256 = "0xl53rs8jzq5yz4wi0vzsr6ajsaf2x2n1h3x7krk02a9839y6f18";
|
||||
};
|
||||
|
||||
vendorSha256 = "0475y95qma5m346ng898n80xv2rxzndx89c9ygjcvjs513yzcba2";
|
||||
vendorSha256 = "1cpm06dyc6lb3a9apfggyi16alb2yijvyan1gbrl8r9fwlqvdpjk";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user