Unverified Commit de9600d4 authored by maralorn's avatar maralorn Committed by GitHub
Browse files

Merge pull request #292592 from felixsinger/pkgs/flashprog 

Rename package flashrom-stable to flashprog
parents 62b87abf 18cf4d44

pkgs/tools/misc/flashrom-stable/default.nix→pkgs/by-name/fl/flashprog/package.nix

+9 −8
Original line number Diff line number Diff line
@@ -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 = [
@@ -34,15 +34,16 @@ 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; {

    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";

  };

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -8158,8 +8158,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 { };