Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d943490dc9a1
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0d80f9659c7c
Choose a head ref
  • 6 commits
  • 5 files changed
  • 6 contributors

Commits on Aug 21, 2018

  1. apmplanner2: init at 2.0.26

    I would like to see more Ground Control Stations in the nixpkgs.
    wucke13 committed Aug 21, 2018
    Copy the full SHA
    b453160 View commit details

Commits on Aug 23, 2018

  1. postman: 6.1.4 -> 6.2.5

    zsedem committed Aug 23, 2018
    Copy the full SHA
    29b92e9 View commit details
  2. Merge pull request #45498 from zsedem/master

    postman: 6.1.4 -> 6.2.5
    Mic92 authored Aug 23, 2018
    Copy the full SHA
    b0fe3c4 View commit details
  3. bazel-deps: update to 2018-08-16 (#45499)

    uri-canva authored and xeji committed Aug 23, 2018
    Copy the full SHA
    487773f View commit details
  4. Copy the full SHA
    8732901 View commit details
  5. Merge pull request #45305 from wucke13/apmplanner2

    apmplanner2: init at 2.0.26
    joachifm authored Aug 23, 2018
    Copy the full SHA
    0d80f96 View commit details
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
, libGL, xcbutilkeysyms, xdg_utils, libtool }:

let
version = "4.30.5.1676";
version = "4.30.5.1682";

rpath = stdenv.lib.makeLibraryPath [
xdg_utils
@@ -43,7 +43,7 @@ in stdenv.mkDerivation {

src = fetchurl {
url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
sha256 = "1fmvarq7zf1cnah2d1l7rxhbiw3dmjcxsldys5is63y204hdh04y";
sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96";
};

buildInputs = [ makeWrapper ];
40 changes: 40 additions & 0 deletions pkgs/applications/science/robotics/apmplanner2/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{ stdenv, fetchFromGitHub, qmake
, qtbase, qtscript, qtwebkit, qtserialport, qtsvg, qtdeclarative, qtquickcontrols2
, alsaLib, libsndfile, flite, openssl, udev, SDL2
}:

stdenv.mkDerivation rec {
name = "apmplanner2-${version}";
version = "2.0.26";
src = fetchFromGitHub {
owner = "ArduPilot";
repo = "apm_planner";
rev = "${version}";
sha256 = "0bnyi1r8k8ij5sq2zqv7mfbrxm0xdw97qrx3sk4rinqv2g6h6di4";
};

qtInputs = [
qtbase qtscript qtwebkit qtserialport qtsvg qtdeclarative qtquickcontrols2
];

buildInputs = [ alsaLib libsndfile flite openssl udev SDL2 ] ++ qtInputs;
nativeBuildInputs = [ qmake ];

qmakeFlags = [ "apm_planner.pro" ];

# this ugly hack is necessary, as `bin/apmplanner2` needs the contents of `share/APMPlanner2` inside of `bin/`
preFixup = "ln --relative --symbolic $out/share/APMPlanner2/* $out/bin/";

enableParallelBuilding = true;

meta = {
description = "Ground station software for autonomous vehicles";
longDescription = ''
A GUI ground control station for autonomous vehicles using the MAVLink protocol.
Includes support for the APM and PX4 based controllers.
'';
homepage = http://ardupilot.org/planner2/;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.wucke13 ];
};
}
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

buildBazelPackage rec {
name = "bazel-deps-${version}";
version = "2018-05-31";
version = "2018-08-16";

meta = with stdenv.lib; {
homepage = "https://github.com/johnynek/bazel-deps";
@@ -15,8 +15,8 @@ buildBazelPackage rec {
src = fetchFromGitHub {
owner = "johnynek";
repo = "bazel-deps";
rev = "dd7d0086d3a61c1d5c3370a0300824d0c75946e4";
sha256 = "1h9ddgk6vn0bhnnkwwz4n1iqv2rcdj521dxhdwj5wwpndbciw855";
rev = "942a0b03cbf159dd6e0f0f40787d6d8e4e832d81";
sha256 = "0ls2jvz9cxa169a8pbbykv2d4dik4ipf7dj1lkqx5g0ss7lgs6q5";
};

bazelTarget = "//src/scala/com/github/johnynek/bazel_deps:parseproject_deploy.jar";
@@ -26,7 +26,7 @@ buildBazelPackage rec {
fetchAttrs = {
preInstall = ''
# Remove all built in external workspaces, Bazel will recreate them when building
rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,local_*,\@local_*}
rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker,embedded_jdk,\@embedded_jdk.marker,local_*,\@local_*}
# For each external workspace, remove all files that aren't referenced by Bazel
# Many of these files are non-hermetic (for example .git/refs/remotes/origin/HEAD)
files_to_delete=()
@@ -66,7 +66,7 @@ buildBazelPackage rec {
find . -type d -empty -delete
'';

sha256 = "0fh9jjwk3aq0kklhl9zyy8hj8gjm1y1fy4ygjinm0469w9jdgc3g";
sha256 = "0jkzf1hay0h8ksk9lhfvdliac6c5d7nih934i1xjbrn6zqlivy19";
};

buildAttrs = {
4 changes: 2 additions & 2 deletions pkgs/development/web/postman/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "postman-${version}";
version = "6.1.4";
version = "6.2.5";

src = fetchurl {
url = "https://dl.pstmn.io/download/version/${version}/linux64";
sha256 = "2f93a860f87d842c0e0433b55cd7c46e04d1d20c0adcae8680332585dffd86eb";
sha256 = "9fd52b4c4ac744d3c70f28e39dbfeda3d03a8640c562e82e3744c2f9d0f8ade1";
name = "${name}.tar.gz";
};

4 changes: 4 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -21211,6 +21211,10 @@ with pkgs;
withRootSupport = true;
});

### SCIENCE/ROBOTICS

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

### MISC

android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { };