Merge pull request #99995 from trepetti/fujprog-4.8

fujprog: 4.6 -> 4.8
NixOS · Oct 12, 2020 · 166bbe9 · 166bbe9
2 parents 153fae4 + 6db853e
commit 166bbe9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/pkgs/development/tools/misc/fujprog/default.nix b/pkgs/development/tools/misc/fujprog/default.nix
@@ -2,19 +2,20 @@
 , fetchFromGitHub
 , cmake
 , pkgconfig
+, IOKit
 , libftdi1
 , libusb-compat-0_1
 }:
 
 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 = [
@@ -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
@@ -11068,7 +11068,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 { };