summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pkgs/development/tools/misc/fujprog/default.nix12
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/tools/misc/fujprog/default.nix b/pkgs/development/tools/misc/fujprog/default.nix
index 61aeea9967d3..e15e48b0f2a9 100644
--- 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
index fcd3461f7909..06a0c8f559b4 100644
--- 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 { };