Merge master into staging-next
This commit is contained in:
commit
e50c762dbb
|
@ -1231,7 +1231,7 @@ in {
|
|||
services.dockerRegistry = optionalAttrs cfg.registry.enable {
|
||||
enable = true;
|
||||
enableDelete = true; # This must be true, otherwise GitLab won't manage it correctly
|
||||
package = cfg.package;
|
||||
package = cfg.registry.package;
|
||||
extraConfig = {
|
||||
auth.token = {
|
||||
realm = "http${optionalString (cfg.https == true) "s"}://${cfg.host}/jwt/auth";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "karmor";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubearmor";
|
||||
repo = "kubearmor-client";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HSMyGA4S8VjEA2u4TbmH+qS5ZCsWBg+aTNhAbt4S6yY=";
|
||||
hash = "sha256-IKvWS1c7u1a3Fm2+uyhhgyuM680ZYiq9Xq2Tg/Y6HJo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Rxm96sgdZFKuyQzT76WJHvzEM0tG2rvqnl7+umoFIMY=";
|
||||
vendorHash = "sha256-xBtKKq6oUjazRac1FozRXBNRv1rFXYAulWu0Rs8ETvQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pachyderm";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pachyderm";
|
||||
repo = "pachyderm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QWlNDnhcFXfCtX4J0V/hq6nFN0RjzYv29mI2zE2fyFo=";
|
||||
hash = "sha256-C3qzf/+A1pYTYR3FMtUuqZNU+j8oOHSBLDfyuWYCh5I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3EG9d4ERaWuHaKFt0KFCOKIgTdrL7HZTO+GSi2RROKY=";
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.7.2";
|
||||
version = "3.7.4";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
|
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-K71nawQhFYLPRg79rcZKJ+US+3M5JAU0eg+ZiFwB6n8=";
|
||||
hash = "sha256-x5hwuc2yXDw8qWGLRJDH4V4rmvxjBKZaogmv4SxXoz4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fastp";
|
||||
version = "0.23.3";
|
||||
version = "0.23.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenGene";
|
||||
repo = "fastp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9YHm5LIKJJpMavlWMZXD5ZgTgT5w9eXuXwQVa/prux8=";
|
||||
sha256 = "sha256-hkCo8CiZNJuVcL9Eg/R7YzM7/FEcGEnovV325oWa7y8=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib libdeflate isa-l ];
|
||||
|
|
|
@ -1,28 +1,69 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, pkgsBuildBuild
|
||||
, jq
|
||||
, moreutils
|
||||
, dbip-country-lite
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "v2ray-geoip";
|
||||
version = "202306010100";
|
||||
let
|
||||
generator = pkgsBuildBuild.buildGoModule {
|
||||
pname = "v2ray-geoip";
|
||||
version = "unstable-2023-03-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "geoip";
|
||||
rev = "d8faa6ba0754c083a89898610942d1d1d978ef7f";
|
||||
sha256 = "sha256-Aumk+YPsxZl3F/DQv6w0rE5f5hduLNYApCKQIvRUSIw=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "geoip";
|
||||
rev = "9321a7f5e301a957228eba44845144b4555b6658";
|
||||
hash = "sha256-S30XEgzA9Vrq7I7REfO/WN/PKpcjcI7KZnrL4uw/Chs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bAXeA1pDIUuEvzTLydUIX6S6fm6j7CUQmBG+7xvxUcc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "GeoIP for V2Ray";
|
||||
homepage = "https://github.com/v2fly/geoip";
|
||||
license = licenses.cc-by-sa-40;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
};
|
||||
};
|
||||
input = {
|
||||
type = "maxmindMMDB";
|
||||
action = "add";
|
||||
args = {
|
||||
uri = dbip-country-lite.mmdb;
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit (generator) pname src;
|
||||
inherit (dbip-country-lite) version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
jq '.input[0] |= ${builtins.toJSON input}' config.json | sponge config.json
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
${generator}/bin/geoip
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -m 0644 geoip.dat -D $out/share/v2ray/geoip.dat
|
||||
install -Dm444 -t "$out/share/v2ray" output/dat/{cn,geoip-only-cn-private,geoip,private}.dat
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
passthru.generator = generator;
|
||||
|
||||
meta = with lib; {
|
||||
description = "GeoIP for V2Ray";
|
||||
homepage = "https://github.com/v2fly/geoip";
|
||||
license = licenses.cc-by-sa-40;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
meta = generator.meta // {
|
||||
inherit (dbip-country-lite.meta) license;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p common-updater-scripts curl jq
|
||||
set -euo pipefail
|
||||
|
||||
COMMIT=$(curl "https://api.github.com/repos/v2fly/geoip/commits/release?per_page=1")
|
||||
update-source-version v2ray-geoip "$(echo $COMMIT | jq -r .commit.message)" --file=pkgs/data/misc/v2ray-geoip/default.nix --rev="$(echo $COMMIT | jq -r .sha)"
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-ecobee-api";
|
||||
version = "0.2.16";
|
||||
version = "0.2.17";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wzL1WylQAFLxWu3lDFqQtLxJbQjse4OX/fbzaaEuvGQ=";
|
||||
hash = "sha256-lJCbNOQJ8xmMa4V+tSFZx4QasK8ZLfsFavMP9Zge4K4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ginkgo";
|
||||
version = "2.9.5";
|
||||
version = "2.9.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onsi";
|
||||
repo = "ginkgo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1Hb8pCvPs/L5UU280XwwEOnQ1CjJjgw0+GdCbtLkIpg=";
|
||||
sha256 = "sha256-+Wkd0+RSNnJb1ganYGhnRdLZGofTwWtDEN82dhc6HPc=";
|
||||
};
|
||||
vendorHash = "sha256-IxyPRUS7aqkfZ+hjtuopCd95dgiTgVdg1thSiTBZArg=";
|
||||
vendorHash = "sha256-x4IghXr80sDPZhe97Q+04Mfcnvku/S/tNPZ9RSUmiVE=";
|
||||
|
||||
# integration tests expect more file changes
|
||||
# types tests are missing CodeLocation
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "act";
|
||||
version = "0.2.45";
|
||||
version = "0.2.46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nektos";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mp5+hDSZsp46WMCCqVoorKSHeoQY/+ORtj0fNrKsFWI=";
|
||||
hash = "sha256-74ap3UgAFrt/ZrSMECdL3Mu26/53VWUEAUnqHw3oJDU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-37fHVy4NLhWyk1yD9zSNnZoVVyd2QizzDCDbiNJCBlc=";
|
||||
vendorHash = "sha256-OYBFaosO1PKoN236pMFauC0ensnoFDlmAKVWd9OwLHU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "granted";
|
||||
version = "0.11.1";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "common-fate";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m6cFAX8FMyv9H1IKm6meWu2yNEZz4g1Q+h2rRijYJsc=";
|
||||
sha256 = "sha256-UoU2+RBR6vBLRx5gJsVUswoEtZ8chCn+bSv+k4SCGyU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8BPntTgd7QqO2T3vyWXC1z5yE/ovg3D3iilnislqV30=";
|
||||
vendorHash = "sha256-P7HeJUdVlqrTEMVXGlvcCr9ezEmqIw5AX/+xdcFQoH4=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mcfly";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cantino";
|
||||
repo = "mcfly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qzi21vouUhvpmqxQpYoCnHJDLRU8ZgCvewxblD2BGJc=";
|
||||
hash = "sha256-9muBKJXsXiSxSmLRygGATEbwpiz6B8oTFQIkVMJMWAk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
|||
substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-RHR+qmtnSrJOPkObRrE39EshmDVu53vEvw647ATk+os=";
|
||||
cargoHash = "sha256-LhIAJ3JI7cp+vzEH5vthefgExPORF6Xnjj3cQkIkhSA=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cantino/mcfly";
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ooniprobe-cli";
|
||||
version = "3.17.2";
|
||||
version = "3.17.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ooni";
|
||||
repo = "probe-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wPvWIeanozLQwgDlU3WR11NYhIpjw04vj7DlnFlacNw=";
|
||||
hash = "sha256-kqjTYowAEfJ+um9DQQXIMLVWlEGJ9intbdTSJukSvVc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-r8kyL9gpdDesY8Mbm4lONAhWC4We26Z9uG7QMt1JT9c=";
|
||||
vendorHash = "sha256-kS5HWiATn2WT6E5gb0Gve83hHJ++xHmPSsgJu/5GqO4=";
|
||||
|
||||
subPackages = [ "cmd/ooniprobe" ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue