diff options
Diffstat (limited to 'pkgs/by-name/fr')
-rw-r--r-- | pkgs/by-name/fr/frequest/package.nix | 60 | ||||
-rw-r--r-- | pkgs/by-name/fr/fritz-exporter/console-script.patch | 14 | ||||
-rw-r--r-- | pkgs/by-name/fr/fritz-exporter/package.nix | 10 |
3 files changed, 63 insertions, 21 deletions
diff --git a/pkgs/by-name/fr/frequest/package.nix b/pkgs/by-name/fr/frequest/package.nix new file mode 100644 index 000000000000..cd157115ecfa --- /dev/null +++ b/pkgs/by-name/fr/frequest/package.nix @@ -0,0 +1,60 @@ +{ lib, stdenv, fetchFromGitHub, qt5 }: + +stdenv.mkDerivation (finalAttrs: { + pname = "frequest"; + version = "1.2a"; + + srcs = [ + (fetchFromGitHub { + owner = "fabiobento512"; + name = "frequest"; + repo = "FRequest"; + rev = "v${finalAttrs.version}"; + hash = "sha256-fdn3MK5GWBOhJjpMtRaytO9EsVzz6KJknDhqWtAyXCc="; + }) + # The application depends on hard-coded relative paths to ../CommonLibs and ../CommonUtils. + # See https://github.com/fabiobento512/FRequest/wiki/Building-FRequest for more info. + # Upstream provides no tags for these dependencies, use latest commit on their `master` branch. + # Changing the name of these srcs will break the build. + (fetchFromGitHub { + owner = "fabiobento512"; + name = "CommonLibs"; + repo = "CommonLibs"; + rev = "d3906931bb06ddf4194ff711a59e1dcff80fa82f"; + hash = "sha256-iLJJ95yJ+VjNPuk8fNEDvYBI0db0rcfJF12a9azGv1Y="; + }) + (fetchFromGitHub { + owner = "fabiobento512"; + name = "CommonUtils"; + repo = "CommonUtils"; + rev = "53970984f6538d78350be1b9426032bcb5bcf818"; + hash = "sha256-nRv9DriSOuAiWhy+KkOVNEz5oSgNNNJZqk8sNwgbx8U="; + }) + ]; + sourceRoot = "frequest"; + + buildInputs = [ + qt5.qtbase + ]; + + nativeBuildInputs = [ + qt5.wrapQtAppsHook + qt5.qmake + ]; + + # Without this, nothing gets installed in $out. + postInstall = '' + install -D FRequest $out/bin/FRequest + install -D LinuxAppImageDeployment/frequest.desktop $out/share/applications/frequest.desktop + install -D LinuxAppImageDeployment/frequest_icon.png $out/share/icons/hicolor/128x128/apps/frequest_icon.png + ''; + + meta = { + description = "A fast, lightweight and opensource desktop application to make HTTP(s) requests"; + homepage = "https://fabiobento512.github.io/FRequest"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ eliandoran ]; + platforms = lib.platforms.linux; + mainProgram = "frequest"; + }; +}) diff --git a/pkgs/by-name/fr/fritz-exporter/console-script.patch b/pkgs/by-name/fr/fritz-exporter/console-script.patch deleted file mode 100644 index e13e78f2d184..000000000000 --- a/pkgs/by-name/fr/fritz-exporter/console-script.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index ffad1a4..e7551da 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -44,6 +44,9 @@ coverage = ">=6.4.4,<8.0.0" - pytest-cov = ">=3,<5" - ruff = "^0.1.7" - -+[tool.poetry.scripts] -+fritzexporter = "fritzexporter.__main__:main" -+ - [build-system] - requires = ["poetry-core"] - build-backend = "poetry.core.masonry.api" diff --git a/pkgs/by-name/fr/fritz-exporter/package.nix b/pkgs/by-name/fr/fritz-exporter/package.nix index 3306802b840f..f9b779f0eec5 100644 --- a/pkgs/by-name/fr/fritz-exporter/package.nix +++ b/pkgs/by-name/fr/fritz-exporter/package.nix @@ -5,21 +5,16 @@ python3.pkgs.buildPythonApplication rec { pname = "fritz-exporter"; - version = "2.3.1"; + version = "2.4.3"; pyproject = true; src = fetchFromGitHub { owner = "pdreker"; repo = "fritz_exporter"; rev = "fritzexporter-v${version}"; - hash = "sha256-Dv/2Og1OJV7canZ8Y5Pai5gPRUvcRDYmSGoD2pnAkSs="; + hash = "sha256-2A8hw2XkdxkauG+lMlKfObEvLHUQk79xWmlp0hlrXYM="; }; - patches = [ - # https://github.com/pdreker/fritz_exporter/pull/282 - ./console-script.patch - ]; - postPatch = '' # don't test coverage sed -i "/^addopts/d" pyproject.toml @@ -31,6 +26,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ attrs + defusedxml fritzconnection prometheus-client pyyaml |