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: d0ef94bfd80a
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: f6bfb371cba2
Choose a head ref
  • 6 commits
  • 7 files changed
  • 3 contributors

Commits on May 15, 2020

  1. meteor: 1.10.1 -> 1.10.2

    @sternenseemann
    sternenseemann authored and Jon committed May 15, 2020
    Copy the full SHA
    aa35d56 View commit details

  2. qt5.qtgamepad: init at 5.12.7

    @HenkKalkwater
    HenkKalkwater authored and Jon committed May 15, 2020
    Copy the full SHA
    5ecd99b View commit details

  3. python27Packages.plexapi: 3.2.0 -> 3.4.0

    @r-ryantm
    r-ryantm authored and Jon committed May 15, 2020
    Copy the full SHA
    762efd1 View commit details

  4. python27Packages.kafka-python: 1.4.7 -> 2.0.1

    @r-ryantm
    r-ryantm authored and Jon committed May 15, 2020
    Copy the full SHA
    23be01d View commit details

  5. python27Packages.evdev: 1.2.0 -> 1.3.0

    @r-ryantm
    r-ryantm authored and Jon committed May 15, 2020
    Copy the full SHA
    f89cfee View commit details

  6. python27Packages.bids-validator: 1.3.12 -> 1.5.1

    @r-ryantm
    r-ryantm authored and Jon committed May 15, 2020
    Copy the full SHA
    f6bfb37 View commit details
3 changes: 2 additions & 1 deletion pkgs/development/libraries/qt-5/5.12/default.nix
View file
Original file line number Diff line number Diff line change
@@ -139,6 +139,7 @@ let
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
qtdoc = callPackage ../modules/qtdoc.nix {};
qtgamepad = callPackage ../modules/qtgamepad.nix {};
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
qtimageformats = callPackage ../modules/qtimageformats.nix {};
qtlocation = callPackage ../modules/qtlocation.nix {};
@@ -171,7 +172,7 @@ let

env = callPackage ../qt-env.nix {};
full = env "qt-full-${qtbase.version}" ([
qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad qtgraphicaleffects
qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
qtscript qtsensors qtserialport qtsvg qttools qttranslations
qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets
9 changes: 9 additions & 0 deletions pkgs/development/libraries/qt-5/modules/qtgamepad.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{ qtModule, qtbase, qtdeclarative, pkgconfig }:

qtModule {
name = "qtgamepad";
qtInputs = [ qtbase qtdeclarative ];
buildInputs = [ ];
nativeBuildInputs = [ pkgconfig ];
outputs = [ "out" "dev" "bin" ];
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/bids-validator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@
}:

buildPythonPackage rec {
version = "1.3.12";
version = "1.5.1";
pname = "bids-validator";

src = fetchPypi {
inherit pname version;
sha256 = "7a244b09adfd083292ed1f7ff335676a1e2effbbffe62b02a4abaf377d33ef86";
sha256 = "1fy8w56m0x546zjk3is1xp83jm19fkn4y15g5jgmq29sfzc8n3y3";
};

propagatedBuildInputs = [ ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/evdev/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "evdev";
version = "1.2.0";
version = "1.3.0";

src = fetchPypi {
inherit pname version;
sha256 = "b03f5e1be5b4a5327494a981b831d251a142b09e8778eda1a8b53eba91100166";
sha256 = "0kb3636yaw9l8xi8s184w0r0n9ic5dw3b8hx048jf9fpzss4kimi";
};

buildInputs = [ linuxHeaders ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/kafka-python/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }:

buildPythonPackage rec {
version = "1.4.7";
version = "2.0.1";
pname = "kafka-python";

src = fetchPypi {
inherit pname version;
sha256 = "2f29baad4b3efe05a2bb81ac268855aa01cbc68397f15bac77b494ffd7e2cada";
sha256 = "1y7ny81rihnhc8lj921d76ir4kf4aj5iy35szgim8zccxhnx96p5";
};

checkInputs = [ pytest six mock ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/plexapi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

buildPythonPackage rec {
pname = "PlexAPI";
version = "3.2.0";
version = "3.4.0";

src = fetchFromGitHub {
owner = "pkkid";
repo = "python-plexapi";
rev = version;
sha256 = "1rzy018zcsws56mcghnphhzwj650pwj7qg6nh9z1kjvgwwjfmghf";
sha256 = "1y6mynsvkm9n2n927x8az9ch4blrjja7im9x7iyfrxahqgz0km77";
};

propagatedBuildInputs = [ requests tqdm websocket_client ];
4 changes: 2 additions & 2 deletions pkgs/servers/meteor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }:

let
version = "1.10.1";
version = "1.10.2";
in

stdenv.mkDerivation {
inherit version;
pname = "meteor";
src = fetchurl {
url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz";
sha256 = "1xck7pi7rhkgssic7adbg1slypjjkqxa18wlf3jffbgj0zzr87nx";
sha256 = "17s1n92nznasaaprvxg289a1fcizq2nj51xqw7akgw5f77q19vmw";
};

#dontStrip = true;