Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
667a7541cd
|
|
@ -351,7 +351,7 @@ in {
|
|||
CacheDirectory = dirs cacheDirs;
|
||||
RuntimeDirectory = dirName;
|
||||
ReadWriteDirectories = lib.mkIf useCustomDir [ cfg.storageDir ];
|
||||
StateDirectory = dirs (lib.optional (!useCustomDir) libDirs);
|
||||
StateDirectory = dirs (lib.optionals (!useCustomDir) libDirs);
|
||||
LogsDirectory = dirName;
|
||||
PrivateTmp = true;
|
||||
ProtectSystem = "strict";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "yacreader";
|
||||
version = "9.12.0";
|
||||
version = "9.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YACReader";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-sIQxUiTGQCcHmxBp0Mf49e/XVaJe7onlLHiorMlNLZ8=";
|
||||
sha256 = "sha256-kiacyHA/G0TnRH/96RqDTF7vdDnf2POMw/iSgtSRbmM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -4,24 +4,42 @@
|
|||
, lib
|
||||
, gnugrep
|
||||
, gnused
|
||||
, wget
|
||||
, curl
|
||||
, catt
|
||||
, syncplay
|
||||
, ffmpeg
|
||||
, fzf
|
||||
, mpv
|
||||
, aria2
|
||||
, withMpv ? true, mpv
|
||||
, withVlc ? false, vlc
|
||||
, withIina ? false, iina
|
||||
, chromecastSupport ? false
|
||||
, syncSupport ? false
|
||||
}:
|
||||
|
||||
assert withMpv || withVlc || withIina;
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "ani-cli";
|
||||
version = "4.5";
|
||||
version = "4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pystardust";
|
||||
repo = "ani-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HDpspU9OZxDET7/1rnKdGgaVEBt0gpzGtd3DuNIj7FY=";
|
||||
hash = "sha256-ahyCD4QsYyb3xtNK03HITeF0+hJFIHZ+PAjisuS/Kdo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
runtimeDependencies =
|
||||
let player = []
|
||||
++ lib.optional withMpv mpv
|
||||
++ lib.optional withVlc vlc
|
||||
++ lib.optional withIina iina;
|
||||
in [ gnugrep gnused curl fzf ffmpeg aria2 ]
|
||||
++ player
|
||||
++ lib.optional chromecastSupport catt
|
||||
++ lib.optional syncSupport syncplay;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
@ -29,7 +47,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
install -Dm755 ani-cli $out/bin/ani-cli
|
||||
|
||||
wrapProgram $out/bin/ani-cli \
|
||||
--prefix PATH : ${lib.makeBinPath [ gnugrep gnused wget fzf mpv aria2 ]}
|
||||
--prefix PATH : ${lib.makeBinPath runtimeDependencies}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -19,17 +19,17 @@ in
|
|||
lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants
|
||||
lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants
|
||||
lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants
|
||||
lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "dracula" "gruvbox" "rimless" "normal" ] tweaks
|
||||
lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "all" "black" "rimless" "normal" "float" ] tweaks
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "2023.04.11";
|
||||
version = "2023-08-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-lVHDQmu9GLesasmI2GQ0hx4f2NtgaM4IlJk/hXe2XzY=";
|
||||
hash = "sha256-Ss6IXd4vYUvIF5/Hn4IVLNvDSaewTY0GNZp7X5Lmz/c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oneDNN";
|
||||
version = "3.2";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "oneDNN";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-V+0NyQMa4pY9Rhw6bLuqTom0ps/+wm4mGfn1rTi+0YM=";
|
||||
sha256 = "sha256-/LbT2nHPpZHjY3xbJ9bDabR7aIMvetNP4mB+rxuTfy8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uthenticode";
|
||||
version = "1.0.9";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trailofbits";
|
||||
repo = "uthenticode";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MEpbvt03L501BP42j6S7rXE9j1d8j6D2Y5kgPNlbHzc=";
|
||||
hash = "sha256-XGKROp+1AJWUjCwMOikh+yvNMGuENJGb/kzJsEOEFeY=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_EXTERNAL_GTEST=1" ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, anyio
|
||||
, distro
|
||||
|
|
@ -16,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "anthropic";
|
||||
version = "0.3.6";
|
||||
version = "0.3.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -25,9 +26,17 @@ buildPythonPackage rec {
|
|||
owner = "anthropics";
|
||||
repo = "anthropic-sdk-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dfMlM7IRP1PG7Ynr+MR4OPeKnHBbhhWKSug7UQ4/4rI=";
|
||||
hash = "sha256-rNLKIZKX9AI0IKGicozllh+XGU4Ll91EfRaAfJYJtJE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "support-pytest-asyncio-0.21.0.patch";
|
||||
url = "https://github.com/anthropics/anthropic-sdk-python/commit/1e199aa9b38970c5b5b4492907494ac653a7f756.patch";
|
||||
hash = "sha256-f9KldnvXuRKVgT7Xb/xdhInKOeXvi4g5OxVRD0PMhgQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,30 +2,38 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "autocommand";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lucretiel";
|
||||
repo = "autocommand";
|
||||
rev = version;
|
||||
hash = "sha256-bjoVGfP57qhvPuHHcMP8JQddAaW4/fEyatElk1UEPZo=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9bv9Agj4RpeyNJvTLUaMwygQld2iZZkoLb81rkXOd3E=";
|
||||
};
|
||||
|
||||
# fails with: SyntaxError: invalid syntax
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "autocommand" ];
|
||||
pythonImportsCheck = [
|
||||
"autocommand"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = " Autocommand turns a python function into a CLI program ";
|
||||
description = "Autocommand turns a python function into a CLI program";
|
||||
homepage = "https://github.com/Lucretiel/autocommand";
|
||||
license = licenses.lgpl3;
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,35 +1,39 @@
|
|||
{ absl-py
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, absl-py
|
||||
, cloudpickle
|
||||
, dm-tree
|
||||
, fetchFromGitHub
|
||||
, jax
|
||||
, jaxlib
|
||||
, lib
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, toolz
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chex";
|
||||
version = "0.1.6";
|
||||
version = "0.1.82";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepmind";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VolRlLLgKga9S17ByVrYya9VPtu9yiOnvt/WmlE1DOc=";
|
||||
hash = "sha256-xBq22AaR2Tp1NSPefEyvCDeUYqRZlAf5LVHWo0luiXk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
absl-py
|
||||
cloudpickle
|
||||
dm-tree
|
||||
jaxlib
|
||||
jax
|
||||
numpy
|
||||
toolz
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
@ -37,21 +41,11 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
jaxlib
|
||||
cloudpickle
|
||||
dm-tree
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# See https://github.com/deepmind/chex/issues/204.
|
||||
"test_uninspected_checks"
|
||||
|
||||
# These tests started failing at some point after upgrading to 0.1.5
|
||||
"test_useful_failure"
|
||||
"TreeAssertionsTest"
|
||||
"PmapFakeTest"
|
||||
"WithDeviceTest"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Chex is a library of utilities for helping to write reliable JAX code.";
|
||||
homepage = "https://github.com/deepmind/chex";
|
||||
|
|
|
|||
|
|
@ -9,14 +9,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dicom-numpy";
|
||||
version = "0.6.3";
|
||||
version = "0.6.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "innolitics";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QIPuSFaWgHmcTddZ8H9kgzLYuwGUzy/FVsi/ttSUskA=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pgmREQlstr0GY2ThIWt4hbcSWmaNWgkr2gO4PSgGHqE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpcio-testing";
|
||||
version = "1.54.2";
|
||||
version = "1.56.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-qCMOjSfe7eGIWyomTLiLrLrt/GekmLdlMO2VnPihgI0=";
|
||||
hash = "sha256-Cg1dONvESb1ayz5ogv9AWHywqd0LdVsRDpIwtos+0SA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "5.0.4";
|
||||
version = "5.0.7";
|
||||
pname = "icalendar";
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "collective";
|
||||
repo = "icalendar";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ch0i6hxEnHV/Xu4PqpRVt30KLOHHgtCAI2W9UyXo15E=";
|
||||
hash = "sha256-fblcbyctnvd7DOc+tMWzg+90NHzZvH5xiY6BfJakQVo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gotraceui";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dominikh";
|
||||
repo = "gotraceui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dryDDunvxjHHzsMtTbEeIWqWOM7wtcyb9DjqzR2SgYE=";
|
||||
sha256 = "sha256-hdI1TT33pPHK5018RQ+riPVqzqOF/xDkvh0WoYi6Pes=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Nx91u2JOBWYiYeG4VbCYKg66GANDViVHrbE31YdPIzM=";
|
||||
vendorHash = "sha256-nXPiwSG2Hs86/raDvTv2p77P6Xwm+t8VT0dvZpXE8Os=";
|
||||
subPackages = ["cmd/gotraceui"];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kubie";
|
||||
version = "0.21.1";
|
||||
version = "0.21.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "sbstp";
|
||||
repo = "kubie";
|
||||
sha256 = "sha256-Qe//QBAQzxgNdQ0YrKFhgqNfVMFT9cb9eSQWgbPv0Gk=";
|
||||
sha256 = "sha256-fkIKb2fcml9E2sSJwhYPrqiThFgpNYh1CampQu8RT4k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hKM1lyVAXaRCIqrrQpVO03FSThzgQw3tFJIjWyUNfXo=";
|
||||
cargoHash = "sha256-zZwSLMuuaQ8Ht6Ux/wrqB/VEHCvBqTQGvg+RSr8+AiQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://github.com/lalrpop/lalrpop";
|
||||
changelog = "https://github.com/lalrpop/lalrpop/blob/${src.rev}/RELEASES.md";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
mainProgram = "lalrpop";
|
||||
maintainers = with maintainers; [ chayleaf ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,10 @@
|
|||
, buildDartApplication
|
||||
, buf
|
||||
, protoc-gen-dart
|
||||
, testers
|
||||
, dart-sass
|
||||
, runCommand
|
||||
, writeText
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -15,17 +19,17 @@ let
|
|||
in
|
||||
buildDartApplication rec {
|
||||
pname = "dart-sass";
|
||||
version = "1.64.1";
|
||||
version = "1.65.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-JIw1I60Av5hUSRyqhc4nK5x9gHJcHTUIdYBTfQf8ob4=";
|
||||
hash = "sha256-q6UY+A7JFDYb9hzvr2SYI9GfkY9bg49fQkUM7gHKOBU=";
|
||||
};
|
||||
|
||||
pubspecLockFile = ./pubspec.lock;
|
||||
vendorHash = "sha256-kGeQIlNTHhlIEFH4MdWF5smc9lLg4YHx11bZS4BTPgI=";
|
||||
vendorHash = "sha256-nIiffqM5HwJmORdONz+RADAPTISrz/3/HxK4aOSl5cM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
buf
|
||||
|
|
@ -47,4 +51,31 @@ buildDartApplication rec {
|
|||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lelgenio ];
|
||||
};
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = dart-sass;
|
||||
command = "dart-sass --version";
|
||||
};
|
||||
|
||||
simple = testers.testEqualContents {
|
||||
assertion = "dart-sass compiles a basic scss file";
|
||||
expected = writeText "expected" ''
|
||||
body h1{color:#123}
|
||||
'';
|
||||
actual = runCommand "actual" {
|
||||
nativeBuildInputs = [ dart-sass ];
|
||||
base = writeText "base" ''
|
||||
body {
|
||||
$color: #123;
|
||||
h1 {
|
||||
color: $color;
|
||||
}
|
||||
}
|
||||
'';
|
||||
} ''
|
||||
dart-sass --style=compressed $base > $out
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "okteto";
|
||||
version = "2.18.0";
|
||||
version = "2.18.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
rev = version;
|
||||
hash = "sha256-u0Ue5padTT2hPEta0ysm7W2oR1/FMFyTZd9yuciCehU=";
|
||||
hash = "sha256-ZSrTVfZfIzfeXr6SDKHZZYrqvGKYA6bwMXZ4fBP+2Uo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ruDXfDwVmMLFsIF+YV4CryEPSeU2cEul9FfRiApII9g=";
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ chkno fgaz thekostins ];
|
||||
platforms = platforms.x86_64;
|
||||
platforms = if enableClient then platforms.x86_64 else platforms.linux;
|
||||
# Hash mismatch on darwin:
|
||||
# https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293
|
||||
broken = stdenv.isDarwin;
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kics";
|
||||
version = "1.7.4";
|
||||
version = "1.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Checkmarx";
|
||||
repo = "kics";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-h6ZnaknqMcW+Zp2t5RHPK/e/Ilw5yWY2fcSTJe2mVR4=";
|
||||
hash = "sha256-+/wqwWRJQKfmh4JuWppcE2444lD1PQ9rDGOsFh57AKs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ipXfxqHdushJ2P//oyGGjZsq5EypDEpHKlW32VHaMXw=";
|
||||
|
|
|
|||
|
|
@ -149,6 +149,13 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts'
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
# make sure .po files are up to date to workaround
|
||||
# parallel `msgmerge --update` on autogenerated .po files:
|
||||
# https://github.com/NixOS/nixpkgs/pull/248747#issuecomment-1676301670
|
||||
make dist
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--enable-grub-mount" # dep of os-prober
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@ assert withGui -> !stdenv.isDarwin;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rmlint";
|
||||
version = "2.10.1";
|
||||
version = "2.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sahib";
|
||||
repo = "rmlint";
|
||||
rev = "v${version}";
|
||||
sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x";
|
||||
sha256 = "sha256-pOo1YfeqHUU6xyBRFbcj2lX1MHJ+a5Hi31BMC1nYZGo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
48
pkgs/tools/security/vault-ssh-plus/default.nix
Normal file
48
pkgs/tools/security/vault-ssh-plus/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, lib
|
||||
, openssh
|
||||
, testers
|
||||
, vault-ssh-plus
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "vault-ssh-plus";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "isometry";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-D38G947/1//AMmWghgw0TDzNcd4LUcCuyLBhRP7YFJY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tNdr2xyxri7mj1bP6oVx1DGzwrzg84TpPCY0kHNkXLw=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/vault-ssh-plus $out/bin/vssh
|
||||
wrapProgram $out/bin/vssh --prefix PATH : ${lib.makeBinPath [ openssh ]};
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = vault-ssh-plus;
|
||||
command = "vssh --version";
|
||||
version = "v${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/isometry/vault-ssh-plus";
|
||||
changelog = "https://github.com/isometry/vault-ssh-plus/releases/tag/v${version}";
|
||||
description = "Automatically use HashiCorp Vault SSH Client Key Signing with ssh(1)";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lesuisse ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "chars";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antifuchs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aswosSXAh0wkO4N/y/H54dufMDrloWjpjrSWHvHR1rc=";
|
||||
sha256 = "sha256-mBtwdPzIc6RgEFTyReStFlhS4UhhRWjBTKT6gD3tzpQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-CqPmasdpXWjCn65G2Ua0h3v+TVP0QPFAdtKOFyoYW/0=";
|
||||
cargoHash = "sha256-wqyExG4haco6jg1zpbouz3xMR7sjiVIAC16PnDU2tc8=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
|||
|
|
@ -41020,6 +41020,8 @@ with pkgs;
|
|||
|
||||
vault-medusa = callPackage ../tools/security/vault-medusa { };
|
||||
|
||||
vault-ssh-plus = callPackage ../tools/security/vault-ssh-plus { };
|
||||
|
||||
vault-bin = callPackage ../tools/security/vault/vault-bin.nix { };
|
||||
|
||||
vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv;
|
||||
|
|
|
|||
Loading…
Reference in a new issue