4 files changed, 130 insertions, 2 deletions
diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix
index 445b116a3aa42..6bb9d765b8414 100644
--- a/pkgs/by-name/fr/free42/package.nix
+++ b/pkgs/by-name/fr/free42/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "free42";
-  version = "3.1.2";
+  version = "3.1.3";
 
   src = fetchFromGitHub {
     owner = "thomasokken";
     repo = "free42";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-v7Qi0ZRLXEoZqnbIiHTkvsftwMi9vUhgH7wOtHN84nU=";
+    hash = "sha256-bOW5OyWaWblH2/2O3jNxaTjJEPZw86dTFJdexdlVLPs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fr/fretboard/package.nix b/pkgs/by-name/fr/fretboard/package.nix
new file mode 100644
index 0000000000000..093ad1ac8d672
--- /dev/null
+++ b/pkgs/by-name/fr/fretboard/package.nix
@@ -0,0 +1,62 @@
+{ lib
+, blueprint-compiler
+, cargo
+, desktop-file-utils
+, fetchFromGitHub
+, glib
+, gtk4
+, libadwaita
+, meson
+, ninja
+, pkg-config
+, rustPlatform
+, rustc
+, stdenv
+, wrapGAppsHook4
+}:
+
+stdenv.mkDerivation rec {
+  pname = "fretboard";
+  version = "5.3";
+
+  src = fetchFromGitHub {
+    owner = "bragefuglseth";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-wwq4Xq6IVLF2hICk9HfCpfxpWer8PNWywD8p3wQdp6U=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    name = "${pname}-${version}";
+    hash = "sha256-H/dAKaYHxRmldny8EoasrcDROZhLo5UbHPAoMicDehA=";
+  };
+
+  nativeBuildInputs = [
+    blueprint-compiler
+    cargo
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    rustPlatform.cargoSetupHook
+    rustc
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    glib
+    gtk4
+    libadwaita
+  ];
+
+  meta = with lib; {
+    description = "Look up guitar chords";
+    homepage = "https://github.com/bragefuglseth/fretboard";
+    changelog = "https://github.com/bragefuglseth/fretboard/releases/tag/v${version}";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ michaelgrahamevans ];
+    mainProgram = "fretboard";
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/fr/fritz-exporter/console-script.patch b/pkgs/by-name/fr/fritz-exporter/console-script.patch
new file mode 100644
index 0000000000000..e13e78f2d184a
--- /dev/null
+++ b/pkgs/by-name/fr/fritz-exporter/console-script.patch
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000000000..3306802b840f5
--- /dev/null
+++ b/pkgs/by-name/fr/fritz-exporter/package.nix
@@ -0,0 +1,52 @@
+{ lib
+, python3
+, fetchFromGitHub
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "fritz-exporter";
+  version = "2.3.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pdreker";
+    repo = "fritz_exporter";
+    rev = "fritzexporter-v${version}";
+    hash = "sha256-Dv/2Og1OJV7canZ8Y5Pai5gPRUvcRDYmSGoD2pnAkSs=";
+  };
+
+  patches = [
+    # https://github.com/pdreker/fritz_exporter/pull/282
+    ./console-script.patch
+  ];
+
+  postPatch = ''
+    # don't test coverage
+    sed -i "/^addopts/d" pyproject.toml
+  '';
+
+  nativeBuildInputs = with python3.pkgs; [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    attrs
+    fritzconnection
+    prometheus-client
+    pyyaml
+    requests
+  ];
+
+  nativeCheckInputs = with python3.pkgs; [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/pdreker/fritz_exporter/blob/${src.rev}/CHANGELOG.md";
+    description = "Prometheus exporter for Fritz!Box home routers";
+    homepage = "https://github.com/pdreker/fritz_exporter";
+    license = lib.licenses.asl20;
+    mainProgram = "fritzexporter";
+    maintainers = with lib.maintainers; [ marie ];
+  };
+}