From 2a230c1b33eb6aab908817d329f94fb136ab921d Mon Sep 17 00:00:00 2001 From: moni-dz Date: Sat, 28 Dec 2024 20:24:39 +0800 Subject: [PATCH 1/4] elf2uf2-rs: adapt for new apple-sdk pattern --- pkgs/development/embedded/elf2uf2-rs/default.nix | 13 ++++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/development/embedded/elf2uf2-rs/default.nix index 239ffbbeb96b..1191c68c9fd7 100644 --- a/pkgs/development/embedded/elf2uf2-rs/default.nix +++ b/pkgs/development/embedded/elf2uf2-rs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, udev, CoreFoundation, DiskArbitration, Foundation }: +{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, udev }: rustPlatform.buildRustPackage rec { pname = "elf2uf2-rs"; @@ -9,18 +9,13 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cmiCOykORue0Cg2uUUWa/nXviX1ddbGNC5gRKe+1kYs="; }; + cargoHash = "sha256-TBH3pLB6vQVGnfShLtFPNKjciuUIuTkvp3Gayzo+X9E="; + nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optional stdenv.hostPlatform.isLinux udev - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - DiskArbitration - Foundation - ]; - - cargoHash = "sha256-TBH3pLB6vQVGnfShLtFPNKjciuUIuTkvp3Gayzo+X9E="; + buildInputs = lib.optional stdenv.hostPlatform.isLinux udev; meta = with lib; { description = "Convert ELF files to UF2 for USB Flashing Bootloaders"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9508dce9689e..c5489cfd03da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8059,9 +8059,7 @@ with pkgs; edb = libsForQt5.callPackage ../development/tools/misc/edb { }; - elf2uf2-rs = darwin.apple_sdk_11_0.callPackage ../development/embedded/elf2uf2-rs { - inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation DiskArbitration Foundation; - }; + elf2uf2-rs = callPackage ../development/embedded/elf2uf2-rs {}; license_finder = callPackage ../development/tools/license_finder { }; From cd3f0d979c1398388200e8313111bc94e0fd03d7 Mon Sep 17 00:00:00 2001 From: moni-dz Date: Wed, 1 Jan 2025 18:55:29 +0800 Subject: [PATCH 2/4] elf2uf2-rs: move to by-name --- .../default.nix => by-name/el/elf2uf2-rs/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/embedded/elf2uf2-rs/default.nix => by-name/el/elf2uf2-rs/package.nix} (100%) diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/by-name/el/elf2uf2-rs/package.nix similarity index 100% rename from pkgs/development/embedded/elf2uf2-rs/default.nix rename to pkgs/by-name/el/elf2uf2-rs/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5489cfd03da..b684fcbd661f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8059,8 +8059,6 @@ with pkgs; edb = libsForQt5.callPackage ../development/tools/misc/edb { }; - elf2uf2-rs = callPackage ../development/embedded/elf2uf2-rs {}; - license_finder = callPackage ../development/tools/license_finder { }; # NOTE: Override and set useIcon = false to use Awk instead of Icon. From 51f29e76710539ee6184a974d017032e901f98ba Mon Sep 17 00:00:00 2001 From: moni-dz Date: Wed, 1 Jan 2025 18:56:54 +0800 Subject: [PATCH 3/4] elf2uf2-rs: format with nixfmt-rfc-style --- pkgs/by-name/el/elf2uf2-rs/package.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/el/elf2uf2-rs/package.nix b/pkgs/by-name/el/elf2uf2-rs/package.nix index 1191c68c9fd7..5d455519c208 100644 --- a/pkgs/by-name/el/elf2uf2-rs/package.nix +++ b/pkgs/by-name/el/elf2uf2-rs/package.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, udev }: +{ + lib, + stdenv, + rustPlatform, + fetchCrate, + pkg-config, + udev, +}: rustPlatform.buildRustPackage rec { pname = "elf2uf2-rs"; @@ -23,6 +30,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/JoNil/elf2uf2-rs"; license = with licenses; [ bsd0 ]; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ polygon moni ]; + maintainers = with maintainers; [ + polygon + moni + ]; }; } From 963ab09401a2fad58135813283659147ef1da1c2 Mon Sep 17 00:00:00 2001 From: moni-dz Date: Wed, 1 Jan 2025 18:57:54 +0800 Subject: [PATCH 4/4] elf2uf2-rs: 2.0.0 -> 2.1.1 --- pkgs/by-name/el/elf2uf2-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/el/elf2uf2-rs/package.nix b/pkgs/by-name/el/elf2uf2-rs/package.nix index 5d455519c208..b10158311d34 100644 --- a/pkgs/by-name/el/elf2uf2-rs/package.nix +++ b/pkgs/by-name/el/elf2uf2-rs/package.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "elf2uf2-rs"; - version = "2.0.0"; + version = "2.1.1"; src = fetchCrate { inherit pname version; - hash = "sha256-cmiCOykORue0Cg2uUUWa/nXviX1ddbGNC5gRKe+1kYs="; + hash = "sha256-7RS2OC00tjsSBYFvg0/FQf1HN515FdrmCoKhJBu4fvI="; }; - cargoHash = "sha256-TBH3pLB6vQVGnfShLtFPNKjciuUIuTkvp3Gayzo+X9E="; + cargoHash = "sha256-oz2XVqDWmv/8HLrIFL+xJinZNUdoWk4KVHDPZr2v+Ls="; nativeBuildInputs = [ pkg-config