summary refs log tree commit diff
diff options
context:
space:
mode:
authorwucke13 <wucke13@gmail.com>2020-06-14 13:27:38 +0200
committerwucke13 <wucke13@gmail.com>2020-06-14 13:27:38 +0200
commit6bd79857e9dba58514553b910aee4fb792771e0c (patch)
tree379b652f17420c6ca462df7ce382710f40124eec
parent20e62aa580c2ed83b1a1b9caf0bd8431c0ab3666 (diff)
downloadnixpkgs-6bd79857e9dba58514553b910aee4fb792771e0c.tar
nixpkgs-6bd79857e9dba58514553b910aee4fb792771e0c.tar.gz
nixpkgs-6bd79857e9dba58514553b910aee4fb792771e0c.tar.bz2
nixpkgs-6bd79857e9dba58514553b910aee4fb792771e0c.tar.lz
nixpkgs-6bd79857e9dba58514553b910aee4fb792771e0c.tar.xz
nixpkgs-6bd79857e9dba58514553b910aee4fb792771e0c.tar.zst
nixpkgs-6bd79857e9dba58514553b910aee4fb792771e0c.zip
apmplanner2: 2.0.27-rc1 -> 2.0.28-rc1
-rw-r--r--pkgs/applications/science/robotics/apmplanner2/default.nix14
1 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix
index ede698e2b0b..e6d1c544ee4 100644
--- a/pkgs/applications/science/robotics/apmplanner2/default.nix
+++ b/pkgs/applications/science/robotics/apmplanner2/default.nix
@@ -5,23 +5,15 @@
 
 mkDerivation rec {
   pname = "apmplanner2";
-  version = "2.0.27-rc1";
+  version = "2.0.28-rc1";
 
   src = fetchFromGitHub {
     owner = "ArduPilot";
     repo = "apm_planner";
     rev = version;
-    sha256 = "1k0786mjzi49nb6yw4chh9l4dmkf9gybpxg9zqkr5yg019nyzcvd";
+    sha256 = "18yn8bdz5hmgb0m5hlk8bibz4cj4g25w75pm1rvc4ds0mr1qgyjd";
   };
 
-  patches = [
-    # can be dropped after 2.0.27-rc1
-    (fetchpatch {
-      url = "https://github.com/ArduPilot/apm_planner/commit/299ff23b5e9910de04edfc06b6893bb06b47a57b.patch";
-      sha256 = "16rc81iwqp2i46g6bm9lbvcjfsk83999r9h8w1pz0mys7rsilvqy";
-    })
-  ];
-
   buildInputs = [
     alsaLib libsndfile flite openssl udev SDL2
     qtbase qtscript qtwebkit qtserialport qtsvg qtdeclarative qtquickcontrols2
@@ -35,7 +27,7 @@ mkDerivation rec {
   preFixup = ''
     ln --relative --symbolic $out/share/APMPlanner2/* $out/bin/
     substituteInPlace $out/share/applications/apmplanner2.desktop \
-                      --replace /usr $out
+      --replace /usr $out
   '';
 
   enableParallelBuilding = true;