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: d387c2dd552b
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: 72a2ced25234
Choose a head ref
  • 5 commits
  • 5 files changed
  • 3 contributors

Commits on Nov 19, 2019

  1. nixos/libinput: apply options to all device types 

    Instead of assign the libinput options to touchpad devices only, it
should be appied by any device using libinput.
Due to the fact that `40-libinput.conf` already defines libinput as
driver for any detected input device, we can use `MatchDriver` to appy
options.

(cherry picked from commit d616928)
    @sylv-io @worldofpeace
    sylv-io authored and worldofpeace committed Nov 19, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ea83c79 View commit details

Commits on Dec 3, 2019

  1. python3Packages.azure-loganalytics: fix python3 namespace

    Jonathan Ringer committed Dec 3, 2019
    Copy the full SHA
    5f706ee View commit details

  2. python3Packages.azure-mgmt-appconfiguration: 0.1.0 -> 0.3.0

    Jonathan Ringer committed Dec 3, 2019
    Copy the full SHA
    4d82b46 View commit details

  3. azure-cli: 2.0.76 -> 2.0.77

    Jonathan Ringer committed Dec 3, 2019
    Copy the full SHA
    ceea7ec View commit details

  4. Merge pull request #73785 from worldofpeace/libinput-options-all-19.09 

    [19.09] nixos/libinput: apply options to all device types
    @worldofpeace
    worldofpeace authored Dec 3, 2019
    Copy the full SHA
    72a2ced View commit details
6 changes: 3 additions & 3 deletions nixos/modules/services/x11/hardware/libinput.nix
View file
Original file line number Diff line number Diff line change
@@ -209,12 +209,12 @@ in {

services.xserver.config =
''
# Automatically enable the libinput driver for all touchpads.
# General libinput configuration.
# See CONFIGURATION DETAILS section of man:libinput(4).
Section "InputClass"
Identifier "libinputConfiguration"
MatchIsTouchpad "on"
MatchDriver "libinput"
${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
Driver "libinput"
Option "AccelProfile" "${cfg.accelProfile}"
${optionalString (cfg.accelSpeed != null) ''Option "AccelSpeed" "${cfg.accelSpeed}"''}
${optionalString (cfg.buttonMapping != null) ''Option "ButtonMapping" "${cfg.buttonMapping}"''}
8 changes: 7 additions & 1 deletion pkgs/development/python-modules/azure-loganalytics/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{ lib
, buildPythonPackage
, fetchPypi
, python
, isPy3k
, msrest
, azure-common
}:
@@ -20,13 +22,17 @@ buildPythonPackage rec {
azure-common
];

postInstall = lib.optionalString isPy3k ''
rm -rf $out/${python.sitePackages}/azure/__init__.py
'';

# has no tests
doCheck = false;

meta = with lib; {
description = "This is the Microsoft Azure Log Analytics Client Library";
homepage = https://docs.microsoft.com/en-us/python/api/overview/azure/loganalytics/client?view=azure-python;
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
maintainers = with maintainers; [ mwilsoninsight jonringer ];
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@
}:

buildPythonPackage rec {
version = "0.1.0";
version = "0.3.0";
pname = "azure-mgmt-appconfiguration";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
sha256 = "0z2f0rbv7drdxihny479bv80bnhgvx8gb2pr0jvbaslll6d6rxig";
sha256 = "1igl3ikdwcz7d2zcja5nm2qjysjh53vgwzcc96lylypmq6z4aq1s";
extension = "zip";
};

8 changes: 5 additions & 3 deletions pkgs/tools/admin/azure-cli/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ stdenv, lib, python, fetchFromGitHub, installShellFiles }:

let
version = "2.0.76";
version = "2.0.77";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
sha256 = "0zfy8nhw4nx0idh94qidr06vsfxgdk2ky0ih76s27121pdwr05aa";
sha256 = "1qd6di8cqwhpcsqcx6g3scmwj90m15r695y5977q6a3qy13knisv";
};

# put packages that needs to be overriden in the py package scope
py = import ./python-packages.nix { inherit python stdenv lib src version; };
py = import ./python-packages.nix { inherit stdenv python lib src version; };
in
py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
pname = "azure-cli";
@@ -45,6 +45,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
azure-functions-devops-build
azure-graphrbac
azure-keyvault
azure-loganalytics
azure-mgmt-advisor
azure-mgmt-apimanagement
azure-mgmt-applicationinsights
@@ -173,6 +174,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
"azure_functions_devops_build"
"azure.graphrbac"
"azure.keyvault"
"azure.loganalytics"
"azure.mgmt.advisor"
"azure.mgmt.apimanagement"
"azure.mgmt.applicationinsights"
44 changes: 24 additions & 20 deletions pkgs/tools/admin/azure-cli/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ python, stdenv, lib, src, version }:
{ stdenv, python, lib, src, version }:

