diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-09 08:26:23 +0200 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-09 08:26:23 +0200 |
commit | 3f59355d8466fc2b1cfe45cd21e4476a686bfeaf (patch) | |
tree | e3f355b60c44bab4ddf55f4a87836c88abf738b1 /pkgs/by-name/pr | |
parent | f682fc1115301f70586f107573d2e4705cb238dd (diff) | |
parent | 038c0347a0d39cb187d76260785b610f05706a23 (diff) |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/by-name/pr')
-rw-r--r-- | pkgs/by-name/pr/pretalx/package.nix | 1 | ||||
-rw-r--r-- | pkgs/by-name/pr/pretix/language-build.patch | 12 | ||||
-rw-r--r-- | pkgs/by-name/pr/pretix/package.nix | 36 | ||||
-rw-r--r-- | pkgs/by-name/pr/proto/package.nix | 52 | ||||
-rw-r--r-- | pkgs/by-name/pr/protoc-go-inject-tag/package.nix | 25 | ||||
-rw-r--r-- | pkgs/by-name/pr/prowler/package.nix | 11 |
6 files changed, 97 insertions, 40 deletions
diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index faf0d0912aee7..9f733eeb8fe4b 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -85,6 +85,7 @@ python.pkgs.buildPythonApplication rec { ]); pythonRelaxDeps = [ + "cssutils" "django-csp" "django-filter" "python-dateutil" diff --git a/pkgs/by-name/pr/pretix/language-build.patch b/pkgs/by-name/pr/pretix/language-build.patch deleted file mode 100644 index b4043b95446d6..0000000000000 --- a/pkgs/by-name/pr/pretix/language-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/pretix/_build_settings.py b/src/pretix/_build_settings.py -index d1ea73b84..9e13cdc87 100644 ---- a/src/pretix/_build_settings.py -+++ b/src/pretix/_build_settings.py -@@ -49,6 +49,7 @@ HAS_MEMCACHED = False - HAS_CELERY = False - HAS_GEOIP = False - SENTRY_ENABLED = False -+LANGUAGES = ALL_LANGUAGES - - for entry_point in entry_points(group='pretix.plugin'): - INSTALLED_APPS.append(entry_point.module) # noqa: F405 diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index d5d59dd851a5e..2456720db7050 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -2,7 +2,6 @@ , buildNpmPackage , fetchFromGitHub , fetchPypi -, fetchpatch2 , nodejs , python3 , gettext @@ -30,13 +29,13 @@ let }; pname = "pretix"; - version = "2024.2.0"; + version = "2024.3.0"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; rev = "refs/tags/v${version}"; - hash = "sha256-emtF5dDXEXN8GIucHbjF+m9Vkg1Jj6nmQdHhBOkXMAs="; + hash = "sha256-Wz1vZcqgwyS0xJgTtRxqfaJpJ1fAMhIyxvTvBT/ABSo="; }; npmDeps = buildNpmPackage { @@ -44,7 +43,7 @@ let inherit version src; sourceRoot = "${src.name}/src/pretix/static/npm_dir"; - npmDepsHash = "sha256-kE13dcTdWZZNHPMcHEiK0a2dEcu3Z3/q815YhaVkLbQ="; + npmDepsHash = "sha256-2fHlEEmYzpF3SyvF7+FbwCt+zQVGF0/kslDFnJ+DQGE="; dontBuild = true; @@ -66,18 +65,6 @@ python.pkgs.buildPythonApplication rec { # Discover pretix.plugin entrypoints during build and add them into # INSTALLED_APPS, so that their static files are collected. ./plugin-build.patch - - # Configure django-statici18n to compile all available languages at - # build time. - ./language-build.patch - - (fetchpatch2 { - # Allow customization of cache and log directory - # https://github.com/pretix/pretix/pull/3997 - name = "pretix-directory-customization.patch"; - url = "https://github.com/pretix/pretix/commit/e151d1d1f08917e547df49da0779b36bb73b7294.patch"; - hash = "sha256-lO5eCKSqUaCwSm7rouMTFMwauWl9Tz/Yf0JE/IO+bnI="; - }) ]; postPatch = '' @@ -94,14 +81,16 @@ python.pkgs.buildPythonApplication rec { --replace-fail psycopg2-binary psycopg2 \ --replace-fail vat_moss_forked==2020.3.20.0.11.0 vat-moss \ --replace-fail "bleach==5.0.*" bleach \ - --replace-fail "django-filter==23.5" django-filter \ - --replace-fail "dnspython==2.5.*" dnspython \ + --replace-fail "dnspython==2.6.*" dnspython \ + --replace-fail "django-countries==7.5.*" django-countries \ + --replace-fail "django-filter==24.1" django-filter \ --replace-fail "importlib_metadata==7.*" importlib_metadata \ - --replace-fail "protobuf==4.25.*" protobuf \ + --replace-fail "markdown==3.6" markdown \ + --replace-fail "protobuf==5.26.*" protobuf \ --replace-fail "pycryptodome==3.20.*" pycryptodome \ --replace-fail "pypdf==3.9.*" pypdf \ - --replace-fail "python-dateutil==2.8.*" python-dateutil \ - --replace-fail "sentry-sdk==1.40.*" sentry-sdk \ + --replace-fail "python-dateutil==2.9.*" python-dateutil \ + --replace-fail "sentry-sdk==1.42.*" sentry-sdk \ --replace-fail "stripe==7.9.*" stripe ''; @@ -222,11 +211,6 @@ python.pkgs.buildPythonApplication rec { pytestFlagsArray = [ "--reruns" "3" - - # tests fail when run before 4:30am - # https://github.com/pretix/pretix/pull/3987 - "--deselect=src/tests/base/test_orders.py::PaymentReminderTests::test_sent_days" - "--deselect=src/tests/plugins/sendmail/test_rules.py::test_sendmail_rule_specified_subevent" ]; preCheck = '' diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix new file mode 100644 index 0000000000000..62ca8f2b025de --- /dev/null +++ b/pkgs/by-name/pr/proto/package.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +, libiconv +, makeBinaryWrapper +, pkg-config +}: + +rustPlatform.buildRustPackage rec { + pname = "proto"; + version = "0.32.2"; + + src = fetchFromGitHub { + owner = "moonrepo"; + repo = pname; + rev = "v${version}"; + hash = "sha256-QxaVXggVfr3O26RwSuUx4qpabhWE9+ZFLKRin/ya2e4="; + }; + + cargoHash = "sha256-j5wXmlauhrUnUVTj/KyqDrf1y9bq3ZInREZXIUQImVE="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + libiconv + ]; + nativeBuildInputs = [ makeBinaryWrapper pkg-config ]; + + # Tests requires network access + doCheck = false; + cargoBuildFlags = [ "--bin proto" "--bin proto-shim" ]; + + postInstall = '' + # proto looks up a proto-shim executable file in $PROTO_LOOKUP_DIR + wrapProgram $out/bin/${pname} \ + --set PROTO_LOOKUP_DIR $out/bin + ''; + + meta = { + description = "A pluggable multi-language version manager"; + longDescription = '' + proto is a pluggable next-generation version manager for multiple programming languages. A unified toolchain. + ''; + homepage = "https://moonrepo.dev/proto"; + changelog = "https://github.com/moonrepo/proto/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nokazn ]; + mainProgram = "proto"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/pr/protoc-go-inject-tag/package.nix b/pkgs/by-name/pr/protoc-go-inject-tag/package.nix new file mode 100644 index 0000000000000..4bb673449ea6f --- /dev/null +++ b/pkgs/by-name/pr/protoc-go-inject-tag/package.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: +buildGoModule rec { + pname = "protoc-go-inject-tag"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "favadi"; + repo = "protoc-go-inject-tag"; + rev = "v${version}"; + sha256 = "01jsrx83pygvjx3nzfnwvb2vn5gagl79m9i67v7cfg1lzz168spj"; + }; + + vendorHash = "sha256-tMpcJ37yGr7i91Kwz57FmJ+u2x0CAus0+yWOR10fJLo="; + + meta = with lib; { + description = "Inject custom tags to protobuf golang struct"; + homepage = "https://github.com/favadi/protoc-go-inject-tag/tree/v1.4.0"; + license = licenses.bsd2; + maintainers = with maintainers; [elrohirgt]; + mainProgram = "protoc-go-inject-tag"; + }; +} diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index 54cdf94882e5b..01dc71bf2fefb 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -6,17 +6,18 @@ python3.pkgs.buildPythonApplication rec { pname = "prowler"; - version = "3.14.0"; + version = "3.15.0"; pyproject = true; src = fetchFromGitHub { owner = "prowler-cloud"; repo = "prowler"; rev = "refs/tags/${version}"; - hash = "sha256-hQVrKhBgucuZQ2CZKG6VJMsHUGkWNch9em2dRCbEA+A="; + hash = "sha256-7aWWaGdHTveFwXsFNj4+tjX5g83/nD77jLAOrDOw8JE="; }; pythonRelaxDeps = [ + "azure-keyvault-keys" "azure-mgmt-compute" "azure-mgmt-network" "azure-mgmt-security" @@ -42,16 +43,22 @@ python3.pkgs.buildPythonApplication rec { alive-progress awsipranges azure-identity + azure-keyvault-keys azure-mgmt-applicationinsights azure-mgmt-authorization azure-mgmt-compute + azure-mgmt-containerservice azure-mgmt-cosmosdb + azure-mgmt-keyvault + azure-mgmt-monitor azure-mgmt-network azure-mgmt-rdbms + azure-mgmt-resource azure-mgmt-security azure-mgmt-sql azure-mgmt-storage azure-mgmt-subscription + azure-mgmt-web azure-storage-blob boto3 botocore |