about summary refs log tree commit diff
path: root/pkgs/tools/misc/flashrom
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2023-01-01 02:09:58 +0100
committerFelix Singer <felixsinger@posteo.net>2023-01-01 02:09:58 +0100
commit69c692467cb4ff3257302f75743aeaa97f13e674 (patch)
tree8f27119d359203f2297455d17ae6e177d56bac40 /pkgs/tools/misc/flashrom
parentac949b889280f7258021d7af4e08d619bd7686a8 (diff)
flashrom: 1.2 -> 1.2.1
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Diffstat (limited to 'pkgs/tools/misc/flashrom')
-rw-r--r--pkgs/tools/misc/flashrom/default.nix18
1 files changed, 2 insertions, 16 deletions
diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index 7f52ccb9c302b..b522499d79095 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -13,31 +13,17 @@
 
 stdenv.mkDerivation rec {
   pname = "flashrom";
-  version = "1.2";
+  version = "1.2.1";
 
   src = fetchurl {
     url = "https://download.flashrom.org/releases/flashrom-v${version}.tar.bz2";
-    sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71";
+    hash = "sha256-iaf/W+sIyJuHlbvSU6UblFNUeoZMMXkzAilrVrvFbWU=";
   };
 
   nativeBuildInputs = [ pkg-config installShellFiles ];
   buildInputs = [ libftdi1 libusb1 pciutils ]
     ++ lib.optional jlinkSupport libjaylink;
 
-  patches = [
-    # remove when updating from 1.2
-    (fetchpatch {
-      name = "fix-aarch64-build.patch";
-      url = "https://github.com/flashrom/flashrom/commit/da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d.patch";
-      sha256 = "sha256-fXYDXgT/ik+qtxxFEyJ7/axtycbwLkEg0UD+hzsYEwg=";
-    })
-    # fix build with gcc 10
-    (fetchpatch {
-      url = "https://github.com/flashrom/flashrom/commit/3a0c1966e4c66f91e6e8551e906b6db38002acb4.patch";
-      sha256 = "sha256-UfXLefMS20VUc7hk4IXECFbDWEbBnHMGSzOYemTfvjI=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace util/z60_flashrom.rules \
       --replace "plugdev" "flashrom"