From 847ca7a0e308a3d88ce448f6d4bdcb168c710104 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 11 Sep 2022 13:06:06 +0100 Subject: [PATCH 1/8] trafficserver: 9.1.2 -> 9.1.3 (cherry picked from commit 618883d37c27392975607d08aa295126c5dd8575) --- pkgs/servers/http/trafficserver/default.nix | 6 +-- .../fix-catch2-version-incompatibility.patch | 43 ------------------- 2 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 pkgs/servers/http/trafficserver/fix-catch2-version-incompatibility.patch diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix index 083d165d5ba0..6beb81b9a229 100644 --- a/pkgs/servers/http/trafficserver/default.nix +++ b/pkgs/servers/http/trafficserver/default.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "trafficserver"; - version = "9.1.2"; + version = "9.1.3"; src = fetchzip { url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2"; - sha256 = "sha256-eRpyTdwwO5EzrVpt9fF6VEYGZjHb905nQJd065wY5RU="; + sha256 = "sha256-Ihhsbn4PvIjWskmbWKajThIwtuiEyldBpmtuQ8RdyHA="; }; patches = [ @@ -64,8 +64,6 @@ stdenv.mkDerivation rec { url = "https://github.com/apache/trafficserver/commit/19d3af481cf74c91fbf713fc9d2f8b138ed5fbaf.diff"; sha256 = "0z1ikgpp00rzrrcqh97931586yn9wbksgai9xlkcjd5cg8gq0150"; }) - - ./fix-catch2-version-incompatibility.patch ]; # NOTE: The upstream README indicates that flex is needed for some features, diff --git a/pkgs/servers/http/trafficserver/fix-catch2-version-incompatibility.patch b/pkgs/servers/http/trafficserver/fix-catch2-version-incompatibility.patch deleted file mode 100644 index 248f9d4ef31a..000000000000 --- a/pkgs/servers/http/trafficserver/fix-catch2-version-incompatibility.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/src/tscore/unit_tests/test_History.cc b/src/tscore/unit_tests/test_History.cc -index 3e699139da0..7505f10aa4c 100644 ---- a/src/tscore/unit_tests/test_History.cc -+++ b/src/tscore/unit_tests/test_History.cc -@@ -59,10 +59,10 @@ TEST_CASE("History", "[libts][History]") - REQUIRE(history[2].reentrancy == static_cast(NO_REENTRANT)); - - history[0].location.str(buf, sizeof(buf)); -- REQUIRE(string_view{buf} == "test_History.cc:48 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(string_view{buf} == "test_History.cc:48 (C_A_T_C_H_T_E_S_T_0)"); - - history[1].location.str(buf, sizeof(buf)); -- REQUIRE(string_view{buf} == "test_History.cc:49 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(string_view{buf} == "test_History.cc:49 (C_A_T_C_H_T_E_S_T_0)"); - - ts::LocalBufferWriter<128> w; - SM *sm = new SM; -@@ -71,10 +71,10 @@ TEST_CASE("History", "[libts][History]") - SM_REMEMBER(sm, 3, NO_REENTRANT); - - w.print("{}", sm->history[0].location); -- REQUIRE(w.view() == "test_History.cc:69 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(w.view() == "test_History.cc:69 (C_A_T_C_H_T_E_S_T_0)"); - - w.reset().print("{}", sm->history[1].location); -- REQUIRE(w.view() == "test_History.cc:70 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(w.view() == "test_History.cc:70 (C_A_T_C_H_T_E_S_T_0)"); - - REQUIRE(sm->history[0].event == 1); - REQUIRE(sm->history[0].reentrancy == 1); -@@ -106,10 +106,10 @@ TEST_CASE("History", "[libts][History]") - REQUIRE(sm2->history.overflowed() == true); - - w.reset().print("{}", sm2->history[0].location); -- REQUIRE(w.view() == "test_History.cc:103 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(w.view() == "test_History.cc:103 (C_A_T_C_H_T_E_S_T_0)"); - - w.reset().print("{}", sm2->history[1].location); -- REQUIRE(w.view() == "test_History.cc:98 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(w.view() == "test_History.cc:98 (C_A_T_C_H_T_E_S_T_0)"); - - sm2->history.clear(); - REQUIRE(sm2->history.size() == 0); From 3c6ea972c5a6ed3f4bda9f0e4b9cc7e58f4c7fb0 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 12 Sep 2022 09:20:53 +0200 Subject: [PATCH 2/8] nixos/paperless: use python from pkg for gunicorn This ensures that a compatible `gunicorn` is used when `pkg` is overridden. (cherry picked from commit fdead18e9e7c5f157c572858494b1c292430eede) --- nixos/modules/services/misc/paperless.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 0d0a1663eeef..74840848751c 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -280,7 +280,7 @@ in serviceConfig = defaultServiceConfig // { User = cfg.user; ExecStart = '' - ${pkgs.python3Packages.gunicorn}/bin/gunicorn \ + ${pkg.python.pkgs.gunicorn}/bin/gunicorn \ -c ${pkg}/lib/paperless-ngx/gunicorn.conf.py paperless.asgi:application ''; Restart = "on-failure"; From 8a53f6da329cde82e7ed174553bb9608bd3e5e17 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 11 Sep 2022 21:55:12 +0200 Subject: [PATCH 3/8] paperless: fix array formatting (cherry picked from commit e3be4ad2f06450b43ee723250cb96bb39a1b50a7) --- pkgs/applications/office/paperless-ngx/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 9a8e8228ba8b..ffc749530a6a 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -31,7 +31,16 @@ let }; }; - path = lib.makeBinPath [ ghostscript imagemagick jbig2enc optipng pngquant qpdf tesseract4 unpaper ]; + path = lib.makeBinPath [ + ghostscript + imagemagick + jbig2enc + optipng + pngquant + qpdf + tesseract4 + unpaper + ]; in python.pkgs.pythonPackages.buildPythonApplication rec { pname = "paperless-ngx"; From 1d16361fe874382de94c0bc35c88ee58376b6a5e Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 11 Sep 2022 21:55:13 +0200 Subject: [PATCH 4/8] paperless: use `imagemagickBig` `imagemagickBig` has `gs` support. This fixes a warning during thumbnail generation (`convert: no images defined`). The type of thumbnails that are generated is unchanged. (cherry picked from commit a611c674c211fe776588dda9a9df88cb914046da) --- pkgs/applications/office/paperless-ngx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index ffc749530a6a..c7ff01322c0f 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -4,7 +4,7 @@ , nixosTests , python3 , ghostscript -, imagemagick +, imagemagickBig , jbig2enc , optipng , pngquant @@ -33,7 +33,7 @@ let path = lib.makeBinPath [ ghostscript - imagemagick + imagemagickBig jbig2enc optipng pngquant From 3fe263d3709bad746f38228c397a800556c6dbbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 11 Sep 2022 21:07:45 +0100 Subject: [PATCH 5/8] cachix-agent: add host option (cherry picked from commit fbc23b491a3a934517430b49b98ab7119d5185b3) --- .../modules/services/system/cachix-agent/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/system/cachix-agent/default.nix b/nixos/modules/services/system/cachix-agent/default.nix index 15c0d6149765..cff18007480b 100644 --- a/nixos/modules/services/system/cachix-agent/default.nix +++ b/nixos/modules/services/system/cachix-agent/default.nix @@ -29,6 +29,12 @@ in { description = "Profile name, defaults to 'system' (NixOS)."; }; + host = mkOption { + type = types.str; + default = null; + description = lib.mdDoc "Cachix uri to use."; + }; + package = mkOption { type = types.package; default = pkgs.cachix; @@ -63,7 +69,10 @@ in { KillMode = "process"; Restart = "on-failure"; EnvironmentFile = cfg.credentialsFile; - ExecStart = "${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} deploy agent ${cfg.name} ${if cfg.profile != null then cfg.profile else ""}"; + ExecStart = '' + ${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} ${lib.optionalString (cfg.host != null) "--host ${cfg.host}"} \ + deploy agent ${cfg.name} ${if cfg.profile != null then cfg.profile else ""} + ''; }; }; }; From 05f3344177b1970037437a433514cecd520bc3ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 12 Sep 2022 15:02:45 +0100 Subject: [PATCH 6/8] Update nixos/modules/services/system/cachix-agent/default.nix Co-authored-by: pennae <82953136+pennae@users.noreply.github.com> --- nixos/modules/services/system/cachix-agent/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/system/cachix-agent/default.nix b/nixos/modules/services/system/cachix-agent/default.nix index cff18007480b..8511f50f1eb5 100644 --- a/nixos/modules/services/system/cachix-agent/default.nix +++ b/nixos/modules/services/system/cachix-agent/default.nix @@ -30,7 +30,7 @@ in { }; host = mkOption { - type = types.str; + type = types.nullOr types.str; default = null; description = lib.mdDoc "Cachix uri to use."; }; From 45e3ff758ed7de5e45bb24425079f837be73df59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 12 Sep 2022 15:16:07 +0100 Subject: [PATCH 7/8] Update nixos/modules/services/system/cachix-agent/default.nix Co-authored-by: pennae <82953136+pennae@users.noreply.github.com> --- nixos/modules/services/system/cachix-agent/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/system/cachix-agent/default.nix b/nixos/modules/services/system/cachix-agent/default.nix index 8511f50f1eb5..22e3671d676f 100644 --- a/nixos/modules/services/system/cachix-agent/default.nix +++ b/nixos/modules/services/system/cachix-agent/default.nix @@ -32,7 +32,7 @@ in { host = mkOption { type = types.nullOr types.str; default = null; - description = lib.mdDoc "Cachix uri to use."; + description = "Cachix uri to use."; }; package = mkOption { From 10f3841d4c1bca4c609192cee0caf6d5d368e396 Mon Sep 17 00:00:00 2001 From: Shane Sveller Date: Thu, 1 Sep 2022 16:54:49 -0500 Subject: [PATCH 8/8] elixir_1_14: init at 1.14.0 https://elixir-lang.org/blog/2022/09/01/elixir-v1-14-0-released/ https://hexdocs.pm/elixir/1.14.0/changelog.html --- pkgs/development/beam-modules/default.nix | 5 +++++ pkgs/development/interpreters/elixir/1.14.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/beam-packages.nix | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/elixir/1.14.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 1cbdf04bef93..3786c6894fc6 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -44,6 +44,11 @@ let # BEAM-based languages. elixir = elixir_1_13; + elixir_1_14 = lib'.callElixir ../interpreters/elixir/1.14.nix { + inherit erlang; + debugInfo = true; + }; + elixir_1_13 = lib'.callElixir ../interpreters/elixir/1.13.nix { inherit erlang; debugInfo = true; diff --git a/pkgs/development/interpreters/elixir/1.14.nix b/pkgs/development/interpreters/elixir/1.14.nix new file mode 100644 index 000000000000..8b540014c664 --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.14.nix @@ -0,0 +1,8 @@ +{ mkDerivation }: + +mkDerivation { + version = "1.14.0"; + sha256 = "16rc4qaykddda6ax5f8zw70yhapgwraqbgx5gp3f40dvfax3d51l"; + # https://hexdocs.pm/elixir/1.14.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp + minimumOTPVersion = "23"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bae0a64d7456..afeb9db82d9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14317,7 +14317,7 @@ with pkgs; inherit (beam.interpreters) erlang erlangR25 erlangR24 erlangR23 erlangR22 erlangR21 erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 - elixir elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 + elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 elixir_ls; erlang_nox = beam_nox.interpreters.erlang; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index e7f4b6b5250f..2539b07d066f 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -105,7 +105,7 @@ with beam; { # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR24.elixir`. inherit (packages.erlang) - elixir elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 elixir_ls; + elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 elixir_ls; inherit (packages.erlang) lfe lfe_1_3; };