From eeb3c1f72677554d45fe8341f0748058862eb357 Mon Sep 17 00:00:00 2001
From: Tom Repetti <trepetti@cs.columbia.edu>
Date: Mon, 12 Oct 2020 12:29:44 -0400
Subject: [PATCH 1/2] fujprog: fix MacOS build by adding IOKit dependency and
 add changelog

---
 pkgs/development/tools/misc/fujprog/default.nix | 8 +++++---
 pkgs/top-level/all-packages.nix                 | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/fujprog/default.nix b/pkgs/development/tools/misc/fujprog/default.nix
index 61aeea9967d..9a56daf5d37 100644
--- a/pkgs/development/tools/misc/fujprog/default.nix
+++ b/pkgs/development/tools/misc/fujprog/default.nix
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , cmake
 , pkgconfig
+, IOKit
 , libftdi1
 , libusb-compat-0_1
 }:
@@ -25,13 +26,14 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libftdi1
     libusb-compat-0_1
-  ];
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
 
   meta = with stdenv.lib; {
-    description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards.";
+    description = "JTAG programmer for the ULX3S and ULX2S open hardware FPGA development boards";
     homepage = "https://github.com/kost/fujprog";
     license = licenses.bsd2;
     maintainers = with maintainers; [ trepetti ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = platforms.all;
+    changelog = "https://github.com/kost/fujprog/releases/tag/v${version}";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab0a1cf5c2f..ec91bb18f2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11033,7 +11033,9 @@ in
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  fujprog = callPackage ../development/tools/misc/fujprog { };
+  fujprog = callPackage ../development/tools/misc/fujprog {
+    inherit (darwin.apple_sdk.frameworks) IOKit;
+  };
 
   funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };
 

From 6db853ec6f0524545bf7c0759ceb2f1371dd9145 Mon Sep 17 00:00:00 2001
From: Tom Repetti <trepetti@cs.columbia.edu>
Date: Mon, 12 Oct 2020 12:30:47 -0400
Subject: [PATCH 2/2] fujprog: 4.6 -> 4.8

---
 pkgs/development/tools/misc/fujprog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/fujprog/default.nix b/pkgs/development/tools/misc/fujprog/default.nix
index 9a56daf5d37..e15e48b0f2a 100644
--- a/pkgs/development/tools/misc/fujprog/default.nix
+++ b/pkgs/development/tools/misc/fujprog/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fujprog";
-  version = "4.6";
+  version = "4.8";
 
   src = fetchFromGitHub {
     owner = "kost";
     repo = "${pname}";
     rev = "v${version}";
-    sha256 = "04l5rrfrp3pflwz5ncwvb4ibbsqib2259m23bzfi8m80aj216shd";
+    sha256 = "08kzkzd5a1wfd1aycywdynxh3qy6n7z9i8lihkahmb4xac3chmz5";
   };
 
   nativeBuildInputs = [