mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-10 15:53:36 +00:00
Merge staging-next into staging
This commit is contained in:
commit
50267970ae
@ -901,6 +901,16 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
sidekiq.concurrency = mkOption {
|
||||
type = with types; nullOr int;
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
How many processor threads to use for processing sidekiq background job queues. When null, the GitLab default is used.
|
||||
|
||||
See <https://docs.gitlab.com/ee/administration/sidekiq/extra_sidekiq_processes.html#manage-thread-counts-explicitly> for details.
|
||||
'';
|
||||
};
|
||||
|
||||
sidekiq.memoryKiller.enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
@ -1454,12 +1464,17 @@ in {
|
||||
TimeoutSec = "infinity";
|
||||
Restart = "always";
|
||||
WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";
|
||||
ExecStart = utils.escapeSystemdExecArgs [
|
||||
"${cfg.packages.gitlab}/share/gitlab/bin/sidekiq-cluster"
|
||||
"-e" "production"
|
||||
"-r" "."
|
||||
"*" # all queue groups
|
||||
];
|
||||
ExecStart = utils.escapeSystemdExecArgs (
|
||||
[
|
||||
"${cfg.packages.gitlab}/share/gitlab/bin/sidekiq-cluster"
|
||||
"*" # all queue groups
|
||||
] ++ lib.optionals (cfg.sidekiq.concurrency != null) [
|
||||
"--concurrency" (toString cfg.sidekiq.concurrency)
|
||||
] ++ [
|
||||
"--environment" "production"
|
||||
"--require" "."
|
||||
]
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -89,6 +89,10 @@ in {
|
||||
dbFile = pkgs.writeText "dbsecret" "we2quaeZ";
|
||||
jwsFile = pkgs.runCommand "oidcKeyBase" {} "${pkgs.openssl}/bin/openssl genrsa 2048 > $out";
|
||||
};
|
||||
|
||||
# reduce memory usage
|
||||
sidekiq.concurrency = 1;
|
||||
puma.workers = 2;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, wrapQtAppsHook
|
||||
, pkg-config
|
||||
@ -129,7 +128,7 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
mkdir -p "$out/Applications"
|
||||
mv "$out/mscore.app" "$out/Applications/mscore.app"
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/Applications/mscore.app/Contents/MacOS/mscore $out/bin/mscore.
|
||||
ln -s $out/Applications/mscore.app/Contents/MacOS/mscore $out/bin/mscore
|
||||
'';
|
||||
|
||||
# Don't run bundled upstreams tests, as they require a running X window system.
|
||||
@ -143,5 +142,6 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ vandenoever doronbehar ];
|
||||
mainProgram = "mscore";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
|
@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cherrytree";
|
||||
version = "1.0.4";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "giuspen";
|
||||
repo = "cherrytree";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SMx3a0pzhNahRzmenZwPQPCBgqoBGo9n3RcNcimNGBE=";
|
||||
hash = "sha256-YoHaWc/olJrbV1A4hqDgYOLVlpHBrgI0x2TFr9oeqh4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -66,5 +66,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://raw.githubusercontent.com/giuspen/cherrytree/${version}/changelog.txt";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
@ -22,6 +22,7 @@
|
||||
, expat
|
||||
, libdrm
|
||||
, libxkbcommon
|
||||
, pipewire
|
||||
, gtk3
|
||||
, pango
|
||||
, cairo
|
||||
@ -81,7 +82,7 @@ stdenv.mkDerivation rec {
|
||||
xorg.libxcb cups.lib dbus.lib expat libdrm
|
||||
xorg.libXcomposite xorg.libXdamage xorg.libXext
|
||||
xorg.libXfixes xorg.libXrandr libxkbcommon
|
||||
gtk3 pango cairo gdk-pixbuf mesa
|
||||
pipewire gtk3 pango cairo gdk-pixbuf mesa
|
||||
alsa-lib at-spi2-core xorg.libxshmfence systemd wayland
|
||||
];
|
||||
naclHelper = lib.makeLibraryPath [
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fn";
|
||||
version = "0.6.30";
|
||||
version = "0.6.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fnproject";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
hash = "sha256-1j0Hd/SYoBhelCIFUFxkByczWSYFXjTE9TVH9E3Km+Y=";
|
||||
hash = "sha256-tL5mygomRdxHdWUAp6umMOhyKq/ZFcjn+5wZcqD2mVA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -82,5 +82,8 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/deepmind/distrax";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
# Several tests fail with:
|
||||
# AssertionError: [Chex] Assertion assert_type failed: Error in type compatibility check
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
@ -47,6 +47,11 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "equinox" ];
|
||||
|
||||
disabledTests = [
|
||||
# Failed: DID NOT WARN. No warnings of type (<class 'UserWarning'>,) were emitted.
|
||||
"test_tracetime"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A JAX library based around a simple idea: represent parameterised functions (such as neural networks) as PyTrees";
|
||||
changelog = "https://github.com/patrick-kidger/equinox/releases/tag/v${version}";
|
||||
|
@ -25,16 +25,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flax";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "flax";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3UzMSJoKw+V1WLBJ+Zf7aF7CDNBsvWnRUfNgb3K4v1A=";
|
||||
hash = "sha256-UABgJGe1grUSkwOJpjeIoFqhXsqG//HlC1YyYPxXV+g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -87,6 +87,7 @@ buildPythonPackage rec {
|
||||
# `tensorflow_datasets`, `vocabulary`) so the benefits of trying to run them
|
||||
# would be limited anyway.
|
||||
"examples/*"
|
||||
"flax/experimental/nnx/examples/*"
|
||||
# See https://github.com/google/flax/issues/3232.
|
||||
"tests/jax_utils_test.py"
|
||||
# Requires tree
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, absl-py
|
||||
, buildPythonPackage
|
||||
, flit-core
|
||||
, chex
|
||||
, fetchFromGitHub
|
||||
, jaxlib
|
||||
@ -11,16 +12,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "optax";
|
||||
version = "0.2.1";
|
||||
format = "setuptools";
|
||||
version = "0.2.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepmind";
|
||||
repo = pname;
|
||||
repo = "optax";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vimsVZV5Z11euLxsu998pMQZ0hG3xl96D3h9iONtl/E=";
|
||||
hash = "sha256-sBiKUuQR89mttc9Njrh1aeUJOYdlcF7Nlj3/+Y7OMb4=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@ -28,6 +29,10 @@ buildPythonPackage rec {
|
||||
"testsout"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
jaxlib
|
||||
];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "atlas";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ariga";
|
||||
repo = "atlas";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PQPf3cHlKP+0PIOkR/SZ4f9sBv+gJ+bJuJl9/OLRpb0=";
|
||||
hash = "sha256-YgZX06BbtI1zf2Z4boyLos6pARzmCtOgJhrQqSZzRS4=";
|
||||
};
|
||||
|
||||
modRoot = "cmd/atlas";
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "telegraf";
|
||||
version = "1.30.0";
|
||||
version = "1.30.1";
|
||||
|
||||
subPackages = [ "cmd/telegraf" ];
|
||||
|
||||
@ -16,10 +16,10 @@ buildGoModule rec {
|
||||
owner = "influxdata";
|
||||
repo = "telegraf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+dQMQsieer0/BfvAKnT35bjNjPjC0Z1houUqFBVIWDE=";
|
||||
hash = "sha256-cBEPNPeezh4X817Iq8Bo41/KX58I9HL2GA0lAU7+ISE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6RfhSrb9mTt2IzEv3zzj26gChz7XKV5uazfwanNe7Pc=";
|
||||
vendorHash = "sha256-jTw5YLGgHs3uvihI6KPZg+cNrnNixUznJsH0CtIVe6I=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags = [
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mutagen";
|
||||
@ -24,6 +24,8 @@ buildGoModule rec {
|
||||
hash = "sha256-RFB1/gzLjs9w8mebEd4M9Ldv3BrLIj2RsN/QAIJi45E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ];
|
||||
@ -33,6 +35,17 @@ buildGoModule rec {
|
||||
postInstall = ''
|
||||
install -d $out/libexec
|
||||
ln -s ${agents}/mutagen-agents.tar.gz $out/libexec/
|
||||
|
||||
$out/bin/mutagen generate \
|
||||
--bash-completion-script mutagen.bash \
|
||||
--fish-completion-script mutagen.fish \
|
||||
--zsh-completion-script mutagen.zsh
|
||||
|
||||
installShellCompletion \
|
||||
--cmd mutagen \
|
||||
--bash mutagen.bash \
|
||||
--fish mutagen.fish \
|
||||
--zsh mutagen.zsh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nfpm";
|
||||
version = "2.35.3";
|
||||
version = "2.36.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QoZiI9rMOdQZbMENVcBfUYPAvN9IqfeR0EK11l8+Hzo=";
|
||||
hash = "sha256-arGTZ7GFM1kQdryPrwklY7S0B9i31eQ/MaR24mRaFAo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WYuhHLq0/OD/JtOEkZsyPEJyjPqEoh9RSfBG0G3E/2w=";
|
||||
vendorHash = "sha256-g57tLk2+WWcdG0COqkQD7eLYG0TdC0RnlhLF6Qt4woY=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
|
@ -13649,9 +13649,7 @@ with pkgs;
|
||||
|
||||
teip = callPackage ../tools/text/teip { };
|
||||
|
||||
telegraf = callPackage ../servers/monitoring/telegraf {
|
||||
buildGoModule = buildGo122Module;
|
||||
};
|
||||
telegraf = callPackage ../servers/monitoring/telegraf { };
|
||||
|
||||
teleport_12 = callPackage ../servers/teleport/12 {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
|
||||
|
Loading…
Reference in New Issue
Block a user