From 98685bbb5cac987b6b1673a57a19949e3c26037b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Mar 2024 09:15:48 +0000 Subject: [PATCH 01/17] cherrytree: 1.0.4 -> 1.1.0 --- pkgs/applications/misc/cherrytree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 74623b544af1..31a8ee716369 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -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 = [ From 4cdc85f7bc254c570cf2dd3f91e4c3e67d6140c3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 1 Apr 2024 00:32:25 +0200 Subject: [PATCH 02/17] cherrytree: set meta.platforms --- pkgs/applications/misc/cherrytree/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 31a8ee716369..f6b7e955176e 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -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; }; } From 361b4e2364568f0956513576f0d58321bd5eec1c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 1 Apr 2024 18:20:02 +0200 Subject: [PATCH 03/17] musescore: remove unused fetchpatch --- pkgs/applications/audio/musescore/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index d6c90f896dfd..0868af98351a 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , wrapQtAppsHook , pkg-config From d1b80fcfdf9df0e594d9852d876c290fbd401b31 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 1 Apr 2024 18:20:18 +0200 Subject: [PATCH 04/17] musescore: fix typo in darwin postInstall --- pkgs/applications/audio/musescore/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 0868af98351a..973d7ffbe1ae 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -128,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. From e073e4923d5d2764d3c3515cc45ad5624a4b823c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 1 Apr 2024 18:20:24 +0200 Subject: [PATCH 05/17] musescore: set meta.platforms --- pkgs/applications/audio/musescore/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 973d7ffbe1ae..707ec5c8ebfe 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -142,5 +142,6 @@ in stdenv'.mkDerivation (finalAttrs: { license = licenses.gpl3Only; maintainers = with maintainers; [ vandenoever doronbehar ]; mainProgram = "mscore"; + platforms = platforms.unix; }; }) From fcd692ed4a67f479151c74721adf2670c6143030 Mon Sep 17 00:00:00 2001 From: Maxime Brunet Date: Mon, 1 Apr 2024 12:44:28 -0700 Subject: [PATCH 06/17] mutagen: add shell completions --- pkgs/tools/misc/mutagen/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index 5cfdff54a708..f759620d63fd 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -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; { From 03cfe274f88306765d1518115450458c3f41c536 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 1 Apr 2024 14:09:44 +0200 Subject: [PATCH 07/17] python311Packages.optax: 0.2.1 -> 0.2.2 Changelog: https://github.com/google-deepmind/optax/releases/tag/v0.2.2 --- pkgs/development/python-modules/optax/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/optax/default.nix b/pkgs/development/python-modules/optax/default.nix index dd36a90864f2..950e9c91dbf5 100644 --- a/pkgs/development/python-modules/optax/default.nix +++ b/pkgs/development/python-modules/optax/default.nix @@ -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 ]; From e80aaa92db463164f71c034c852ab18656c42288 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 2 Apr 2024 00:39:29 +0200 Subject: [PATCH 08/17] python311Packages.flax: 0.8.1 -> 0.8.2 Diff: https://github.com/google/flax/compare/refs/tags/v0.8.1...v0.8.2 Changelog: https://github.com/google/flax/releases/tag/v0.8.2 --- pkgs/development/python-modules/flax/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index c7fc681955a3..ce41f8e56139 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -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 From 39db04baf04fc793f115c22f6384ded95584b4ef Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 2 Apr 2024 00:44:48 +0200 Subject: [PATCH 09/17] python311Packages.equinox: fix build by disabling failing test --- pkgs/development/python-modules/equinox/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index 92ce388c8765..e679e15d9704 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -47,6 +47,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "equinox" ]; + disabledTests = [ + # Failed: DID NOT WARN. No warnings of type (,) 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}"; From fb7f0dad50ff4fcea97615ee038f35a3b34835c4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 2 Apr 2024 00:52:38 +0200 Subject: [PATCH 10/17] python311Packages.distrax: mark as broken --- pkgs/development/python-modules/distrax/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/distrax/default.nix b/pkgs/development/python-modules/distrax/default.nix index cc667cc6bf19..bdd443356a8c 100644 --- a/pkgs/development/python-modules/distrax/default.nix +++ b/pkgs/development/python-modules/distrax/default.nix @@ -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; }; } From e993fc0a7de99fdae71d5d98e0e827f8f4a2f40d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Apr 2024 00:49:16 +0000 Subject: [PATCH 11/17] nfpm: 2.35.3 -> 2.36.1 --- pkgs/tools/package-management/nfpm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index e37393e41b85..67d9bd518588 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -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}" ]; From 080a4a27f206d07724b88da096e27ef63401a504 Mon Sep 17 00:00:00 2001 From: Florentin Labelle <101594032+florentinl@users.noreply.github.com> Date: Sat, 30 Mar 2024 22:52:15 +0100 Subject: [PATCH 12/17] microsoft-edge: fix screen sharing on wayland --- .../networking/browsers/microsoft-edge/browser.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index a73768519086..72f664597c6e 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -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 [ From db902cab975c21c3a9ae1158bb8427b33254275e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Apr 2024 03:22:08 +0000 Subject: [PATCH 13/17] atlas: 0.20.0 -> 0.21.0 --- pkgs/development/tools/database/atlas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/atlas/default.nix b/pkgs/development/tools/database/atlas/default.nix index 581f0b51f922..1c05424af90d 100644 --- a/pkgs/development/tools/database/atlas/default.nix +++ b/pkgs/development/tools/database/atlas/default.nix @@ -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"; From 5ea02227c91c3c4273ee1a199d5829d5cdee6d0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Apr 2024 03:06:41 +0000 Subject: [PATCH 14/17] telegraf: 1.30.0 -> 1.30.1 --- pkgs/servers/monitoring/telegraf/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 96e9c86cf74f..af59e6eec7a0 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -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 = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d977766a928a..f9f1dbba2960 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; From c90648d1976034bf58ac6d3373f629b26cd5fea0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Apr 2024 04:54:01 +0000 Subject: [PATCH 15/17] fn-cli: 0.6.30 -> 0.6.31 --- pkgs/applications/networking/cluster/fn-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index 93079d227538..c6b1c0edb2a4 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -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; From dcd0f499c6e5d5d480a0190bf33e5e361867e69d Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 30 Mar 2024 13:03:37 +0100 Subject: [PATCH 16/17] nixos/gitlab: Add option sidekiq.concurrency. This commit adds an option to configure the amount of threads to use with sidekiq-cluster. The GitLab default is currently set to 20 threads. In space constrained environments this may become a problem with running out of memory as a result. --- nixos/modules/services/misc/gitlab.nix | 27 ++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index db62d6f90901..6619949f5540 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -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 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" "." + ] + ); }; }; From cfbde8ec8d8f81b53011b14b643584cfb89e980a Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 14 Jan 2024 14:11:27 +0100 Subject: [PATCH 17/17] nixos/tests/gitlab: reduce memory usage Co-Authored-By: Yaya --- nixos/tests/gitlab.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index c4d69a56c93a..52fe588930df 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -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; }; }; };