summary refs log tree commit diff
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2017-02-06 20:09:45 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2017-02-06 20:19:36 +0100
commitd3c7a94b77864949896dd1641200d185c83fd23c (patch)
treeced8877102ff2dcc91a9440b74e9c0e34b8d570e
parent82c1d98e94d8d3c7869f09c3e51e68b7c2661bc3 (diff)
downloadnixpkgs-d3c7a94b77864949896dd1641200d185c83fd23c.tar
nixpkgs-d3c7a94b77864949896dd1641200d185c83fd23c.tar.gz
nixpkgs-d3c7a94b77864949896dd1641200d185c83fd23c.tar.bz2
nixpkgs-d3c7a94b77864949896dd1641200d185c83fd23c.tar.lz
nixpkgs-d3c7a94b77864949896dd1641200d185c83fd23c.tar.xz
nixpkgs-d3c7a94b77864949896dd1641200d185c83fd23c.tar.zst
nixpkgs-d3c7a94b77864949896dd1641200d185c83fd23c.zip
openocd: 0.9.0 -> 0.10.0
Announcement:
http://openocd.org/2017/01/openocd-0-10-0-release-is-out/

The udev rules were renamed. Add code to automatically detect renames in
the future.
-rw-r--r--pkgs/development/tools/misc/openocd/default.nix11
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index ea52fff64cc..3349213a741 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "openocd-${version}";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2";
-    sha256 = "0hzlnm19c4b35vsxs6ik94xbigv3ykdgr8gzrdir6sqmkan44w43";
+    sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk";
   };
 
   buildInputs = [ libftdi libusb1 pkgconfig hidapi ];
@@ -26,7 +26,12 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     mkdir -p "$out/etc/udev/rules.d"
-    ln -s "$out/share/openocd/contrib/99-openocd.rules" "$out/etc/udev/rules.d/99-openocd.rules"
+    rules="$out/share/openocd/contrib/60-openocd.rules"
+    if [ ! -f "$rules" ]; then
+        echo "$rules is missing, must update the Nix file."
+        exit 1
+    fi
+    ln -s "$rules" "$out/etc/udev/rules.d/"
   '';
 
   meta = with stdenv.lib; {