public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #99995 from trepetti/fujprog-4.8

Browse Source 
fujprog: 4.6 -> 4.8
This commit is contained in:
Mario Rodas 2020-10-12 18:25:18 -05:00 committed by GitHub
commit 166bbe963b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/misc/fujprog/default.nix
View File

@ -2,19 +2,20 @@
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, pkgconfig , pkgconfig
, IOKit
, libftdi1 , libftdi1
, libusb-compat-0_1 , libusb-compat-0_1
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fujprog"; pname = "fujprog";
version = "4.6"; version = "4.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kost"; owner = "kost";
repo = "${pname}"; repo = "${pname}";
rev = "v${version}"; rev = "v${version}";
sha256 = "04l5rrfrp3pflwz5ncwvb4ibbsqib2259m23bzfi8m80aj216shd"; sha256 = "08kzkzd5a1wfd1aycywdynxh3qy6n7z9i8lihkahmb4xac3chmz5";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -25,13 +26,14 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libftdi1 libftdi1
libusb-compat-0_1 libusb-compat-0_1
]; ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
meta = with stdenv.lib; { 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"; homepage = "https://github.com/kost/fujprog";
license = licenses.bsd2; license = licenses.bsd2;
maintainers = with maintainers; [ trepetti ]; maintainers = with maintainers; [ trepetti ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.all;
changelog = "https://github.com/kost/fujprog/releases/tag/v${version}";
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -11068,7 +11068,9 @@ in
inherit (darwin.apple_sdk.frameworks) CoreServices; 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 { }; funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };