From c5923af98669282886140478c6d83ddcdcf77a42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 29 Nov 2022 01:45:05 +0100 Subject: [PATCH 001/111] lib/systems/architectures: expand inferiors --- lib/systems/architectures.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix index ddc320d24e0a..04f48ccd5b9f 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -40,14 +40,21 @@ rec { # a superior CPU has all the features of an inferior and is able to build and test code for it inferiors = { # x86_64 Intel + # https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html default = [ ]; westmere = [ ]; - sandybridge = [ "westmere" ] ++ inferiors.westmere; - ivybridge = [ "sandybridge" ] ++ inferiors.sandybridge; - haswell = [ "ivybridge" ] ++ inferiors.ivybridge; - broadwell = [ "haswell" ] ++ inferiors.haswell; - skylake = [ "broadwell" ] ++ inferiors.broadwell; - skylake-avx512 = [ "skylake" ] ++ inferiors.skylake; + sandybridge = [ "westmere" ] ++ inferiors.westmere; + ivybridge = [ "sandybridge" ] ++ inferiors.sandybridge; + haswell = [ "ivybridge" ] ++ inferiors.ivybridge; + broadwell = [ "haswell" ] ++ inferiors.haswell; + skylake = [ "broadwell" ] ++ inferiors.broadwell; + skylake-avx512 = [ "skylake" ] ++ inferiors.skylake; + cannonlake = [ "skylake-avx512" ] ++ inferiors.skylake-avx512; + icelake-client = [ "cannonlake" ] ++ inferiors.cannonlake; + icelake-server = [ "icelake-client" ] ++ inferiors.icelake-client; + cascadelake = [ "skylake-avx512" ] ++ inferiors.cannonlake; + cooperlake = [ "cascadelake" ] ++ inferiors.cascadelake; + tigerlake = [ "icelake-server" ] ++ inferiors.icelake-server; # x86_64 AMD # TODO: fill this (need testing) From 030b1aae17a7c520ae648fa9e8c3621889d04014 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Dec 2022 15:26:06 +0000 Subject: [PATCH 002/111] scorecard: 4.8.0 -> 4.10.2 --- pkgs/tools/security/scorecard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/scorecard/default.nix b/pkgs/tools/security/scorecard/default.nix index befc07e2e18d..d3295de5bad8 100644 --- a/pkgs/tools/security/scorecard/default.nix +++ b/pkgs/tools/security/scorecard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "scorecard"; - version = "4.8.0"; + version = "4.10.2"; src = fetchFromGitHub { owner = "ossf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LGxSiubZECNwoFkkJOySI4LOmwk7DXVtY74XBCsr+uk="; + sha256 = "sha256-GQs+wBq47sn3h8I87p+HErBmLMs8Dzh9xj3xMYDsXm4="; # populate values otherwise taken care of by goreleaser, # unfortunately these require us to use git. By doing # this in postFetch we can delete .git afterwards and @@ -22,7 +22,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-j8/sVdqxLmrvQwHn+uj8+q+ne98xcIeQKS1VQJcrkh0="; + vendorSha256 = "sha256-W213KQu4FuJcT/cJOvS+WMw1fXBcSoZ4yssI06JAIc8="; nativeBuildInputs = [ installShellFiles ]; From 86e33692cc9f308ab672cd05845a3c91e78540a4 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 5 Dec 2022 10:56:01 +0100 Subject: [PATCH 003/111] ndn-cxx: 0.7.1 -> 0.8.1 --- .../development/libraries/ndn-cxx/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index ee05d2606def..e7cc6e705b67 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -6,38 +6,37 @@ , python3 , python3Packages , wafHook -, boost175 +, boost , openssl , sqlite }: stdenv.mkDerivation rec { pname = "ndn-cxx"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "named-data"; repo = "ndn-cxx"; rev = "${pname}-${version}"; - sha256 = "sha256-oTSc/lh0fDdk7dQeDhYKX5+gFl2t2Xlu1KkNmw7DitE="; + sha256 = "sha256-nnnxlkYVTSRB6ZcuIUDFol999+amGtqegHXK+06ITK8="; }; nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ]; - buildInputs = [ boost175 openssl sqlite ]; + buildInputs = [ boost openssl sqlite ]; wafConfigureFlags = [ "--with-openssl=${openssl.dev}" - "--boost-includes=${boost175.dev}/include" - "--boost-libs=${boost175.out}/lib" - # "--with-tests" # disabled since upstream tests fail (Net/TestFaceUri/ParseDev Bug #3896) + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" + "--with-tests" ]; - - doCheck = false; # disabled since upstream tests fail (Net/TestFaceUri/ParseDev Bug #3896) + doCheck = false; checkPhase = '' runHook preCheck - LD_PRELOAD=build/ndn-cxx.so build/unit-tests + LD_PRELOAD=build/libndn-cxx.so build/unit-tests # some tests fail in upstream, some fail because of the sandbox environment runHook postCheck ''; From c1ab15495e72643b205887db388746f5994901aa Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 5 Dec 2022 10:56:31 +0100 Subject: [PATCH 004/111] ndn-tools: 0.7.0 -> 22.12 --- pkgs/tools/networking/ndn-tools/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix index 05804ab29c00..9ab84724d078 100644 --- a/pkgs/tools/networking/ndn-tools/default.nix +++ b/pkgs/tools/networking/ndn-tools/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, boost175 +, boost , fetchFromGitHub , libpcap , ndn-cxx @@ -12,28 +12,28 @@ stdenv.mkDerivation rec { pname = "ndn-tools"; - version = "0.7.1"; + version = "22.12"; src = fetchFromGitHub { owner = "named-data"; repo = pname; rev = "ndn-tools-${version}"; - sha256 = "sha256-3hE/esOcS/ln94wZIRVCLjWgouEYnJJf3EvirNEGTeA="; + sha256 = "sha256-28sPgo2nq5AhIzZmvDz38echGPzKDzNm2J6iIao4yL8="; }; nativeBuildInputs = [ pkg-config sphinx wafHook ]; buildInputs = [ libpcap ndn-cxx openssl ]; wafConfigureFlags = [ - "--boost-includes=${boost175.dev}/include" - "--boost-libs=${boost175.out}/lib" - # "--with-tests" + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" + "--with-tests" ]; doCheck = false; checkPhase = '' runHook preCheck - build/unit-tests + build/unit-tests # some tests fail because of the sandbox environment runHook postCheck ''; From 79a301305be732d1bc294dcc18126f14f7ef5581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 7 Feb 2023 17:25:15 +0100 Subject: [PATCH 005/111] nginx: remove with lib over entire file --- pkgs/servers/http/nginx/generic.nix | 40 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 06fa12725674..f882b782bcc1 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -31,14 +31,12 @@ outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt , passthru ? { tests = {}; } }: -with lib; - let moduleNames = map (mod: mod.name or (throw "The nginx module with source ${toString mod.src} does not have a `name` attribute. This prevents duplicate module detection and is no longer supported.")) modules; - mapModules = attrPath: flip concatMap modules + mapModules = attrPath: lib.flip lib.concatMap modules (mod: let supports = mod.supports or (_: true); in @@ -47,8 +45,8 @@ let in -assert assertMsg (unique moduleNames == moduleNames) - "nginx: duplicate modules: ${concatStringsSep ", " moduleNames}. A common cause for this is that services.nginx.additionalModules adds a module which the nixos module itself already adds."; +assert lib.assertMsg (lib.unique moduleNames == moduleNames) + "nginx: duplicate modules: ${lib.concatStringsSep ", " moduleNames}. A common cause for this is that services.nginx.additionalModules adds a module which the nixos module itself already adds."; stdenv.mkDerivation { inherit pname version nginxVersion; @@ -94,37 +92,37 @@ stdenv.mkDerivation { "--http-fastcgi-temp-path=/tmp/nginx_fastcgi" "--http-uwsgi-temp-path=/tmp/nginx_uwsgi" "--http-scgi-temp-path=/tmp/nginx_scgi" - ] ++ optionals withDebug [ + ] ++ lib.optionals withDebug [ "--with-debug" - ] ++ optionals withKTLS [ + ] ++ lib.optionals withKTLS [ "--with-openssl-opt=enable-ktls" - ] ++ optionals withStream [ + ] ++ lib.optionals withStream [ "--with-stream" "--with-stream_realip_module" "--with-stream_ssl_module" "--with-stream_ssl_preread_module" - ] ++ optionals withMail [ + ] ++ lib.optionals withMail [ "--with-mail" "--with-mail_ssl_module" - ] ++ optionals withPerl [ + ] ++ lib.optionals withPerl [ "--with-http_perl_module" "--with-perl=${perl}/bin/perl" "--with-perl_modules_path=lib/perl5" - ] ++ optional withSlice "--with-http_slice_module" - ++ optional (gd != null) "--with-http_image_filter_module" - ++ optional (geoip != null) "--with-http_geoip_module" - ++ optional (withStream && geoip != null) "--with-stream_geoip_module" - ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" + ] ++ lib.optional withSlice "--with-http_slice_module" + ++ lib.optional (gd != null) "--with-http_image_filter_module" + ++ lib.optional (geoip != null) "--with-http_geoip_module" + ++ lib.optional (withStream && geoip != null) "--with-stream_geoip_module" + ++ lib.optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" ++ configureFlags ++ map (mod: "--add-module=${mod.src}") modules; NIX_CFLAGS_COMPILE = toString ([ "-I${libxml2.dev}/include/libxml2" "-Wno-error=implicit-fallthrough" - ] ++ optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ + ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ # fix build vts module on gcc11 "-Wno-error=stringop-overread" - ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"); + ] ++ lib.optional stdenv.isDarwin "-Wno-error=deprecated-declarations"); configurePlatforms = []; @@ -133,7 +131,7 @@ stdenv.mkDerivation { preConfigure = '' setOutputFlags= '' + preConfigure - + concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules; + + lib.concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules; patches = map fixPatch ([ (substituteAll { @@ -143,7 +141,7 @@ stdenv.mkDerivation { ''; }) ./nix-skip-check-logs-path.patch - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ (fetchpatch { url = "https://raw.githubusercontent.com/openwrt/packages/c057dfb09c7027287c7862afab965a4cd95293a3/net/nginx/patches/102-sizeof_test_fix.patch"; sha256 = "0i2k30ac8d7inj9l6bl0684kjglam2f68z8lf3xggcc2i5wzhh8a"; @@ -161,7 +159,7 @@ stdenv.mkDerivation { inherit postPatch; - hardeningEnable = optional (!stdenv.isDarwin) "pie"; + hardeningEnable = lib.optional (!stdenv.isDarwin) "pie"; enableParallelBuilding = true; @@ -186,7 +184,7 @@ stdenv.mkDerivation { } // passthru.tests; }; - meta = if meta != null then meta else { + meta = if meta != null then meta else with lib; { description = "A reverse proxy and lightweight webserver"; homepage = "http://nginx.org"; license = licenses.bsd2; From 35b5c598f10c88b9a2ac571c477586bd2fd0feba Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 12 Jan 2023 17:49:03 +0800 Subject: [PATCH 006/111] deepin-reader: init at 5.10.28 --- .../deepin/apps/deepin-reader/default.nix | 74 +++++++++++++++++++ .../apps/deepin-reader/use-pkg-config.diff | 46 ++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 3 files changed, 121 insertions(+) create mode 100644 pkgs/desktops/deepin/apps/deepin-reader/default.nix create mode 100644 pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix new file mode 100644 index 000000000000..f7ab5220b61c --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, lib +, fetchFromGitHub +, qmake +, pkg-config +, qttools +, wrapQtAppsHook +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, qtwebengine +, karchive +, poppler +, libchardet +, libspectre +, openjpeg +, djvulibre +, gtest +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "deepin-reader"; + version = "5.10.28"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-0jHhsxEjBbu3ktvjX1eKnkZDwzRk9MrUSJSdYeOvWtI="; + }; + + patches = [ ./use-pkg-config.diff ]; + + postPatch = '' + substituteInPlace reader/{reader.pro,document/Model.cpp} htmltopdf/htmltopdf.pro 3rdparty/deepin-pdfium/src/src.pro \ + --replace "/usr" "$out" + ''; + + nativeBuildInputs = [ + qmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + qtwebengine + karchive + poppler + libchardet + libspectre + djvulibre + openjpeg + gtest + ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + meta = with lib; { + description = "A simple memo software with texts and voice recordings"; + homepage = "https://github.com/linuxdeepin/deepin-reader"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff b/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff new file mode 100644 index 000000000000..7993cecd30ad --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff @@ -0,0 +1,46 @@ +diff --git a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri +index 3e04f340..894b0ac7 100755 +--- a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri ++++ b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri +@@ -20,13 +20,8 @@ DEFINES += USE_SYSTEM_LIBJPEG \ + USE_SYSTEM_LIBOPENJPEG2 \ + USE_SYSTEM_FREETYPE + +-INCLUDEPATH += /usr/include/openjpeg-2.3 \ +- /usr/include/openjpeg-2.4 \ +- /usr/include/freetype2 \ +- /usr/include/freetype2/freetype \ +- /usr/include/freetype2/freetype/config +- +-LIBS += -lopenjp2 -llcms2 -lfreetype ++CONFIG += link_pkgconfig ++PKGCONFIG += libopenjp2 lcms2 freetype2 + + #QMAKE_CXXFLAGS += "-Wc++11-narrowing" #is_clang + #QMAKE_CXXFLAGS += "-Wno-inconsistent-missing-override" #is_clang Suppress no override warning for overridden functions. +diff --git a/3rdparty/deepin-pdfium/src/src.pro b/3rdparty/deepin-pdfium/src/src.pro +index 196b91d3..bda71ff4 100755 +--- a/3rdparty/deepin-pdfium/src/src.pro ++++ b/3rdparty/deepin-pdfium/src/src.pro +@@ -2,7 +2,9 @@ TARGET = $$PWD/../lib/deepin-pdfium + + TEMPLATE = lib + +-CONFIG += c++14 ++CONFIG += c++14 link_pkgconfig ++ ++PKGCONFIG += chardet + + ###安全漏洞检测 + #QMAKE_CXX += -g -fsanitize=undefined,address -O2 +@@ -28,10 +30,6 @@ include($$PWD/3rdparty/pdfium/pdfium.pri) + + INCLUDEPATH += $$PWD/../include + +-INCLUDEPATH += /usr/include/chardet +- +-LIBS += -lchardet +- + public_headers += \ + $$PWD/../include/dpdfglobal.h \ + $$PWD/../include/dpdfdoc.h \ diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index bb36b21b31c8..9a573ebcd133 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -29,6 +29,7 @@ let deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; deepin-picker = callPackage ./apps/deepin-picker { }; deepin-terminal = callPackage ./apps/deepin-terminal { }; + deepin-reader = callPackage ./apps/deepin-reader { }; #### ARTWORK dde-account-faces = callPackage ./artwork/dde-account-faces { }; From 14edf27b25d929459c371b2a7fc5167ab5fa497d Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 7 Feb 2023 17:36:06 -0500 Subject: [PATCH 007/111] python310Packages.grad-cam: init at 1.4.6 --- .../python-modules/grad-cam/default.nix | 65 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/grad-cam/default.nix diff --git a/pkgs/development/python-modules/grad-cam/default.nix b/pkgs/development/python-modules/grad-cam/default.nix new file mode 100644 index 000000000000..4e43915c86df --- /dev/null +++ b/pkgs/development/python-modules/grad-cam/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, matplotlib +, numpy +, opencv4 +, pillow +, scikitlearn +, torch +, torchvision +, ttach +, tqdm +}: + +buildPythonPackage rec { + pname = "grad-cam"; + version = "1.4.6"; + disabled = pythonOlder "3.6"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-sL4+UUfC60JWAgJPvXeVGUHAskuoceVYwYDrYlibUOE="; + }; + + postPatch = '' + substituteInPlace requirements.txt --replace "opencv-python" "opencv" + ''; + + propagatedBuildInputs = [ + matplotlib + numpy + opencv4 + pillow + scikitlearn + torchvision + ttach + tqdm + ]; + + # Let the user bring their own instance (as with torchmetrics) + buildInputs = [ + torch + ]; + + doCheck = false; # every nontrivial test tries to download a pretrained model + + pythonImportsCheck = [ + "pytorch_grad_cam" + "pytorch_grad_cam.metrics" + "pytorch_grad_cam.metrics.cam_mult_image" + "pytorch_grad_cam.metrics.road" + "pytorch_grad_cam.utils" + "pytorch_grad_cam.utils.image" + "pytorch_grad_cam.utils.model_targets" + ]; + + meta = with lib; { + description = "Advanced AI explainability for computer vision."; + homepage = "https://jacobgil.github.io/pytorch-gradcam-book"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c672707b90ef..fefeca12e5ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4055,6 +4055,8 @@ self: super: with self; { gql = callPackage ../development/python-modules/gql { }; + grad-cam = callPackage ../development/python-modules/grad-cam { }; + gradient = callPackage ../development/python-modules/gradient { }; gradient-utils = callPackage ../development/python-modules/gradient-utils { }; From bae9dc42dcdfcc6fedae1a6c8a4dc423b6fadfed Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 10 Feb 2023 13:16:35 -0500 Subject: [PATCH 008/111] river: 0.2.3 -> 0.2.4 --- pkgs/applications/window-managers/river/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index e86af9dad573..439030f34da3 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "riverwm"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-noZ2vo4J0cG3PN2k+2LzMc5WMtj0FEmMttE9obFH/tM="; + hash = "sha256-cIcO6owM6eYn+obYVaBOVQpnBx4++KOqQk5Hzo3GcNs="; fetchSubmodules = true; }; From 6965ac6ccecb23e1120aad8fdb67fdcd89a0bc9f Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Mon, 13 Feb 2023 10:56:26 +0100 Subject: [PATCH 009/111] rubyPackages.mail: init at 2.8.1 The `mail` gem has been removed in 3b953b5a697 because it was only a dependency of the gem `rails` which has been commented out. --- .../ruby-modules/with-packages/Gemfile | 1 + pkgs/top-level/ruby-packages.nix | 85 +++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile index 479981419801..21c4765abf2f 100644 --- a/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/pkgs/development/ruby-modules/with-packages/Gemfile @@ -84,6 +84,7 @@ gem 'jwt' gem 'kramdown-rfc2629' gem 'libv8' gem 'libxml-ruby' +gem 'mail' gem 'magic' gem 'markaby' gem 'method_source' diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index d1bf5cf7b69e..97d5ad25f63f 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -663,6 +663,16 @@ }; version = "0.10.17"; }; + date = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + type = "gem"; + }; + version = "3.3.3"; + }; dep-selector-libgecode = { groups = ["default"]; platforms = []; @@ -1873,6 +1883,17 @@ }; version = "0.2.9"; }; + mail = { + dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; + type = "gem"; + }; + version = "2.8.1"; + }; markaby = { dependencies = ["builder"]; groups = ["default"]; @@ -1945,6 +1966,16 @@ }; version = "4.11.0"; }; + mini_mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + type = "gem"; + }; + version = "1.1.2"; + }; mini_portile2 = { groups = ["default"]; platforms = []; @@ -2077,6 +2108,39 @@ }; version = "1.4.10"; }; + net-imap = { + dependencies = ["date" "net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + type = "gem"; + }; + version = "0.3.4"; + }; + net-pop = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; + type = "gem"; + }; + version = "0.1.2"; + }; + net-protocol = { + dependencies = ["timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + type = "gem"; + }; + version = "0.2.1"; + }; net-scp = { dependencies = ["net-ssh"]; groups = ["default"]; @@ -2088,6 +2152,17 @@ }; version = "4.0.0"; }; + net-smtp = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + type = "gem"; + }; + version = "0.3.3"; + }; net-ssh = { groups = ["default"]; platforms = []; @@ -3202,6 +3277,16 @@ }; version = "2.0.11"; }; + timeout = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lnh0kr7f43m1cjzc2jvggfsl1rzsaj2rd3pn6vp7mcqliymzaza"; + type = "gem"; + }; + version = "0.3.1"; + }; tiny_tds = { groups = ["default"]; platforms = []; From e23578703ad5d57bfa1c48db341348e5cdd25b1b Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Mon, 13 Feb 2023 10:57:50 +0100 Subject: [PATCH 010/111] rubyPackages: update --- pkgs/top-level/ruby-packages.nix | 408 +++++++++++++++---------------- 1 file changed, 194 insertions(+), 214 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 97d5ad25f63f..3bdb15e9d7e2 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1271f7nyrmb0kk93zjsb3zyxng8jlzhhg9784pwfpwvrlclashlw"; + sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za"; type = "gem"; }; - version = "6.0.6"; + version = "6.1.7.2"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "091qjiv0mvmn5k9krqkv1lfg8983mgcmrf11gxa6xkchh74csr6a"; + sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2"; type = "gem"; }; - version = "6.0.6"; + version = "6.1.7.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -119,10 +119,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xwcnbwnbqq8jp92mvawn6y69cb53wsz84wwmk9vsfk1jjvqfw2z"; + sha256 = "017jh2lx3z5hqjvnqclc5bfr5q0d3zk0nqjfz73909ybr4h20kmi"; type = "gem"; }; - version = "0.2.0"; + version = "0.2.1"; }; builder = { groups = ["default"]; @@ -193,10 +193,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7"; + sha256 = "1a36zn77yyibqsfpka0i8vgf3yv98ic2b9wwlbc29566y8wpa2bq"; type = "gem"; }; - version = "3.0.5"; + version = "3.0.6"; }; charlock_holmes = { groups = ["default"]; @@ -360,10 +360,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fxrq0b1x5gr2gr9md6mkwgaj8519gf1sbyqs88yqphbigf5iy75"; + sha256 = "0csgcp2kkmciavnic1yrb8z405dg4lqkzdlw2zscahvggpwr0j2p"; type = "gem"; }; - version = "0.1.1"; + version = "0.2.0"; }; cocoapods-downloader = { groups = ["default"]; @@ -401,10 +401,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vpn0y2r91cv9kr2kh6rwh51ipi90iyjfya8ir9grxh1ngv179ck"; + sha256 = "06rvrsb5p4j9pwqg7xzx8kv0v4x3wwjbiw6y2i905qhyqxqrww2l"; type = "gem"; }; - version = "2.2.2"; + version = "2.2.4"; }; cocoapods-git_url_rewriter = { groups = ["default"]; @@ -417,15 +417,15 @@ version = "1.0.1"; }; cocoapods-keys = { - dependencies = ["dotenv" "osx_keychain"]; + dependencies = ["dotenv" "ruby-keychain"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153cxxsi77dygc4qrij6qs44dbvc7dw31jx06cmf0ajrhv9qjnxl"; + sha256 = "1zycjq1i3kqzpixngm1jp66r075yrb54qcd0xxxa8rmxngimqhff"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.1"; }; cocoapods-open = { groups = ["default"]; @@ -587,20 +587,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f3v6ffikj694h925zvfzgx995q6l1ixnqpph3qpnjdsyjpsmbn8"; + sha256 = "1q4ai2i4rswhq5l46ny5066z8pavj3j0qvr9hbgqvzj677fa335f"; type = "gem"; }; - version = "0.23.6"; + version = "0.23.8"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.0"; }; connection_pool = { groups = ["default"]; @@ -627,10 +627,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1195gisqv1kn4lpshn6frlnjgx5r9a0gnpkzjxzsi6wfmfys1mwy"; + sha256 = "1lgga9ina9gnpp9ycj8lpqkc5hm5qlxb41s4pfg0w6fnnpgmairc"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.5"; }; curses = { groups = ["default"]; @@ -709,10 +709,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kqfwfz3pf6mb22r48ybbp7hkzy2qafdpp1bv1knjd74zyilv73h"; + sha256 = "0qbj8lvl8lzrbpfj9612iiwxf53drb8jg1l4bd1mcqyds8lw9z9z"; type = "gem"; }; - version = "7.4.0"; + version = "7.5.0"; }; dnsruby = { dependencies = ["simpleidn"]; @@ -793,10 +793,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; escape = { groups = ["default"]; @@ -814,10 +814,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288"; + sha256 = "17ix0mijpsy3y0c6ywrk5ibarmvqzjsirjyprpsy3hwax8fdm85v"; type = "gem"; }; - version = "0.15.0"; + version = "0.16.0"; }; eventmachine = { groups = ["default"]; @@ -834,10 +834,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v71iii13cnlkck20xv0yrbz0g60qn88f4r6518k8vk31sddw4hx"; + sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09"; type = "gem"; }; - version = "0.93.1"; + version = "0.99.0"; }; execjs = { groups = ["default"]; @@ -855,20 +855,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mqv17hfmph4ylmb2bqyccy64gsgpmzapq5yrmf5yjsqkvw9rxbv"; + sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.4"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13b717ddw90iaf4vijy06srmkvrfbzsnyjap93yll0nibad4dbxq"; + sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; ffi = { groups = ["default"]; @@ -1023,10 +1023,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-bkSvvD2SClHJ5FyERpyqZaWp0im7NNhn+wplbmnZD84="; + sha256 = "0llbqaziga5vawfs71r1ijfiw9allsd15wsrm5vr0sqd3yn7ak89"; type = "gem"; }; - version = "1.13.1"; + version = "1.13.2"; }; github-pages = { dependencies = ["github-pages-health-check" "jekyll" "jekyll-avatar" "jekyll-coffeescript" "jekyll-commonmark-ghpages" "jekyll-default-layout" "jekyll-feed" "jekyll-gist" "jekyll-github-metadata" "jekyll-include-cache" "jekyll-mentions" "jekyll-optional-front-matter" "jekyll-paginate" "jekyll-readme-index" "jekyll-redirect-from" "jekyll-relative-links" "jekyll-remote-theme" "jekyll-sass-converter" "jekyll-seo-tag" "jekyll-sitemap" "jekyll-swiss" "jekyll-theme-architect" "jekyll-theme-cayman" "jekyll-theme-dinky" "jekyll-theme-hacker" "jekyll-theme-leap-day" "jekyll-theme-merlot" "jekyll-theme-midnight" "jekyll-theme-minimal" "jekyll-theme-modernist" "jekyll-theme-primer" "jekyll-theme-slate" "jekyll-theme-tactile" "jekyll-theme-time-machine" "jekyll-titles-from-headings" "jemoji" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "minima" "nokogiri" "rouge" "terminal-table"]; @@ -1034,10 +1034,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kg03q6hvz191pyqhbhz3qis5niy3qvrxsnd3sdxcqz6a750wmw6"; + sha256 = "0brk2sgk01mly2hb1h5hm3ip1l6hjr4xx9zkqfhs5k3swlwnwzq9"; type = "gem"; }; - version = "227"; + version = "228"; }; github-pages-health-check = { dependencies = ["addressable" "dnsruby" "octokit" "public_suffix" "typhoeus"]; @@ -1055,10 +1055,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yvh8vv9kgd06hc8c1pl2hq56w56vr0n7dr5mz19fx4p2v89y7xb"; + sha256 = "1m3ypny84jyvlxf060p3q3d8pb4yihxa2br5hh012bgc11d09nky"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.0"; }; glib2 = { dependencies = ["native-package-installer" "pkg-config"]; @@ -1088,10 +1088,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbgh9d8nbvsvyzqnd0mzhz0nr9hx4qn025kmz6d837lry4lc6gw"; + sha256 = "0qn87vxdsaq1szcvq39rnz38cgqllncdxmiyghnbzl7x5aah8sbw"; type = "gem"; }; - version = "2.0.20"; + version = "2.0.22"; }; gtk2 = { dependencies = ["atk" "gdk_pixbuf2" "pango"]; @@ -1110,10 +1110,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03qiz6kbk260v3613z4wrk8iy1mi06j631fglcskfxyhf18lpy05"; + sha256 = "1vcr5wcvfbsq91302playk3i98wdisspkybcmajl04agv4k8xr68"; type = "gem"; }; - version = "6.0.8"; + version = "6.1.1"; }; hashie = { groups = ["default"]; @@ -1130,10 +1130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; + sha256 = "1f8cr014j7mdqpdb9q17fp5vb5b8n1pswqaif91s3ylg5x3pygfn"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.0"; }; hike = { groups = ["default"]; @@ -1244,10 +1244,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; + sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; type = "gem"; }; - version = "0.9.5"; + version = "1.12.0"; }; iconv = { groups = ["default"]; @@ -1264,20 +1264,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xjr8nxpq6vsa4kd7pvd14xxiba9y4dais1yyz4dj567hsqdrhcm"; + sha256 = "0dy04jx3n1ddz744b80mg7hp87miysnjp0h21lqr43hpmhdglxih"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; ipaddr = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13qd34nzpgp3fxfjbvaqg3dcnfr0cgl5vjvcqy0hfllbvfcklnbq"; + sha256 = "0ypic2hrmvvcgw7al72raphqv5cs1zvq4w284pwrkvfqsrqrqrsf"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.5"; }; jaro_winkler = { groups = ["default"]; @@ -1306,10 +1306,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wzb3ysr43f9acpdfhnndnqh1ypir01w4s4clzi38l9mxkfc4d75"; + sha256 = "0m9yzkiwm751wbyq3aq1355afcx240r24nrick1fzv578bis4kyy"; type = "gem"; }; - version = "3.9.2"; + version = "3.9.3"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -1350,10 +1350,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xkqq0cyca84hxs47ilkg3sjavwjvc6wijz4n0zd4nxj01jz54bh"; + sha256 = "1zps7bb9kc4qf32b9y9h47z08wpsziklg0jnhcrcz2wxn09fijgd"; type = "gem"; }; - version = "0.2.0"; + version = "0.4.0"; }; jekyll-default-layout = { dependencies = ["jekyll"]; @@ -1732,40 +1732,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl"; + sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; type = "gem"; }; - version = "2.6.2"; + version = "2.6.3"; }; json_pure = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04d8lc6mc09bqmcrlygh51an8r0j7l3p9aghjkc1g6i4fvmrmxfc"; + sha256 = "0kn736pb52j8b9xxq6l8wqp2chs74aa14vfnp0rijjn086m8b4f3"; type = "gem"; }; - version = "2.6.2"; + version = "2.6.3"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq"; + sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p"; type = "gem"; }; - version = "2.5.0"; + version = "2.7.0"; }; kramdown = { dependencies = ["rexml"]; @@ -1815,10 +1815,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jbqw7hkx08i5dj74fwfdc16980hsj3mhrxp4mmjxsdzw1kndrvp"; + sha256 = "1xz5mrp103i95r4wfxny1f5x7h7vgnxv2p9cdkmmdjzrsk23rijs"; type = "gem"; }; - version = "3.2.4"; + version = "4.0.0"; }; link_header = { groups = ["default"]; @@ -1835,10 +1835,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by"; + sha256 = "1czxv2i1gv3k7hxnrgfjb0z8khz74l4pmfwd70c7kr25l2qypksg"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.4"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -1846,10 +1846,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v"; + sha256 = "13rgkfar8pp31z1aamxf5y7cfq88wv6rxxcwy7cmm177qq508ycn"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1857,7 +1857,7 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-bGRp797+NJYBAACjRvnTv3EOEaxGYeNTz1aFIyb7ECM="; + sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; type = "gem"; }; version = "2.19.1"; @@ -1961,10 +1961,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs"; + sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37"; type = "gem"; }; - version = "4.11.0"; + version = "4.12.0"; }; mini_mime = { groups = ["default"]; @@ -1981,10 +1981,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; minima = { dependencies = ["jekyll" "jekyll-feed" "jekyll-seo-tag"]; @@ -2002,10 +2002,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; + sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; type = "gem"; }; - version = "5.16.3"; + version = "5.17.0"; }; molinillo = { groups = ["default"]; @@ -2063,10 +2063,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xsy70mg4p854jska7ff7cy8fyn9nhlkrmfdvkkfmk8qxairbfq1"; + sha256 = "1gjvj215qdhwk3292sc7xsn6fmwnnaq2xs35hh5hc8d8j22izlbn"; type = "gem"; }; - version = "0.5.4"; + version = "0.5.5"; }; nanaimo = { groups = ["default"]; @@ -2199,10 +2199,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-0+4A8mwVF2PaFpHH/Ghx3dA+Uy90+FEB9aztwtCZ6Vg="; + sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj"; type = "gem"; }; - version = "1.13.10"; + version = "1.14.1"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -2215,16 +2215,27 @@ }; version = "4.25.1"; }; + og-corefoundation = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xmz13rb92xy55askn5f3kkmz14qwyyhkdsikk2gd1ydicnaqkh8"; + type = "gem"; + }; + version = "0.2.3"; + }; openssl = { dependencies = ["ipaddr"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xx01in25q31rpxmq2qlimi44zarsp4px7046xnc6in0pa127xsk"; + sha256 = "0rm9nzz2p204dgcplq9v53jr62m74w63vz01rk8dfmcgifkxhnff"; type = "gem"; }; - version = "2.2.2"; + version = "2.2.3"; }; optimist = { groups = ["default"]; @@ -2247,17 +2258,6 @@ }; version = "1.0.1"; }; - osx_keychain = { - dependencies = ["RubyInline"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10hr3lihq7s5fv18dp0g4mfncvapkcwcd6xnn5483ximyd7rhfx0"; - type = "gem"; - }; - version = "1.0.2"; - }; ovirt-engine-sdk = { dependencies = ["json"]; groups = ["default"]; @@ -2275,10 +2275,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zk3fwwx8zzxhmfmlgzzr050jzsl58ma54wy99xy4xx0ibmw48pv"; + sha256 = "1hi3jcm9s7hkv35gzgdh3nxs0s9h7kkqwv1x6kalww15msk60fxd"; type = "gem"; }; - version = "1.0.4"; + version = "1.1.0"; }; pango = { dependencies = ["cairo-gobject" "gobject-introspection"]; @@ -2307,20 +2307,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; + sha256 = "0cdjcasyg7w05kk82dqysq29f1qcf8y5sw8iak5flpxjbdil50qv"; type = "gem"; }; - version = "3.1.2.1"; + version = "3.2.1.0"; }; paru = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v6my9g7bwjlx92hr9w0blnrcrai1yg3yz6k9xz0i6mq8lml2k87"; + sha256 = "0mzy0s4cdqm5nvgyj55idc2pv51k3zlgw6sa7825dcyrk2ihcx0c"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; pastel = { dependencies = ["tty-color"]; @@ -2369,20 +2369,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09a5z9qhxnybahx162q2q1cygdhxfp6cihdivvzh32jlwc37z1x3"; + sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; type = "gem"; }; - version = "1.4.4"; + version = "1.4.5"; }; pkg-config = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v9vmkmpha34lwdhig08kb7z4wk3xmw49dvkl99nz9llxhzqr5hl"; + sha256 = "02fw2pzrmvwp67nbndpy8a2ln74fd8kmsiffw77z7g1mp58ww651"; type = "gem"; }; - version = "1.4.9"; + version = "1.5.1"; }; polyglot = { groups = ["default"]; @@ -2410,10 +2410,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l5pk6w63bj7cxy4y9mqvpclw6r0pcm7xa44c33vx3f960px8wk8"; + sha256 = "1bbw4czjr2ch6m57rgjib5a35hx3g18975vwzm2iwq13pvdj9hzk"; type = "gem"; }; - version = "1.0.2"; + version = "1.2.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -2421,10 +2421,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m445x8fwcjdyv2bc0glzss2nbm1ll51bq45knixapc7cl3dzdlr"; + sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4"; type = "gem"; }; - version = "0.14.1"; + version = "0.14.2"; }; pry-byebug = { dependencies = ["byebug" "pry"]; @@ -2443,10 +2443,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wyvql6pb6m8jl8bsamabxhxhd86bnqblspaxzz05sl0fm2ynj0r"; + sha256 = "1pp43n69p6bjvc640wgcz295w1q2v9awcqgbwcqn082dbvq5xvnx"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; public_suffix = { groups = ["default"]; @@ -2464,30 +2464,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yabmxmqprb2x58awiasidsiwpplscmyar9dzwh5l8jgaw4i3wra"; + sha256 = "1ymaq2m30yx35sninw8mjknsjw23k6458ph9k350khwwn1hh2d1k"; type = "gem"; }; - version = "6.0.0"; + version = "6.1.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.2"; }; rack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; + sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; type = "gem"; }; - version = "2.2.4"; + version = "2.2.6.2"; }; rack-protection = { dependencies = ["rack"]; @@ -2495,10 +2495,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jmixih0qrsdz60dhznkk29v50ks55cqq51jjf0yn3amqghh4bhk"; + sha256 = "1a12m1mv8dc0g90fs1myvis8vsgr427k1arg1q4a9qlfw6fqyhis"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.5"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -2517,10 +2517,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-iV0Mh6K2YjiR6FwdUHx/FqzaTnfZRpL1N981unE5i9U="; + sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; type = "gem"; }; - version = "1.4.4"; + version = "1.5.0"; }; rainbow = { groups = ["default"]; @@ -2589,10 +2589,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wd4j2irk88qcrxbhhbrsr6rswz8ckva7n0hsjyffnmx1ya60n8y"; + sha256 = "0dgj5n7rj83981fvrhswfwsh88x42p7r00nvd80hkxmdcjvda2h6"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.4"; }; rchardet = { groups = ["default"]; @@ -2630,10 +2630,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi"; + sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca"; type = "gem"; }; - version = "3.5.1"; + version = "3.6.0"; }; redis = { dependencies = ["redis-client"]; @@ -2641,10 +2641,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s2hvsq0nyxmh27cqv00zk0s6bb4dlxfhzng5x0w8qijpw0vx9h5"; + sha256 = "10r5z5mg1x5kjx3wvwx5d8bqgd2j8pc4dlaasq7nmnl3nsn7sn9k"; type = "gem"; }; - version = "5.0.5"; + version = "5.0.6"; }; redis-client = { dependencies = ["connection_pool"]; @@ -2652,10 +2652,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hkwqi18cbiil787ivvh2s8i6csrn0z3qb4ccp2vhrc2w6ay6ncq"; + sha256 = "1q9h6mgr3nnxlc65r3f78cn208i4l8y2jqa1g6wwjl620za3ay9q"; type = "gem"; }; - version = "0.10.0"; + version = "0.12.1"; }; redis-rack = { dependencies = ["rack" "redis-store"]; @@ -2684,10 +2684,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mm5sykyblc61a82zz3dag6yy3mvflj2z47060kjzjj5793blqzi"; + sha256 = "0d6241adx6drsfzz74nx1ld3394nm6fjpv3ammzr0g659krvgf7q"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.0"; }; rest-client = { dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"]; @@ -2722,14 +2722,15 @@ version = "3.2.5"; }; rmagick = { + dependencies = ["pkg-config"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v269bx6bhnrlxpsmhr8xjv64dwnnykiw9hr58dwghsps1qb8ib7"; + sha256 = "11skr2l49cml2wgm74zzcxwdyw0vn0abynhhq1m08jpzr309x730"; type = "gem"; }; - version = "5.0.0"; + version = "5.1.0"; }; rouge = { groups = ["default"]; @@ -2768,10 +2769,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4"; + sha256 = "0da45cvllbv39sdbsl65vp5djb2xf5m10mxc9jm7rsqyyxjw4h1f"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.1"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2779,10 +2780,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qldsmjhqr4344zdlamzggr3y98wdk2c4hihkhwx8imk800gkl8v"; + sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.2"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2790,10 +2791,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvwnb0x5d6d4ff3wlgahk0wcw72ic51gd2snr1xxc5ify41kabv"; + sha256 = "0sq2cc9pm5gq411y7iwfvzbmgv3g91lyf7y7cqn1lr3yf1v122nc"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.3"; }; rspec-support = { groups = ["default"]; @@ -2811,10 +2812,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xhm882zzs4z4ivknrymh6lgnd3p90b651dn0fp32dciajdxr9f1"; + sha256 = "1jsiy93y5c2sx2sr5jmdah208idw038m2fpihgan4klmldm3r1pm"; type = "gem"; }; - version = "1.37.1"; + version = "1.45.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2822,10 +2823,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qiq3q66w57im0ryrvnd1yq0g2s2safhywpv94441kvc1amayjzy"; + sha256 = "1zqk8dgjjhm0zll2rxqvvb8fl5vin7mmbc1ndn1a2q4276ri6ydc"; type = "gem"; }; - version = "1.23.0"; + version = "1.26.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -2833,10 +2834,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h06a2asg8pjq7l0k885126n60y54rgw0qr957qarpv7qligzn4c"; + sha256 = "1n7g0vg06ldjaq4f8c11c7yqy99zng1qdrkkk4kfziippy24yxnc"; type = "gem"; }; - version = "1.15.0"; + version = "1.16.0"; }; ruby-graphviz = { dependencies = ["rexml"]; @@ -2849,6 +2850,17 @@ }; version = "1.2.5"; }; + ruby-keychain = { + dependencies = ["ffi" "og-corefoundation"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g57fr1r39bfh1r887hp87mawfg3miidagvpqyqq3l0152ya43wr"; + type = "gem"; + }; + version = "0.4.0"; + }; ruby-libvirt = { groups = ["default"]; platforms = []; @@ -2920,17 +2932,6 @@ }; version = "0.0.5"; }; - RubyInline = { - dependencies = ["ZenTest"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zq24qvkqzjsrcwyz9lp3pm602kqw08cp3g1acf3zy0nc7npvx9p"; - type = "gem"; - }; - version = "3.12.6"; - }; rubyzip = { groups = ["default"]; platforms = []; @@ -2946,10 +2947,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02h1cv73znwfgy61mqmfylcfvwyyp3lddiz3njgivfx234mpz50x"; + sha256 = "0wnfgxx59nq2wpvi8ll7bqw9x99x5hps6i38xdjrwbb5a3896d58"; type = "gem"; }; - version = "1.5.0.1"; + version = "1.5.1"; }; safe_yaml = { groups = ["default"]; @@ -3021,20 +3022,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yzv7gn539aqwpada2mvfrnbdygr3d61ryp68ncp3kpx6nbz1x25"; + sha256 = "1ffbd7jimj73fwdg7gf26bfc41a06aqi7zrwj90pkkwxipjljrzl"; type = "gem"; }; - version = "0.16.0"; + version = "0.17.0"; }; sequel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qg80fqxs1rabsg3xrkfkkicnn1z2p02xsb1lxv78a6iw5p17d73"; + sha256 = "1yf5sqw15gj5vmrbklw144y0wg8r92fwczfg64znwn61k9bz9j21"; type = "gem"; }; - version = "5.61.0"; + version = "5.65.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -3042,10 +3043,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15ndf1wr45vyqiyc3059f8zv0wp11i6xqfqclsa0v3qf739jb1zw"; + sha256 = "01j51vn47ynyhlxpgz6wj8swm3d8g1hrad1678s0sd43kh2hqxdg"; type = "gem"; }; - version = "1.17.0"; + version = "1.17.1"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -3053,10 +3054,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr"; + sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; type = "gem"; }; - version = "0.21.2"; + version = "0.22.0"; }; simplecov-html = { groups = ["default"]; @@ -3095,10 +3096,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2vmy0j5amy9fihs2gz2ssm4bdpqqh4llyjfl6qqqry7f87c6xz"; + sha256 = "1ryfja9yd3fq8n1p5yi3qnd0pjk7bkycmxxmbb1bj0axlr1pdv20"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.5"; }; slather = { dependencies = ["CFPropertyList" "activesupport" "clamp" "nokogiri" "xcodeproj"]; @@ -3106,10 +3107,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wy8ws5n2gvxgkncbhrp4vkwjcbphcczw4k7y3g2wfl8fdmv5b4n"; + sha256 = "0kdigir21jinkkj4q3cjsswix26lmff1rmnwjz2ywc6y9d8ib9ak"; type = "gem"; }; - version = "2.7.2"; + version = "2.7.4"; }; slop = { groups = ["default"]; @@ -3147,10 +3148,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0smcpi3x87chkdqdclhgh36xlbwm7r44r58m3k1w4mcikdwlpjl7"; + sha256 = "1pdy2f5phffknx98j2f5k72s52ayp456m3jkg08vx396yg59l0gi"; type = "gem"; }; - version = "0.47.2"; + version = "0.48.0"; }; sqlite3 = { dependencies = ["mini_portile2"]; @@ -3158,10 +3159,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i95rgfxdj2rhxifps27dz7fjfdih5iyl7b01di9gdmh9m04ylk6"; + sha256 = "0f24qp50mc1qg8yvv7b3x73mh78d6mzd3b7rqib1ixfbsdiayx1x"; type = "gem"; }; - version = "1.5.3"; + version = "1.6.0"; }; string_inflection = { groups = ["default"]; @@ -3179,10 +3180,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1im3kskcrmwa12q4pxilps7dyf9jlc82saasp6lkn5q7zqi7ilfh"; + sha256 = "0zkq75hcqnxnipvccsd2f7vqcra6rplzvn1ds73sna6lcy8s6sxa"; type = "gem"; }; - version = "4.3.0"; + version = "6.0.0"; }; syntax_tree-haml = { dependencies = ["haml" "prettier_print" "syntax_tree"]; @@ -3190,10 +3191,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n2ag309fzz9qvj634aibv2khfc45vvsg1sra227ssn3xwcvx4vq"; + sha256 = "0nnq6z8xhvcv3yc7rf64np3f8dx6j8gmvbi6ws3lwccq4w5cmqnk"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.0"; }; syntax_tree-rbs = { dependencies = ["prettier_print" "rbs" "syntax_tree"]; @@ -3211,31 +3212,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zf6cavsmj87lszy0b5mzw6mdg0dbsb7f52xy2fx06y9abv78xxw"; + sha256 = "0yvchq3j0splz70796a27hr1v6ifhyab5ddc9fl1x734nhmsy4rb"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; }; temple = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kzp8c08jl137v62rafmr81b7hg01q3d1q70fr5y5cmmranfpml1"; + sha256 = "07k5wr2ypsmsbyc9d1plhdki4xr7vvggld8r1i49iljkrpx5nbqc"; type = "gem"; }; - version = "0.9.1"; + version = "0.10.0"; }; terminal-table = { - dependencies = ["unicode-display_width"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + sha256 = "0hbmzfr17ji5ws5x5z3kypmb5irwwss7q7kkad0gs005ibqrxv0a"; type = "gem"; }; - version = "1.8.0"; + version = "1.6.0"; }; thor = { groups = ["default"]; @@ -3247,16 +3247,6 @@ }; version = "1.2.1"; }; - thread_safe = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; - type = "gem"; - }; - version = "0.3.6"; - }; thrift = { groups = ["default"]; platforms = []; @@ -3303,10 +3293,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0697qz1akblf8r3wi0s2dsjh468hfsd57fb0mrp93z35y2ni6bhh"; + sha256 = "0adc8qblz8ii668r3rksjx83p675iryh52rvdvysimx2hkbasj7d"; type = "gem"; }; - version = "1.6.11"; + version = "1.6.12"; }; tty-color = { groups = ["default"]; @@ -3351,15 +3341,15 @@ version = "1.4.0"; }; tzinfo = { - dependencies = ["thread_safe"]; + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rw89y3zj0wcybcyiazgcprg6hi42k8ipp1n2lbl95z1dmpgmly6"; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; type = "gem"; }; - version = "1.2.10"; + version = "2.0.6"; }; uglifier = { dependencies = ["execjs"]; @@ -3398,10 +3388,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; + sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; type = "gem"; }; - version = "1.8.0"; + version = "2.4.2"; }; uuid4r = { groups = ["default"]; @@ -3482,29 +3472,19 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18hihq3hxs2ywxh3ixm366cawwy4k733mh680ldaa1vxjiraxj58"; + sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1"; type = "gem"; }; - version = "2.6.1"; - }; - ZenTest = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vss0ldskqprnlvl5pczcl8p346p2ib1sc6hyprbprh6gjq4v16y"; - type = "gem"; - }; - version = "4.12.1"; + version = "2.6.7"; }; zookeeper = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gbmc76cxi4nlhrdch8ykinyzp5f2m6d272g8xhn5rjg3fjp15l1"; + sha256 = "1hc87pbmgc53lksa1aql61kxn9d2kjzmlhnjxa5rcn01qhm3pkvg"; type = "gem"; }; - version = "1.5.3"; + version = "1.5.5"; }; } From ccbff74b884ea0e16c1a970017b9f4ad0c083ff9 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 13 Feb 2023 20:46:47 +0000 Subject: [PATCH 011/111] graalvmCEPackages.buildGraalvmProduct: inherit default meta from graalvm-ce --- .../graalvm/community-edition/buildGraalvmProduct.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix index e4b55cc756b7..5ec1b4062777 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -1,6 +1,7 @@ { lib , stdenv , autoPatchelfHook +, graalvm-ce , makeWrapper , perl , unzip @@ -64,10 +65,7 @@ stdenv.mkDerivation (args // { passthru = { inherit product; } // passthru; meta = with lib; ({ - homepage = "https://www.graalvm.org/"; + inherit (graalvm-ce.meta) homepage license sourceProvenance maintainers platforms; description = "High-Performance Polyglot VM (Product: ${product})"; - license = with licenses; [ upl gpl2Classpath bsd3 ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; teams.graalvm-ce.members ++ [ ]; } // meta); }) From c37428c7f35289e7b52092635777020ec6def81c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 13 Feb 2023 20:59:33 +0000 Subject: [PATCH 012/111] graalvmCEPackages.python-installable-svm: init at 22.3.1 --- .../graalvm/community-edition/default.nix | 33 ++++++- .../graalvm/community-edition/hashes.nix | 94 +++++++++++++++++++ .../python-installable-svm.nix | 18 ++++ .../graalvm/community-edition/update.sh | 6 +- 4 files changed, 146 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index 0f9cec44f18f..d97269536b5f 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -6,7 +6,7 @@ }: let - buildGraalvm = callPackage ./buildGraalvm.nix { inherit Foundation; }; + buildGraalvm = lib.makeOverridable (callPackage ./buildGraalvm.nix { inherit Foundation; }); buildGraalvmProduct = callPackage ./buildGraalvmProduct.nix { }; javaPlatform = { "aarch64-linux" = "linux-aarch64"; @@ -16,7 +16,8 @@ let }; javaPlatformVersion = javaVersion: "${javaVersion}-${javaPlatform.${stdenv.system} or (throw "Unsupported platform: ${stdenv.system}")}"; - source = product: javaVersion: (import ./hashes.nix).${product}.${javaPlatformVersion javaVersion}; + source = product: javaVersion: (import ./hashes.nix).${product}.${javaPlatformVersion javaVersion} + or (throw "Unsupported product combination: product=${product} java=${javaVersion} system=${stdenv.system}"); in rec { @@ -30,6 +31,20 @@ rec { products = [ native-image-installable-svm-java11 ]; }; + # Mostly available for testing, do not expose in all-packages + graalvm11-ce-full = graalvm11-ce.override { + products = [ + native-image-installable-svm-java11 + python-installable-svm-java11 + ]; + }; + + python-installable-svm-java11 = callPackage ./python-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "python-installable-svm" javaVersion); + }; + native-image-installable-svm-java11 = callPackage ./native-image-installable-svm.nix rec { javaVersion = "11"; version = "22.3.1"; @@ -44,6 +59,20 @@ rec { products = [ native-image-installable-svm-java17 ]; }; + # Mostly available for testing, do not expose in all-packages + graalvm17-ce-full = graalvm17-ce.override { + products = [ + native-image-installable-svm-java17 + python-installable-svm-java17 + ]; + }; + + python-installable-svm-java17 = callPackage ./python-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "python-installable-svm" javaVersion); + }; + native-image-installable-svm-java17 = callPackage ./native-image-installable-svm.nix rec { javaVersion = "17"; version = "22.3.1"; diff --git a/pkgs/development/compilers/graalvm/community-edition/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/hashes.nix index c0353e033ae2..4cfe5eedb773 100644 --- a/pkgs/development/compilers/graalvm/community-edition/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/hashes.nix @@ -1,5 +1,65 @@ # Generated by pkgs/development/compilers/graalvm/community-edition/update.sh script { + "wasm-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "1d67jm41psypkhpy77cb2l00smhni3pgkybwx79z7dzcyid7p2l1"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "1cg9zxyjirfl0afr9cppg2h17j8qdidi4llbal2g5w1p2v9zq78b"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "19v7jqhvijmzzb0i9q6hbvrmqnmmzbyvai3il9f357qvv6r6lylb"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "0sfnsy0r4qf7ni9mh437dad1d8sidajcra2azsmy5qdmh091zhj5"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "0764d97mla5cii4iyvyb43v62dk8ff3plqjmdc69qqxx8mdzpwqv"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "1ip6ybm7p28bs2lifxqhq6fyvfm3wmacv6dqziyl2v7v7yl0iw4i"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; + "python-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "1yl36x5svld7qnm3m6vmacm2n4d6l9vhdxhaypvlv2bbfbnym3c5"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "0ggx5rwz3qnnxgz407r8yx12556pcbirhnc44972l77r320rdmqc"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "11c19a20v3ff83dxzs9hf1z89kh0qich41b03gx8mancf12jfwnl"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "0pga44whhvm98d8j2v2bpl9rkbvr9bv947rc4imlbf01cyxjwl71"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-aarch64" = { + sha256 = "0qnh8i9nazrv25jhn13wp7qqm9wwhcz4kpp2ygvsdmf9s3d2f5lf"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-darwin-aarch64-22.3.1.jar"; + }; + "17-darwin-aarch64" = { + sha256 = "0j13xvy9d19glipz4wdma2y02g0cnksg1iij4247fjhpqh0axkdz"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-darwin-aarch64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "1ny5664h7pibvskmm51mlxrxkbbj2dvxsv2yqbq6v51a57wm1yzn"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "01jjncx8jm1yrps2nj217vgcmjaqclmpb27rdp3qn7k64w5wzipg"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.3.1/python-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; "native-image-installable-svm" = { "11-linux-aarch64" = { sha256 = "0z9rbmci6yz7f7mqd3xzsxc5ih4hq72lyzqfchan7fr6mh38d6gw"; @@ -68,4 +128,38 @@ url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java17-darwin-amd64-22.3.1.tar.gz"; }; }; + "ruby-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "10wm1sq7smywy63mzlsbn21kzd65yaqj8yismpq8bz19h9skas7w"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "0kh1w49yp3kpfvhqw19bbx51ay1wgzq80gsrfqax4zm5ixz4wsbz"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "0avsawgfkqbgqc2hm8zmz37qg9ag3ddni3my8g73kvzfkghsdabh"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "1ib00pqdhzl24y97j16mm86qwrijqjnmhjmk3g5vdhyhh099vjp1"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-aarch64" = { + sha256 = "1im75qad89xa2nbl80csnwn56k6n11zv5g91xlkqq4xk300v1saj"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-darwin-aarch64-22.3.1.jar"; + }; + "17-darwin-aarch64" = { + sha256 = "1pfzsisf4sgzxmk3r1p4apzqkwipjpf8naly3v94i5v3b5gbnczx"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-darwin-aarch64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "1jfls71y92hw09s869v2qw8pypgl1fciqz3m9zcd2602hikysq6c"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "03x2h4sw72l05xxg73xj9mzzkxffbjpv8hdi59rgxxljnz0ai6rx"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.3.1/ruby-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix new file mode 100644 index 000000000000..50821f79efc4 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix @@ -0,0 +1,18 @@ +{ lib +, stdenv +, graalvmCEPackages +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "python-installable-svm"; + + installCheckPhase = '' + echo "Testing GraalPython" + $out/bin/graalpy -c 'print(1 + 1)' + echo '1 + 1' | $out/bin/graalpy + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/update.sh b/pkgs/development/compilers/graalvm/community-edition/update.sh index 476bd754ad50..ff16f2741a3d 100755 --- a/pkgs/development/compilers/graalvm/community-edition/update.sh +++ b/pkgs/development/compilers/graalvm/community-edition/update.sh @@ -40,9 +40,9 @@ fi declare -r -A products_urls=( [graalvm-ce]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/graalvm-ce-java@platform@-${new_version}.tar.gz" [native-image-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/native-image-installable-svm-java@platform@-${new_version}.jar" - # [ruby-installable-svm]="https://github.com/oracle/truffleruby/releases/download/vm-${new_version}/ruby-installable-svm-java@platform@-${new_version}.jar" - # [wasm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/wasm-installable-svm-java@platform@-${new_version}.jar" - # [python-installable-svm]="https://github.com/graalvm/graalpython/releases/download/vm-${new_version}/python-installable-svm-java@platform@-${new_version}.jar" + [ruby-installable-svm]="https://github.com/oracle/truffleruby/releases/download/vm-${new_version}/ruby-installable-svm-java@platform@-${new_version}.jar" + [wasm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/wasm-installable-svm-java@platform@-${new_version}.jar" + [python-installable-svm]="https://github.com/graalvm/graalpython/releases/download/vm-${new_version}/python-installable-svm-java@platform@-${new_version}.jar" ) readonly platforms=( From e17f76f94f2fd9460bbf33eb072a0e0e7d807f4c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 13 Feb 2023 21:19:42 +0000 Subject: [PATCH 013/111] graalvmCEPackages.wasm-installable-svm: init at 22.3.1 --- .../community-edition/buildGraalvm.nix | 3 +++ .../graalvm/community-edition/default.nix | 14 ++++++++++++ .../wasm-installable-svm.nix | 22 +++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index f8a1e515db3b..0abc92f6ed25 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -109,6 +109,9 @@ let installCheckPhase = '' runHook preInstallCheck + echo "Testing Jshell" + echo '1 + 1' | $out/bin/jshell + echo ${ lib.escapeShellArg '' public class HelloWorld { diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index d97269536b5f..4008b0b925ba 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -36,6 +36,7 @@ rec { products = [ native-image-installable-svm-java11 python-installable-svm-java11 + wasm-installable-svm-java11 ]; }; @@ -51,6 +52,12 @@ rec { src = fetchurl (source "native-image-installable-svm" javaVersion); }; + wasm-installable-svm-java11 = callPackage ./wasm-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "wasm-installable-svm" javaVersion); + }; + graalvm17-ce = buildGraalvm rec { version = "22.3.1"; javaVersion = "17"; @@ -64,6 +71,7 @@ rec { products = [ native-image-installable-svm-java17 python-installable-svm-java17 + wasm-installable-svm-java17 ]; }; @@ -78,4 +86,10 @@ rec { version = "22.3.1"; src = fetchurl (source "native-image-installable-svm" javaVersion); }; + + wasm-installable-svm-java17 = callPackage ./wasm-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "wasm-installable-svm" javaVersion); + }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix new file mode 100644 index 000000000000..6cf6cdb1d6ed --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix @@ -0,0 +1,22 @@ +{ lib +, stdenv +, graalvm-ce +, graalvmCEPackages +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "wasm-installable-svm"; + + # TODO: improve this test + installCheckPhase = '' + echo "Testing wasm" + $out/bin/wasm --help + ''; + + # Not supported in aarch64-darwin yet as GraalVM 22.3.1 release + meta.platforms = builtins.filter (p: p != "aarch64-darwin") graalvm-ce.meta.platforms; +} From 751f8617b38e915500142a2ac001b4586722b4ed Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Mon, 13 Feb 2023 15:05:06 -0800 Subject: [PATCH 014/111] nix-your-shell: 1.0.1 -> 1.0.2 https://github.com/MercuryTechnologies/nix-your-shell/releases/tag/v1.0.2 --- pkgs/shells/nix-your-shell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nix-your-shell/default.nix b/pkgs/shells/nix-your-shell/default.nix index c5dfaab71505..98125cd4b41d 100644 --- a/pkgs/shells/nix-your-shell/default.nix +++ b/pkgs/shells/nix-your-shell/default.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "nix-your-shell"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "MercuryTechnologies"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kdZFwMHatnhdXGSIItuE3g27qqUKqT/Hkbz13Ba5eq4="; + sha256 = "sha256-W3MeApvqO3hBaHWu6vyrR6pniEMMKiXTAQ0bhUPbpx8="; }; - cargoSha256 = "sha256-U4nN/N345XFRj0L9cLJAjRuND0W3OE6XEB/z3zXaUiQ="; + cargoSha256 = "sha256-M6yj4jTTWnembVX51/Xz+JtKhWJsmQ7SpipH8pHzids="; meta = with lib; { description = "A `nix` and `nix-shell` wrapper for shells other than `bash`"; From 171730f0f744675b14fdc3109f0bb2dd92b59dde Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 13 Feb 2023 23:06:35 +0000 Subject: [PATCH 015/111] graalvmCEProducts.buildGraalvmProduct: make it overridable --- .../compilers/graalvm/community-edition/buildGraalvm.nix | 1 - .../development/compilers/graalvm/community-edition/default.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 0abc92f6ed25..3a72aa72cd72 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -139,7 +139,6 @@ let }; meta = with lib; ({ - inherit platforms; homepage = "https://www.graalvm.org/"; description = "High-Performance Polyglot VM"; license = with licenses; [ upl gpl2Classpath bsd3 ]; diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index 4008b0b925ba..49d54ab33f87 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -7,7 +7,7 @@ let buildGraalvm = lib.makeOverridable (callPackage ./buildGraalvm.nix { inherit Foundation; }); - buildGraalvmProduct = callPackage ./buildGraalvmProduct.nix { }; + buildGraalvmProduct = lib.makeOverridable (callPackage ./buildGraalvmProduct.nix { }); javaPlatform = { "aarch64-linux" = "linux-aarch64"; "x86_64-linux" = "linux-amd64"; From 1645ebc882f17e0913aefafcedcafc7cbdb62fa2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 14 Feb 2023 10:38:08 +0100 Subject: [PATCH 016/111] soco-cli: 0.4.21 -> 0.4.55 --- pkgs/tools/audio/soco-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/soco-cli/default.nix b/pkgs/tools/audio/soco-cli/default.nix index 72e5323f60f3..068f916e4ef0 100644 --- a/pkgs/tools/audio/soco-cli/default.nix +++ b/pkgs/tools/audio/soco-cli/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "soco-cli"; - version = "0.4.21"; + version = "0.4.55"; format = "setuptools"; disabled = python3.pythonOlder "3.6"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "avantrec"; repo = pname; rev = "v${version}"; - sha256 = "1kz2zx59gjfs01jiyzmps8j6yca06yqn6wkidvdk4s3izdm0rarw"; + sha256 = "sha256-zdu1eVtVBTYa47KjGc5fqKN6olxp98RoLGT2sNCfG9E="; }; propagatedBuildInputs = with python3.pkgs; [ From e918da4d48ca1e5721cb11ade963e6c4ec3c91d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 2 Feb 2023 16:18:12 +0100 Subject: [PATCH 017/111] openssh: 9.1p1 -> 9.2p1 --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ pkgs/tools/networking/openssh/default.nix | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 22b1fe885cc3..3c76ee6ccae1 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -64,6 +64,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `borgbackup` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.borgbackup.jobs..inhibitsSleep`](#opt-services.borgbackup.jobs._name_.inhibitsSleep). +- The `ssh` client tool now disables the `~C` escape sequence by default. This can be re-enabled by setting `EnableEscapeCommandline yes` + - `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems. - `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories. diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index f9ad037d55da..b7e1e879b060 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -6,11 +6,11 @@ in openssh = common rec { pname = "openssh"; - version = "9.1p1"; + version = "9.2p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-GfhQCcfj4jeH8CNvuxV4OSq01L+fjsX+a8HNfov90og="; + hash = "sha256-P2bb8WVftF9Q4cVtpiqwEhjCKIB7ITONY068351xz0Y="; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; @@ -37,6 +37,13 @@ in stripLen = 1; sha256 = "sha256-p3CmMqTgrqFZUo4ZuqaPLczAhjmPufkCvptVW5dI+MI="; }) + + (fetchpatch { + name = "CVE-2023-25136.patch"; + url = "https://ftp.openbsd.org/pub/OpenBSD/patches/7.2/common/017_sshd.patch.sig"; + stripLen = 1; + hash = "sha256-ol/YXXb2gJNBfvg9JKmIEdwGK8RaDfW53aKKT6HU++M="; + }) ]; extraNativeBuildInputs = [ autoreconfHook ]; From e9748e4b9bc39bd5efca90f5eb5f098741276dd4 Mon Sep 17 00:00:00 2001 From: Slin Lee Date: Tue, 14 Feb 2023 06:38:37 -0800 Subject: [PATCH 018/111] vhs: remove unneeded buildInputs --- pkgs/applications/misc/vhs/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix index fc66c908be70..ee24812881e2 100644 --- a/pkgs/applications/misc/vhs/default.nix +++ b/pkgs/applications/misc/vhs/default.nix @@ -14,7 +14,6 @@ buildGoModule rec { vendorHash = "sha256-9nkRr5Jh1nbI+XXbPj9KB0ZbLybv5JUVovpB311fO38="; nativeBuildInputs = [ installShellFiles makeWrapper ]; - buildInputs = [ ttyd ffmpeg ]; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; From f164ce437306c2e7fe41c758226ead343091bcb9 Mon Sep 17 00:00:00 2001 From: Slin Lee Date: Tue, 14 Feb 2023 06:51:16 -0800 Subject: [PATCH 019/111] vhs: add chromium to wrapper --- pkgs/applications/misc/vhs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix index ee24812881e2..bb498c7ee237 100644 --- a/pkgs/applications/misc/vhs/default.nix +++ b/pkgs/applications/misc/vhs/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, installShellFiles, fetchFromGitHub, ffmpeg, ttyd, makeWrapper }: +{ lib, buildGoModule, installShellFiles, fetchFromGitHub, ffmpeg, ttyd, chromium, makeWrapper }: buildGoModule rec { pname = "vhs"; @@ -18,7 +18,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; postInstall = '' - wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath [ ffmpeg ttyd ]} + wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath [ chromium ffmpeg ttyd ]} $out/bin/vhs man > vhs.1 installManPage vhs.1 installShellCompletion --cmd vhs \ From 4f150675badaeaaf2aa9e2c49ff37a69e52b9c72 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 14 Feb 2023 15:17:12 +0000 Subject: [PATCH 020/111] graalvm*-ce: make update.sh script re-use cache --- .../graalvm/community-edition/update.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/update.sh b/pkgs/development/compilers/graalvm/community-edition/update.sh index ff16f2741a3d..575fbbf493cf 100755 --- a/pkgs/development/compilers/graalvm/community-edition/update.sh +++ b/pkgs/development/compilers/graalvm/community-edition/update.sh @@ -14,9 +14,10 @@ verlte() { [ "$1" = "$(echo -e "$1\n$2" | sort -V | head -n1)" ] } +readonly hashes_nix="hashes.nix" readonly nixpkgs=../../../../.. -readonly current_version="$(nix-instantiate "$nixpkgs" --eval --strict -A graalvm-ce.version | tr -d \")" +readonly current_version="$(nix-instantiate "$nixpkgs" --eval --strict -A graalvm-ce.version --json | jq -r)" if [[ -z "${1:-}" ]]; then readonly gh_version="$(curl \ @@ -40,9 +41,9 @@ fi declare -r -A products_urls=( [graalvm-ce]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/graalvm-ce-java@platform@-${new_version}.tar.gz" [native-image-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/native-image-installable-svm-java@platform@-${new_version}.jar" + [python-installable-svm]="https://github.com/graalvm/graalpython/releases/download/vm-${new_version}/python-installable-svm-java@platform@-${new_version}.jar" [ruby-installable-svm]="https://github.com/oracle/truffleruby/releases/download/vm-${new_version}/ruby-installable-svm-java@platform@-${new_version}.jar" [wasm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/wasm-installable-svm-java@platform@-${new_version}.jar" - [python-installable-svm]="https://github.com/graalvm/graalpython/releases/download/vm-${new_version}/python-installable-svm-java@platform@-${new_version}.jar" ) readonly platforms=( @@ -65,11 +66,20 @@ for product in "${!products_urls[@]}"; do url="${products_urls["${product}"]}" echo_file " \"$product\" = {" for platform in "${platforms[@]}"; do - if hash="$(nix-prefetch-url "${url//@platform@/$platform}")"; then + # Reuse cache as long the version is the same + if [[ "$current_version" == "$new_version" ]]; then + previous_hash="$(nix-instantiate --eval "$hashes_nix" -A "$product.$platform.sha256" --json | jq -r || true)" + else + previous_hash="" + fi + # Lack of quoting in $previous_hash is proposital + if hash="$(nix-prefetch-url "${url//@platform@/$platform}" $previous_hash)"; then echo_file " \"$platform\" = {" echo_file " sha256 = \"$hash\";" echo_file " url = \"${url//@platform@/${platform}}\";" echo_file " };" + else + info "Error while downloading '$product' for '$platform'. Skipping it..." fi done echo_file " };" @@ -81,6 +91,6 @@ info "Updating graalvm-ce version..." sed "s|$current_version|$new_version|" -i default.nix info "Moving the temporary file to hashes.nix" -mv "$tmpfile" hashes.nix +mv "$tmpfile" "$hashes_nix" info "Done!" From 365ff22467cf1a43ed36f9c5aac6851840b6e84b Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 14 Feb 2023 15:23:26 +0000 Subject: [PATCH 021/111] graalvmCEPackages.llvm-installable-svm: init at 22.3.1 --- .../graalvm/community-edition/default.nix | 22 +++++++++--- .../graalvm/community-edition/hashes.nix | 34 +++++++++++++++++++ .../llvm-installable-svm.nix | 22 ++++++++++++ .../ruby-installable-svm.nix | 30 ++++++++++++++++ .../graalvm/community-edition/update.sh | 1 + 5 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix create mode 100644 pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index 49d54ab33f87..616e73554748 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -34,16 +34,17 @@ rec { # Mostly available for testing, do not expose in all-packages graalvm11-ce-full = graalvm11-ce.override { products = [ + llvm-installable-svm-java17 native-image-installable-svm-java11 python-installable-svm-java11 wasm-installable-svm-java11 ]; }; - python-installable-svm-java11 = callPackage ./python-installable-svm.nix rec { + llvm-installable-svm-java11 = callPackage ./llvm-installable-svm.nix rec { javaVersion = "11"; version = "22.3.1"; - src = fetchurl (source "python-installable-svm" javaVersion); + src = fetchurl (source "llvm-installable-svm" javaVersion); }; native-image-installable-svm-java11 = callPackage ./native-image-installable-svm.nix rec { @@ -52,6 +53,12 @@ rec { src = fetchurl (source "native-image-installable-svm" javaVersion); }; + python-installable-svm-java11 = callPackage ./python-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "python-installable-svm" javaVersion); + }; + wasm-installable-svm-java11 = callPackage ./wasm-installable-svm.nix rec { javaVersion = "11"; version = "22.3.1"; @@ -69,16 +76,17 @@ rec { # Mostly available for testing, do not expose in all-packages graalvm17-ce-full = graalvm17-ce.override { products = [ + llvm-installable-svm-java17 native-image-installable-svm-java17 python-installable-svm-java17 wasm-installable-svm-java17 ]; }; - python-installable-svm-java17 = callPackage ./python-installable-svm.nix rec { + llvm-installable-svm-java17 = callPackage ./llvm-installable-svm.nix rec { javaVersion = "17"; version = "22.3.1"; - src = fetchurl (source "python-installable-svm" javaVersion); + src = fetchurl (source "llvm-installable-svm" javaVersion); }; native-image-installable-svm-java17 = callPackage ./native-image-installable-svm.nix rec { @@ -87,6 +95,12 @@ rec { src = fetchurl (source "native-image-installable-svm" javaVersion); }; + python-installable-svm-java17 = callPackage ./python-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "python-installable-svm" javaVersion); + }; + wasm-installable-svm-java17 = callPackage ./wasm-installable-svm.nix rec { javaVersion = "17"; version = "22.3.1"; diff --git a/pkgs/development/compilers/graalvm/community-edition/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/hashes.nix index 4cfe5eedb773..0970ffadee4d 100644 --- a/pkgs/development/compilers/graalvm/community-edition/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/hashes.nix @@ -1,5 +1,39 @@ # Generated by pkgs/development/compilers/graalvm/community-edition/update.sh script { + "llvm-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "0h8xkvsixcwak5dymkj3jgjv11w3ivnd6d45v5pdbymd0m2ifia8"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "1zww45z7m3mvzg47fwc3jgqz3hkra220isf4ih8sv6kjg1jc4y14"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "133m9vg9rlp2xkndh3d6b8ybq8vwch99rj1b50xr6bz8r6306ara"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "0nz09idp8wawm3yinsplzvxhld8yav06l1nqj02gxrc1kxd5nsr1"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-aarch64" = { + sha256 = "0ngcm3ara7g1xz4kh515igpyrjhr1k5z9nf4vsaw4lpa5sqljv7z"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-darwin-aarch64-22.3.1.jar"; + }; + "17-darwin-aarch64" = { + sha256 = "1lr8kk82c3l9hx7wc5hqmpqfgvpk72xg1h07b6cgibry1bm6baj6"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-aarch64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "058pzrd90xx4yi7mm2fvs2npqcdkb2nzhqfwfz5v202038igi61g"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "10rfz8ddq82zpf6cy2y0gx1bx0zhjzm3gwwdb1j7mll0hvwp84sg"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; "wasm-installable-svm" = { "11-linux-aarch64" = { sha256 = "1d67jm41psypkhpy77cb2l00smhni3pgkybwx79z7dzcyid7p2l1"; diff --git a/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix new file mode 100644 index 000000000000..7c2fc8e49916 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix @@ -0,0 +1,22 @@ +{ lib +, stdenv +, graalvmCEPackages +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "llvm-installable-svm"; + + preFixup = '' + ln -s $out/languages/llvm/native/lib/*.so $out/lib + ''; + + # TODO: improve this test + installCheckPhase = '' + echo "Testing llvm" + $out/bin/lli --help + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix new file mode 100644 index 000000000000..50ee59927bf6 --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, graalvmCEPackages +, openssl +, javaVersion +, musl +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "ruby-installable-svm"; + + extraBuildInputs = [ openssl ]; + + preFixup = '' + patchelf $out/languages/ruby/lib/mri/openssl.so \ + --replace-needed libssl.so.10 libssl.so \ + --replace-needed libcrypto.so.10 libcrypto.so + ''; + + installCheckPhase = '' + echo "Testing TruffleRuby" + # Hide warnings about wrong locale + export LANG=C + export LC_ALL=C + $out/bin/ruby -e 'puts(1 + 1)' + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/update.sh b/pkgs/development/compilers/graalvm/community-edition/update.sh index 575fbbf493cf..7bb95010512e 100755 --- a/pkgs/development/compilers/graalvm/community-edition/update.sh +++ b/pkgs/development/compilers/graalvm/community-edition/update.sh @@ -40,6 +40,7 @@ fi declare -r -A products_urls=( [graalvm-ce]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/graalvm-ce-java@platform@-${new_version}.tar.gz" + [llvm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/llvm-installable-svm-java@platform@-${new_version}.jar" [native-image-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/native-image-installable-svm-java@platform@-${new_version}.jar" [python-installable-svm]="https://github.com/graalvm/graalpython/releases/download/vm-${new_version}/python-installable-svm-java@platform@-${new_version}.jar" [ruby-installable-svm]="https://github.com/oracle/truffleruby/releases/download/vm-${new_version}/ruby-installable-svm-java@platform@-${new_version}.jar" From 140046c4225a8bc349a1e9241f3666b739d5b5b7 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 14 Feb 2023 15:46:39 +0000 Subject: [PATCH 022/111] graalvmCEPackages.ruby-installable-svm: init at 22.3.1 --- .../graalvm/community-edition/default.nix | 16 ++++++++++++++++ .../community-edition/llvm-installable-svm.nix | 2 +- .../community-edition/ruby-installable-svm.nix | 7 ++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index 616e73554748..1de27fc0d50b 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -37,6 +37,7 @@ rec { llvm-installable-svm-java17 native-image-installable-svm-java11 python-installable-svm-java11 + ruby-installable-svm-java11 wasm-installable-svm-java11 ]; }; @@ -59,6 +60,13 @@ rec { src = fetchurl (source "python-installable-svm" javaVersion); }; + ruby-installable-svm-java11 = callPackage ./ruby-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "ruby-installable-svm" javaVersion); + llvm-installable-svm = llvm-installable-svm-java11; + }; + wasm-installable-svm-java11 = callPackage ./wasm-installable-svm.nix rec { javaVersion = "11"; version = "22.3.1"; @@ -79,6 +87,7 @@ rec { llvm-installable-svm-java17 native-image-installable-svm-java17 python-installable-svm-java17 + ruby-installable-svm-java17 wasm-installable-svm-java17 ]; }; @@ -101,6 +110,13 @@ rec { src = fetchurl (source "python-installable-svm" javaVersion); }; + ruby-installable-svm-java17 = callPackage ./ruby-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "ruby-installable-svm" javaVersion); + llvm-installable-svm = llvm-installable-svm-java17; + }; + wasm-installable-svm-java17 = callPackage ./wasm-installable-svm.nix rec { javaVersion = "17"; version = "22.3.1"; diff --git a/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix index 7c2fc8e49916..c831d8119877 100644 --- a/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix @@ -10,7 +10,7 @@ graalvmCEPackages.buildGraalvmProduct rec { inherit src javaVersion version; product = "llvm-installable-svm"; - preFixup = '' + postUnpack = '' ln -s $out/languages/llvm/native/lib/*.so $out/lib ''; diff --git a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix index 50ee59927bf6..4d00ef43c685 100644 --- a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix @@ -6,13 +6,17 @@ , musl , src , version +, llvm-installable-svm }: graalvmCEPackages.buildGraalvmProduct rec { inherit src javaVersion version; product = "ruby-installable-svm"; - extraBuildInputs = [ openssl ]; + extraBuildInputs = [ + llvm-installable-svm + openssl + ]; preFixup = '' patchelf $out/languages/ruby/lib/mri/openssl.so \ @@ -26,5 +30,6 @@ graalvmCEPackages.buildGraalvmProduct rec { export LANG=C export LC_ALL=C $out/bin/ruby -e 'puts(1 + 1)' + echo '1 + 1' | $out/bin/irb ''; } From acf85793075f03d54d6639abc3dd02503f7c8499 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 14 Feb 2023 16:01:43 +0000 Subject: [PATCH 023/111] graalvmCEPackages.buildGraalvmProduct: add passthru.graalvmPhases This way it is easier to differentiate between phases running in the `buildGraalvmProduct` and `buildGraalvm`. --- .../community-edition/buildGraalvm.nix | 6 ++-- .../community-edition/buildGraalvmProduct.nix | 30 +++++++++++++------ .../llvm-installable-svm.nix | 2 +- .../native-image-installable-svm.nix | 4 +-- .../python-installable-svm.nix | 2 +- .../ruby-installable-svm.nix | 2 +- .../wasm-installable-svm.nix | 2 +- 7 files changed, 30 insertions(+), 18 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 3a72aa72cd72..a3dc2691830a 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -23,10 +23,10 @@ let runtimeLibraryPath = lib.makeLibraryPath ([ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]); - mapProducts = key: default: (map (p: p.${key} or default) products); + mapProducts = key: default: (map (p: p.graalvmPhases.${key} or default) products); concatProducts = key: lib.concatStringsSep "\n" (mapProducts key ""); - graalvmXXX-ce = stdenv.mkDerivation (args // { + graalvmXXX-ce = stdenv.mkDerivation ({ pname = "graalvm${javaVersion}-ce"; unpackPhase = '' @@ -146,5 +146,5 @@ let mainProgram = "java"; maintainers = with maintainers; teams.graalvm-ce.members ++ [ ]; } // meta); - }); + } // (builtins.removeAttrs args [ "javaVersion" "meta" "products" ])); in graalvmXXX-ce diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix index 5ec1b4062777..de1f75249e47 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -9,13 +9,14 @@ }: { product , javaVersion -, extraNativeBuildInputs ? [ ] , extraBuildInputs ? [ ] +, extraNativeBuildInputs ? [ ] +, graalvmPhases ? { } , meta ? { } , passthru ? { } , ... } @ args: -stdenv.mkDerivation (args // { +stdenv.mkDerivation ({ pname = "${product}-java${javaVersion}"; nativeBuildInputs = [ perl unzip makeWrapper ] @@ -56,16 +57,27 @@ stdenv.mkDerivation (args // { dontInstall = true; dontBuild = true; dontStrip = true; - # installCheckPhase is going to run in GraalVM main derivation (see buildGraalvm.nix) - # to make sure that it has everything it needs to run correctly. - # Other hooks like fixupPhase/installPhase are also going to run there for the - # same reason. - doInstallCheck = false; - passthru = { inherit product; } // passthru; + passthru = { + inherit product javaVersion; + # build phases that are going to run during GraalVM derivation build, + # since they depend in having the fully setup GraalVM environment + # e.g.: graalvmPhases.installCheckPhase will run the checks only after + # GraalVM+products is build + # see buildGraalvm.nix file for the available phases + inherit graalvmPhases; + } // passthru; meta = with lib; ({ inherit (graalvm-ce.meta) homepage license sourceProvenance maintainers platforms; description = "High-Performance Polyglot VM (Product: ${product})"; } // meta); -}) +} // (builtins.removeAttrs args [ + "product" + "javaVersion" + "extraBuildInputs" + "extraNativeBuildInputs" + "graalvmPhases" + "meta" + "passthru" +])) diff --git a/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix index c831d8119877..96b9ee9635a5 100644 --- a/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix @@ -15,7 +15,7 @@ graalvmCEPackages.buildGraalvmProduct rec { ''; # TODO: improve this test - installCheckPhase = '' + graalvmPhases.installCheckPhase = '' echo "Testing llvm" $out/bin/lli --help ''; diff --git a/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix index 393a226df19c..6d1c58d4b114 100644 --- a/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix @@ -27,14 +27,14 @@ graalvmCEPackages.buildGraalvmProduct rec { inherit src javaVersion version; product = "native-image-installable-svm"; - postInstall = lib.optionalString stdenv.isLinux '' + graalvmPhases.postInstall = lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/native-image \ --prefix PATH : ${binPath} \ ${lib.concatStringsSep " " (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs)} ''; - installCheckPhase = '' + graalvmPhases.installCheckPhase = '' echo "Ahead-Of-Time compilation" $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld ./helloworld | fgrep 'Hello World' diff --git a/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix index 50821f79efc4..43d6e85ef560 100644 --- a/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix @@ -10,7 +10,7 @@ graalvmCEPackages.buildGraalvmProduct rec { inherit src javaVersion version; product = "python-installable-svm"; - installCheckPhase = '' + graalvmPhases.installCheckPhase = '' echo "Testing GraalPython" $out/bin/graalpy -c 'print(1 + 1)' echo '1 + 1' | $out/bin/graalpy diff --git a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix index 4d00ef43c685..e7f8f157db9e 100644 --- a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix @@ -24,7 +24,7 @@ graalvmCEPackages.buildGraalvmProduct rec { --replace-needed libcrypto.so.10 libcrypto.so ''; - installCheckPhase = '' + graalvmPhases.installCheckPhase = '' echo "Testing TruffleRuby" # Hide warnings about wrong locale export LANG=C diff --git a/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix index 6cf6cdb1d6ed..9a5bef7c1e35 100644 --- a/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix @@ -12,7 +12,7 @@ graalvmCEPackages.buildGraalvmProduct rec { product = "wasm-installable-svm"; # TODO: improve this test - installCheckPhase = '' + graalvmPhases.installCheckPhase = '' echo "Testing wasm" $out/bin/wasm --help ''; From c9d481f3caa646e1131e254dd8ad8919c17b7611 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 14 Feb 2023 16:32:49 +0000 Subject: [PATCH 024/111] graalvm*-ce-full: improve comment about it --- .../compilers/graalvm/community-edition/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index 1de27fc0d50b..7956b701893e 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -31,7 +31,7 @@ rec { products = [ native-image-installable-svm-java11 ]; }; - # Mostly available for testing, do not expose in all-packages + # Mostly available for testing, not to be exposed at the top level graalvm11-ce-full = graalvm11-ce.override { products = [ llvm-installable-svm-java17 @@ -81,7 +81,7 @@ rec { products = [ native-image-installable-svm-java17 ]; }; - # Mostly available for testing, do not expose in all-packages + # Mostly available for testing, not to be exposed at the top level graalvm17-ce-full = graalvm17-ce.override { products = [ llvm-installable-svm-java17 From 3e5d655f0f3305dfac6d397734fcfd74e5482573 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 14 Feb 2023 16:43:06 +0000 Subject: [PATCH 025/111] graalvmCEPackages.graalvm11-ce-full: fix llvm-installable-svm version --- .../development/compilers/graalvm/community-edition/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index 7956b701893e..0654dc89c20a 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -34,7 +34,7 @@ rec { # Mostly available for testing, not to be exposed at the top level graalvm11-ce-full = graalvm11-ce.override { products = [ - llvm-installable-svm-java17 + llvm-installable-svm-java11 native-image-installable-svm-java11 python-installable-svm-java11 ruby-installable-svm-java11 From a065de41acc840cbb2931a68f1177d8b6eddc2f0 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 14 Feb 2023 16:44:24 +0000 Subject: [PATCH 026/111] graalvmCEPackages.ruby-installable-svm: update comment about locale --- .../graalvm/community-edition/ruby-installable-svm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix index e7f8f157db9e..381c895c2b3a 100644 --- a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix @@ -26,7 +26,7 @@ graalvmCEPackages.buildGraalvmProduct rec { graalvmPhases.installCheckPhase = '' echo "Testing TruffleRuby" - # Hide warnings about wrong locale + # Fixup/silence warnings about wrong locale export LANG=C export LC_ALL=C $out/bin/ruby -e 'puts(1 + 1)' From eaa3e39cc0e870e38d9d2ac6d105458b4df45830 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 14 Feb 2023 16:53:34 +0000 Subject: [PATCH 027/111] graalvmCEPackages.ruby-installable-svm: run patchelf only in Linux --- .../graalvm/community-edition/ruby-installable-svm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix index 381c895c2b3a..a9cc5d92257b 100644 --- a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix @@ -18,7 +18,7 @@ graalvmCEPackages.buildGraalvmProduct rec { openssl ]; - preFixup = '' + preFixup = lib.optionalString stdenv.isLinux '' patchelf $out/languages/ruby/lib/mri/openssl.so \ --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so From 820eb1cc8dfed101fd25c81f8aef9bf68210da79 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 14 Feb 2023 17:00:01 +0000 Subject: [PATCH 028/111] graalvmCEPackages.buildGraalvm: disable test in Darwin --- .../compilers/graalvm/community-edition/buildGraalvm.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index a3dc2691830a..a7d824f87972 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -109,8 +109,11 @@ let installCheckPhase = '' runHook preInstallCheck - echo "Testing Jshell" - echo '1 + 1' | $out/bin/jshell + ${# broken in darwin + lib.optionalString stdenv.isLinux '' + echo "Testing Jshell" + echo '1 + 1' | $out/bin/jshell + ''} echo ${ lib.escapeShellArg '' From 248449fbdf50e60cc38a52c243e3d68bb3efcb66 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 14 Feb 2023 17:00:45 +0000 Subject: [PATCH 029/111] graalvmCEPackages: formatting --- .../compilers/graalvm/community-edition/buildGraalvm.nix | 6 ++++-- .../graalvm/community-edition/buildGraalvmProduct.nix | 3 ++- .../community-edition/native-image-installable-svm.nix | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index a7d824f87972..3111fea1b400 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -18,7 +18,8 @@ { javaVersion , meta ? { } , products ? [ ] -, ... } @ args: +, ... +} @ args: let runtimeLibraryPath = lib.makeLibraryPath @@ -150,4 +151,5 @@ let maintainers = with maintainers; teams.graalvm-ce.members ++ [ ]; } // meta); } // (builtins.removeAttrs args [ "javaVersion" "meta" "products" ])); -in graalvmXXX-ce +in +graalvmXXX-ce diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix index de1f75249e47..52cf6e7e89e9 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -14,7 +14,8 @@ , graalvmPhases ? { } , meta ? { } , passthru ? { } -, ... } @ args: +, ... +} @ args: stdenv.mkDerivation ({ pname = "${product}-java${javaVersion}"; diff --git a/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix index 6d1c58d4b114..427c5ffef5b5 100644 --- a/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix @@ -39,7 +39,8 @@ graalvmCEPackages.buildGraalvmProduct rec { $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld ./helloworld | fgrep 'Hello World' - ${lib.optionalString (stdenv.isLinux && !useMusl) '' + ${# --static is only available in Linux + lib.optionalString (stdenv.isLinux && !useMusl) '' echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC" $out/bin/native-image -H:+StaticExecutableWithDynamicLibC HelloWorld ./helloworld | fgrep 'Hello World' @@ -49,7 +50,8 @@ graalvmCEPackages.buildGraalvmProduct rec { ./helloworld | fgrep 'Hello World' ''} - ${lib.optionalString (stdenv.isLinux && useMusl) '' + ${# --static is only available in Linux + lib.optionalString (stdenv.isLinux && useMusl) '' echo "Ahead-Of-Time compilation with --static and --libc=musl" $out/bin/native-image --static HelloWorld --libc=musl ./helloworld | fgrep 'Hello World' From 19e4e0a5e9465de8a60e7b62a37fa97d2dc06087 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 14 Feb 2023 17:19:52 +0000 Subject: [PATCH 030/111] graalvmCEPackages.graaljs: init at 22.3.1 --- .../graalvm/community-edition/default.nix | 14 ++++++++ .../graalvm/community-edition/hashes.nix | 34 +++++++++++++++++++ .../community-edition/js-installable-svm.nix | 18 ++++++++++ .../graalvm/community-edition/update.sh | 1 + 4 files changed, 67 insertions(+) create mode 100644 pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index 0654dc89c20a..afc0456c9746 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -34,6 +34,7 @@ rec { # Mostly available for testing, not to be exposed at the top level graalvm11-ce-full = graalvm11-ce.override { products = [ + js-installable-svm-java11 llvm-installable-svm-java11 native-image-installable-svm-java11 python-installable-svm-java11 @@ -42,6 +43,12 @@ rec { ]; }; + js-installable-svm-java11 = callPackage ./js-installable-svm.nix rec { + javaVersion = "11"; + version = "22.3.1"; + src = fetchurl (source "js-installable-svm" javaVersion); + }; + llvm-installable-svm-java11 = callPackage ./llvm-installable-svm.nix rec { javaVersion = "11"; version = "22.3.1"; @@ -84,6 +91,7 @@ rec { # Mostly available for testing, not to be exposed at the top level graalvm17-ce-full = graalvm17-ce.override { products = [ + js-installable-svm-java17 llvm-installable-svm-java17 native-image-installable-svm-java17 python-installable-svm-java17 @@ -92,6 +100,12 @@ rec { ]; }; + js-installable-svm-java17 = callPackage ./js-installable-svm.nix rec { + javaVersion = "17"; + version = "22.3.1"; + src = fetchurl (source "js-installable-svm" javaVersion); + }; + llvm-installable-svm-java17 = callPackage ./llvm-installable-svm.nix rec { javaVersion = "17"; version = "22.3.1"; diff --git a/pkgs/development/compilers/graalvm/community-edition/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/hashes.nix index 0970ffadee4d..c67702db82b9 100644 --- a/pkgs/development/compilers/graalvm/community-edition/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/hashes.nix @@ -60,6 +60,40 @@ url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/wasm-installable-svm-java17-darwin-amd64-22.3.1.jar"; }; }; + "js-installable-svm" = { + "11-linux-aarch64" = { + sha256 = "1b8vnjjsa548c6j3dycxp57i9xmyvndiz2xhv7fm10izcplyspxq"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-linux-aarch64-22.3.1.jar"; + }; + "17-linux-aarch64" = { + sha256 = "1kcy3mjk908zs7f3k95awp6294cwr06hand4cbw1lsnfvp0qwhk7"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-linux-aarch64-22.3.1.jar"; + }; + "11-linux-amd64" = { + sha256 = "0sq80a4nnvik560whgv5vwlsszi8z02idvpd92p0caf03bra9x2b"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-linux-amd64-22.3.1.jar"; + }; + "17-linux-amd64" = { + sha256 = "0fd160yxsi09m97z7vqh5kwf1g0p0hn4niy48glj9jhirfqzzw0c"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-linux-amd64-22.3.1.jar"; + }; + "11-darwin-aarch64" = { + sha256 = "18g0xixzk45yrxv3zfs7qrdyj0b3ksp59jhbcis0vwy9gx8094wq"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-darwin-aarch64-22.3.1.jar"; + }; + "17-darwin-aarch64" = { + sha256 = "0cf4iivkniilvbqyniqxcz1qf49cs4lxi0axjsk9sz1zmxcq0bnk"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-darwin-aarch64-22.3.1.jar"; + }; + "11-darwin-amd64" = { + sha256 = "0ibcz6ivx068ndf45j9pghm8qwq287glqxf0xx08kjxnhms67p52"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java11-darwin-amd64-22.3.1.jar"; + }; + "17-darwin-amd64" = { + sha256 = "16q7whnvdrk8lb4fp96qr3p567kggyk9q5iqcn081qk8xjkbx0zv"; + url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/js-installable-svm-java17-darwin-amd64-22.3.1.jar"; + }; + }; "python-installable-svm" = { "11-linux-aarch64" = { sha256 = "1yl36x5svld7qnm3m6vmacm2n4d6l9vhdxhaypvlv2bbfbnym3c5"; diff --git a/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix new file mode 100644 index 000000000000..0ab20c0e1dfe --- /dev/null +++ b/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix @@ -0,0 +1,18 @@ +{ lib +, stdenv +, graalvm-ce +, graalvmCEPackages +, javaVersion +, src +, version +}: + +graalvmCEPackages.buildGraalvmProduct rec { + inherit src javaVersion version; + product = "js-installable-svm"; + + graalvmPhases.installCheckPhase = '' + echo "Testing GraalJS" + echo '1 + 1' | $out/bin/js + ''; +} diff --git a/pkgs/development/compilers/graalvm/community-edition/update.sh b/pkgs/development/compilers/graalvm/community-edition/update.sh index 7bb95010512e..fb1036cf8870 100755 --- a/pkgs/development/compilers/graalvm/community-edition/update.sh +++ b/pkgs/development/compilers/graalvm/community-edition/update.sh @@ -40,6 +40,7 @@ fi declare -r -A products_urls=( [graalvm-ce]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/graalvm-ce-java@platform@-${new_version}.tar.gz" + [js-installable-svm]="https://github.com/graalvm/graaljs/releases/download/vm-${new_version}/js-installable-svm-java@platform@-${new_version}.jar" [llvm-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/llvm-installable-svm-java@platform@-${new_version}.jar" [native-image-installable-svm]="https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${new_version}/native-image-installable-svm-java@platform@-${new_version}.jar" [python-installable-svm]="https://github.com/graalvm/graalpython/releases/download/vm-${new_version}/python-installable-svm-java@platform@-${new_version}.jar" From c09076d5d94a84af5866f10a6ef4ae23f9de6fcb Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Mon, 13 Feb 2023 22:04:36 +0100 Subject: [PATCH 031/111] listenbrainz-mpd: init at 2.0.2 --- .../audio/listenbrainz-mpd/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/audio/listenbrainz-mpd/default.nix diff --git a/pkgs/applications/audio/listenbrainz-mpd/default.nix b/pkgs/applications/audio/listenbrainz-mpd/default.nix new file mode 100644 index 000000000000..04216bdf09f6 --- /dev/null +++ b/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -0,0 +1,35 @@ +{ lib +, rustPlatform +, fetchFromGitea +, pkg-config +, stdenv +, openssl +, libiconv +, Security }: + +rustPlatform.buildRustPackage rec { + pname = "listenbrainz-mpd"; + version = "2.0.2"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "elomatreb"; + repo = "listenbrainz-mpd"; + rev = "v${version}"; + hash = "sha256-DO7YUqaJZyVWjiAZ9WIVNTTvOU0qdsI2ct7aT/6O5dQ="; + }; + + cargoHash = "sha256-MiAalxe0drRHrST3maVvi8GM2y3d0z4Zl7R7Zx8VjEM="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = if stdenv.isDarwin then [ libiconv Security ] else [ openssl ]; + + meta = with lib; { + homepage = "https://codeberg.org/elomatreb/listenbrainz-mpd"; + changelog = "https://codeberg.org/elomatreb/listenbrainz-mpd/src/tag/v${version}/CHANGELOG.md"; + description = "ListenBrainz submission client for MPD"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ DeeUnderscore ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ee84cd2bbd1..5b496b1e79c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18093,6 +18093,10 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) Virtualization; }; + listenbrainz-mpd = callPackage ../applications/audio/listenbrainz-mpd { + inherit (darwin.apple_sdk.frameworks) Security; + }; + lit = callPackage ../development/tools/misc/lit { }; litecli = callPackage ../development/tools/database/litecli {}; From 3926d8c482fcb577f22e2c68ed36d537fb6a927c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 14 Feb 2023 17:53:57 +0000 Subject: [PATCH 032/111] graalvmCEPackages.ruby-installable-svm: disable broken test in darwin --- .../graalvm/community-edition/ruby-installable-svm.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix index a9cc5d92257b..a5c8f718b278 100644 --- a/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/ruby-installable-svm.nix @@ -30,6 +30,9 @@ graalvmCEPackages.buildGraalvmProduct rec { export LANG=C export LC_ALL=C $out/bin/ruby -e 'puts(1 + 1)' - echo '1 + 1' | $out/bin/irb + ${# broken in darwin with sandbox enabled + lib.optionalString stdenv.isLinux '' + echo '1 + 1' | $out/bin/irb + ''} ''; } From b3c41de572f8601dcd3a89eccf2ee1eafe36ee36 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 5 Dec 2022 10:57:40 +0100 Subject: [PATCH 033/111] nfd: 0.7.1 -> 22.12 --- pkgs/development/libraries/ndn-cxx/default.nix | 4 ++-- pkgs/servers/nfd/default.nix | 12 ++++++------ pkgs/tools/networking/ndn-tools/default.nix | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index e7cc6e705b67..c7977ed89d99 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { "--with-tests" ]; - doCheck = false; + doCheck = false; # some tests fail in upstream, some fail because of the sandbox environment checkPhase = '' runHook preCheck - LD_PRELOAD=build/libndn-cxx.so build/unit-tests # some tests fail in upstream, some fail because of the sandbox environment + LD_PRELOAD=build/libndn-cxx.so build/unit-tests runHook postCheck ''; diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix index 58c4dd42936e..87ce4ce1889f 100644 --- a/pkgs/servers/nfd/default.nix +++ b/pkgs/servers/nfd/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, boost175 +, boost , fetchFromGitHub , libpcap , ndn-cxx @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nfd"; - version = "0.7.1"; + version = "22.12"; src = fetchFromGitHub { owner = "named-data"; repo = lib.toUpper pname; rev = "NFD-${version}"; - sha256 = "sha256-8Zm8oxbpw9qD31NuofDdgPYnTWIz5E04NhkZhiRkK9E="; + sha256 = "sha256-epY5qtET7rsKL3KIKvxfa+wF+AGZbYs+zRhy8SnIffk="; fetchSubmodules = true; }; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap ndn-cxx openssl websocketpp ] ++ lib.optional withSystemd systemd; wafConfigureFlags = [ - "--boost-includes=${boost175.dev}/include" - "--boost-libs=${boost175.out}/lib" + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" "--with-tests" ] ++ lib.optional (!withWebSocket) "--without-websocket"; @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { description = "Named Data Networking (NDN) Forwarding Daemon"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ lib.maintainers.bertof ]; + maintainers = with maintainers; [ bertof ]; }; } diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix index 9ab84724d078..425ddb440435 100644 --- a/pkgs/tools/networking/ndn-tools/default.nix +++ b/pkgs/tools/networking/ndn-tools/default.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { "--with-tests" ]; - doCheck = false; + doCheck = false; # some tests fail because of the sandbox environment checkPhase = '' runHook preCheck - build/unit-tests # some tests fail because of the sandbox environment + build/unit-tests runHook postCheck ''; From bc3d5934d7f276a21537b40159491257ee163d94 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 14 Feb 2023 19:11:59 +0100 Subject: [PATCH 034/111] treewide: use lib.optionals --- .../editors/vscode/extensions/vscodeEnv.nix | 3 +-- .../file-managers/spacefm/default.nix | 2 +- pkgs/applications/kde/kdevelop/wrapper.nix | 4 ++-- .../networking/browsers/chromium/browser.nix | 4 +--- .../networking/browsers/firefox/wrapper.nix | 4 ++-- pkgs/applications/radio/gnuradio/shared.nix | 18 ++++++++---------- pkgs/applications/radio/gnuradio/wrapper.nix | 7 ++----- pkgs/build-support/build-setupcfg/default.nix | 7 ++++--- .../dotnet/make-nuget-source/default.nix | 4 +--- .../interpreters/python/default.nix | 2 +- .../python/python-packages-base.nix | 2 +- pkgs/development/java-modules/m2install.nix | 2 +- .../androidenv/compose-android-packages.nix | 6 +++--- .../python-modules/polars/default.nix | 2 +- pkgs/games/xjump/default.nix | 8 ++------ pkgs/stdenv/generic/check-meta.nix | 2 +- pkgs/stdenv/native/default.nix | 6 +++--- pkgs/tools/archivers/zip/default.nix | 2 +- pkgs/tools/nix/info/default.nix | 2 +- pkgs/tools/typesetting/tex/nix/default.nix | 5 +++-- pkgs/top-level/darwin-packages.nix | 2 +- pkgs/top-level/release-haskell.nix | 4 +--- pkgs/top-level/release-python.nix | 2 +- 23 files changed, 43 insertions(+), 57 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix b/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix index 7c58a4bdfb34..818cca51772a 100644 --- a/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix +++ b/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix @@ -25,8 +25,7 @@ }: let mutableExtensionsFilePath = toString mutableExtensionsFile; - mutableExtensions = if builtins.pathExists mutableExtensionsFile - then import mutableExtensionsFilePath else []; + mutableExtensions = lib.optionals builtins.pathExists mutableExtensionsFile (import mutableExtensionsFilePath); vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { inherit lib writeShellScriptBin extensionsFromVscodeMarketplace; vscodeDefault = vscode; diff --git a/pkgs/applications/file-managers/spacefm/default.nix b/pkgs/applications/file-managers/spacefm/default.nix index 334228f98ead..605340cbc85c 100644 --- a/pkgs/applications/file-managers/spacefm/default.nix +++ b/pkgs/applications/file-managers/spacefm/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 udev desktop-file-utils shared-mime-info wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2 - ] ++ (if ifuseSupport then [ ifuse ] else []); + ] ++ (lib.optionals ifuseSupport [ ifuse ]); # Introduced because ifuse doesn't build due to CVEs in libplist # Revert when libplist builds again… diff --git a/pkgs/applications/kde/kdevelop/wrapper.nix b/pkgs/applications/kde/kdevelop/wrapper.nix index 86d3de9eb39a..c73f2bba7b50 100644 --- a/pkgs/applications/kde/kdevelop/wrapper.nix +++ b/pkgs/applications/kde/kdevelop/wrapper.nix @@ -1,7 +1,7 @@ -{ symlinkJoin, kdevelop-unwrapped, plugins ? null }: +{ lib, symlinkJoin, kdevelop-unwrapped, plugins ? null }: symlinkJoin { name = "kdevelop-with-plugins"; - paths = [ kdevelop-unwrapped ] ++ (if plugins != null then plugins else []); + paths = [ kdevelop-unwrapped ] ++ (lib.optionals (plugins != null) plugins); } diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 2f39e82f3b24..1eea3e8962f8 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -90,9 +90,7 @@ mkChromiumDerivation (base: rec { license = if enableWideVine then lib.licenses.unfree else lib.licenses.bsd3; platforms = lib.platforms.linux; mainProgram = "chromium"; - hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium") - then ["aarch64-linux" "x86_64-linux"] - else []; + hydraPlatforms = lib.optionals (channel == "stable" || channel == "ungoogled-chromium") ["aarch64-linux" "x86_64-linux"]; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) }; }) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 06bd49facb81..de68807d8f25 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -98,7 +98,7 @@ let usesNixExtensions = nixExtensions != null; - nameArray = builtins.map(a: a.name) (if usesNixExtensions then nixExtensions else []); + nameArray = builtins.map(a: a.name) (lib.optionals usesNixExtensions nixExtensions); requiresSigning = browser ? MOZ_REQUIRE_SIGNING -> toString browser.MOZ_REQUIRE_SIGNING != ""; @@ -114,7 +114,7 @@ let throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" else a - ) (if usesNixExtensions then nixExtensions else []); + ) (lib.optionals usesNixExtensions nixExtensions); enterprisePolicies = { diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index ff6aaf35bea0..bdbc22cb787d 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -37,20 +37,18 @@ rec { ); nativeBuildInputs = lib.flatten (lib.mapAttrsToList ( feat: info: ( - if hasFeature feat then - (if builtins.hasAttr "native" info then info.native else []) ++ - (if builtins.hasAttr "pythonNative" info then info.pythonNative else []) - else - [] + lib.optionals (hasFeature feat) ( + (lib.optionals (builtins.hasAttr "native" info) info.native) ++ + (lib.optionals (builtins.hasAttr "pythonNative" info) info.pythonNative) + ) ) ) featuresInfo); buildInputs = lib.flatten (lib.mapAttrsToList ( feat: info: ( - if hasFeature feat then - (if builtins.hasAttr "runtime" info then info.runtime else []) ++ - (if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else []) - else - [] + lib.optionals (hasFeature feat) ( + (lib.optionals (builtins.hasAttr "runtime" info) info.runtime) ++ + (lib.optionals (builtins.hasAttr "pythonRuntime" info) info.pythonRuntime) + ) ) ) featuresInfo); cmakeFlags = lib.mapAttrsToList ( diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 926022353e41..c38c89fc459b 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -41,12 +41,9 @@ let ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages) ++ lib.flatten (lib.mapAttrsToList ( feat: info: ( - if unwrapped.hasFeature feat then - (if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else []) - else - [] + lib.optionals ((unwrapped.hasFeature feat) && (builtins.hasAttr "pythonRuntime" info)) info.pythonRuntime ) - ) unwrapped.featuresInfo) + ) unwrapped.featuresInfo) ; pythonEnv = unwrapped.python.withPackages(ps: pythonPkgs); diff --git a/pkgs/build-support/build-setupcfg/default.nix b/pkgs/build-support/build-setupcfg/default.nix index bc6482f0a88e..5737989249af 100644 --- a/pkgs/build-support/build-setupcfg/default.nix +++ b/pkgs/build-support/build-setupcfg/default.nix @@ -6,8 +6,8 @@ # * application: Whether this package is a python library or an # application which happens to be written in python. # * doCheck: Whether to run the test suites. -pythonPackages: -{ src, info, meta ? {}, application ? false, doCheck ? true }: let +lib: pythonPackages: +{ src, info, meta ? {}, application ? false, doCheck ? true}: let build = if application then pythonPackages.buildPythonApplication else pythonPackages.buildPythonPackage; @@ -18,7 +18,8 @@ in build { nativeBuildInputs = map (p: pythonPackages.${p}) ( (info.setup_requires or []) ++ - (if doCheck then (info.tests_require or []) else [])); + (lib.optionals doCheck (info.tests_require or [])) + ); propagatedBuildInputs = map (p: pythonPackages.${p}) (info.install_requires or []); diff --git a/pkgs/build-support/dotnet/make-nuget-source/default.nix b/pkgs/build-support/dotnet/make-nuget-source/default.nix index 8dc77f3aac03..ea1c5328082d 100644 --- a/pkgs/build-support/dotnet/make-nuget-source/default.nix +++ b/pkgs/build-support/dotnet/make-nuget-source/default.nix @@ -30,9 +30,7 @@ let meta.licence = let depLicenses = lib.splitString "\n" (builtins.readFile "${nuget-source}/share/licenses"); in (lib.flatten (lib.forEach depLicenses (spdx: - if (spdx != "") - then lib.getLicenseFromSpdxId spdx - else [] + lib.optionals (spdx != "") (lib.getLicenseFromSpdxId spdx) ))); }; in nuget-source diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 76dc12005f8e..08e2717d41c1 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -63,7 +63,7 @@ hooks = import ./hooks/default.nix; keep = lib.extends hooks pythonPackagesFun; extra = _: {}; - optionalExtensions = cond: as: if cond then as else []; + optionalExtensions = cond: as: lib.optionals cond as; pythonExtension = import ../../../top-level/python-packages.nix; python2Extension = import ../../../top-level/python2-packages.nix; extensions = lib.composeManyExtensions ([ diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index d5b02223fd6c..ee94d4aec031 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -39,7 +39,7 @@ let })); # See build-setupcfg/default.nix for documentation. - buildSetupcfg = import ../../../build-support/build-setupcfg self; + buildSetupcfg = import ../../../build-support/build-setupcfg lib self; # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix index b35880e013c8..c058590c8574 100644 --- a/pkgs/development/java-modules/m2install.nix +++ b/pkgs/development/java-modules/m2install.nix @@ -5,7 +5,7 @@ , sha512 , type ? "jar" , suffix ? "" -, sourceProvenance ? (if type == "jar" then [ lib.sourceTypes.binaryBytecode ] else []) +, sourceProvenance ? (lib.optionals (type == "jar") [ lib.sourceTypes.binaryBytecode ]) }: let diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 75f393b3f9e2..d27c1bb1cdc9 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -186,7 +186,7 @@ rec { system-images = lib.flatten (map (apiVersion: map (type: map (abiVersion: - if lib.hasAttrByPath [apiVersion type abiVersion] system-images-packages then + lib.optionals (lib.hasAttrByPath [apiVersion type abiVersion] system-images-packages) ( deployAndroidPackage { inherit os; package = system-images-packages.${apiVersion}.${type}.${abiVersion}; @@ -197,7 +197,7 @@ rec { sed -i '/^Addon.Vendor/d' source.properties ''; } - else [] + ) ) abiVersions ) systemImageTypes ) platformVersions); @@ -217,7 +217,7 @@ rec { }; # All NDK bundles. - ndk-bundles = if includeNDK then map makeNdkBundle ndkVersions else []; + ndk-bundles = lib.optionals includeNDK (map makeNdkBundle ndkVersions); # The "default" NDK bundle. ndk-bundle = if includeNDK then lib.findFirst (x: x != null) null ndk-bundles else null; diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index f265e24fe4ef..5424152a1e82 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -42,7 +42,7 @@ buildPythonPackage { # Revisit this whenever package or Rust is upgraded RUSTC_BOOTSTRAP = 1; - propagatedBuildInputs = if pythonOlder "3.10" then [ typing-extensions ] else []; + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; diff --git a/pkgs/games/xjump/default.nix b/pkgs/games/xjump/default.nix index 3c13fc1a9b78..2c56e0bba4f6 100644 --- a/pkgs/games/xjump/default.nix +++ b/pkgs/games/xjump/default.nix @@ -12,12 +12,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake ]; buildInputs = [ libX11 libXt libXpm libXaw ]; preConfigure = "autoreconf --install"; - patches = if stdenv.buildPlatform.isDarwin then [ ./darwin.patch ] else []; - configureFlags = - if localStateDir != null then - ["--localstatedir=${localStateDir}"] - else - []; + patches = lib.optionals stdenv.buildPlatform.isDarwin [ ./darwin.patch ]; + configureFlags = lib.optionals (localStateDir != null) ["--localstatedir=${localStateDir}"]; meta = with lib; { description = "The falling tower game"; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index dd7825a409e2..4b0ca649ee94 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -322,7 +322,7 @@ let }" else "key 'meta.${k}' is unrecognized; expected one of: \n [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]"; - checkMeta = meta: if config.checkMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else []; + checkMeta = meta: lib.optionals config.checkMeta (lib.remove null (lib.mapAttrsToList checkMetaAttr meta)); checkOutputsToInstall = attrs: let expectedOutputs = attrs.meta.outputsToInstall or []; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 87862b84bc1b..bae4ff2c93b2 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -12,9 +12,9 @@ let else "/bin/bash"; path = - (if system == "i686-solaris" then [ "/usr/gnu" ] else []) ++ - (if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++ - (if system == "x86_64-solaris" then [ "/opt/local/gnu" ] else []) ++ + (lib.optionals (system == "i686-solaris") [ "/usr/gnu" ]) ++ + (lib.optionals (system == "i686-netbsd") [ "/usr/pkg" ]) ++ + (lib.optionals (system == "x86_64-solaris") [ "/opt/local/gnu" ]) ++ ["/" "/usr" "/usr/local"]; prehookBase = '' diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index ab91cfc64834..82329537251e 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "INSTALL=cp" ]; - patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else []; + patches = lib.optionals (enableNLS && !stdenv.isCygwin) [ ./natspec-gentoo.patch.bz2 ]; buildInputs = lib.optional enableNLS libnatspec ++ lib.optional stdenv.isCygwin libiconv; diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix index 151a53f15258..84bd3e891622 100644 --- a/pkgs/tools/nix/info/default.nix +++ b/pkgs/tools/nix/info/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { path = lib.makeBinPath ([ coreutils findutils gnugrep - ] ++ (if stdenv.isDarwin then [ darwin.DarwinTools ] else [])); + ] ++ (lib.optionals stdenv.isDarwin [ darwin.DarwinTools ])); is_darwin = if stdenv.isDarwin then "yes" else "no"; sandboxtest = ./sandbox.nix; diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index fbb6fdb0fe01..e9017333c943 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -82,7 +82,8 @@ rec { findLhs2TeXIncludes = - { rootFile + { lib + , rootFile }: builtins.genericClosure { @@ -97,7 +98,7 @@ rec { { src = key; } "${pkgs.stdenv.bash}/bin/bash ${./find-lhs2tex-includes.sh}"); - in pkgs.lib.concatMap (x: if builtins.pathExists x then [{key = x;}] else []) + in pkgs.lib.concatMap (x: lib.optionals (builtins.pathExists x) [{key = x;}]) (map (x: dirOf key + ("/" + x)) deps); }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index f9aa50a01d71..cf9bb6e59345 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -41,7 +41,7 @@ makeScopeWithSplicing (generateSplicesForMkScope "darwin") (_: {}) (spliced: spl useAppleSDKLibs = stdenv.hostPlatform.isAarch64; selectAttrs = attrs: names: - lib.listToAttrs (lib.concatMap (n: if attrs ? "${n}" then [(lib.nameValuePair n attrs."${n}")] else []) names); + lib.listToAttrs (lib.concatMap (n: lib.optionals (attrs ? "${n}") [(lib.nameValuePair n attrs."${n}")]) names); chooseLibs = ( # There are differences in which libraries are exported. Avoid evaluation diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index ee7e64f1ffaa..8c38800b77cb 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -39,9 +39,7 @@ let attrs: if lib.isDerivation attrs then [ attrs ] - else if lib.isAttrs attrs - then accumulateDerivations (lib.attrValues attrs) - else [] + else lib.optionals (lib.isAttrs attrs) (accumulateDerivations (lib.attrValues attrs)) ) jobList; # names of all subsets of `pkgs.haskell.packages` diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index f34185722201..691f50708ace 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -24,7 +24,7 @@ let packagePython value else []); - in if res.success then res.value else [] + in lib.optionals res.success res.value ); jobs = { From f7eba3716c09b53359c4d206f46e10ee9b2c78d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Feb 2023 19:30:20 +0100 Subject: [PATCH 035/111] spidermonkey_102: 102.1.0 -> 102.8.0 https://www.mozilla.org/en-US/security/advisories/mfsa2023-06/#CVE-2023-25735 Fixes: CVE-2023-25735 --- pkgs/development/interpreters/spidermonkey/102.nix | 4 ++-- .../interpreters/spidermonkey/common.nix | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/102.nix b/pkgs/development/interpreters/spidermonkey/102.nix index ef89d1ca0a27..ff6808b13b0a 100644 --- a/pkgs/development/interpreters/spidermonkey/102.nix +++ b/pkgs/development/interpreters/spidermonkey/102.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "102.1.0"; - hash = "sha512-JQW4fOQRVEVWjra32K9BZ4vXh/0H8/eenwoi2QzfdSrl1DcYVs+cVuLZ2n1bfDk53CqrV1P8wBc5jn1lJg9vAw=="; + version = "102.8.0"; + hash = "sha512-k+qHmXtmCIuUxulDtumemnHRkIRE0JbA9ltodtLFhOVf9hICZvOFH5hrZkvR8S+jEgawNHnCt1Hnw8oJesFCdQ=="; } diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index 32a0ae2e7467..a4310b8f206f 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -62,19 +62,6 @@ stdenv.mkDerivation (finalAttrs: rec { # use pkg-config at all systems ./always-check-for-pkg-config.patch ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch - - # Patches required by GJS - # https://discourse.gnome.org/t/gnome-43-to-depend-on-spidermonkey-102/10658 - # Install ProfilingCategoryList.h - (fetchpatch { - url = "https://hg.mozilla.org/releases/mozilla-esr102/raw-rev/33147b91e42b79f4c6dd3ec11cce96746018407a"; - sha256 = "sha256-xJFJZMYJ6P11HQDZbr48GFgybpAeVcu3oLIFEyyMjBI="; - }) - # Fix embeder build - (fetchpatch { - url = "https://hg.mozilla.org/releases/mozilla-esr102/raw-rev/1fa20fb474f5d149cc32d98df169dee5e6e6861b"; - sha256 = "sha256-eCisKjNxy9SLr9KoEE2UB26BflUknnR7PIvnpezsZeA="; - }) ] ++ lib.optionals (lib.versionAtLeast version "91" && stdenv.hostPlatform.system == "i686-linux") [ # Fixes i686 build, https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 ./fix-float-i686.patch From 2b4f446ee82c2962fe5a86c26675c6205f40754e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Feb 2023 19:31:55 +0100 Subject: [PATCH 036/111] spidermonkey_91: 91.12.0 -> 91.13.0 Bringing the 91 release series to its final version. Did not check for changes, but this gives me closure. --- pkgs/development/interpreters/spidermonkey/91.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix index ca771fa75fd6..0ffa5fc287d5 100644 --- a/pkgs/development/interpreters/spidermonkey/91.nix +++ b/pkgs/development/interpreters/spidermonkey/91.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "91.12.0"; - hash = "sha512-Mj+3UkiLRYcrQPCw7h2MHf+haHTb/yr94ZpUKGyCTvSBdyM+Ap+ur6WUYYTnHDHGvFun7BelceIa9k/F9zNAQg=="; + version = "91.13.0"; + hash = "sha512-OLTMUt4h521gYea6F14cv9iIoWBwqpUfWkQoPy251+lPJQRiHw2nj+rG5xSRptDnA49j3QrhEtytcA6wLpqlFg=="; } From cce466a5827333c67a5a9ae4c2929e7ce1c0050b Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 14 Feb 2023 19:04:12 +0000 Subject: [PATCH 037/111] graalvm*-ce: allow all parameters to be overriden --- .../community-edition/buildGraalvm.nix | 33 +++++++++++++++---- .../community-edition/buildGraalvmProduct.nix | 33 ++++++++++++------- .../graalvm/community-edition/default.nix | 5 ++- pkgs/top-level/all-packages.nix | 4 +-- 4 files changed, 52 insertions(+), 23 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 3111fea1b400..2a77029d136e 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -4,24 +4,45 @@ , autoPatchelfHook , cairo , cups +, darwin , fontconfig -, Foundation , glib , gtk3 -, gtkSupport ? stdenv.isLinux , makeWrapper , setJavaClassPath , unzip , xorg , zlib -}: -{ javaVersion + # extra params +, javaVersion , meta ? { } , products ? [ ] +, gtkSupport ? stdenv.isLinux , ... } @ args: let + extraArgs = builtins.removeAttrs args [ + "lib" + "stdenv" + "alsa-lib" + "autoPatchelfHook" + "cairo" + "cups" + "darwin" + "fontconfig" + "glib" + "gtk3" + "makeWrapper" + "setJavaClassPath" + "unzip" + "xorg" + "zlib" + "javaVersion" + "meta" + "products" + "gtkSupport" + ]; runtimeLibraryPath = lib.makeLibraryPath ([ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]); mapProducts = key: default: (map (p: p.graalvmPhases.${key} or default) products); @@ -72,7 +93,7 @@ let ++ lib.optional stdenv.isLinux autoPatchelfHook; propagatedBuildInputs = [ setJavaClassPath zlib ] - ++ lib.optional stdenv.isDarwin Foundation; + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; buildInputs = lib.optionals stdenv.isLinux [ alsa-lib # libasound.so wanted by lib/libjsound.so @@ -150,6 +171,6 @@ let mainProgram = "java"; maintainers = with maintainers; teams.graalvm-ce.members ++ [ ]; } // meta); - } // (builtins.removeAttrs args [ "javaVersion" "meta" "products" ])); + } // extraArgs); in graalvmXXX-ce diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix index 52cf6e7e89e9..aad60e13d308 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -6,8 +6,8 @@ , perl , unzip , zlib -}: -{ product + # extra params +, product , javaVersion , extraBuildInputs ? [ ] , extraNativeBuildInputs ? [ ] @@ -17,6 +17,25 @@ , ... } @ args: +let + extraArgs = builtins.removeAttrs args [ + "lib" + "stdenv" + "autoPatchelfHook" + "graalvm-ce" + "makeWrapper" + "perl" + "unzip" + "zlib" + "product" + "javaVersion" + "extraBuildInputs" + "extraNativeBuildInputs" + "graalvmPhases" + "meta" + "passthru" + ]; +in stdenv.mkDerivation ({ pname = "${product}-java${javaVersion}"; @@ -73,12 +92,4 @@ stdenv.mkDerivation ({ inherit (graalvm-ce.meta) homepage license sourceProvenance maintainers platforms; description = "High-Performance Polyglot VM (Product: ${product})"; } // meta); -} // (builtins.removeAttrs args [ - "product" - "javaVersion" - "extraBuildInputs" - "extraNativeBuildInputs" - "graalvmPhases" - "meta" - "passthru" -])) +} // extraArgs) diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index afc0456c9746..9eafd12b97e9 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -2,12 +2,11 @@ , stdenv , callPackage , fetchurl -, Foundation }: let - buildGraalvm = lib.makeOverridable (callPackage ./buildGraalvm.nix { inherit Foundation; }); - buildGraalvmProduct = lib.makeOverridable (callPackage ./buildGraalvmProduct.nix { }); + buildGraalvm = callPackage ./buildGraalvm.nix; + buildGraalvmProduct = callPackage ./buildGraalvmProduct.nix; javaPlatform = { "aarch64-linux" = "linux-aarch64"; "x86_64-linux" = "linux-amd64"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 005e63be84a7..727caeb072a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15014,9 +15014,7 @@ with pkgs; openjdk_headless = jdk_headless; graalvmCEPackages = - recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { - inherit (darwin.apple_sdk.frameworks) Foundation; - }); + recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { }); graalvm-ce = graalvm11-ce; graalvm11-ce = graalvmCEPackages.graalvm11-ce; graalvm17-ce = graalvmCEPackages.graalvm17-ce; From 14a114606a660e99feec27de917eec7e061201d4 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Tue, 14 Feb 2023 18:15:30 +0100 Subject: [PATCH 038/111] opensearch: init at 2.5.0 --- pkgs/servers/search/opensearch/default.nix | 51 +++++++++++++++++++ .../opensearch/opensearch-home-fix.patch | 26 ++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 79 insertions(+) create mode 100644 pkgs/servers/search/opensearch/default.nix create mode 100644 pkgs/servers/search/opensearch/opensearch-home-fix.patch diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix new file mode 100644 index 000000000000..da1e739b4a2a --- /dev/null +++ b/pkgs/servers/search/opensearch/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenvNoCC +, fetchurl +, makeWrapper +, jre_headless +, util-linux +, gnugrep +, coreutils +, autoPatchelfHook +, zlib +}: + +stdenvNoCC.mkDerivation rec { + pname = "opensearch"; + version = "2.5.0"; + + src = fetchurl { + url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${version}/opensearch-${version}-linux-x64.tar.gz"; + hash = "sha256-WPD5StVBb/hK+kP/1wkQQBKRQma/uaP+8ULeIFUBL1U="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre_headless util-linux ]; + patches = [./opensearch-home-fix.patch ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -R bin config lib modules plugins $out + + substituteInPlace $out/bin/opensearch \ + --replace 'bin/opensearch-keystore' "$out/bin/opensearch-keystore" + + wrapProgram $out/bin/opensearch \ + --prefix PATH : "${lib.makeBinPath [ util-linux gnugrep coreutils ]}" \ + --set JAVA_HOME "${jre_headless}" + + wrapProgram $out/bin/opensearch-plugin --set JAVA_HOME "${jre_headless}" + + runHook postInstall + ''; + + meta = { + description = "Open Source, Distributed, RESTful Search Engine"; + homepage = "https://github.com/opensearch-project/OpenSearch"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ shyim ]; + }; +} diff --git a/pkgs/servers/search/opensearch/opensearch-home-fix.patch b/pkgs/servers/search/opensearch/opensearch-home-fix.patch new file mode 100644 index 000000000000..25d0130d6d9b --- /dev/null +++ b/pkgs/servers/search/opensearch/opensearch-home-fix.patch @@ -0,0 +1,26 @@ +diff -Naur a/bin/opensearch-env b/bin/opensearch-env +--- a/bin/opensearch-env 2017-12-12 13:31:51.000000000 +0100 ++++ b/bin/opensearch-env 2017-12-18 19:51:12.282809695 +0100 +@@ -19,18 +19,10 @@ + fi + done + +-# determine OpenSearch home; to do this, we strip from the path until we find +-# bin, and then strip bin (there is an assumption here that there is no nested +-# directory under bin also named bin) +-OPENSEARCH_HOME=`dirname "$SCRIPT"` +- +-# now make OPENSEARCH_HOME absolute +-OPENSEARCH_HOME=`cd "$OPENSEARCH_HOME"; pwd` +- +-while [ "`basename "$OPENSEARCH_HOME"`" != "bin" ]; do +- OPENSEARCH_HOME=`dirname "$OPENSEARCH_HOME"` +-done +-OPENSEARCH_HOME=`dirname "$OPENSEARCH_HOME"` ++if [ -z "$OPENSEARCH_HOME" ]; then ++ echo "You must set the OPENSEARCH_HOME var" >&2 ++ exit 1 ++fi + + # now set the classpath + OPENSEARCH_CLASSPATH="$OPENSEARCH_HOME/lib/*" \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c5cae91ff1c..62eb435f0272 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34812,6 +34812,8 @@ with pkgs; openrct2 = callPackage ../games/openrct2 { }; + opensearch = callPackage ../servers/search/opensearch { }; + osu-lazer = callPackage ../games/osu-lazer { }; osu-lazer-bin = callPackage ../games/osu-lazer/bin.nix { }; From d7eb44a4210e86e93002a5de90dd425ddef8e5d4 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Tue, 14 Feb 2023 18:15:42 +0100 Subject: [PATCH 039/111] nixos/opensearch: init module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/search/opensearch.nix | 210 +++++++++++++++++++ 2 files changed, 211 insertions(+) create mode 100644 nixos/modules/services/search/opensearch.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 74651efc0c5a..9ce78c9eb124 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1048,6 +1048,7 @@ ./services/search/hound.nix ./services/search/kibana.nix ./services/search/meilisearch.nix + ./services/search/opensearch.nix ./services/search/solr.nix ./services/security/aesmd.nix ./services/security/certmgr.nix diff --git a/nixos/modules/services/search/opensearch.nix b/nixos/modules/services/search/opensearch.nix new file mode 100644 index 000000000000..17b8697d149c --- /dev/null +++ b/nixos/modules/services/search/opensearch.nix @@ -0,0 +1,210 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.opensearch; + + settingsFormat = pkgs.formats.yaml {}; + + configDir = cfg.dataDir + "/config"; + + opensearchYml = settingsFormat.generate "opensearch.yml" cfg.settings; + + loggingConfigFilename = "log4j2.properties"; + loggingConfigFile = pkgs.writeTextFile { + name = loggingConfigFilename; + text = cfg.logging; + }; +in +{ + + options.services.opensearch = { + enable = mkEnableOption (lib.mdDoc "Whether to enable OpenSearch."); + + package = lib.mkPackageOptionMD pkgs "OpenSearch package to use." { + default = [ "opensearch" ]; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options."network.host" = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1"; + description = lib.mdDoc '' + Which port this service should listen on. + ''; + }; + + options."cluster.name" = lib.mkOption { + type = lib.types.str; + default = "opensearch"; + description = lib.mdDoc '' + The name of the cluster. + ''; + }; + + options."discovery.type" = lib.mkOption { + type = lib.types.str; + default = "single-node"; + description = lib.mdDoc '' + The type of discovery to use. + ''; + }; + + options."http.port" = lib.mkOption { + type = lib.types.port; + default = 9200; + description = lib.mdDoc '' + The port to listen on for HTTP traffic. + ''; + }; + + options."transport.port" = lib.mkOption { + type = lib.types.port; + default = 9300; + description = lib.mdDoc '' + The port to listen on for transport traffic. + ''; + }; + }; + + default = {}; + + description = lib.mdDoc '' + OpenSearch configuration. + ''; + }; + + logging = lib.mkOption { + description = lib.mdDoc "opensearch logging configuration."; + + default = '' + logger.action.name = org.opensearch.action + logger.action.level = info + + appender.console.type = Console + appender.console.name = console + appender.console.layout.type = PatternLayout + appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n + + rootLogger.level = info + rootLogger.appenderRef.console.ref = console + ''; + type = types.str; + }; + + dataDir = lib.mkOption { + type = lib.types.path; + default = "/var/lib/opensearch"; + description = lib.mdDoc '' + Data directory for opensearch. + ''; + }; + + extraCmdLineOptions = lib.mkOption { + description = lib.mdDoc "Extra command line options for the opensearch launcher."; + default = [ ]; + type = lib.types.listOf lib.types.str; + }; + + extraJavaOptions = lib.mkOption { + description = lib.mdDoc "Extra command line options for Java."; + default = [ ]; + type = lib.types.listOf lib.types.str; + example = [ "-Djava.net.preferIPv4Stack=true" ]; + }; + + restartIfChanged = lib.mkOption { + type = lib.types.bool; + description = lib.mdDoc '' + Automatically restart the service on config change. + This can be set to false to defer restarts on a server or cluster. + Please consider the security implications of inadvertently running an older version, + and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option. + ''; + default = true; + }; + }; + + config = mkIf cfg.enable { + systemd.services.opensearch = { + description = "OpenSearch Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + path = [ pkgs.inetutils ]; + inherit (cfg) restartIfChanged; + environment = { + OPENSEARCH_HOME = cfg.dataDir; + OPENSEARCH_JAVA_OPTS = toString cfg.extraJavaOptions; + OPENSEARCH_PATH_CONF = configDir; + }; + serviceConfig = { + ExecStart = "${cfg.package}/bin/opensearch ${toString cfg.extraCmdLineOptions}"; + User = "opensearch"; + Group = "opensearch"; + StateDirectory = cfg.dataDir; + StateDirectoryMode = "0700"; + PermissionsStartOnly = true; + LimitNOFILE = "1024000"; + Restart = "always"; + TimeoutStartSec = "infinity"; + }; + preStart = optionalString (!config.boot.isContainer) '' + # Only set vm.max_map_count if lower than ES required minimum + # This avoids conflict if configured via boot.kernel.sysctl + if [ $(${pkgs.procps}/bin/sysctl -n vm.max_map_count) -lt 262144 ]; then + ${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144 + fi + '' + '' + mkdir -m 0700 -p ${cfg.dataDir} + + # Install plugins + ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib + ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules + + # opensearch needs to create the opensearch.keystore in the config directory + # so this directory needs to be writable. + mkdir -m 0700 -p ${configDir} + + # Note that we copy config files from the nix store instead of symbolically linking them + # because otherwise X-Pack Security will raise the following exception: + # java.security.AccessControlException: + # access denied ("java.io.FilePermission" "/var/lib/opensearch/config/opensearch.yml" "read") + + cp ${opensearchYml} ${configDir}/opensearch.yml + # Make sure the logging configuration for old opensearch versions is removed: + rm -f "${configDir}/logging.yml" + cp ${loggingConfigFile} ${configDir}/${loggingConfigFilename} + mkdir -p ${configDir}/scripts + cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options + # redirect jvm logs to the data directory + mkdir -m 0700 -p ${cfg.dataDir}/logs + sed -e '#logs/gc.log#${cfg.dataDir}/logs/gc.log#' -i ${configDir}/jvm.options \ + + if [ "$(id -u)" = 0 ]; then chown -R opensearch:opensearch ${cfg.dataDir}; fi + ''; + postStart = '' + # Make sure opensearch is up and running before dependents + # are started + while ! ${pkgs.curl}/bin/curl -sS -f http://${cfg.settings."network.host"}:${toString cfg.settings."http.port"} 2>/dev/null; do + sleep 1 + done + ''; + }; + + environment.systemPackages = [ cfg.package ]; + + users = { + groups.opensearch = {}; + users.opensearch = { + description = "OpenSearch daemon user"; + home = cfg.dataDir; + group = "opensearch"; + isSystemUser = true; + }; + }; + }; +} From 4561785dfc6f454ce4df116a212f9282be76a164 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Tue, 14 Feb 2023 18:16:11 +0100 Subject: [PATCH 040/111] nixos/tests/opensearch: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/opensearch.nix | 19 +++++++++++++++++++ pkgs/servers/search/opensearch/default.nix | 3 +++ 3 files changed, 23 insertions(+) create mode 100644 nixos/tests/opensearch.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ced2687ed9a4..4e8334622f83 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -490,6 +490,7 @@ in { ombi = handleTest ./ombi.nix {}; openarena = handleTest ./openarena.nix {}; openldap = handleTest ./openldap.nix {}; + opensearch = handleTest ./opensearch.nix {}; openresty-lua = handleTest ./openresty-lua.nix {}; opensmtpd = handleTest ./opensmtpd.nix {}; opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix {}; diff --git a/nixos/tests/opensearch.nix b/nixos/tests/opensearch.nix new file mode 100644 index 000000000000..db63c2e053f5 --- /dev/null +++ b/nixos/tests/opensearch.nix @@ -0,0 +1,19 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "opensearch"; + meta.maintainers = with pkgs.lib.maintainers; [ shyim ]; + + nodes.machine = { + virtualisation.memorySize = 2048; + services.opensearch.enable = true; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("opensearch.service") + machine.wait_for_open_port(9200) + + machine.succeed( + "curl --fail localhost:9200" + ) + ''; +}) diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index da1e739b4a2a..cf03d1939d9f 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -8,6 +8,7 @@ , coreutils , autoPatchelfHook , zlib +, nixosTests }: stdenvNoCC.mkDerivation rec { @@ -41,6 +42,8 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; + passthru.tests = { inherit (nixosTests) opensearch; }; + meta = { description = "Open Source, Distributed, RESTful Search Engine"; homepage = "https://github.com/opensearch-project/OpenSearch"; From 8b84a720e87fe30f992fcee9ba9ae4b5f5588b91 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Tue, 14 Feb 2023 20:06:05 +0000 Subject: [PATCH 041/111] nixos/doc: add release note for opensearch --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 8af1753bb781..0a34dabd8217 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -36,6 +36,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [imaginary](https://github.com/h2non/imaginary), a microservice for high-level image processing that Nextcloud can use to generate previews. Available as [services.imaginary](#opt-services.imaginary.enable). +- [opensearch](https://opensearch.org), a search server alternative to Elasticsearch. Available as [services.opensearch](options.html#opt-services.opensearch.enable). + - [goeland](https://github.com/slurdge/goeland), an alternative to rss2email written in golang with many filters. Available as [services.goeland](#opt-services.goeland.enable). - [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable). From cd01d5dd52a0f0732d4ce57221fc7a8ac378b576 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 14 Feb 2023 20:42:35 +0100 Subject: [PATCH 042/111] vscode-extensions.eamodio.gitlens: 2023.2.1204 -> 2023.2.1404 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a8e91494b7e7..ee7527583afc 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -927,8 +927,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "2023.2.1204"; - sha256 = "sha256-FurYfkw+mOjyymR1VCGf0jJ2JCZJ8eGb1J7zD2peBjw="; + version = "2023.2.1404"; + sha256 = "sha256-hszwiETLDKqV4yqchPA1o3WuAgvmY2AwslvvbAhkRCE="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; From 6b890e4ad396a74e5b6113e6c46e01407ed2a330 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 14 Feb 2023 20:44:39 +0100 Subject: [PATCH 043/111] vscode-extensions.gruntfuggly.todo-tree: 0.0.220 -> 0.0.224 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ee7527583afc..e01a2ada0c00 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1375,8 +1375,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.220"; - sha256 = "06kzb4msfdv11lij4dwbn1vxdxhvnpfcjqw0gvydgkqjy7dridjk"; + version = "0.0.224"; + sha256 = "sha256-ObFmzAaOlbtWC31JRYR/1y+JK1h22SVDPPRWWqPzrQs="; }; meta = with lib; { license = licenses.mit; From b70278949acf8c944bb15f9444dc28b700d4b4a3 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 14 Feb 2023 20:47:37 +0100 Subject: [PATCH 044/111] vscode-extensions.jock.svg: 1.4.23 -> 1.5.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e01a2ada0c00..e61d98ec8099 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1555,8 +1555,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.23"; - sha256 = "11f1g4a8v8330ki4240bvg5zpydagg1dwqfh1sar9ds7p1795ims"; + version = "1.5.0"; + sha256 = "sha256-anIZxqO4pK77FmhUamRnJVN2q8FifH6ffqRE2eFwyWM="; }; meta = with lib; { license = licenses.mit; From 8ff8742f1ebc4aa71b1764d75b55d5a5f76eb9fe Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 14 Feb 2023 20:48:27 +0100 Subject: [PATCH 045/111] vscode-extensions.ms-azuretools.vscode-docker: 1.22.2 -> 1.23.3 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e61d98ec8099..445aac34cbb6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1865,8 +1865,8 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.22.2"; - sha256 = "13scns5iazzsjx8rli311ym2z8i8f4nvbcd5w8hqj5z0rzsds6xi"; + version = "1.23.3"; + sha256 = "sha256-0qflugzWA1pV0PVWGTzOjdxM/0G8hTLOozoXCAdQnRY="; }; meta = { license = lib.licenses.mit; From d1eddaa8853bf11cb7dc7989ea0b03ed94527764 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 14 Feb 2023 20:54:12 +0100 Subject: [PATCH 046/111] vscode-extensions.ms-vscode.PowerShell: 2022.11.0 -> 2023.1.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 445aac34cbb6..3fd1ab0da099 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1929,8 +1929,8 @@ let mktplcRef = { name = "PowerShell"; publisher = "ms-vscode"; - version = "2022.11.0"; - sha256 = "01pq84rqh2q6rd0ljfql37q6i1kg597qy0mr7fiz5ddi15zcfn19"; + version = "2023.1.0"; + sha256 = "sha256-OiVb88BGvzsPTzKU1rGLGSMQSwKV4zI9FthOmutz34U="; }; meta = with lib; { description = "A Visual Studio Code extension for PowerShell language support"; From a65da35855cc1c8f61e3b92f63b2450c30f59287 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 14 Feb 2023 20:55:01 +0100 Subject: [PATCH 047/111] vscode-extensions.redhat.java: 1.14.2022120303 -> 1.15.2023021403 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3fd1ab0da099..6147bfb63ff6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2146,8 +2146,8 @@ let mktplcRef = { name = "java"; publisher = "redhat"; - version = "1.14.2022120303"; - sha256 = "sha256-tlWb2rkDcEWgdpuidkBGN5Nxr3pmkYxnPJN/UdbQfEw="; + version = "1.15.2023021403"; + sha256 = "sha256-g56+nproGC8zHidyf1Tqz0kbJrmrkgOsDA5jqaZULas="; }; buildInputs = [ jdk ]; meta = { From 820a471c6c79f1ebc25bc764ac5e4fecc4034619 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 14 Feb 2023 20:56:12 +0100 Subject: [PATCH 048/111] vscode-extensions.pkief.material-icon-theme: 4.22.0 -> 4.24.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 6147bfb63ff6..1284d414d739 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2226,8 +2226,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.22.0"; - sha256 = "0irrivfidgjqfd205gh27r2ccj2anvqgvq7lfaaf92wrrc2zvlsk"; + version = "4.24.0"; + sha256 = "sha256-hJy+ymnlF9a2vvN/HhJ5N75lIc2afzkq+S0Cv/KnD3M="; }; meta = { license = lib.licenses.mit; From bcf2bd171ccef0fe3bf65bd194c674cdf70505e6 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 14 Feb 2023 20:57:21 +0100 Subject: [PATCH 049/111] vscode-extensions.tomoki1207.pdf: 1.2.0 -> 1.2.2 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1284d414d739..00a1a5f16e10 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2737,8 +2737,8 @@ let mktplcRef = { name = "pdf"; publisher = "tomoki1207"; - version = "1.2.0"; - sha256 = "1bcj546bp0w4yndd0qxwr8grhiwjd1jvf33jgmpm0j96y34vcszz"; + version = "1.2.2"; + sha256 = "sha256-i3Rlizbw4RtPkiEsodRJEB3AUzoqI95ohyqZ0ksROps="; }; meta = { description = "Show PDF preview in VSCode"; From 0afb28ea1f6eb8450c982316f5a4b4e8340e8339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 14 Feb 2023 13:12:38 -0800 Subject: [PATCH 050/111] python310Packages.twitchapi: 3.7.0 -> 3.8.0 Changelog: https://github.com/Teekeks/pyTwitchAPI/blob/v3.8.0/docs/changelog.rst --- pkgs/development/python-modules/twitchapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index 4d9223f7d93a..6200298b3be3 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "3.7.0"; + version = "3.8.0"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "twitchAPI"; inherit version; - hash = "sha256-zmMzHuaSsuj2MxkmQyzROrZ/zxO0/I7llKlnpZzauDw="; + hash = "sha256-gGLSR6XESaUUt31njQJtPeTOKSgVJHlS+UdYhPKvQJQ="; }; propagatedBuildInputs = [ From 07be193b44a688b092aaa17e32aefaf7977a22bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 14 Feb 2023 13:22:46 -0800 Subject: [PATCH 051/111] python310Packages.approvaltests: 8.1.0 -> 8.2.0 Diff: https://github.com/approvals/ApprovalTests.Python/compare/refs/tags/v8.1.0...v8.2.0 --- pkgs/development/python-modules/approvaltests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 066af243f627..e4e1f5873b21 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -19,7 +19,7 @@ }: buildPythonPackage rec { - version = "8.1.0"; + version = "8.2.0"; pname = "approvaltests"; format = "setuptools"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-01OgofksXFglohcQtJqkir/nqBJArw3pXEmnX9P7rOA="; + hash = "sha256-7OeFOPBOs+SXKOQGKxiigVvoY50+bqRo+oDbVYTMQxU="; }; propagatedBuildInputs = [ From 0dfdc09dba3ea6e873c5dbc81dc88577cab97979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 14 Feb 2023 13:29:15 -0800 Subject: [PATCH 052/111] libadwaita: 1.2.1 -> 1.2.2 Diff: https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.2.1...1.2.2 Changelog: https://gitlab.gnome.org/GNOME/libadwaita/-/blob/1.2.2/NEWS --- pkgs/development/libraries/libadwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 7b08005133ad..d6917fe7f2da 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.2.1"; + version = "1.2.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-FJmH/DTTn01UlATgxC0d7vrpVLwAot6Y4cZralQz2nU="; + hash = "sha256-ftq7PLbTmhAAAhAYfrwicWn8t88+dG45G8q/vQa2cKw="; }; depsBuildBuild = [ From 747decaf2e5afb22185e71943de5ebc48daaf41a Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Tue, 14 Feb 2023 23:34:27 +0100 Subject: [PATCH 053/111] caddy: 2.6.3 -> 2.6.4 https://github.com/caddyserver/caddy/releases/tag/v2.6.4 --- pkgs/servers/caddy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 2c2f153626d1..b4cd637d3d02 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -7,12 +7,12 @@ , installShellFiles }: let - version = "2.6.3"; + version = "2.6.4"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; rev = "v${version}"; - sha256 = "sha256-SJO1q4g9uyyky9ZYSiqXJgNIvyxT5RjrpYd20YDx8ec="; + hash = "sha256-SJO1q4g9uyyky9ZYSiqXJgNIvyxT5RjrpYd20YDx8ec="; }; in buildGoModule { @@ -23,10 +23,10 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - sha256 = "sha256-YH+lo6gKqmhu1/3HZdWXnxTXaUwC8To+OCmGpji6i3k="; + hash = "sha256-3a3+nFHmGONvL/TyQRqgJtrSDIn0zdGy9YwhZP17mU0="; }; - vendorSha256 = "sha256-sqjN+NgwdP2qw7/CBxKvSwwA3teg/trXg/oa1Ff0N8s="; + vendorHash = "sha256-toi6efYZobjDV3YPT9seE/WZAzNaxgb1ioVG4txcuXM="; subPackages = [ "cmd/caddy" ]; From 56a285e2b78b3e5a36ac8f3752723bd9965eb190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 14 Feb 2023 23:34:35 +0100 Subject: [PATCH 054/111] gtksourceview: remove with lib over entire file --- pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 9db253dab3a2..902178d16706 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -4,8 +4,6 @@ , testers }: -with lib; - stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; version = "2.10.5"; @@ -17,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"; }; - patches = optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ (fetchpatch { name = "change-igemacintegration-to-gtkosxapplication.patch"; url = "https://gitlab.gnome.org/GNOME/gtksourceview/commit/e88357c5f210a8796104505c090fb6a04c213902.patch"; @@ -35,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { atk cairo glib gtk2 pango libxml2Python perl gettext - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ gnome-common gtk-mac-integration-gtk2 ]; - preConfigure = optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' intltoolize --force ''; From 613fac9d41baa970361e47e5c03ba6bcd6d3a490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Tue, 14 Feb 2023 22:25:52 +0100 Subject: [PATCH 055/111] pulumi: 3.54.0 -> 3.55.0 --- pkgs/tools/admin/pulumi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 3481baabe6b7..68a0936c7eba 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -14,21 +14,21 @@ buildGoModule rec { pname = "pulumi"; - version = "3.54.0"; + version = "3.55.0"; # Used in pulumi-language packages, which inherit this prop - sdkVendorHash = "sha256-NstNzPKHlN8S+HSpYnG60ZtZtUQsh1Idr8Zz2Ef/jiw="; + sdkVendorHash = "sha256-ZE+df01jRx3nDiPGdlh1JNJn5NqsHW22fiUzeNlkzF8="; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-Rl0kh9NCliADfU9Nxc2SwnOIGDilYEeA0rcVCfal5N8="; + hash = "sha256-x5XebYFpxFi2QgrrK+wdMFOLiJLnRmar4gsply8F718="; # Some tests rely on checkout directory name name = "pulumi"; }; - vendorSha256 = "sha256-Bkmpw+ZneB1zHmaV4S29LFNoCjB2QmO5nR/iwQQQPpo="; + vendorSha256 = "sha256-8vchyD3MTi9Fxrd6SiywFK4tadyauvDxjs9RmoJuULA="; sourceRoot = "${src.name}/pkg"; From 413e3eb3c0746db175b747e7aa6996667b47beca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 14 Feb 2023 15:58:27 -0800 Subject: [PATCH 056/111] gpg-tui: 0.9.3 -> 0.9.4 Diff: https://github.com/orhun/gpg-tui/compare/v0.9.3...v0.9.4 Changelog: https://github.com/orhun/gpg-tui/blob/v0.9.4/CHANGELOG.md --- pkgs/tools/security/gpg-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 486ee7ba654a..8b003ea4701f 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - hash = "sha256-4Xi4ePFJL56HxCkbTlu4WiCTRzLEqvfbEk/2q9QjAd8="; + hash = "sha256-2OMjqY1oTVKyEuCJrGGSQfgjQPSOQRx6LPhoFUuf/pw="; }; - cargoHash = "sha256-MEj7c87msMv/+D70EDWmWEHTtmQcx5DEMf2I/AXnwm8="; + cargoHash = "sha256-EhnQvVXv08l4ONnuIudU0WBw5AptD7OcvPUNOdpRZj4="; nativeBuildInputs = [ gpgme # for gpgme-config From 36c3acef215191c09d5be2cac30096e6d127ce38 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Feb 2023 01:25:55 +0100 Subject: [PATCH 057/111] microcodeIntel: 20221108 -> 20230214 https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20230214 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00767.html Fixes: CVE-2022-38090 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00738.html Fixes: CVE-2022-33196 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00700.html Fixes: CVE-2022-21216 --- pkgs/os-specific/linux/microcode/intel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 3683522f04f9..83ad98d1b1d2 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20221108"; + version = "20230214"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - hash = "sha256-JZbBrD3fHgJogDw4u2YggDX7OCXCu5/XEZKzHuVJR9k="; + hash = "sha256-SwdE1c7OEg5nncs5QqaTKCL77KddeHw7ZilctQ4L9RA="; }; nativeBuildInputs = [ iucode-tool libarchive ]; From f5f6f0582b56f7c0d0c6e3ba92832a5dcfb13f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ho=C3=A0ng=20Minh=20Th=E1=BA=AFng?= Date: Tue, 14 Feb 2023 17:57:46 -0700 Subject: [PATCH 058/111] calibre: add speechd as python dependencies This enables text to speech feature in calibre --- pkgs/applications/misc/calibre/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index acfe1d9284e5..d7198461eeab 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -22,6 +22,7 @@ , qtbase , qtwayland , removeReferencesTo +, speechd , sqlite , wrapQtAppsHook , xdg-utils @@ -121,6 +122,7 @@ stdenv.mkDerivation rec { regex sip setuptools + speechd zeroconf jeepney pycryptodome From dbed3a071fe86ae546f4da7df96614e2000da75f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 14 Feb 2023 17:16:37 -0300 Subject: [PATCH 059/111] slop: fix build FindGLEW.cmake Module silently tries to include glew-config.cmake. If it succeeds, then it stop and return to the caller. However, glew-config.cmake only sets GLEW::GLEW, resulting in missing glew shared library at link time. References: * https://github.com/naelstrof/slop/pull/135 * https://gitlab.exherbo.org/DanySpin97/danyspin97-exheres/-/issues/2 --- pkgs/tools/misc/slop/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index d0736761bada..05b008997b7f 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , glew @@ -25,6 +26,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-LdBQxw8K8WWSfm4E2QpK4GYTuYvI+FX5gLOouVFSU/U="; }; + patches = [ + (fetchpatch { + # From Upstream PR#135: https://github.com/naelstrof/slop/pull/135 + name = "Fix-linking-of-GLEW-library.patch"; + url = "https://github.com/naelstrof/slop/commit/811b7e44648b9dd6c1da1554e70298cf4157e5fe.patch"; + sha256 = "sha256-LNUrAeVZUJFNOt1csOaIid7gLBdtqRxp8AcC7f3cnIQ="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config From cfd6d439f2fab36535c251df6de3bfd3259a9396 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 14 Feb 2023 20:32:12 -0500 Subject: [PATCH 060/111] static-web-server: 2.14.1 -> 2.14.2 Diff: https://github.com/static-web-server/static-web-server/compare/v2.14.1...v2.14.2 Changelog: https://github.com/static-web-server/static-web-server/blob/v2.14.2/CHANGELOG.md --- pkgs/servers/static-web-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix index 492f323d3845..0e0c84e97de6 100644 --- a/pkgs/servers/static-web-server/default.nix +++ b/pkgs/servers/static-web-server/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.14.1"; + version = "2.14.2"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - sha256 = "1x9l39yf65a8ji8x84h583s82hlj6s99gj0fsm4sh2l4i8yrq2yb"; + sha256 = "sha256-c+bPe1t7Nhpx5fwwpLYtsuzxleLd4b1SwBFBaySmLOg="; }; - cargoSha256 = "sha256-Ox1mHjeBprxmuqPIVxeTXDyFcEuipSJ7UjXZjcLElIs="; + cargoSha256 = "sha256-K+YXl1SFVe6aBt663QXlQFD8jB5pvlLwNqUvUP+5aU8="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security From a1fed0d5c493a097bb2f43579be8745d4b0bb1f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Feb 2023 01:46:54 +0000 Subject: [PATCH 061/111] mdbook-open-on-gh: 2.3.1 -> 2.3.2 --- pkgs/tools/text/mdbook-open-on-gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-open-on-gh/default.nix b/pkgs/tools/text/mdbook-open-on-gh/default.nix index cba1e97591ef..1d618a4413ea 100644 --- a/pkgs/tools/text/mdbook-open-on-gh/default.nix +++ b/pkgs/tools/text/mdbook-open-on-gh/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-open-on-gh"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = version; - hash = "sha256-uXfvE34yRrTUjh/HTMvOeZVxX4Drt6sxziaazg0CR3I="; + hash = "sha256-MO+tadm20qG5NtIXaWxDRiX7l+m7t0QRK/9IK7qA0bo="; }; - cargoHash = "sha256-ol06ErggVLw2ThpXq9NRWEr7ymDSEBN4ae5zUmHKa7k="; + cargoHash = "sha256-X113sexUgLOsrXXO2p+qNFT2XcEy9AGPvVEf3bxqH8g="; meta = with lib; { description = "mdbook preprocessor to add a open-on-github link on every page"; From 9aac52f6364bfe727df08c115993c3ced202fb8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Feb 2023 02:39:57 +0000 Subject: [PATCH 062/111] syft: 0.70.0 -> 0.71.0 --- pkgs/tools/admin/syft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index d162774ed59b..2d7f00d2d649 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.70.0"; + version = "0.71.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-Dr0kVJk2LyyRFZq1fZBQSLb7z/AfCm8Y+tIMm8JmyJo="; + hash = "sha256-Q02WBUMwboGkXrSjCT2C3vLYH4UlnavIudvOSb5g2bA="; # 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; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-UB0ltY4CYlsH4CyQZSOHDH8C9jSCL0TCri33H3oPH/0="; + vendorHash = "sha256-bUSQk4uJ4TAhjLS8pjqC486sa31z/MyZf5jDsnxhtSM="; nativeBuildInputs = [ installShellFiles ]; From 3fb063661032667cec8a853aa94364e428fdf888 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 14 Feb 2023 22:24:50 -0500 Subject: [PATCH 063/111] mdbook-open-on-gh: 2.3.2 -> 2.3.3 Diff: https://github.com/badboy/mdbook-open-on-gh/compare/2.3.2...2.3.3 --- pkgs/tools/text/mdbook-open-on-gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-open-on-gh/default.nix b/pkgs/tools/text/mdbook-open-on-gh/default.nix index 1d618a4413ea..29c6e54ee5f6 100644 --- a/pkgs/tools/text/mdbook-open-on-gh/default.nix +++ b/pkgs/tools/text/mdbook-open-on-gh/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-open-on-gh"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = version; - hash = "sha256-MO+tadm20qG5NtIXaWxDRiX7l+m7t0QRK/9IK7qA0bo="; + hash = "sha256-K7SkfUxav/r8icrpdfnpFTSZdYV9qUEvYZ2dGSbaP0w="; }; - cargoHash = "sha256-X113sexUgLOsrXXO2p+qNFT2XcEy9AGPvVEf3bxqH8g="; + cargoHash = "sha256-Uvg0h0s3xtv/bVjqWLldvM/R5HQ6yoHdnBXvpUp/E3A="; meta = with lib; { description = "mdbook preprocessor to add a open-on-github link on every page"; From 0c9bacbad83474be5e664bf470b94178bb54b852 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Feb 2023 04:45:38 +0000 Subject: [PATCH 064/111] gotrue-supabase: 2.47.0 -> 2.47.1 --- pkgs/tools/security/gotrue/supabase.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix index 0f1b461b9289..d7c158e6a004 100644 --- a/pkgs/tools/security/gotrue/supabase.nix +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gotrue"; - version = "2.47.0"; + version = "2.47.1"; src = fetchFromGitHub { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-ww3tiIIn2Vwhwa5IgkrybnWQQ3beihQhZzB1ysz4y1k="; + hash = "sha256-GBrdYlWvtlz/A/5Tn58EPYBL3X73D44GzbN1OrzwU8U="; }; vendorHash = "sha256-FIl30sKmdcXayK8KWGFl+N+lYExl4ibKZ2tcvelw8zo="; From bd067f1a8c8cfce562006b2b527badf187ca62c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Feb 2023 04:57:50 +0000 Subject: [PATCH 065/111] amber-secret: 0.1.3 -> 0.1.5 --- pkgs/tools/security/amber/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/amber/default.nix b/pkgs/tools/security/amber/default.nix index c2196cea686a..2b64480c4a00 100644 --- a/pkgs/tools/security/amber/default.nix +++ b/pkgs/tools/security/amber/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { # Renaming it to amber-secret because another package named amber exists pname = "amber-secret"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "fpco"; repo = "amber"; rev = "v${version}"; - sha256 = "sha256-kPDNTwsfI+8nOgsLv2aONrLGSRZhw5YzNntJ2tbE0oI="; + sha256 = "sha256-11dqfOi/DdfFrFTeboPyFkixXG+fCJ2jpHM55qsQ1jw="; }; - cargoSha256 = "sha256-fTdTgbeOQXEpLHq9tHiPLkttvaxS/WJ86h3jRdrfbJM="; + cargoHash = "sha256-u0vceIurenYnKfF3gWNw304hX4vVFoszZD7AMwffOmc="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 48a0a6ccee48b908c7a86d91396c270b48e79c0c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 03:10:08 +0000 Subject: [PATCH 066/111] =?UTF-8?q?terraform-providers.brightbox:=203.2.0?= =?UTF-8?q?=20=E2=86=92=203.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e3fae245ee4f..bd8fa2adcb2a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -173,11 +173,11 @@ "vendorHash": "sha256-foMmZbNPLww1MN4UZwuynBDgt2w40aMqVINRw//Q0d0=" }, "brightbox": { - "hash": "sha256-ISK6cpE4DVrVzjC0N5BdyR3Z5LfF9qfg/ACTgDP+WqY=", + "hash": "sha256-YmgzzDLNJg7zm8smboI0gE2kOgjb2RwPf5v1CbzgvGA=", "homepage": "https://registry.terraform.io/providers/brightbox/brightbox", "owner": "brightbox", "repo": "terraform-provider-brightbox", - "rev": "v3.2.0", + "rev": "v3.2.1", "spdx": "MPL-2.0", "vendorHash": "sha256-IiP1LvAX8fknB56gJoI75kGGkRIIoSfpmPkoTxujVDU=" }, From f29d37e5002bd4b924ca3d0eda1aeb1914588f3d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 03:15:04 +0000 Subject: [PATCH 067/111] =?UTF-8?q?terraform-providers.google:=204.53.0=20?= =?UTF-8?q?=E2=86=92=204.53.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index bd8fa2adcb2a..a8aad2ce4d26 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -438,14 +438,14 @@ "vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE=" }, "google": { - "hash": "sha256-z5Fi+ac7dcDr/eTTJWWfsIm9tJJ+NgcY2L08h317G7g=", + "hash": "sha256-WE1UjyqsrhlGWJHZ6VlNCBtdSsXM6ewK4WJrmqFN6NU=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.53.0", + "rev": "v4.53.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-glxBI4e5BN28GMGeixUSiCaDTIlr+8e4QHnzaDagyno=" + "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, "google-beta": { "hash": "sha256-0NCndgGz/xrYNvWjs49u//VXvndw0RFyAINnGUTKQ4s=", From 62db9eec723f6df3618bb6d9a1ef23d548d329bf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 03:15:10 +0000 Subject: [PATCH 068/111] =?UTF-8?q?terraform-providers.google-beta:=204.53?= =?UTF-8?q?.0=20=E2=86=92=204.53.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a8aad2ce4d26..55d30a419805 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -448,14 +448,14 @@ "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, "google-beta": { - "hash": "sha256-0NCndgGz/xrYNvWjs49u//VXvndw0RFyAINnGUTKQ4s=", + "hash": "sha256-eXIYVB3YzhJNjYNR1oB7bj5uGZgRhgMD5eWxLls6KoE=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.53.0", + "rev": "v4.53.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-glxBI4e5BN28GMGeixUSiCaDTIlr+8e4QHnzaDagyno=" + "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", From 94c35e37558662f72b8fb5b21209dcbafeee114c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 03:17:51 +0000 Subject: [PATCH 069/111] =?UTF-8?q?terraform-providers.helm:=202.8.0=20?= =?UTF-8?q?=E2=86=92=202.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 55d30a419805..d8950613c4ee 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -494,11 +494,11 @@ "vendorHash": "sha256-/dsiIxgW4BxSpRtnD77NqtkxEEAXH1Aj5hDCRSdiDYg=" }, "helm": { - "hash": "sha256-MSBCn4AriAWys2FIYJIGamcaLGx0gtO5IiB/WxcN2rg=", + "hash": "sha256-X9keFjAmV86F/8ktxiv/VrnkHOazP9e/aOC9aRw1A48=", "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", "repo": "terraform-provider-helm", - "rev": "v2.8.0", + "rev": "v2.9.0", "spdx": "MPL-2.0", "vendorHash": null }, From bb3879e8774124e43ee8d52ea67d06a03071fa6a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 03:19:21 +0000 Subject: [PATCH 070/111] =?UTF-8?q?terraform-providers.spotinst:=201.97.0?= =?UTF-8?q?=20=E2=86=92=201.99.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d8950613c4ee..03731b18041d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1045,13 +1045,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-UivENbjPajJdH9PwHznMP+cLXBJ8C38wgHS2IqyoqRk=", + "hash": "sha256-5irTp8teFShAd0FV2fIKf4dE9WokmxK3rREEozinQZM=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.97.0", + "rev": "v1.99.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-iQLZpSa1gJ4z2/r1Om9vFrcKP5ik7kcx+rNVZLhmSBc=" + "vendorHash": "sha256-yuGUEy9us2BL2v06tL3XDcpCujQk8H2DUzQiJQQNsvo=" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", From 551245d6c4636862f91ba4a0e94b8120b7e8d4d4 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Mon, 13 Feb 2023 19:09:35 +0400 Subject: [PATCH 071/111] plasma-mobile/qmlkonsole: init at 23.01.0 --- pkgs/applications/plasma-mobile/default.nix | 1 + .../applications/plasma-mobile/qmlkonsole.nix | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/plasma-mobile/qmlkonsole.nix diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index 86a4f1d10071..9efbaa603395 100644 --- a/pkgs/applications/plasma-mobile/default.nix +++ b/pkgs/applications/plasma-mobile/default.nix @@ -78,6 +78,7 @@ let plasma-phonebook = callPackage ./plasma-phonebook.nix {}; plasma-settings = callPackage ./plasma-settings.nix {}; plasmatube = callPackage ./plasmatube {}; + qmlkonsole = callPackage ./qmlkonsole.nix {}; spacebar = callPackage ./spacebar.nix { inherit srcs; }; tokodon = callPackage ./tokodon.nix {}; }; diff --git a/pkgs/applications/plasma-mobile/qmlkonsole.nix b/pkgs/applications/plasma-mobile/qmlkonsole.nix new file mode 100644 index 000000000000..da892fb47c0e --- /dev/null +++ b/pkgs/applications/plasma-mobile/qmlkonsole.nix @@ -0,0 +1,42 @@ +{ lib +, mkDerivation + +, cmake +, extra-cmake-modules + +, kconfig +, ki18n +, kirigami-addons +, kirigami2 +, kcoreaddons +, qtquickcontrols2 +, kwindowsystem +, qmltermwidget +}: + +mkDerivation { + pname = "qmlkonsole"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kconfig + ki18n + kirigami-addons + kirigami2 + qtquickcontrols2 + kcoreaddons + kwindowsystem + qmltermwidget + ]; + + meta = with lib; { + description = "Terminal app for Plasma Mobile"; + homepage = "https://invent.kde.org/plasma-mobile/qmlkonsole"; + license = with licenses; [ gpl2Plus gpl3Plus cc0 ]; + maintainers = with maintainers; [ balsoft ]; + }; +} From 0b6ee48830e8089e8a8decf76aa17daf0929729d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Feb 2023 05:46:08 +0000 Subject: [PATCH 072/111] zine: 0.10.0 -> 0.10.1 --- pkgs/applications/misc/zine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix index 0cf50c96ada9..3f62f3381c55 100644 --- a/pkgs/applications/misc/zine/default.nix +++ b/pkgs/applications/misc/zine/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "zine"; - version = "0.10.0"; + version = "0.10.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-hkBQ9WaWJrDhGAt35yueINutc7sAMbgbr8Iw5h0Ey4I="; + sha256 = "sha256-3xFJ7v/IZQ3yfU0D09sFXV+4XKRau+Mj3BNxkeUjbbU="; }; - cargoSha256 = "sha256-rY7WHgd5wyx7TUgJamzre8HjeI0BRtaM14V3doCkfVY="; + cargoHash = "sha256-3Sw/USfGJuf6JGSR3Xkjnmm/UR7NK8rB8St48b4WpIM="; nativeBuildInputs = [ pkg-config From c5edb111ae86d707134138f16587da19d9c55fd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Feb 2023 05:58:54 +0000 Subject: [PATCH 073/111] tbls: 1.61.0 -> 1.62.0 --- pkgs/tools/misc/tbls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 36c69bc4989b..bca16be194f1 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.61.0"; + version = "1.62.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-yXD/LILWaXtjd3etdWINglZtvIYE6i6qmCSR3FUUQeM="; + hash = "sha256-T2zmgGbhWvqaor76mQuQ1O5bF+eGVaH6N4w17iyNhwU="; }; vendorHash = "sha256-AeaTAjo1wRl7Ymg/fyoijaa9UXf9SiNR447WJtZeN5o="; From a9b83cbff472c52ef468dd42452c3d6587e812fb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Feb 2023 16:40:04 +0100 Subject: [PATCH 074/111] eccodes: 2.24.2 -> 2.28.0 --- pkgs/development/libraries/eccodes/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index d91cf9298071..cf82f74e8924 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -4,6 +4,7 @@ , cmake , netcdf , openjpeg +, libaec , libpng , gfortran , perl @@ -15,11 +16,11 @@ stdenv.mkDerivation rec { pname = "eccodes"; - version = "2.24.2"; + version = "2.28.0"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "sha256-xgrQ/YnhGRis4NhMAUifISIrEdbK0/90lYVqCt1hBAM="; + sha256 = "sha256-KDE0exUXr569cN08rYiugYqESNTmyGcapyhhfnNDHNU="; }; postPatch = '' @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ netcdf openjpeg + libaec libpng ]; From e6257034e85e9bf96e165fc243b67a32712ede88 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Feb 2023 17:57:17 +0100 Subject: [PATCH 075/111] eccodes: remove no longer needed replacement --- pkgs/development/libraries/eccodes/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index cf82f74e8924..5663652429a4 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -62,9 +62,7 @@ stdenv.mkDerivation rec { doCheck = true; # Only do tests that don't require downloading 120MB of testdata - checkPhase = lib.optionalString (stdenv.isDarwin) '' - substituteInPlace "tests/include.sh" --replace "set -ea" "set -ea; export DYLD_LIBRARY_PATH=$(pwd)/lib" - '' + '' + checkPhase = '' ctest -R "eccodes_t_(definitions|calendar|unit_tests|md5|uerra|grib_2nd_order_numValues|julian)" -VV ''; From 88128a0d86d74be43afe2740307e0d45af2b9539 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Feb 2023 07:54:17 +0000 Subject: [PATCH 076/111] python310Packages.google-cloud-pubsub: 2.14.0 -> 2.14.1 --- .../python-modules/google-cloud-pubsub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 26446cc412e5..cefa183916a6 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.14.0"; + version = "2.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4nFPB7dQRYvq9bB7Zw6ntgWO4VXAIcmH0LjmpAvzRG8="; + hash = "sha256-KLPGICGwT3j5FYwVfb/K6+n/tQTt0pda0PIo6/AgTG8="; }; propagatedBuildInputs = [ From 2b54954fdb4a25c6f9cf80cfd36c43e4c4577c0b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 6 Feb 2023 09:27:32 +0800 Subject: [PATCH 077/111] python3Packages.aiohttp-jinja2: remove maintainer --- pkgs/development/python-modules/aiohttp-jinja2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index a9773ff498e1..6008b94179fb 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Jinja2 support for aiohttp"; homepage = "https://github.com/aio-libs/aiohttp_jinja2"; license = licenses.asl20; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ ]; }; } From 016bfaf3026ecc096360c78f93ae9d046839e1d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Feb 2023 10:59:04 +0000 Subject: [PATCH 078/111] numix-icon-theme-circle: 23.02.05 -> 23.02.12 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 0f81ab04264e..91d3426f016a 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.02.05"; + version = "23.02.12"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-wS7GAfrzJ2/BvfoBZ7YR/X5j/ND4o7shf08dgk9GBkA="; + sha256 = "sha256-gQdVmF7ZzC+KjU0uQW6+sEw9Wz5940G60ebXqKHajuY="; }; nativeBuildInputs = [ gtk3 ]; From 5ef2ffc6c9ff40f9a18fee2d17cc7c1f2f1b4f55 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Feb 2023 11:55:26 +0100 Subject: [PATCH 079/111] esphome: 2022.12.8 -> 2023.2.0 https://github.com/esphome/esphome/releases/tag/2023.2.0 --- pkgs/tools/misc/esphome/dashboard.nix | 4 ++-- pkgs/tools/misc/esphome/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index 04abea26cabc..b9b5bfcc021b 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20221213.0"; + version = "20230214.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-LwP+LBHzEWjPUih6aaZnI7Yh85vsa1Md1YgBWkLOUIs="; + hash = "sha256-TfQIvvLLsYubLbai2RNJkCu96nYFEWbdZU8WaJbpUwU="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 848a1c1dbb56..410dede6387c 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2022.12.8"; + version = "2023.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VKxCdejQGWLYeNOxa1PCwhdrLilnsYD9UBqj8Sen+OM="; + hash = "sha256-WoQ7mAtkv7By738bW1/oCurKEpHQKlqZkQ6D/b4zAes="; }; postPatch = '' From 418cc13dd1c2e7550c1c59fe4f1046d4e0c7ea94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Feb 2023 11:56:07 +0000 Subject: [PATCH 080/111] docker-compose: 2.15.1 -> 2.16.0 --- pkgs/applications/virtualization/docker/compose.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 1646c0517514..cada624a2a68 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.15.1"; + version = "2.16.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-CDkewlZFvjp6kb6UoMDUv9iAUfm0akMD9RpI9/H7Sz8="; + sha256 = "sha256-/kdEzC97atFJw8rWFAdm9tofayj1fwBRvNKwbjWIGR8="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorSha256 = "sha256-sv4lK6MRwmp/1CSGBoYMpcGunVCuE8p1vB4VKaRuwQc="; + vendorHash = "sha256-1iEJPVrsRqQQhkspRmUtS4ru4DCKiyobGztM4d0vb2Y="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; From d7e04271d5fcc702f5f8b0d6f0ca0d8a9babae5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 15 Feb 2023 09:23:47 -0300 Subject: [PATCH 081/111] linuxKernel.kernels.linux_lqx: 6.1.10-lqx1 -> 6.1.12-lqx1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 3610fe38f50d..4ca66b004b24 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -11,9 +11,9 @@ let }; # ./update-zen.py lqx lqxVariant = { - version = "6.1.10"; #lqx + version = "6.1.12"; #lqx suffix = "lqx1"; #lqx - sha256 = "1ka94z0wvq90vfzd4ncjrzk5xcb5gvaldaph7mc25jxgh6pal822"; #lqx + sha256 = "0a6slrydf47hk4b3xlxycjw9y2xgjgvzjic2psbcb1c5y75zq720"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { From bc12cf5976f682bfada4a780d4209202fa514512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 15 Feb 2023 09:25:17 -0300 Subject: [PATCH 082/111] linuxKernel.kernels.linux_zen: 6.1.10-zen1 -> 6.1.12-zen1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 4ca66b004b24..2745cd780fce 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,9 +4,9 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.1.10"; #zen + version = "6.1.12"; #zen suffix = "zen1"; #zen - sha256 = "0dfn449v3lzz1clxbsypakd0sfii9iycy1hq9x52fr9xf8wy3cxk"; #zen + sha256 = "16g0rkgmxbj4425mbnadam7vbd8621ar13ddx26j298bc9m8yqic"; #zen isLqx = false; }; # ./update-zen.py lqx From c5a0a5ac5e205458224755ae194f768f2a8e6d8f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 15 Feb 2023 13:51:06 +0100 Subject: [PATCH 083/111] curl: add pkg-config metadata for libcurl.pc I did not add the validatePkgConfig setup hook to curl, as I suspect it may cause trouble when bootstrapping. --- doc/languages-frameworks/pkg-config.section.md | 2 +- pkgs/tools/networking/curl/default.nix | 3 +++ pkgs/top-level/pkg-config/pkg-config-data.json | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/pkg-config.section.md b/doc/languages-frameworks/pkg-config.section.md index eecc84b4c1aa..fb6fee997d6f 100644 --- a/doc/languages-frameworks/pkg-config.section.md +++ b/doc/languages-frameworks/pkg-config.section.md @@ -6,7 +6,7 @@ Nixpkgs provides a couple of facilities for working with this tool. ## Writing packages providing pkg-config modules -Packages should set `meta.pkgConfigProvides` with the list of package config modules they provide. +Packages should set `meta.pkgConfigModules` with the list of package config modules they provide. They should also use `testers.testMetaPkgConfig` to check that the final built package matches that list. Additionally, the [`validatePkgConfig` setup hook](https://nixos.org/manual/nixpkgs/stable/#validatepkgconfig), will do extra checks on to-be-installed pkg-config modules. diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 311e9e1b8c76..b91e7733ab23 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -33,6 +33,7 @@ , phpExtensions , python3 , tests +, testers , fetchpatch }: @@ -178,6 +179,7 @@ stdenv.mkDerivation (finalAttrs: { # Additional checking with support http3 protocol. # nginx-http3 = useThisCurl nixosTests.nginx-http3; nginx-http3 = nixosTests.nginx-http3; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; }; @@ -189,5 +191,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.all; # Fails to link against static brotli or gss broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport); + pkgConfigModules = [ "libcurl" ]; }; }) diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index 61ed9098b919..758986390b22 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -445,6 +445,11 @@ "openssl" ] }, + "libcurl": { + "attrPath": [ + "curl" + ] + }, "libecpg": { "attrPath": [ "postgresql" From 30e36d2e82c33cab87f1f50f4e66e1930942690f Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 14 Feb 2023 21:51:57 +0300 Subject: [PATCH 084/111] linux: 5.15.93 -> 5.15.94 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index f7ffc7c06669..394883e2de1e 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.93"; + version = "5.15.94"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1baxkkd572110p95ah1wv0b4i2hfbkf8vyncb08y3w0bd7r29vg7"; + sha256 = "0wjsqvhp0jnisypb8yw6dncyp5k7zxbhjivh7jqivpsdwvdp14ns"; }; } // (args.argsOverride or { })) From 6ee2f048f2e18d77afcc1e3f4c830573c21e29fd Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 14 Feb 2023 21:52:02 +0300 Subject: [PATCH 085/111] linux: 6.1.11 -> 6.1.12 --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index 4ea471e02ac4..4c7249f2b4c2 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.11"; + version = "6.1.12"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "18gpkaa030g8mgmyprl05h4i8y5rjgyvbh0jcl8waqvq0xh0a6sq"; + sha256 = "1spdl3i69qwn7cywzs6kql8nlisdnmnwk9za7v4xq1092xsscynl"; }; } // (args.argsOverride or { })) From 30a72be3384bc56f4102e42cd20001cfa847b99f Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 14 Feb 2023 21:52:39 +0300 Subject: [PATCH 086/111] linux-rt_5_15: 5.15.92-rt57 -> 5.15.93-rt58 --- pkgs/os-specific/linux/kernel/linux-rt-5.15.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index 9f73d7a57f27..9197f7d24827 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.15.92-rt57"; # updated by ./update-rt.sh + version = "5.15.93-rt58"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "14ggwrvk9n2nvk38fp4g486k864knf3n9979mm51m8wrvd8h8hlz"; + sha256 = "1baxkkd572110p95ah1wv0b4i2hfbkf8vyncb08y3w0bd7r29vg7"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "181db4cdaw8wjrqfh07mbqgyzv1awl1g12x6k8lciv78j10x5kmb"; + sha256 = "10xx70qf6nph3223yh6sc5jcyy938qrfdilli2a4zzhp0ibgp8bz"; }; }; in [ rt-patch ] ++ kernelPatches; From 5aec2a7956678bca924b3324f773eb0cd1665dca Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 14 Feb 2023 21:53:33 +0300 Subject: [PATCH 087/111] linux/hardened/patches/5.15: 5.15.92-hardened1 -> 5.15.93-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 88fad3e8aa62..56b143bb408a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.92-hardened1.patch", - "sha256": "0wwi15r51jb0396vc4nbwjh9kxh68jvcbdw72pllwsgkhijgzkhg", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.92-hardened1/linux-hardened-5.15.92-hardened1.patch" + "name": "linux-hardened-5.15.93-hardened1.patch", + "sha256": "093a6qpiws4v8pzld6r92dczwvslrp8f2xrpb29qrp37i3kny5si", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.93-hardened1/linux-hardened-5.15.93-hardened1.patch" }, - "sha256": "14ggwrvk9n2nvk38fp4g486k864knf3n9979mm51m8wrvd8h8hlz", - "version": "5.15.92" + "sha256": "1baxkkd572110p95ah1wv0b4i2hfbkf8vyncb08y3w0bd7r29vg7", + "version": "5.15.93" }, "5.4": { "patch": { From fa90359876285998d9e1877c671dc6cadaf9cb2c Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 14 Feb 2023 21:53:41 +0300 Subject: [PATCH 088/111] linux/hardened/patches/6.1: 6.1.10-hardened1 -> 6.1.11-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 56b143bb408a..5bc0f53c4684 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.10-hardened1.patch", - "sha256": "0v0w4phc02ghylqnyhzkl1frmjkxwkxgadf2ycyzm8ckl73q8lr5", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.10-hardened1/linux-hardened-6.1.10-hardened1.patch" + "name": "linux-hardened-6.1.11-hardened1.patch", + "sha256": "1pydcjy2cjnb4zxcqr41hr34fg8alph314xasdsfvdw4zaz55s6h", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.11-hardened1/linux-hardened-6.1.11-hardened1.patch" }, - "sha256": "17fifhfh2jrvlhry696n428ldl5ag3g2km5l9hx8gx8wm6dr3qhb", - "version": "6.1.10" + "sha256": "18gpkaa030g8mgmyprl05h4i8y5rjgyvbh0jcl8waqvq0xh0a6sq", + "version": "6.1.11" } } From e7d911977671471a206d3484a04e6f2cdb789c40 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 8 Feb 2023 23:23:19 -0300 Subject: [PATCH 089/111] python311Packages.pyregion: skip 2 failing tests Skipping 2 tests because it's failing. Domain knowledge was unavailable on decision. Error logs: https://gist.github.com/superherointj/3f616f784014eeb2e3039b0f4037e4e9 --- pkgs/development/python-modules/pyregion/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index 02c69a461520..9e8fd5f78922 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , fetchpatch @@ -47,6 +48,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-astropy ]; + disabledTests = lib.optional (!stdenv.hostPlatform.isDarwin) [ + # Skipping 2 tests because it's failing. Domain knowledge was unavailable on decision. + # Error logs: https://gist.github.com/superherointj/3f616f784014eeb2e3039b0f4037e4e9 + "test_calculate_rotation_angle" + "test_region" + ]; + # Disable automatic update of the astropy-helper module postPatch = '' substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" From d4c9404846a082b435e4f97c6541516dff8e9c57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Feb 2023 15:02:22 +0000 Subject: [PATCH 090/111] ov: 0.14.1 -> 0.14.2 --- pkgs/tools/text/ov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/ov/default.nix b/pkgs/tools/text/ov/default.nix index ebc7cdcf716c..55c66f7a5408 100644 --- a/pkgs/tools/text/ov/default.nix +++ b/pkgs/tools/text/ov/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "ov"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; rev = "refs/tags/v${version}"; - hash = "sha256-ow2tIML7+x0X3FSpr4UQ8bzzYhZJZ9pZL8eNReEjitQ="; + hash = "sha256-tbJ3Es6huu+0HcpoiNpYLbxsm0QCWYZk6bX2MdQxT2I="; }; - vendorHash = "sha256-X2/kcXxdGwFvdiTu1MGyv90OngWmR/xR2YtjvmLkiVE="; + vendorHash = "sha256-EjLslvc0cgvD7LjuDa49h/qt6K4Z9DEtQjV/LYkKwKo="; ldflags = [ "-X main.Version=v${version}" From d5c4fdaa0085ced92826ceefacbddebc1c1ccccc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Feb 2023 16:04:56 +0000 Subject: [PATCH 091/111] python310Packages.types-urllib3: 1.26.25.5 -> 1.26.25.6 --- pkgs/development/python-modules/types-urllib3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 8b16993877b3..e60c8a87c676 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.25.5"; + version = "1.26.25.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-VjDleCRtFw2R6+OQF4jNKNU8TgRNwuJIjjsNVftoldg="; + hash = "sha256-NVhnJ8vXdRrMzywPNKiLr/wJL0NatiRY8Qd2RmWQ8tU="; }; # Module doesn't have tests From 9e9007e45fec743f41f47aa92c47ba36bc8e76b5 Mon Sep 17 00:00:00 2001 From: talyz Date: Wed, 15 Feb 2023 16:11:39 +0100 Subject: [PATCH 092/111] nixos/opensearch: Use DynamicUser and StateDirectory by default ...but still allow for setting `dataDir` to a custom path. This gets rid of the use of the deprecated option PermissionsStartOnly. Also, add the ability to customize user and group, since that could be useful with a custom `dataDir`. --- nixos/modules/services/search/opensearch.nix | 156 +++++++++++-------- nixos/tests/all-tests.nix | 2 +- nixos/tests/opensearch.nix | 67 ++++++-- pkgs/servers/search/opensearch/default.nix | 2 +- 4 files changed, 147 insertions(+), 80 deletions(-) diff --git a/nixos/modules/services/search/opensearch.nix b/nixos/modules/services/search/opensearch.nix index 17b8697d149c..df699b56747e 100644 --- a/nixos/modules/services/search/opensearch.nix +++ b/nixos/modules/services/search/opensearch.nix @@ -9,6 +9,9 @@ let configDir = cfg.dataDir + "/config"; + usingDefaultDataDir = cfg.dataDir == "/var/lib/opensearch"; + usingDefaultUserAndGroup = cfg.user == "opensearch" && cfg.group == "opensearch"; + opensearchYml = settingsFormat.generate "opensearch.yml" cfg.settings; loggingConfigFilename = "log4j2.properties"; @@ -20,9 +23,9 @@ in { options.services.opensearch = { - enable = mkEnableOption (lib.mdDoc "Whether to enable OpenSearch."); + enable = mkEnableOption (lib.mdDoc "OpenSearch"); - package = lib.mkPackageOptionMD pkgs "OpenSearch package to use." { + package = lib.mkPackageOptionMD pkgs "OpenSearch" { default = [ "opensearch" ]; }; @@ -99,13 +102,37 @@ in dataDir = lib.mkOption { type = lib.types.path; default = "/var/lib/opensearch"; + apply = converge (removeSuffix "/"); description = lib.mdDoc '' - Data directory for opensearch. + Data directory for OpenSearch. If you change this, you need to + manually create the directory. You also need to create the + `opensearch` user and group, or change + [](#opt-services.opensearch.user) and + [](#opt-services.opensearch.group) to existing ones with + access to the directory. + ''; + }; + + user = lib.mkOption { + type = lib.types.str; + default = "opensearch"; + description = lib.mdDoc '' + The user OpenSearch runs as. Should be left at default unless + you have very specific needs. + ''; + }; + + group = lib.mkOption { + type = lib.types.str; + default = "opensearch"; + description = lib.mdDoc '' + The group OpenSearch runs as. Should be left at default unless + you have very specific needs. ''; }; extraCmdLineOptions = lib.mkOption { - description = lib.mdDoc "Extra command line options for the opensearch launcher."; + description = lib.mdDoc "Extra command line options for the OpenSearch launcher."; default = [ ]; type = lib.types.listOf lib.types.str; }; @@ -142,69 +169,76 @@ in OPENSEARCH_PATH_CONF = configDir; }; serviceConfig = { + ExecStartPre = + let + startPreFullPrivileges = '' + set -o errexit -o pipefail -o nounset -o errtrace + shopt -s inherit_errexit + '' + (optionalString (!config.boot.isContainer) '' + # Only set vm.max_map_count if lower than ES required minimum + # This avoids conflict if configured via boot.kernel.sysctl + if [ $(${pkgs.procps}/bin/sysctl -n vm.max_map_count) -lt 262144 ]; then + ${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144 + fi + ''); + startPreUnprivileged = '' + set -o errexit -o pipefail -o nounset -o errtrace + shopt -s inherit_errexit + + # Install plugins + ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib + ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules + + # opensearch needs to create the opensearch.keystore in the config directory + # so this directory needs to be writable. + mkdir -p ${configDir} + chmod 0700 ${configDir} + + # Note that we copy config files from the nix store instead of symbolically linking them + # because otherwise X-Pack Security will raise the following exception: + # java.security.AccessControlException: + # access denied ("java.io.FilePermission" "/var/lib/opensearch/config/opensearch.yml" "read") + + cp ${opensearchYml} ${configDir}/opensearch.yml + + # Make sure the logging configuration for old OpenSearch versions is removed: + rm -f "${configDir}/logging.yml" + cp ${loggingConfigFile} ${configDir}/${loggingConfigFilename} + mkdir -p ${configDir}/scripts + cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options + + # redirect jvm logs to the data directory + mkdir -p ${cfg.dataDir}/logs + chmod 0700 ${cfg.dataDir}/logs + sed -e '#logs/gc.log#${cfg.dataDir}/logs/gc.log#' -i ${configDir}/jvm.options + ''; + in [ + "+${pkgs.writeShellScript "opensearch-start-pre-full-privileges" startPreFullPrivileges}" + "${pkgs.writeShellScript "opensearch-start-pre-unprivileged" startPreUnprivileged}" + ]; + ExecStartPost = pkgs.writeShellScript "opensearch-start-post" '' + set -o errexit -o pipefail -o nounset -o errtrace + shopt -s inherit_errexit + + # Make sure opensearch is up and running before dependents + # are started + while ! ${pkgs.curl}/bin/curl -sS -f http://${cfg.settings."network.host"}:${toString cfg.settings."http.port"} 2>/dev/null; do + sleep 1 + done + ''; ExecStart = "${cfg.package}/bin/opensearch ${toString cfg.extraCmdLineOptions}"; - User = "opensearch"; - Group = "opensearch"; - StateDirectory = cfg.dataDir; - StateDirectoryMode = "0700"; - PermissionsStartOnly = true; + User = cfg.user; + Group = cfg.group; LimitNOFILE = "1024000"; Restart = "always"; TimeoutStartSec = "infinity"; - }; - preStart = optionalString (!config.boot.isContainer) '' - # Only set vm.max_map_count if lower than ES required minimum - # This avoids conflict if configured via boot.kernel.sysctl - if [ $(${pkgs.procps}/bin/sysctl -n vm.max_map_count) -lt 262144 ]; then - ${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144 - fi - '' + '' - mkdir -m 0700 -p ${cfg.dataDir} - - # Install plugins - ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib - ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules - - # opensearch needs to create the opensearch.keystore in the config directory - # so this directory needs to be writable. - mkdir -m 0700 -p ${configDir} - - # Note that we copy config files from the nix store instead of symbolically linking them - # because otherwise X-Pack Security will raise the following exception: - # java.security.AccessControlException: - # access denied ("java.io.FilePermission" "/var/lib/opensearch/config/opensearch.yml" "read") - - cp ${opensearchYml} ${configDir}/opensearch.yml - # Make sure the logging configuration for old opensearch versions is removed: - rm -f "${configDir}/logging.yml" - cp ${loggingConfigFile} ${configDir}/${loggingConfigFilename} - mkdir -p ${configDir}/scripts - cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options - # redirect jvm logs to the data directory - mkdir -m 0700 -p ${cfg.dataDir}/logs - sed -e '#logs/gc.log#${cfg.dataDir}/logs/gc.log#' -i ${configDir}/jvm.options \ - - if [ "$(id -u)" = 0 ]; then chown -R opensearch:opensearch ${cfg.dataDir}; fi - ''; - postStart = '' - # Make sure opensearch is up and running before dependents - # are started - while ! ${pkgs.curl}/bin/curl -sS -f http://${cfg.settings."network.host"}:${toString cfg.settings."http.port"} 2>/dev/null; do - sleep 1 - done - ''; + DynamicUser = usingDefaultUserAndGroup && usingDefaultDataDir; + } // (optionalAttrs (usingDefaultDataDir) { + StateDirectory = "opensearch"; + StateDirectoryMode = "0700"; + }); }; environment.systemPackages = [ cfg.package ]; - - users = { - groups.opensearch = {}; - users.opensearch = { - description = "OpenSearch daemon user"; - home = cfg.dataDir; - group = "opensearch"; - isSystemUser = true; - }; - }; }; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 4e8334622f83..86dd096afc0b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -490,7 +490,7 @@ in { ombi = handleTest ./ombi.nix {}; openarena = handleTest ./openarena.nix {}; openldap = handleTest ./openldap.nix {}; - opensearch = handleTest ./opensearch.nix {}; + opensearch = discoverTests (import ./opensearch.nix); openresty-lua = handleTest ./openresty-lua.nix {}; opensmtpd = handleTest ./opensmtpd.nix {}; opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix {}; diff --git a/nixos/tests/opensearch.nix b/nixos/tests/opensearch.nix index db63c2e053f5..c0caf950cb9c 100644 --- a/nixos/tests/opensearch.nix +++ b/nixos/tests/opensearch.nix @@ -1,19 +1,52 @@ -import ./make-test-python.nix ({ pkgs, ... }: { - name = "opensearch"; - meta.maintainers = with pkgs.lib.maintainers; [ shyim ]; +let + opensearchTest = + import ./make-test-python.nix ( + { pkgs, lib, extraSettings ? {} }: { + name = "opensearch"; + meta.maintainers = with pkgs.lib.maintainers; [ shyim ]; - nodes.machine = { - virtualisation.memorySize = 2048; - services.opensearch.enable = true; + nodes.machine = lib.mkMerge [ + { + virtualisation.memorySize = 2048; + services.opensearch.enable = true; + } + extraSettings + ]; + + testScript = '' + machine.start() + machine.wait_for_unit("opensearch.service") + machine.wait_for_open_port(9200) + + machine.succeed( + "curl --fail localhost:9200" + ) + ''; + }); +in +{ + opensearch = opensearchTest {}; + opensearchCustomPathAndUser = opensearchTest { + extraSettings = { + services.opensearch.dataDir = "/var/opensearch_test"; + services.opensearch.user = "open_search"; + services.opensearch.group = "open_search"; + system.activationScripts.createDirectory = { + text = '' + mkdir -p "/var/opensearch_test" + chown open_search:open_search /var/opensearch_test + chmod 0700 /var/opensearch_test + ''; + deps = [ "users" "groups" ]; + }; + users = { + groups.open_search = {}; + users.open_search = { + description = "OpenSearch daemon user"; + group = "open_search"; + isSystemUser = true; + }; + }; + }; }; - - testScript = '' - machine.start() - machine.wait_for_unit("opensearch.service") - machine.wait_for_open_port(9200) - - machine.succeed( - "curl --fail localhost:9200" - ) - ''; -}) +} diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index cf03d1939d9f..b8274d894b27 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.tests = { inherit (nixosTests) opensearch; }; + passthru.tests = nixosTests.opensearch; meta = { description = "Open Source, Distributed, RESTful Search Engine"; From bb584ee6cd8b0d543b559ef715d161deb318ff3b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Feb 2023 09:35:20 -0800 Subject: [PATCH 093/111] cf-terraforming: 0.9.0 -> 0.10.0 (#216462) --- pkgs/tools/misc/cf-terraforming/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/cf-terraforming/default.nix b/pkgs/tools/misc/cf-terraforming/default.nix index 20c4221a0816..d57475fb5938 100644 --- a/pkgs/tools/misc/cf-terraforming/default.nix +++ b/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-wELV3Jp11Iv3G//VOAosL5QDnbNTyEAvq9hmLWDdPBU="; + sha256 = "sha256-2YL+ncT1UcanslFnMIMonvGugD7HxO6taYZtKK6kmEc="; }; - vendorHash = "sha256-XFJGw76Fz9tzknWuzc1aw1uJ34UQfFLe1WUVtPGbn64="; + vendorHash = "sha256-eAWgLR3wqcTmlA3hG9IGgTm/Q+EKcypXYXRdtRAb94o="; ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ]; # The test suite insists on downloading a binary release of Terraform from From e69c7f78148b97b20992ee5ab7d58c5914dc10a7 Mon Sep 17 00:00:00 2001 From: Thibault Polge Date: Wed, 15 Feb 2023 18:54:50 +0100 Subject: [PATCH 094/111] auto-multiple-choice: Use default value for $MODSDIR Changing this value broke the program, because the variable controls the installation path of Perl modules, but the main binary uses a constant, hardcoded path. --- .../applications/misc/auto-multiple-choice/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix index 900653633a4b..8617e3454239 100644 --- a/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -42,8 +42,14 @@ stdenv.mkDerivation rec { # Relative paths. "BINDIR=/bin" "PERLDIR=/share/perl5" - "MODSDIR=/nonexistent" # AMC will test for that dir before - # defaulting to the "portable" strategy, so this test *must* fail. + "MODSDIR=/lib" # At runtime, AMC will test for that dir before + # defaulting to the "portable" strategy we use, so this test + # *must* fail. *But* this variable cannot be set to anything but + # "/lib" , because that name is hardcoded in the main executable + # and this variable controls both both the path AMC will check at + # runtime, AND the path where the actual modules will be stored at + # build-time. This has been reported upstream as + # https://project.auto-multiple-choice.net/issues/872 "TEXDIR=/tex/latex/" # what texlive.combine expects "TEXDOCDIR=/share/doc/texmf/" # TODO where to put this? "MAN1DIR=/share/man/man1" From 858e6cb6ed3d094cbac5a9a75155e430dca4bded Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Feb 2023 18:55:07 +0000 Subject: [PATCH 095/111] adguardhome: 0.107.23 -> 0.107.24 --- pkgs/servers/adguardhome/bins.nix | 28 ++++++++++++++-------------- pkgs/servers/adguardhome/default.nix | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index b58c5ad5c445..cb84adf1e780 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,31 +1,31 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-ZhezLVn4PHPAnKCjlR9zI4zt9eJZYIUUODjS01M7q1E="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-sfEnGeWjqCjjZSUUVMi5tsqXdrkCPXrg7Xpi8jTmjLU="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.24/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-Vfu/mCR1rMBtYMsm/l5cfIwBnNNeJ7G0pC42rLdqWOk="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-htHUgx/A+AOhlbEjK5tEvJ0GbC/GsEUz/N2x9Wfyr5o="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.24/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-1pgGKUE9hHFGPNAOYNEM0VTYBDdmcrXyJjcT9ymyyiM="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-VzPxraAqmTp6c9OFw3VbpcpzRVkAxiaOlA/eQT7z/js="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.24/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-ApCBjbhfoGYm0rmjQ8U1zA/VHNJgC1kBlk5DvmQ6wTc="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-cQMKUL5RT+CJiCwXnOPc9o0AwDmo0Z6X8L8TjWTKwpY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.24/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-qC7BrBhI9berbuIVIQ6yOo74eHRsoneVRJMx1K/Ljds="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-TixmsB8ZmevQB/ZK7NhtZGchDm+r8XRkCR7qiaUTKLE="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.24/AdGuardHome_linux_arm64.tar.gz"; }; armv6l-linux = fetchurl { - sha256 = "sha256-cWoEpOScFzcz3tsG7IIBV2xpBT+uvSYMEfrmE3pohWA="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_armv6.tar.gz"; + sha256 = "sha256-OUvxgvF8qtLuFVuhLYEL7HipcTZrpuYxp8u7uroaUMc="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.24/AdGuardHome_linux_armv6.tar.gz"; }; armv7l-linux = fetchurl { - sha256 = "sha256-DTGyyNCncbGrrpHzcIxpZqukAYsHarqSJhlbYvjN6dA="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_armv7.tar.gz"; + sha256 = "sha256-okhx2mOIBzJevugpcUh12D85WATV7iCqiiOuvOgUezI="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.24/AdGuardHome_linux_armv7.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 867ba69077f1..3345619bc9aa 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.23"; + version = "0.107.24"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = ./update.sh; - schema_version = 14; + schema_version = 16; tests.adguardhome = nixosTests.adguardhome; }; From e5bde651a57cb4e136797d794acf33fce4110eea Mon Sep 17 00:00:00 2001 From: Matthew Croughan Date: Mon, 13 Feb 2023 04:35:42 +0000 Subject: [PATCH 096/111] Revert "cppcheck: 2.9.3 -> 2.10" --- pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 51fd3aefa87e..1a8183ebab8d 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.10"; + version = "2.9.3"; src = fetchFromGitHub { owner = "danmar"; repo = "cppcheck"; rev = version; - hash = "sha256-Ss35foFlh4sw6TxMp++0b9E5KDUjBpDPuWIHsak8OGY="; + hash = "sha256-AaZzr5r+tpG5M40HSx45KCUBPhN/nSpXxS5H3FuSx2c="; }; buildInputs = [ pcre From e8ac0b5e12e280a13b370b8e830e8257e1baa0de Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Feb 2023 21:38:54 +0100 Subject: [PATCH 097/111] python310Packages.aioaladdinconnect: 0.1.55 -> 0.1.56 Changelog: https://github.com/mkmer/AIOAladdinConnect/releases/tag/0.1.56 --- pkgs/development/python-modules/aioaladdinconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix index 550c6d675e99..42f8f3fb7bf3 100644 --- a/pkgs/development/python-modules/aioaladdinconnect/default.nix +++ b/pkgs/development/python-modules/aioaladdinconnect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioaladdinconnect"; - version = "0.1.55"; + version = "0.1.56"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "AIOAladdinConnect"; inherit version; - hash = "sha256-Lyhv6JF+KuCiGz05EbXMEeXzVCI7ACsJmnEuAtDghYo="; + hash = "sha256-YLAIT33ItaNgokwensOan/OO2lK01GO/u5AZwzvuoPo="; }; propagatedBuildInputs = [ From 058d733e757b584481a7c2ec0563c2aaf4a24054 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Feb 2023 21:39:26 +0100 Subject: [PATCH 098/111] python310Packages.pyopenuv: 2023.01.0 -> 2023.02.0 Diff: https://github.com/bachya/pyopenuv/compare/refs/tags/2023.01.0...2023.02.0 --- pkgs/development/python-modules/pyopenuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix index 49f4b06a5ce6..d41ba8de1c00 100644 --- a/pkgs/development/python-modules/pyopenuv/default.nix +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyopenuv"; - version = "2023.01.0"; + version = "2023.02.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qPLfah35E0vX2tQhGw4wTSMyE4nIyWMDIaKlJePVSd4="; + hash = "sha256-EiTTck6hmOGSQ7LyZsbhnH1zgkH8GccejLdJaH2m0F8="; }; nativeBuildInputs = [ From 88b16f26057e3d837d9c37a92d8f44a35efa66fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Feb 2023 21:42:28 +0100 Subject: [PATCH 099/111] python310Packages.python-matter-server: 2.0.2 -> 2.1.0 Diff: https://github.com/home-assistant-libs/python-matter-server/compare/refs/tags/2.0.2...2.1.0 Changelog: https://github.com/home-assistant-libs/python-matter-server/releases/tag/2.1.0 --- .../python-modules/python-matter-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index d7dfee08633a..e59781180b38 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "2.0.2"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-9Lb5Q54hPdyqMjrHvwBzVXPk8uKBLNRUl2Bljo64Fpo="; + hash = "sha256-T7afZsrvvJeEfLZm4jopAtfQ0Bhqa+s77SyrJToyUWU="; }; nativeBuildInputs = [ From ef4209a7abe68e1b008b8f9add866281a6a80fc1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Feb 2023 21:43:09 +0100 Subject: [PATCH 100/111] python310Packages.reolink-aio: 0.4.0 -> 0.4.2 Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.4.0...0.4.2 Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.4.2 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 88d968a8ed26..5f3a22c3a1e0 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.4.0"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-fMB71fUMtckXiwCXaDHy3jmh0MsdKtamatEL+gYSdXA="; + hash = "sha256-7XD8nmuja8BL66OCdflKWiKyR47TRXUjJLSmcgqSl8g="; }; postPatch = '' From f998fc2a691cba2828882edaf6b2303a46239686 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Feb 2023 21:44:35 +0100 Subject: [PATCH 101/111] home-assistant: 2023.2.4 -> 2023.2.5 https://github.com/home-assistant/core/releases/tag/2023.2.5 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3a171c41725a..dafb5b4976d2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.2.4"; + version = "2023.2.5"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9811d52a8db9..4d6e0b6cca62 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -270,7 +270,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.2.4"; + hassVersion = "2023.2.5"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -288,7 +288,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-Lt/t4S6To0MvdvmdKir7VytrNXPGhC7sMfjQmgox5XY="; + hash = "sha256-7rH4tEW5gQZ/dPkgGzygfT2PwdZGASuyiFrNyn3hfys="; }; nativeBuildInputs = with python3.pkgs; [ From f5be8464dbe91fbe9a4669e7be8534b0f3ead587 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Feb 2023 22:06:46 +0100 Subject: [PATCH 102/111] python310Packages.archinfo: 9.2.37 -> 9.2.38 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 7f7aff682bed..87d33b235c2b 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.37"; + version = "9.2.38"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-WGc6FmrS0aVmiY5s8fUVHCT6cqcmj52H6FD2TR1HyK0="; + hash = "sha256-fpYoX5+TrZaozq7E3qBlhYUPrbbL3fb+wadQToLqtU0="; }; nativeBuildInputs = [ From 3324200a2ce7d3ab4efafb58c2faf82f1f992e21 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Feb 2023 22:06:53 +0100 Subject: [PATCH 103/111] python310Packages.ailment: 9.2.37 -> 9.2.38 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 81f73d324b1d..fa0611385b01 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.37"; + version = "9.2.38"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-MFQiLOCqEAKzST7voMIQH0TYGuwICSVBcQZwUkk9S1Q="; + hash = "sha256-nhvFBXOoxCWaSjUdPyQP234URI50DM3ZoweRK9d1LIA="; }; nativeBuildInputs = [ From d63b815ed66e890d7bd8e4149bec9f32deee8e7e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Feb 2023 22:06:57 +0100 Subject: [PATCH 104/111] python310Packages.pyvex: 9.2.37 -> 9.2.38 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 20d7da5f4883..4d56399d1491 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.37"; + version = "9.2.38"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-JGTfOE16tycBkbsihKPgSZPlfqun1vr/86kAlNwrSZA="; + hash = "sha256-9Cv0Quh0uN/DxOG1J2QCFb8fqRJTyovixmU8X721t8o="; }; nativeBuildInputs = [ From 061f0074da186aa7c91c81f119bc361c49ad32fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Feb 2023 22:07:02 +0100 Subject: [PATCH 105/111] python310Packages.claripy: 9.2.37 -> 9.2.38 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 05ff5762bb35..109a29ac79ef 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.37"; + version = "9.2.38"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8kABsLp3Nrzjn7staiNfU6HdQTu1x6DNQzilMceqKVY="; + hash = "sha256-nKUp8N1T6fcXd1V9Ppqb5fFy8UHGPE/tiyHIanhgUoE="; }; nativeBuildInputs = [ From b54820c90054a69d98efcbac6c12115e4b587a10 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Feb 2023 22:07:06 +0100 Subject: [PATCH 106/111] python310Packages.cle: 9.2.37 -> 9.2.38 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 8ed14ba28cc3..512d105914b3 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.37"; + version = "9.2.38"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-vgH8UAR8B4l29RH0dwMlGVjOHgdcOTfLMHPiKN9Z36s="; + hash = "sha256-3B62NMlAGv4Q6HOkACafBETbOj4QsWsvfrTAM+5b9NY="; }; nativeBuildInputs = [ From a89a024ed4a21f0d3e1baa246b0300791953afe4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Feb 2023 22:07:12 +0100 Subject: [PATCH 107/111] python310Packages.angr: 9.2.37 -> 9.2.38 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index a164cd284c57..8c80631bc1a9 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.37"; + version = "9.2.38"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-sl3GzNMN90ez1Zks43B2How7QTaaJZbxOxK2hl/UzdQ="; + hash = "sha256-9/7GiF+Q7AUmKEqleVF8brCFSAqswalXxgPCApD19ZE="; }; propagatedBuildInputs = [ From 4ffd5a8684e9ab7e519904c1fcda051917b278b4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 15 Feb 2023 07:23:30 +1000 Subject: [PATCH 108/111] go_1_20: 1.20 -> 1.20.1 --- pkgs/development/compilers/go/1.20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.20.nix b/pkgs/development/compilers/go/1.20.nix index 203081fb379f..d158bd5ff3fd 100644 --- a/pkgs/development/compilers/go/1.20.nix +++ b/pkgs/development/compilers/go/1.20.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.20"; + version = "1.20.1"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-Oin/BCG+r2MpKSuKRjEcn78GyAAHfO3e9ft/jVsazjM="; + hash = "sha256-tcGjr1LDhabRx2rtU2HPJkWQI5gNAyDedli645FYMaI="; }; strictDeps = true; From 1bddde315297c092712b0ef03d9def7a474b28ae Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Wed, 15 Feb 2023 20:20:06 +0100 Subject: [PATCH 109/111] fzf: 0.37.0 -> 0.38.0 --- pkgs/tools/misc/fzf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index fa6df2cebff4..7b59dd92df46 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -24,13 +24,13 @@ let in buildGoModule rec { pname = "fzf"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - hash = "sha256-m+tKNz7tUWkm/Vg9DhcfZyaBgZh+Mcf0mRfc5/SW2Os="; + hash = "sha256-XZ0S6cps3WIMqWUHivXPKSN2PiZsSEmETnu9sglwXKw="; }; vendorHash = "sha256-MsMwBBualAwJzCrv/WNBJakv6LcKZYsDUqkNmivUMOQ="; From 5cbf79a9382a0e267cef07d639d02aebecfcbe41 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Feb 2023 22:35:19 +0100 Subject: [PATCH 110/111] mitmproxy2swagger: 0.7.2 -> 0.8.0 Diff: https://github.com/alufers/mitmproxy2swagger/compare/refs/tags/0.7.2...0.8.0 Changelog: https://github.com/alufers/mitmproxy2swagger/releases/tag/0.8.0 --- pkgs/tools/security/mitmproxy2swagger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/mitmproxy2swagger/default.nix b/pkgs/tools/security/mitmproxy2swagger/default.nix index 3378e0d332c7..6e5f934d868f 100644 --- a/pkgs/tools/security/mitmproxy2swagger/default.nix +++ b/pkgs/tools/security/mitmproxy2swagger/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mitmproxy2swagger"; - version = "0.7.2"; + version = "0.8.0"; format = "pyproject"; src = fetchFromGitHub { owner = "alufers"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LnH0RDiRYJAGI7ZT6Idu1AqSz0yBRuBJvhIgY72Z4CA="; + hash = "sha256-HD+zYWQvmAqtJqG8I2Yib/UWCvUewGsXxTtd2E4GyJ0="; }; nativeBuildInputs = with python3.pkgs; [ From 334b915c8b5a666ed74d4027c8fc94dcf2c42d2b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Feb 2023 22:48:57 +0100 Subject: [PATCH 111/111] python310Packages.pontos: 23.2.8 -> 23.2.9 Changelog: https://github.com/greenbone/pontos/releases/tag/v23.2.9 --- pkgs/development/python-modules/pontos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 849dc7b09612..8bcc74025698 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.2.8"; + version = "23.2.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yxE+Gx48JQE++7SB8ouwgh2/rKKv8CC0QQSvwaSeFVc="; + hash = "sha256-+oHqBopA2FLrDdxsVQhciW4ZXluZn+z05LmHtyDtFyI="; }; nativeBuildInputs = [