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

Commits on Mar 14, 2019

  1. apmplanner2: fix build 

    see ArduPilot/apm_planner#1166

(cherry picked from commit 08e4d7c)
    @stephengroat @veprbl
    stephengroat authored and veprbl committed Mar 14, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veprbl Dmitry Kalinkin
    GPG key ID: 06AF1D3C38F04E0E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    62e659a View commit details
Showing with 2 additions and 1 deletion.
  1. +1 −0 pkgs/applications/science/robotics/apmplanner2/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
1 change: 1 addition & 0 deletions pkgs/applications/science/robotics/apmplanner2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@

stdenv.mkDerivation rec {
name = "apmplanner2-${version}";
# TODO revert Qt59 to Qt5 in pkgs/top-level/all-packages.nix on next release
version = "2.0.26";
src = fetchFromGitHub {
owner = "ArduPilot";
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -22200,7 +22200,7 @@ in

### SCIENCE/ROBOTICS

apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { };
apmplanner2 = libsForQt59.callPackage ../applications/science/robotics/apmplanner2 { };

### MISC