From 9e4e29949bda5ef0247b2d30ca4d665a6f2bfaab Mon Sep 17 00:00:00 2001 From: CodeRadu <47945947+CodeRadu@users.noreply.github.com> Date: Fri, 21 Feb 2025 17:50:43 +0100 Subject: [PATCH 1/3] maintainers: add CodeRadu --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 195207a11aa9d..ca84dc9f980e3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4532,6 +4532,11 @@ email = "jupiter@m.rdis.dev"; name = "Scott Little"; }; + CodeRadu = { + github = "CodeRadu"; + githubId = 47945947; + name = "Radu"; + }; codgician = { email = "codgician@outlook.com"; github = "codgician"; From 2672c034ffb9e0d3ca16bd35d11a64f5365dae4b Mon Sep 17 00:00:00 2001 From: CodeRadu <47945947+CodeRadu@users.noreply.github.com> Date: Fri, 21 Feb 2025 17:51:42 +0100 Subject: [PATCH 2/3] flipperzero-toolchain: init at 39 --- .../fl/flipperzero-toolchain/package.nix | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/fl/flipperzero-toolchain/package.nix diff --git a/pkgs/by-name/fl/flipperzero-toolchain/package.nix b/pkgs/by-name/fl/flipperzero-toolchain/package.nix new file mode 100644 index 0000000000000..d101a83d0339c --- /dev/null +++ b/pkgs/by-name/fl/flipperzero-toolchain/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + libgcc, + libnsl, + libxcrypt, +}: + +stdenv.mkDerivation rec { + pname = "flipperzero-toolchain"; + version = "39"; + + src = fetchurl { + url = "https://update.flipperzero.one/builds/toolchain/gcc-arm-none-eabi-12.3-x86_64-linux-flipper-${version}.tar.gz"; + hash = "sha256-wETFkjP2b278+FSv/i1eCdutBNaHCdUTvHYLHZiJWFM="; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + libgcc + stdenv.cc.cc.lib # for libstdc++.so.6 + libnsl + libxcrypt + ]; + + sourceRoot = "."; + + shellHook = '' + export FBT_TOOLCHAIN_PATH=$out/opt/flipperzero-toolchain + ''; + + installPhase = '' + mkdir -p $out/opt/flipperzero-toolchain/toolchain/x86_64-linux + cp -r gcc-arm-none-eabi-12.3-x86_64-linux-flipper/* $out/opt/flipperzero-toolchain/toolchain/x86_64-linux + ln -sf ${libnsl}/lib/libnsl.so.3 $out/opt/flipperzero-toolchain/toolchain/x86_64-linux/lib/libnsl.so.2 + ln -sf ${libxcrypt}/lib/libcrypt.so.2 $out/opt/flipperzero-toolchain/toolchain/x86_64-linux/lib/libcrypt.so.1 + ln -sf $out/opt/flipperzero-toolchain/toolchain/x86_64-linux $out/opt/flipperzero-toolchain/toolchain/current + ''; + + meta = { + description = "Toolchain for the flipperzero"; + homepage = "https://github.com/flipperdevices/flipperzero-toolchain"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ CodeRadu ]; + platforms = lib.platforms.linux; + }; +} From 2db7e58695850d4a81116a5bc94caf0b6068b30f Mon Sep 17 00:00:00 2001 From: CodeRadu <47945947+CodeRadu@users.noreply.github.com> Date: Fri, 21 Feb 2025 17:52:28 +0100 Subject: [PATCH 3/3] ufbt: init at 0.2.5 --- pkgs/by-name/uf/ufbt/package.nix | 37 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/by-name/uf/ufbt/package.nix diff --git a/pkgs/by-name/uf/ufbt/package.nix b/pkgs/by-name/uf/ufbt/package.nix new file mode 100644 index 0000000000000..736d58045d1a8 --- /dev/null +++ b/pkgs/by-name/uf/ufbt/package.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + setuptools-git-versioning, + flipperzero-toolchain, +}: + +buildPythonPackage rec { + pname = "ufbt"; + version = "0.2.5"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-pQI8pSn5X6ISJ2rlEIfe6je4g7PY8HhKITl1GemMvf8="; + }; + + propagatedBuildInputs = [ + setuptools + setuptools-git-versioning + ]; + + makeWrapperArgs = [ + "--set-default FBT_TOOLCHAIN_PATH ${flipperzero-toolchain}/opt/flipperzero-toolchain" + ]; + + meta = { + description = "Cross-platform tool for building applications for Flipper Zero"; + mainProgram = "ufbt"; + homepage = "https://github.com/flipperdevices/flipperzero-ufbt"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ CodeRadu ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 498f4d6b5d66d..d67681a5778bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7469,6 +7469,10 @@ with pkgs; }; })); + ufbt = callPackage ../by-name/uf/ufbt/package.nix { + inherit (python3Packages) buildPythonPackage setuptools setuptools-git-versioning; + }; + ansible-builder = with python3Packages; toPythonApplication ansible-builder; ansible-doctor = callPackage ../tools/admin/ansible/doctor.nix { };