Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 60604acab061
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b4888489e344
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 23, 2018

  1. libftdi1: add darwin platform

    @thefloweringash @bjornfor
    thefloweringash authored and bjornfor committed Mar 23, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d0df007 View commit details

  2. avrdude: add darwin platform

    @thefloweringash @bjornfor
    thefloweringash authored and bjornfor committed Mar 23, 2018
    Copy the full SHA
    b488848 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 pkgs/development/libraries/libftdi/1.x.nix
  2. +1 −1 pkgs/development/tools/misc/avrdude/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/libftdi/1.x.nix
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
description = "A library to talk to FTDI chips using libusb";
homepage = https://www.intra2net.com/en/developer/libftdi/;
license = with licenses; [ lgpl2 gpl2 ];
platforms = platforms.linux;
platforms = with platforms; linux ++ darwin;
maintainers = [ maintainers.bjornfor ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/tools/misc/avrdude/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://www.nongnu.org/avrdude/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
platforms = with platforms; linux ++ darwin;
maintainers = [ maintainers.bjornfor ];
};
}