let
buildAzureCliPackage = with py.pkgs; attrs: buildPythonPackage (attrs // {
@@ -53,33 +53,37 @@ let
propagatedBuildInputs = with self; [
adal
argcomplete
azure-common
azure-cli-telemetry
azure-mgmt-resource
colorama
jmespath
humanfriendly
jmespath
knack
msrest
msrestazure
paramiko
psutil
pygments
pyjwt
pyopenssl
pyperclip
pyyaml
requests
six
azure-mgmt-resource
tabulate
pyperclip
psutil
]
++ lib.optionals isPy3k [ antlr4-python3-runtime ]
++ lib.optionals (!isPy3k) [ enum34 futures antlr4-python2-runtime ndg-httpsclient ];

# darwin has permission issues
doCheck = !stdenv.isDarwin;
doCheck = stdenv.isLinux;
# ignore test that does network call
checkPhase = ''
HOME=$TMPDIR pytest --ignore=azure/cli/core/tests/test_profile.py
rm azure/{,cli/}__init__.py
python -c 'import azure.common; print(azure.common)'
PYTHONPATH=$PWD:$PYTHONPATH HOME=$TMPDIR pytest \
--ignore=azure/cli/core/tests/test_profile.py \
--ignore=azure/cli/core/tests/test_generic_update.py
'';

pythonImportsCheck = [
@@ -116,14 +120,14 @@ let
azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "5.0.0" "zip"
"1m7v3rfkvmdgghrpz15fm8pvmmhi40lcwfxdm2kxh7mx01r5l906";

azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "8.0.0" "zip"
"06hmf9iq2yqpmmvw7pr9zm4v427q03i436lnin3aczizfndrk76i";
azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "10.0.0" "zip"
"1s3bx6knxw5dxycp43yimvgrh0i19drzd09asglcwz2x5mr3bpyg";

azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
"12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs";

azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "7.0.0" "zip"
"104w7rxv7hy84yzddbbpkjqha04ghr0zz9qy788n3wl69cj4cv1a";
azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "8.0.0" "zip"
"0akpm12xj453dp84dfdpi06phr4q0hknr5l7bz96zbc8iand78wg";

azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.8.0" "zip"
"0iakxb2rr1w9171802m9syjzqas02vjah711mpagbgcj549mjysb";
@@ -137,8 +141,8 @@ let
azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "2.2.0" "zip"
"15lpyv9z8ss47rjmg1wx5akh22p9br2vckaj7jk3639vi38ac5nl";

azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.6.0" "zip"
"10ymvyj386z9bjdm2g1b5a4vfnn87ig2zm6xn2xddvbpy0jxnyfv";
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.7.0" "zip"
"0cf4pknb5y2yz4jqwg7xm626zkfx8i8hqcr3dkvq21lrx7fz96r3";

azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip"
"1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p";
@@ -152,8 +156,8 @@ let
azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.42.0" "zip"
"0vp40i9aaw5ycz7s7qqir6jq7327f7zg9j9i8g31qkfl1h1c7pdn";

azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.3.2" "zip"
"0nksxjh5kh09dr0zw667fg8mzik4ymvfq3dipwag6pynbqr9ls4l";
azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip"
"16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3";

azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.1.0" "zip"
"1cb466722bs0ribrirb32kc299716pl0pwivz3jyn40dd78cwhhx";
@@ -173,8 +177,8 @@ let
azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc7" "zip"
"1bzfpbz186dhnxn0blgr20xxnk67gkr8ysn2b3f1r41bq9hz97xp";

azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.5.2" "zip"
"1r01aq5rbynbc1my4qljdifjdj9h65bh8cdzgd7vm4ij7r48v9gi";
azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.7.0" "zip"
"1pprvk5255b6brbw73g0g13zygwa7a2px5x08wy3153rqlzan5l2";

azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "2.0.1" "zip"
"1wsfkprdrn22mwm24y2zlcms8ppp7jwq3s86r3ymbl29pbaxca8r";
@@ -194,8 +198,8 @@ let
azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "0.3.0" "zip"
"08b2i6wz9n13h77ahay1hvmg8abk2vvs7kn4y7xip9gi6ij8fv0a";

azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.13.0" "zip"
"184jma28nyn4c52mjj0g0p6rci6kajsdjqy8mbdaisphpjl4f77l";
azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.15.0" "zip"
"0qv58xraznv2ldhd34cvznhz045x3ncfgam9c12gxyj4q0k3pyc9";

azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.1.0" "zip"
"0lj9dhb14dx4ag5pgd2zvrmn9y5ziq2qywvw38ccbv9g3bxpglkn";