diff options
Diffstat (limited to 'pkgs/by-name/pr')
25 files changed, 468 insertions, 28 deletions
diff --git a/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix index cfa6269b89f44..513227e5637c2 100644 --- a/pkgs/by-name/pr/pragtical/package.nix +++ b/pkgs/by-name/pr/pragtical/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { changelog = "https://github.com/pragtical/pragtical/blob/${finalAttrs.src.rev}/changelog.md"; - description = "A practical and pragmatic code editor"; + description = "Practical and pragmatic code editor"; homepage = "https://pragtical.dev"; license = lib.licenses.mit; mainProgram = "pragtical"; diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index e14510559cbec..5e7e767fef595 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { - description = "A terminal based slideshow tool"; + description = "Terminal based slideshow tool"; changelog = "https://github.com/mfontanini/presenterm/releases/tag/v${version}"; homepage = "https://github.com/mfontanini/presenterm"; license = licenses.bsd2; diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index 4674812339ae3..784976d06eaf8 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -3,6 +3,7 @@ , gettext , python3 , fetchFromGitHub +, fetchpatch2 , plugins ? [ ] , nixosTests }: @@ -70,6 +71,15 @@ python.pkgs.buildPythonApplication rec { "static" ]; + patches = [ + (fetchpatch2 { + # Backport support for Djangorestframework 3.15.x + name = "pretalx-drf-3.15.patch"; + url = "https://github.com/pretalx/pretalx/commit/43a0416c6968d64ea57720abdb82f482940b11f8.patch"; + hash = "sha256-Iw1xVF7j7c712kwIk1SMbQSF0ixMUZr1BJib3KAb2HY="; + }) + ]; + postPatch = '' substituteInPlace src/pretalx/common/management/commands/rebuild.py \ --replace 'subprocess.check_call(["npm", "run", "build"], cwd=frontend_dir, env=env)' "" @@ -92,10 +102,12 @@ python.pkgs.buildPythonApplication rec { "django-csp" "django-filter" "django-hierarkey" + "djangorestframework" "markdown" "pillow" "python-dateutil" "reportlab" + "requests" "rules" ]; diff --git a/pkgs/by-name/pr/pretalx/plugins/public-voting.nix b/pkgs/by-name/pr/pretalx/plugins/public-voting.nix index 3ce595b69fe58..49439ef92c51b 100644 --- a/pkgs/by-name/pr/pretalx/plugins/public-voting.nix +++ b/pkgs/by-name/pr/pretalx/plugins/public-voting.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pretalx_public_voting" ]; meta = { - description = "A public voting plugin for pretalx"; + description = "Public voting plugin for pretalx"; homepage = "https://github.com/pretalx/pretalx-public-voting"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ wegank ]; diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index a45fdbdf2ff31..f4e744af6748f 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -14,6 +14,15 @@ let packageOverrides = self: super: { django = super.django_4; + django-oauth-toolkit = super.django-oauth-toolkit.overridePythonAttrs (oldAttrs: { + version = "2.3.0"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/v${version}"; + hash = "sha256-oGg5MD9p4PSUVkt5pGLwjAF4SHHf4Aqr+/3FsuFaybY="; + }; + }); + stripe = super.stripe.overridePythonAttrs rec { version = "7.9.0"; @@ -29,13 +38,13 @@ let }; pname = "pretix"; - version = "2024.4.0"; + version = "2024.5.0"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; rev = "refs/tags/v${version}"; - hash = "sha256-+F5EOMMkO1ngGeFscDipwbldsY0AhOUKbjqgNpuph4g="; + hash = "sha256-dLzCugbRQSGuOwe99a3WLMffisyvYWNRdSdcdW9knjY="; }; npmDeps = buildNpmPackage { @@ -43,7 +52,7 @@ let inherit version src; sourceRoot = "${src.name}/src/pretix/static/npm_dir"; - npmDepsHash = "sha256-0Q/BCRHlnyQJlCF3PgIP9q3Qyr/ff+GP0lPIwPsIMSU="; + npmDepsHash = "sha256-SEgAC3dmnxG1xM9QZQ/e+6NFOwXU3tXlbfZCzrAMFO0="; dontBuild = true; @@ -81,15 +90,14 @@ 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-hierarkey==1.1.*" django-hierarkey \ --replace-fail "djangorestframework==3.15.*" djangorestframework \ --replace-fail "dnspython==2.6.*" dnspython \ --replace-fail "importlib_metadata==7.*" importlib_metadata \ --replace-fail "markdown==3.6" markdown \ - --replace-fail "protobuf==5.26.*" protobuf \ + --replace-fail "protobuf==5.27.*" protobuf \ --replace-fail "pycryptodome==3.20.*" pycryptodome \ - --replace-fail "pypdf==3.9.*" pypdf \ --replace-fail "python-dateutil==2.9.*" python-dateutil \ + --replace-fail "requests==2.32.*" "requests" \ --replace-fail "stripe==7.9.*" stripe ''; @@ -179,7 +187,9 @@ python.pkgs.buildPythonApplication rec { vobject webauthn zeep - ] ++ plugins; + ] + ++ django.optional-dependencies.argon2 + ++ plugins; optional-dependencies = with python.pkgs; { memcached = [ diff --git a/pkgs/by-name/pr/pretix/plugins/pages.nix b/pkgs/by-name/pr/pretix/plugins/pages.nix index 91f8ef032f773..0edc1f9c34894 100644 --- a/pkgs/by-name/pr/pretix/plugins/pages.nix +++ b/pkgs/by-name/pr/pretix/plugins/pages.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretix-pages"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-pages"; rev = "v${version}"; - hash = "sha256-cO5tAiOifLpqFEQwYgrGoByUecpzvue8YmChpPwm+y0="; + hash = "sha256-u2POt3v0OpjbauDCX8Uclvqd1+jujvVrzUIYrvDv/qI="; }; build-system = [ diff --git a/pkgs/by-name/pr/pretix/plugins/passbook.nix b/pkgs/by-name/pr/pretix/plugins/passbook.nix index b7d380aa681d9..ccb14543b7ab0 100644 --- a/pkgs/by-name/pr/pretix/plugins/passbook.nix +++ b/pkgs/by-name/pr/pretix/plugins/passbook.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pretix-passbook"; - version = "1.13.1"; + version = "1.13.2"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-passbook"; rev = "v${version}"; - hash = "sha256-bp64wCEMon05JhOaDr/cVbqUxc+7ndcsSuSesxJt8GE="; + hash = "sha256-rdX93AFoLLsA44a9sSgcQrCJiOlhe3j5WTBO+MHZ/X8="; }; patches = [ diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix new file mode 100644 index 0000000000000..64b014517c63e --- /dev/null +++ b/pkgs/by-name/pr/probe-rs-tools/package.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, cmake +, gitMinimal +, pkg-config +, libusb1 +, openssl +, DarwinTools +, AppKit +}: + +rustPlatform.buildRustPackage rec { + pname = "probe-rs-tools"; + version = "0.24.0"; + + src = fetchFromGitHub { + owner = "probe-rs"; + repo = "probe-rs"; + rev = "v${version}"; + hash = "sha256-H1RT+H7aQjZmesW+/0mjPH2M01J1eBZ47Rern5lCqWk="; + }; + + cargoHash = "sha256-aTBtWPcOYT5koIu/uw5S2oKTnsvXcqB39SFbe8U1NJY="; + + buildAndTestSubdir = pname; + + nativeBuildInputs = [ + # required by libz-sys, no option for dynamic linking + # https://github.com/rust-lang/libz-sys/issues/158 + cmake + # build.rs fails without git + # https://github.com/probe-rs/probe-rs/pull/2492 + gitMinimal + pkg-config + ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + + buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + + checkFlags = [ + # require a physical probe + "--skip=cmd::dap_server::server::debugger::test::attach_request" + "--skip=cmd::dap_server::server::debugger::test::attach_with_flashing" + "--skip=cmd::dap_server::server::debugger::test::launch_and_threads" + "--skip=cmd::dap_server::server::debugger::test::launch_with_config_error" + "--skip=cmd::dap_server::server::debugger::test::test_initalize_request" + "--skip=cmd::dap_server::server::debugger::test::test_launch_and_terminate" + "--skip=cmd::dap_server::server::debugger::test::test_launch_no_probes" + "--skip=cmd::dap_server::server::debugger::test::wrong_request_after_init" + # compiles an image for an embedded target which we do not have a toolchain for + "--skip=util::cargo::test::get_binary_artifact_with_cargo_config" + "--skip=util::cargo::test::get_binary_artifact_with_cargo_config_toml" + # requires other crates in the workspace + "--skip=util::cargo::test::get_binary_artifact" + "--skip=util::cargo::test::library_with_example_specified" + "--skip=util::cargo::test::multiple_binaries_in_crate_select_binary" + "--skip=util::cargo::test::workspace_binary_package" + "--skip=util::cargo::test::workspace_root" + ]; + + meta = with lib; { + description = "CLI tool for on-chip debugging and flashing of ARM chips"; + homepage = "https://probe.rs/"; + changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ xgroleau newam ]; + }; +} diff --git a/pkgs/by-name/pr/process-cpp/package.nix b/pkgs/by-name/pr/process-cpp/package.nix new file mode 100644 index 0000000000000..2a04e385c3254 --- /dev/null +++ b/pkgs/by-name/pr/process-cpp/package.nix @@ -0,0 +1,78 @@ +{ lib +, stdenv +, fetchFromGitLab +, testers +, unstableGitUpdater +, cmake +, coreutils +, boost +, gtest +, lomiri +, properties-cpp +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "process-cpp"; + version = "3.0.1-unstable-2024-03-14"; + + src = fetchFromGitLab { + domain = "gitlab.com"; + owner = "ubports"; + repo = "development/core/lib-cpp/process-cpp"; + rev = "7b0a829abcbcdd25d949e5f9e2c26bb985a58b31"; + hash = "sha256-Az+lSJ7uVR4pAWvOeah5vFtIPb12eKp0nAFF1qsHZXA="; + }; + + outputs = [ + "out" + "dev" + ]; + + postPatch = '' + substituteInPlace data/process-cpp.pc.in \ + --replace-fail 'libdir=''${exec_prefix}' 'libdir=''${prefix}' \ + --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}' + + substituteInPlace tests/posix_process_test.cpp \ + --replace-fail '/usr/bin/sleep' '${lib.getExe' coreutils "sleep"}' \ + --replace-fail '/usr/bin/env' '${lib.getExe' coreutils "env"}' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + boost + lomiri.cmake-extras + properties-cpp + ]; + + checkInputs = [ + gtest + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = unstableGitUpdater { }; + }; + + meta = with lib; { + description = "Simple convenience library for handling processes in C++11"; + homepage = "https://gitlab.com/ubports/development/core/lib-cpp/process-cpp"; + license = with licenses; [ gpl3Only lgpl3Only ]; + maintainers = with maintainers; [ onny OPNA2608 ]; + platforms = platforms.linux; + pkgConfigModules = [ "process-cpp" ]; + }; +}) diff --git a/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix b/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix new file mode 100644 index 0000000000000..179acfe520ace --- /dev/null +++ b/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + fetchurl, +}: +stdenv.mkDerivation ( + finalAttrs: + let + jarName = "jmx_prometheus_javaagent-${finalAttrs.version}.jar"; + in + { + pname = "jmx-prometheus-javaagent"; + version = "0.20.0"; + src = fetchurl { + url = "mirror://maven/io/prometheus/jmx/jmx_prometheus_javaagent/${finalAttrs.version}/${jarName}"; + sha256 = "sha256-i2ftQEhdR1ZIw20R0hRktIRAb4X6+RKzNj9xpqeGEyA="; + }; + + dontUnpack = true; + + installPhase = '' + env + mkdir -p $out/lib + cp $src $out/lib/${jarName} + ''; + + meta = { + homepage = "https://github.com/prometheus/jmx_exporter"; + description = "A process for exposing JMX Beans via HTTP for Prometheus consumption"; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.srhb ]; + platforms = lib.platforms.unix; + }; + } +) diff --git a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix new file mode 100644 index 0000000000000..1c9098997010c --- /dev/null +++ b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub, }: + +buildGoModule rec { + pname = "squid-exporter"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "boynux"; + repo = "squid-exporter"; + rev = "v${version}"; + sha256 = "sha256-43f6952IqUHoB5CN0p5R5J/sMKbTe2msF9FGqykwMBo="; + }; + + vendorHash = null; + + meta = { + description = "Squid Prometheus exporter"; + homepage = "https://github.com/boynux/squid-exporter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ srhb ]; + }; +} diff --git a/pkgs/by-name/pr/promexplorer/package.nix b/pkgs/by-name/pr/promexplorer/package.nix index d0443ecf1aa63..ce4b22bfb3404 100644 --- a/pkgs/by-name/pr/promexplorer/package.nix +++ b/pkgs/by-name/pr/promexplorer/package.nix @@ -12,7 +12,7 @@ buildNimPackage (finalAttrs: { lockFile = ./lock.json; meta = with lib; { - description = "A simple tool to explore prometheus exporter metrics"; + description = "Simple tool to explore prometheus exporter metrics"; homepage = "https://github.com/marcusramberg/promexplorer"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/by-name/pr/promptfoo/package.nix b/pkgs/by-name/pr/promptfoo/package.nix index 34a76e5b45840..50fc9fa251234 100644 --- a/pkgs/by-name/pr/promptfoo/package.nix +++ b/pkgs/by-name/pr/promptfoo/package.nix @@ -19,7 +19,7 @@ buildNpmPackage rec { dontNpmBuild = true; meta = with lib; { - description = "Test your prompts, models, RAGs. Evaluate and compare LLM outputs, catch regressions, and improve prompt quality."; + description = "Test your prompts, models, RAGs. Evaluate and compare LLM outputs, catch regressions, and improve prompt quality"; mainProgram = "promptfoo"; homepage = "https://www.promptfoo.dev/"; changelog = "https://github.com/promptfoo/promptfoo/releases/tag/${version}"; diff --git a/pkgs/by-name/pr/protege/enforce-plugin-versions.patch b/pkgs/by-name/pr/protege/enforce-plugin-versions.patch new file mode 100644 index 0000000000000..1df4594f2c99f --- /dev/null +++ b/pkgs/by-name/pr/protege/enforce-plugin-versions.patch @@ -0,0 +1,43 @@ +diff --git a/pom.xml b/pom.xml +index 839bed04..4cb5f392 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -358,6 +358,30 @@ + <release>11</release> + </configuration> + </plugin> ++ ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-install-plugin</artifactId> ++ <version>3.1.1</version> ++ </plugin> ++ ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-site-plugin</artifactId> ++ <version>3.12.1</version> ++ </plugin> ++ ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-deploy-plugin</artifactId> ++ <version>3.1.1</version> ++ </plugin> ++ ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-jar-plugin</artifactId> ++ <version>3.3.0</version> ++ </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> +@@ -476,6 +494,7 @@ + <requireMavenVersion> + <version>3.6.3</version> + </requireMavenVersion> ++ <requirePluginVersions/> + </rules> + </configuration> + </execution> diff --git a/pkgs/by-name/pr/protege/package.nix b/pkgs/by-name/pr/protege/package.nix new file mode 100644 index 0000000000000..f6d22a08e2f57 --- /dev/null +++ b/pkgs/by-name/pr/protege/package.nix @@ -0,0 +1,93 @@ +{ lib +, fetchFromGitHub +, copyDesktopItems +, iconConvTools +, makeDesktopItem +, makeWrapper +, jdk11 +, maven +}: + +let + mvn = maven.override { jdk = jdk11; }; +in +mvn.buildMavenPackage rec { + pname = "protege"; + version = "5.6.4"; + + src = fetchFromGitHub { + owner = "protegeproject"; + repo = "protege"; + rev = version; + hash = "sha256-Q3MHa7nCeF31n7JPltcemFBc/sJwGA9Ev0ymjQhY/U0="; + }; + + mvnHash = "sha256-kemP2gDv1CYuaoK0fwzBxdLTusarPasf2jCDQj/HPYE="; + + patches = [ + # Pin built-in Maven plugins to avoid checksum variations on Maven updates + ./enforce-plugin-versions.patch + # Avoid building platform-dependent builds which embed their own JREs + ./platform-independent-only.patch + ]; + + nativeBuildInputs = [ + copyDesktopItems + iconConvTools + jdk11 + makeWrapper + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/protege + + # Copy the application directory whole into the output, as it is used by the + # launcher script as a reference point to look for default configuration + mv protege-desktop/target/protege-${version}-platform-independent/Protege-${version} $out/Protege + + # Place a wrapper for the launcher script into a default /bin location + makeWrapper $out/Protege/run.sh $out/bin/protege \ + --set JAVA_HOME ${jdk11.home} + + # Link all jars from within the standard /share/protege directory + ln -s -t $out/share/protege $out/Protege/bundles/* + + # Generate and copy icons to where they can be found + icoFileToHiColorTheme $out/Protege/app/Protege.ico protege $out + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "Protege Desktop"; + genericName = "Ontology Editor"; + icon = "protege"; + comment = meta.description; + categories = [ "Development" ]; + exec = "protege"; + }) + ]; + + meta = { + homepage = "https://protege.stanford.edu/"; + downloadPage = "https://protege.stanford.edu/software.php#desktop-protege"; + description = "A free and open-source OWL 2 ontology editor"; + longDescription = '' + Protégé Desktop is a feature rich ontology editing environment with full + support for the OWL 2 Web Ontology Language, and direct in-memory + connections to description logic reasoners. + ''; + maintainers = with lib.maintainers; [ nessdoor ]; + license = with lib.licenses; [ bsd2 ]; + # TODO Protege is able to run on Darwin as well, but I (@nessdoor) had no + # way of testing it nor any experience in packaging Darwin apps, so I + # will leave the task to someone who has the right tools and knowledge. + platforms = lib.platforms.unix; + mainProgram = "protege"; + sourceProvenance = with lib.sourceTypes; [ fromSource binaryBytecode ]; + }; +} diff --git a/pkgs/by-name/pr/protege/platform-independent-only.patch b/pkgs/by-name/pr/protege/platform-independent-only.patch new file mode 100644 index 0000000000000..d0f489372f2e4 --- /dev/null +++ b/pkgs/by-name/pr/protege/platform-independent-only.patch @@ -0,0 +1,24 @@ +diff --git a/protege-desktop/pom.xml b/protege-desktop/pom.xml +index 2f599708..60059308 100644 +--- a/protege-desktop/pom.xml ++++ b/protege-desktop/pom.xml +@@ -110,9 +110,6 @@ + </archiverConfig> + <descriptors> + <descriptor>src/main/assembly/protege-platform-independent.xml</descriptor> +- <descriptor>src/main/assembly/protege-os-x.xml</descriptor> +- <descriptor>src/main/assembly/protege-win.xml</descriptor> +- <descriptor>src/main/assembly/protege-linux.xml</descriptor> + </descriptors> + </configuration> + </execution> +@@ -165,9 +162,6 @@ + </archiverConfig> + <descriptors> + <descriptor>src/main/assembly/protege-platform-independent.xml</descriptor> +- <descriptor>src/main/assembly/protege-os-x.xml</descriptor> +- <descriptor>src/main/assembly/protege-win.xml</descriptor> +- <descriptor>src/main/assembly/protege-linux.xml</descriptor> + </descriptors> + </configuration> + </execution> diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 606db2601f0cc..3afa04ec788a7 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.35.2"; + version = "0.37.1"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-2m6ktcSZWOuu4S3FI3kiPTRhS2+rRgI5M7BZ//9bb8M="; + hash = "sha256-IqXxjR+M1OCRKUA2HCT6WQvdBMOa0efT8m+drhyQCoE="; }; - cargoHash = "sha256-JbuHuj0VG+3nRNEoVHoOdA66RWbWrIzDkwa7PsO3TJ0="; + cargoHash = "sha256-NnTiT1jLMo9EfYau+U0FiAC+V67GnoI90vSsotwniio="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { ''; meta = { - description = "A pluggable multi-language version manager"; + description = "Pluggable multi-language version manager"; longDescription = '' proto is a pluggable next-generation version manager for multiple programming languages. A unified toolchain. ''; diff --git a/pkgs/by-name/pr/protoc-gen-js/package.nix b/pkgs/by-name/pr/protoc-gen-js/package.nix index 0df0cb62a83e1..08fb3345fedca 100644 --- a/pkgs/by-name/pr/protoc-gen-js/package.nix +++ b/pkgs/by-name/pr/protoc-gen-js/package.nix @@ -33,6 +33,6 @@ buildBazelPackage rec { platforms = platforms.linux ++ platforms.darwin; license = with licenses; [ asl20 bsd3 ]; sourceProvenance = [ sourceTypes.fromSource ]; - maintainers = with maintainers; [ Sorixelle ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index a281607d5024b..186943dd9dca1 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton9-5"; + version = "GE-Proton9-7"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-bUlV533M5BL5UEOB0ED8VIMmquvVAvIm+E/ZJNjftRU="; + hash = "sha256-/FXdyPuCe6rD5HoMOHPVlwRXu3DMJ3lEOnRloYZMA8s="; }; outputs = [ "out" "steamcompattool" ]; diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix new file mode 100644 index 0000000000000..960eb6c64a934 --- /dev/null +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenvNoCC, + fetchurl, + dpkg, + makeWrapper, + electron, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "proton-pass"; + version = "1.17.5"; + + src = fetchurl { + url = "https://proton.me/download/PassDesktop/linux/x64/ProtonPass_${finalAttrs.version}.deb"; + hash = "sha256-2dnR/4LpLiQlJebv74/F7L/a5lYPh+AMPqQVIBHvxcg="; + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ + dpkg + makeWrapper + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r usr/share/ $out/ + cp -r usr/lib/proton-pass/resources/app.asar $out/share/ + runHook postInstall + ''; + + preFixup = '' + makeWrapper ${lib.getExe electron} $out/bin/proton-pass \ + --add-flags $out/share/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ + --set-default ELECTRON_IS_DEV 0 \ + --inherit-argv0 + ''; + + meta = { + description = "Desktop application for Proton Pass"; + homepage = "https://proton.me/pass"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ massimogengarelli sebtm ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + mainProgram = "proton-pass"; + }; +}) diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index fce6e7bef53eb..8d65ba26b294b 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -10,11 +10,11 @@ let mainProgram = "proton-mail"; in stdenv.mkDerivation rec { pname = "protonmail-desktop"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/proton-mail_${version}_amd64.deb"; - hash = "sha256-c+0iFBpcg+t983oOttPokA5sLGsIQFIsC+GbsVY6hmI="; + hash = "sha256-opavVpXQmA/VDZ+K/k0NJFwQHUUJhg+bUm/w8Ertopw="; }; dontConfigure = true; diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix index cd715b3a36d0c..ed74777fedecc 100644 --- a/pkgs/by-name/pr/protonplus/package.nix +++ b/pkgs/by-name/pr/protonplus/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { mainProgram = "com.vysp3r.ProtonPlus"; - description = "A simple Wine and Proton-based compatibility tools manager"; + description = "Simple Wine and Proton-based compatibility tools manager"; homepage = "https://github.com/Vysp3r/ProtonPlus"; changelog = "https://github.com/Vysp3r/ProtonPlus/releases/tag/v${finalAttrs.version}"; license = licenses.gpl3Only; diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index a8c5fb546e79e..cf843d8ab1c75 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -23,6 +23,7 @@ python3.pkgs.buildPythonApplication rec { "azure-mgmt-containerservice" "azure-mgmt-network" "azure-mgmt-security" + "azure-mgmt-storage" "azure-storage-blob" "boto3" "botocore" diff --git a/pkgs/by-name/pr/prox/package.nix b/pkgs/by-name/pr/prox/package.nix index 6f432de3ec72d..ef7b588ea51fe 100644 --- a/pkgs/by-name/pr/prox/package.nix +++ b/pkgs/by-name/pr/prox/package.nix @@ -24,7 +24,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/fgrosse/prox"; - description = "A process runner for Procfile-based applications "; + description = "Process runner for Procfile-based applications "; mainProgram = "prox"; license = licenses.bsd2; maintainers = with maintainers; [ lucperkins ]; diff --git a/pkgs/by-name/pr/prr/package.nix b/pkgs/by-name/pr/prr/package.nix index f856b20fcae66..46576e1a18222 100644 --- a/pkgs/by-name/pr/prr/package.nix +++ b/pkgs/by-name/pr/prr/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; meta = with lib; { - description = "A tool that brings mailing list style code reviews to Github PRs"; + description = "Tool that brings mailing list style code reviews to Github PRs"; homepage = "https://github.com/danobi/prr"; license = licenses.gpl2Only; mainProgram = "prr"; |