From 68474c15417b0de059b1ae6e6ff8fffd888986ea Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 1 Mar 2024 13:55:29 +0100 Subject: [PATCH 1/2] flashrom-stable: Use one line per condition Signed-off-by: Felix Singer --- pkgs/tools/misc/flashrom-stable/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/flashrom-stable/default.nix b/pkgs/tools/misc/flashrom-stable/default.nix index 81beb2346e34..518d0d1bfa2d 100644 --- a/pkgs/tools/misc/flashrom-stable/default.nix +++ b/pkgs/tools/misc/flashrom-stable/default.nix @@ -34,7 +34,8 @@ stdenv.mkDerivation rec { pciutils ]; - makeFlags = [ "PREFIX=$(out)" "libinstall" ] ++ lib.optionals stdenv.isDarwin [ "CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no" ] + makeFlags = [ "PREFIX=$(out)" "libinstall" ] + ++ lib.optionals stdenv.isDarwin [ "CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "CONFIG_INTERNAL_X86=no" "CONFIG_INTERNAL_DMI=no" "CONFIG_RAYER_SPI=0" ]; meta = with lib; { From 18cf4d44dc8113007d75c83b71384befb7a32d2b Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 1 Mar 2024 14:02:35 +0100 Subject: [PATCH 2/2] Rename package flashrom-stable to flashprog flashprog, formerly flashrom-stable, got separated and is its own project now. Thus, rename the formerly known package flashrom-stable to flashprog and adjust all references and meta data. Update to the newest available release 1.0.1. Signed-off-by: Felix Singer --- .../fl/flashprog/package.nix} | 14 +++++++------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 8 insertions(+), 9 deletions(-) rename pkgs/{tools/misc/flashrom-stable/default.nix => by-name/fl/flashprog/package.nix} (74%) diff --git a/pkgs/tools/misc/flashrom-stable/default.nix b/pkgs/by-name/fl/flashprog/package.nix similarity index 74% rename from pkgs/tools/misc/flashrom-stable/default.nix rename to pkgs/by-name/fl/flashprog/package.nix index 518d0d1bfa2d..7cf95b62e5c2 100644 --- a/pkgs/tools/misc/flashrom-stable/default.nix +++ b/pkgs/by-name/fl/flashprog/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { - pname = "flashrom-stable"; - version = "1.1"; + pname = "flashprog"; + version = "1.0.1"; src = fetchgit { - url = "https://review.coreboot.org/flashrom-stable"; - rev = "272aae888ce5abf5e999d750ee4577407db32246"; - hash = "sha256-DR4PAING69+TMsyycGxt1cu0ba1tTlG36+H/pJ0oP4E="; + url = "https://review.sourcearcade.org/flashprog"; + rev = "2ca11f9a4101ea230081d448ab2b570425b7f0bd"; + hash = "sha256-pm9g9iOJAKnzzY9couzt8RmqZFbIpKcO++zsUJ9o49U="; }; nativeBuildInputs = [ @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "CONFIG_INTERNAL_X86=no" "CONFIG_INTERNAL_DMI=no" "CONFIG_RAYER_SPI=0" ]; meta = with lib; { - homepage = "https://www.flashrom.org"; + homepage = "https://flashprog.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = with licenses; [ gpl2 gpl2Plus ]; maintainers = with maintainers; [ felixsinger ]; platforms = platforms.all; - mainProgram = "flashrom"; + mainProgram = "flashprog"; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 20c3ddbfc53f..f31cbfbecc7d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -300,6 +300,7 @@ mapAliases ({ firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fishfight = jumpy; # Added 2022-08-03 fitnesstrax = throw "fitnesstrax was removed from nixpkgs because it disappeared upstream and no longer compiles"; # added 2023-07-04 + flashrom-stable = flashprog; # Added 2024-03-01 flatbuffers_2_0 = flatbuffers; # Added 2022-05-12 flutter2 = throw "flutter2 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 flutter37 = throw "flutter37 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 667e4a9c1a88..f9b89bb94457 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8172,8 +8172,6 @@ with pkgs; flashrom = callPackage ../tools/misc/flashrom { }; - flashrom-stable = callPackage ../tools/misc/flashrom-stable { }; - flent = python3Packages.callPackage ../applications/networking/flent { }; flexoptix-app = callPackage ../tools/misc/flexoptix-app { };