mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-18 18:14:42 +00:00
Merge staging-next into staging
This commit is contained in:
commit
588298ee0a
@ -1259,6 +1259,14 @@
|
||||
compatibilty, but will be removed at a later date.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>unifi</literal> package was switched from
|
||||
<literal>unifi6</literal> to <literal>unifi7</literal>. Direct
|
||||
downgrades from Unifi 7 to Unifi 6 are not possible and
|
||||
require restoring from a backup made by Unifi 6.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>programs.zsh.autosuggestions.strategy</literal> now
|
||||
|
@ -468,6 +468,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
combined `influxdb2` package is still provided in this release for
|
||||
backwards compatibilty, but will be removed at a later date.
|
||||
|
||||
- The `unifi` package was switched from `unifi6` to `unifi7`.
|
||||
Direct downgrades from Unifi 7 to Unifi 6 are not possible and require restoring from a backup made by Unifi 6.
|
||||
|
||||
- `programs.zsh.autosuggestions.strategy` now takes a list of strings instead of a string.
|
||||
|
||||
- The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11.
|
||||
|
@ -214,6 +214,8 @@ in
|
||||
User = cfg.user;
|
||||
ExecStart = "${cfg.package}/bin/paperless-ng qcluster";
|
||||
Restart = "on-failure";
|
||||
# The `mbind` syscall is needed for running the classifier.
|
||||
SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "mbind" ];
|
||||
};
|
||||
environment = env;
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kube-capacity";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "robscott";
|
||||
repo = pname;
|
||||
sha256 = "sha256-jop1dn+D0A6BkR1UCMrU9qcbZ1AHVth430cTd+kUYJw=";
|
||||
sha256 = "sha256-+1qewL8N3WTS7GW6fpL2+RPbFQQ/3DDMgShtBi+lRtg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-PkCUwe3S1bq37ME2WyTUnwEcbnFcNI0eaI9yW/HZ1uw=";
|
||||
vendorSha256 = "sha256-sMobdarMMktf34LbQnyZ6sgbfiJhWxWSQR0F+4x5J58=";
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
|
@ -5,13 +5,13 @@ buildGoModule rec {
|
||||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.25.2";
|
||||
version = "0.25.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-L5pXq4vfus8gpQMO+j2+WXMPkk3sv3WeeeYrBFd+w7s=";
|
||||
sha256 = "sha256-YB2oKyO+pJSzx/ZgPFhP8+5auKxX/4sQyv1qW9B5PGg=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opensmt";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usi-verification-and-security";
|
||||
repo = "opensmt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5Gw9+J+3LHNUNbcHxsQR/ivWndL2P7yBt/Q35fBMg58=";
|
||||
sha256 = "sha256-3F4Q/ZWlgkiiW7QVjnaaDLSNLVdfAOSmwYdQo1v9Lv4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake bison flex ];
|
||||
|
@ -8,13 +8,13 @@ with lib;
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gogs";
|
||||
version = "0.12.4";
|
||||
version = "0.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gogs";
|
||||
repo = "gogs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-t2aXRYCr54sqXwv6cJHDf1z1z94SqJM0WQRd2ejc7XY=";
|
||||
sha256 = "sha256-I3kFRKgVMGMKgHU5VEeNai8FseN/ea6MzEP94AR2Zfo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-3dT5D+oDd0mpJp/cP53TQcRUkmqh6g3sRBWWAUqhaAo=";
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let version = "1.210"; in
|
||||
let version = "1.222"; in
|
||||
fetchzip {
|
||||
name = "lxgw-wenkai-${version}";
|
||||
url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/lxgw-wenkai-v${version}.tar.gz";
|
||||
@ -11,7 +11,7 @@ fetchzip {
|
||||
cp *.ttf $out/share/fonts/truetype
|
||||
'';
|
||||
|
||||
sha256 = "n8vnkoOJuUO4Gh+GUInZ/HJK5t4pD7MrPPaxDyH+0Qw=";
|
||||
sha256 = "sha256-u2NTEYZrotOHktc2R5RWMFqeZ775/IpYJSUBO6PWijM=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://lxgw.github.io/";
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.21.1";
|
||||
version = "3.22.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
inherit version;
|
||||
sha256 = "sha256-gVJUjxsl1rxvboL53186r63yp0k4FtTSgKJuqPzE2Q0=";
|
||||
sha256 = "sha256-XnB6aSTKRV72WjcXx9jPZ+FGmCNh6dvwiau7WDlyE5M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -0,0 +1,32 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, pythonOlder
|
||||
, azure-core
|
||||
, msrest
|
||||
, msrestazure
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-containerregistry";
|
||||
version = "1.0.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-DIZCHZM5aeKtmJrgwAk5J26ltaxNxKUn3rR+FbmuyZc=";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ azure-core msrest msrestazure ];
|
||||
|
||||
# tests require azure-devtools which are not published (since 2020)
|
||||
# https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/containerregistry/azure-containerregistry/dev_requirements.txt
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "azure.core" "azure.containerregistry" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Microsoft Azure Container Registry client library for Python";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/containerregistry/azure-containerregistry";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ peterromfeldhk ];
|
||||
};
|
||||
}
|
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "forecast-solar";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-libs";
|
||||
repo = "forecast_solar";
|
||||
rev = version;
|
||||
sha256 = "sha256-UrLy+j8YDWuS9pciEDKb/+UoCcw54XWiIUAEYC72/W0=";
|
||||
sha256 = "sha256-2gex50QEN55uUa8SfAQA7iDZ3SVnpOTXfD3Sxq7KvNw=";
|
||||
};
|
||||
|
||||
PACKAGE_VERSION = version;
|
||||
|
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigtable";
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TUgC/6IZ9kNE5iDtbhKPHJqo3sv9W+nl7KcxuXfrbyM=";
|
||||
hash = "sha256-TUMgrv1JNt8h6DzCNtk0Fm4LQFC73/FNfpgTs9jhkYs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "0.37.1";
|
||||
version = "0.37.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ZENCcNppXOl0OHQDdybJV+SxOgtVzF2PPN0gAPIMjXM=";
|
||||
sha256 = "sha256-Mb6ruBFM3IiU5EUwOTiWEL3qt7p/n7QIgI5+j0mrOkw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plexapi";
|
||||
version = "4.10.0";
|
||||
version = "4.10.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "pkkid";
|
||||
repo = "python-plexapi";
|
||||
rev = version;
|
||||
sha256 = "sha256-paj1QFSHQw7MfOor1yYwb2vkF9b5RPj6R6dRstK24gA=";
|
||||
sha256 = "sha256-0j3uf3wSDFSyDGo3oRi99KNKfhuGP2puSi0KgVjsXnQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -32,13 +32,13 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.968";
|
||||
version = "2.0.971";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-F+SMgNCL6qOOhfpZi0Gg/OWPjxzMDVVvXTrPOZCfrLU=";
|
||||
hash = "sha256-4iY0/pCU7ezf2llSNxnUB/Sky+salpEC6N80C2Pbt6k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Cem53w/pzSDTi9A9mh9VeLlRn1m6KhkxWaqJjEtfwUs=";
|
||||
hash = "sha256-wd/tuFOoWhts/i+FCNVXmREUHAsh6hYOUowCyZjg92Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "evans";
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ktr0731";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-F9URMwQaSAQZaiZ95rDZqe8+YcJ9aMInSTIgQ7JLyOw=";
|
||||
sha256 = "sha256-4KHJodqmx03uQ+HJBWmKbIBvkLh80N4fHnYL4GLciNc=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-ICGnjI9sFwt81rZCnap/rggfSs4+pZNmLouoTY7CYKw=";
|
||||
vendorSha256 = "sha256-to75gON3Kl0GHgVhhrW8I6GWOg9/KrUts3rwDLAfFnM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "More expressive universal gRPC client";
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "operator-sdk";
|
||||
version = "1.18.0";
|
||||
version = "1.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "operator-framework";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TamtjFnh+HT7JHcRTEpALdkXM9MyZGulb644bNr/BQI=";
|
||||
sha256 = "sha256-BusShYGgaUGwLMWr/EHS7kDUTnTJyHzWUztlaMJskAg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-uci8/gQqLtjmxxqSlpgZhgBnvMotMvklNfwR+ua8H3M=";
|
||||
vendorSha256 = "sha256-VH2ALKSr+UFk26Y5/1yhLP//wc1t8f9O5dMg0RGz4ZM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "libreddit";
|
||||
version = "0.21.7";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spikecodes";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pALPhSoamsU5xEbSoXFe+Cikl16gxTXccUATMkYB97M=";
|
||||
sha256 = "sha256-k6GAxEGmDzC6nUCMYXahw/MTQanpZw8UMBVPCA4zSTs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-/P8wyFPCcCoGINtJ0qom3xLlkunH6xZPd7/7ynXmTy4=";
|
||||
cargoSha256 = "sha256-K31z5j/pBN84Egrfwe4/V3hpbIrlzn6ppFFNWFXFVcc=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
@ -65,7 +65,7 @@ in rec {
|
||||
};
|
||||
|
||||
unifi7 = generic {
|
||||
version = "7.0.20-894288bd9b";
|
||||
sha256 = "sha256-lDSU4D159svqkv+e61v/RWIyw0KOrF8X0nNpo9eQe50=";
|
||||
version = "7.0.23";
|
||||
sha256 = "1y2z02blgbqa6xvwjrvzx6mfwbbbmmv50rq409rsg1hkkzispxmw";
|
||||
};
|
||||
}
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "autorestic";
|
||||
version = "1.5.6";
|
||||
version = "1.5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cupcakearmy";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NhKAxybPLBR1Kaw2d4xI8WKS4cG0yAMHbUBDWgr5T0A=";
|
||||
sha256 = "sha256-o3SO3y26ur16D20rTYtzfyZWNDbeOzvj/BpMykvG698=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-WzmgV0wUsGfMVeho6M8wXJKD9adaAKRYmaJYaAcXwFc=";
|
||||
vendorSha256 = "sha256-qYXdRpQT7x+Y5h8PuKGjsANXLqjNlsPKO76GQhnufTU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "chezmoi";
|
||||
version = "2.13.1";
|
||||
version = "2.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ui9zj/PI8vYkbT8M13dZ1N4sxhM8fo8ZVeOP9Oa35xg=";
|
||||
sha256 = "sha256-WxOpmowRP8KSxxjW4JNQlQL6jZ2EhvpNb87NgeSO890=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-6+T0UQDrCnoRZkMajyw50eH/AFIUzCgxCkWVmTfycD0=";
|
||||
vendorSha256 = "sha256-ord4jHjgiW+Z2OD/x2ZAFOJYLyoB7Tja6SOd+JqxWDM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -11,19 +11,27 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "miniserve";
|
||||
version = "0.19.2";
|
||||
version = "0.19.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svenstaro";
|
||||
repo = "miniserve";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/LmLz4hTmOjpR4Bqf+hABh3PSeaO/sSz/EgHp+nM20o=";
|
||||
hash = "sha256-JlpjDUX8v7sGADhdKNQXoklbl/fw8DT0A6hEaUG61TQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-/KL5c5OeflNDKWuE5Gzqgcew9zf8HFjvmBid+mQSqZE=";
|
||||
cargoSha256 = "sha256-5V8+Mcuu3fxG399QjW++/uWpPMvVWBfhI/L/6pmbkVY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config zlib ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
pkg-config
|
||||
zlib
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
Security
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
"--skip=bind_ipv4_ipv6::case_2"
|
||||
@ -38,7 +46,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "For when you really just want to serve some files over HTTP right now!";
|
||||
description = "CLI tool to serve files and directories over HTTP";
|
||||
homepage = "https://github.com/svenstaro/miniserve";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ ];
|
||||
|
@ -2,33 +2,61 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fulcio";
|
||||
version = "0.1.1";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MvLQMGPyJYqYUljLqsr+qJeeYnxdH9aNGkWpDRvOeh8=";
|
||||
sha256 = "sha256-tCjFx9Ug8rO8cSxQb2vBG/MHSUJCx17lDeGnSGjZLcI=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd "$out"
|
||||
git rev-parse HEAD > $out/COMMIT
|
||||
# '0000-00-00T00:00:00Z'
|
||||
date -u -d "@$(git log -1 --pretty=%ct)" "+'%Y-%m-%dT%H:%M:%SZ'" > $out/SOURCE_DATE_EPOCH
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorSha256 = "sha256-pRL0et+UOi/tzuQz/Q7UmSA+pVhLJYR8lG8NAbPN9PU=";
|
||||
vendorSha256 = "sha256-CmtsReP0JacgNyRqCrYZRONwR5eluymrQgsj/ukhYNQ=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
# Install completions post-install
|
||||
# install completions post-install
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/sigstore/fulcio/cmd/app.gitVersion=v${version}"
|
||||
"-X github.com/sigstore/fulcio/cmd/app.gitTreeState=clean"
|
||||
];
|
||||
|
||||
# ldflags based on metadata from git and source
|
||||
preBuild = ''
|
||||
ldflags+=" -X github.com/sigstore/fulcio/cmd/app.gitCommit=$(cat COMMIT)"
|
||||
ldflags+=" -X github.com/sigstore/fulcio/cmd/app.buildDate=$(cat SOURCE_DATE_EPOCH)"
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# remove test that requires networking
|
||||
rm pkg/config/config_test.go
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/fulcio $out/bin/fulcio-server
|
||||
installShellCompletion --cmd fulcio-server \
|
||||
--bash <($out/bin/fulcio-server completion bash) \
|
||||
--fish <($out/bin/fulcio-server completion fish) \
|
||||
--zsh <($out/bin/fulcio-server completion zsh)
|
||||
installShellCompletion --cmd fulcio \
|
||||
--bash <($out/bin/fulcio completion bash) \
|
||||
--fish <($out/bin/fulcio completion fish) \
|
||||
--zsh <($out/bin/fulcio completion zsh)
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
$out/bin/fulcio-server --help
|
||||
|
||||
$out/bin/fulcio --help
|
||||
$out/bin/fulcio version | grep "v${version}"
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
|
@ -6,23 +6,21 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grype";
|
||||
version = "0.34.2";
|
||||
version = "0.34.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tMkMGM45/LcFllEgQ3UTl6FsLJmdsU8SLcLH/8+zMA4=";
|
||||
sha256 = "sha256-iWmLfQ08+dhjvKQiK2iy2Tegk4jH9dGopu/6kdDRZd0=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd "$out"
|
||||
commit="$(git rev-parse HEAD)"
|
||||
source_date_epoch=$(git log --date=format:'%Y-%m-%dT%H:%M:%SZ' -1 --pretty=%ad)
|
||||
substituteInPlace "$out/internal/version/build.go" \
|
||||
--replace 'gitCommit = valueNotProvided' "gitCommit = \"$commit\"" \
|
||||
--replace 'buildDate = valueNotProvided' "buildDate = \"$source_date_epoch\""
|
||||
git rev-parse HEAD > $out/COMMIT
|
||||
# 0000-00-00T00:00:00Z
|
||||
date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
@ -37,14 +35,17 @@ buildGoModule rec {
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/anchore/grype/internal/version.version=${version}"
|
||||
"-X github.com/anchore/grype/internal/version.gitDescription=v${version}"
|
||||
"-X github.com/anchore/grype/internal/version.gitTreeState=clean"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# grype version also displays the version of the syft library used
|
||||
# we need to grab it from the go.sum and add an ldflag for it
|
||||
SYFTVERSION="$(grep "github.com/anchore/syft" go.sum -m 1 | awk '{print $2}')"
|
||||
ldflags+=" -X github.com/anchore/grype/internal/version.syftVersion=$SYFTVERSION"
|
||||
SYFT_VERSION="$(grep "github.com/anchore/syft" go.sum -m 1 | awk '{print $2}')"
|
||||
ldflags+=" -X github.com/anchore/grype/internal/version.syftVersion=$SYFT_VERSION"
|
||||
ldflags+=" -X github.com/anchore/grype/internal/version.gitCommit=$(cat COMMIT)"
|
||||
ldflags+=" -X github.com/anchore/grype/internal/version.buildDate=$(cat SOURCE_DATE_EPOCH)"
|
||||
'';
|
||||
|
||||
# Tests require a running Docker instance
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "spire";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
outputs = [ "out" "agent" "server" ];
|
||||
|
||||
@ -10,10 +10,10 @@ buildGoModule rec {
|
||||
owner = "spiffe";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "01ph9jzh18bnidrsbnnxm3gxh0cgfllnjvf7a5haqz51lm6a9pny";
|
||||
sha256 = "sha256-LK73RGSTwGhCXOglsqK8RAAldovRzliE78vi2ilTSrw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1fd1k5by4wcjmzfgi3gnrwnb38b0wa3w67kzjlx8s0nwapyfgx0b";
|
||||
vendorSha256 = "sha256-am8ZTUX8Vph1Eg013NObMiSVeupS2hlHdpZ/1mO27dY=";
|
||||
|
||||
subPackages = [ "cmd/spire-agent" "cmd/spire-server" ];
|
||||
|
||||
@ -30,6 +30,7 @@ buildGoModule rec {
|
||||
meta = with lib; {
|
||||
description = "The SPIFFE Runtime Environment";
|
||||
homepage = "https://github.com/spiffe/spire";
|
||||
changelog = "https://github.com/spiffe/spire/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jonringer fkautz ];
|
||||
};
|
||||
|
@ -5,15 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "volatility3";
|
||||
version = "2.0.0";
|
||||
|
||||
disabled = python3.pythonOlder "3.6";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "volatilityfoundation";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "141n09cdc17pfdhs01aw8l4cvsqpcz8ji5l4gi7r88cyf4ix2lnz";
|
||||
hash = "sha256-rEqp+V5r4Sk4D+r2ukR1uy4IDj9XQGhYwoYSPeMyKpA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
@ -31,7 +29,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "volatility3" ];
|
||||
pythonImportsCheck = [
|
||||
"volatility3"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Volatile memory extraction frameworks";
|
||||
|
@ -1,21 +1,32 @@
|
||||
{ buildGoModule, fetchFromGitHub, lib, installShellFiles }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hostctl";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guumaster";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VjFjGvIoymGVVRiZUk/qoq/PTYoklp+Jz89zndX0e5A=";
|
||||
hash = "sha256-rvUm31WRSLusM9VGsIHKGTH6Vs8LWPtzPDs3azA710w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-rGDWrivIdl5FTu/kNR8nAfE2+1hE4cm3uDg7oBobE9M=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}" ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd hostctl \
|
||||
--bash <($out/bin/hostctl completion bash) \
|
||||
@ -23,7 +34,7 @@ buildGoModule rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Your dev tool to manage /etc/hosts like a pro!";
|
||||
description = "CLI tool to manage the /etc/hosts file";
|
||||
longDescription = ''
|
||||
This tool gives you more control over the use of your hosts file.
|
||||
You can have multiple profiles and switch them on/off as you need.
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cliphist";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sentriz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fx33m7DCp5N9VGI/H/IO66ECdFLobRRAAuRGNu4gzSk=";
|
||||
sha256 = "sha256-kmXR8xzjAphgaC2Yd55VwZIJ4ehxP1LEA24hgyAbM7A=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-UrKSDvskGwHjwkb/fjvaJZ8xXFD98BFeSJxwJpc8A+M=";
|
||||
vendorSha256 = "sha256-LZnefa0FjYG39YJrSN9ef6OnXHXgSrlSL4LvRqLxFx4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wayland clipboard manager";
|
||||
|
@ -22200,7 +22200,7 @@ with pkgs;
|
||||
unifi6
|
||||
unifi7;
|
||||
|
||||
unifi = unifi6;
|
||||
unifi = unifi7;
|
||||
|
||||
unifi-video = callPackage ../servers/unifi-video { };
|
||||
|
||||
|
@ -844,6 +844,8 @@ in {
|
||||
|
||||
azure-common = callPackage ../development/python-modules/azure-common { };
|
||||
|
||||
azure-containerregistry = callPackage ../development/python-modules/azure-containerregistry { };
|
||||
|
||||
azure-core = callPackage ../development/python-modules/azure-core { };
|
||||
|
||||
azure-cosmos = callPackage ../development/python-modules/azure-cosmos { };
|
||||
|
Loading…
Reference in New Issue
Block a user