Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

avrdude: 7.3 -> 8.0 #337100

Merged
merged 1 commit into from
Aug 27, 2024
Merged

avrdude: 7.3 -> 8.0 #337100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions pkgs/development/embedded/avrdude/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, callPackage, stdenv, fetchFromGitHub, cmake, bison, flex, libusb1, elfutils
{ lib, callPackage, stdenv, fetchFromGitHub, cmake, bison, flex, pkg-config, libusb1, elfutils
, libftdi1, readline, hidapi, libserialport, libusb-compat-0_1
# Documentation building doesn't work on Darwin. It fails with:
# Undefined subroutine &Locale::Messages::dgettext called in ... texi2html
Expand All @@ -12,16 +12,16 @@ in

stdenv.mkDerivation (finalAttrs: {
pname = "avrdude";
version = "7.3";
version = "8.0";

src = fetchFromGitHub {
owner = "avrdudes";
repo = "avdude";
repo = "avrdude";
rev = "v${finalAttrs.version}";
sha256 = "sha256-JqW3AOMmAfcy+PQRcqviWlxA6GoMSEfzIFt1pRYY7Dw=";
sha256 = "w58HVCvKuWpGJwllupbj7ndeq4iE9LPs/IjFSUN0DOU=";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use an SRI hash here:

hash = "sha256-w58HVCvKuWpGJwllupbj7ndeq4iE9LPs/IjFSUN0DOU=";

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will change this at the beginning of next week as I am on holiday right now.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. I plan to merge tonight, as I think sha256 vs hash is orthogonal to the version bump.

};

nativeBuildInputs = [ cmake bison flex ] ++ lib.optionals docSupport [
nativeBuildInputs = [ cmake bison flex pkg-config ] ++ lib.optionals docSupport [
unixtools.more
texliveMedium
texinfo
Expand All @@ -48,11 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = lib.optionals docSupport [ "-DBUILD_DOC=ON" ]
++ lib.optionals stdenv.hostPlatform.isLinux [ "-DHAVE_LINUXSPI=ON" "-DHAVE_PARPORT=ON" ];

# dvips output references texlive in comments, resulting in a huge closure
postInstall = lib.optionalString docSupport ''
rm $out/share/doc/avrdude/*.ps
'';
funkeleinhorn marked this conversation as resolved.
Show resolved Hide resolved

passthru = {
# Vendored and mutated copy of libelf for avrdudes use.
# Produces a static library only.
Expand Down