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: 63f2f1df49b1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ff882242ea70
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 2, 2020

  1. Revert "Revert "openocd: Fix FTDI channel configuration for SheevaPlug"" 

    This reverts commit b2623d3. The revert
was an error since there was an override in my environment fetching a
more recent version of openocd.
    @fpletz
    fpletz committed Jan 2, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    pierreis Pierre
    GPG key ID: F88C917469AB1D8C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ff88224 View commit details
Showing with 10 additions and 1 deletion.
  1. +10 −1 pkgs/development/tools/misc/openocd/default.nix
11 changes: 10 additions & 1 deletion pkgs/development/tools/misc/openocd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, libftdi1, libusb1, pkgconfig, hidapi }:
{ stdenv, lib, fetchurl, fetchpatch, libftdi1, libusb1, pkgconfig, hidapi }:

stdenv.mkDerivation rec {
pname = "openocd";
@@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk";
};

patches = [
# Fix FTDI channel configuration for SheevaPlug
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837989
(fetchpatch {
url = "https://salsa.debian.org/electronics-team/openocd/raw/9a94335daa332a37a51920f87afbad4d36fad2d5/debian/patches/fix-sheeva.patch";
sha256 = "01x021fagwvgxdpzk7psap7ryqiya4m4mi4nqr27asbmb3q46g5r";
})
];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libftdi1 libusb1 hidapi ];