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: 6e7c70d02d4f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 01e4b493de4e
Choose a head ref
  • 10 commits
  • 6 files changed
  • 5 contributors

Commits on Apr 16, 2021

  1. Copy the full SHA
    52c3576 View commit details

Commits on Apr 23, 2021

  1. Copy the full SHA
    f4d48fc View commit details
  2. Copy the full SHA
    d312288 View commit details
  3. dockle: 0.3.11 -> 0.3.13

    06kellyjac committed Apr 23, 2021
    Copy the full SHA
    a4597c4 View commit details
  4. angrop: init at 9.0.6790

    fabaff committed Apr 23, 2021
    Copy the full SHA
    fe3c957 View commit details

Commits on Apr 24, 2021

  1. Merge pull request #119623 from drewrisinger/dr-pr-tqdm-bump

    python3Packages.tqdm: 4.58.0 -> 4.60.0
    mweinelt authored Apr 24, 2021
    Copy the full SHA
    8019e66 View commit details
  2. Copy the full SHA
    bf18034 View commit details
  3. Merge pull request #120328 from fabaff/angrop

    angrop: init at 9.0.6790
    SuperSandro2000 authored Apr 24, 2021
    Copy the full SHA
    8657f49 View commit details
  4. Merge pull request #120327 from 06kellyjac/dockle

    dockle: 0.3.11 -> 0.3.13
    SuperSandro2000 authored Apr 24, 2021
    Copy the full SHA
    0469237 View commit details
  5. Copy the full SHA
    01e4b49 View commit details
37 changes: 37 additions & 0 deletions pkgs/development/python-modules/angrop/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{ lib
, angr
, buildPythonPackage
, fetchFromGitHub
, progressbar
, pythonOlder
}:

buildPythonPackage rec {
pname = "angrop";
version = "9.0.6790";
disabled = pythonOlder "3.6";

src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "16r22ajkj8sxbgsym0i85xdjvphgf1566p5s7d915kkj37qdrrpy";
};

propagatedBuildInputs = [
angr
progressbar
];

# Tests have additional requirements, e.g., angr binaries
# cle is executing the tests with the angr binaries already and is a requirement of angr
doCheck = false;
pythonImportsCheck = [ "angrop" ];

meta = with lib; {
description = "ROP gadget finder and chain builder";
homepage = "https://github.com/angr/angrop";
license = with licenses; [ bsd2 ];
maintainers = with maintainers; [ fab ];
};
}
36 changes: 36 additions & 0 deletions pkgs/development/python-modules/pydroid-ipcam/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, yarl
}:

buildPythonPackage rec {
pname = "pydroid-ipcam";
version = "unstable-2021-04-16";
disabled = pythonOlder "3.7";

src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = pname;
rev = "9f22682c6f9182aa5e42762f52223337b8b6909c";
sha256 = "1lvppyzmwg0fp8zch11j51an4sb074yl9shzanakvjmbqpnif6s6";
};

propagatedBuildInputs = [
aiohttp
yarl
];

# Project has no tests
doCheck = false;
pythonImportsCheck = [ "pydroid_ipcam" ];

meta = with lib; {
description = "Python library for Android IP Webcam";
homepage = "https://github.com/home-assistant-libs/pydroid-ipcam";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}
17 changes: 11 additions & 6 deletions pkgs/development/python-modules/tqdm/default.nix
Original file line number Diff line number Diff line change
@@ -14,11 +14,11 @@

buildPythonPackage rec {
pname = "tqdm";
version = "4.59.0";
version = "4.60.0";

src = fetchPypi {
inherit pname version;
sha256 = "d666ae29164da3e517fcf125e41d4fe96e5bb375cd87ff9763f6b38b5592fe33";
sha256 = "ebdebdb95e3477ceea267decfc0784859aa3df3e27e22d23b83e9b272bf157ae";
};

nativeBuildInputs = [
@@ -39,14 +39,19 @@ buildPythonPackage rec {

# Remove performance testing.
# Too sensitive for on Hydra.
PYTEST_ADDOPTS = "-k \"not perf\"";
disabledTests = [
"perf"
];

LC_ALL="en_US.UTF-8";

meta = {
pythonImportsCheck = [ "tqdm" ];

meta = with lib; {
description = "A Fast, Extensible Progress Meter";
homepage = "https://github.com/tqdm/tqdm";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ fridh ];
changelog = "https://tqdm.github.io/releases/";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fridh ];
};
}
6 changes: 3 additions & 3 deletions pkgs/development/tools/dockle/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "dockle";
version = "0.3.11";
version = "0.3.13";

src = fetchFromGitHub {
owner = "goodwithtech";
repo = pname;
rev = "v${version}";
sha256 = "sha256-TAV+bdHURclrwM0ByfbM2S4GdAnHrwclStyUlGraOpw=";
sha256 = "sha256-U0nIGuQ4QjBaCck0Kg1RTS2IQwfivN3VI5vxh8lxAYE=";
};

vendorSha256 = "sha256-npbUE3ch8TamW0aikdKuFElE4YDRKwNVUscuvmlQxl4=";
vendorSha256 = "sha256-uHHm4AgnjTdPgpu3OpXXIRzrGhkpOoRY8qynfl7DO6w=";

nativeBuildInputs = [ pkg-config ];
buildInputs = [ btrfs-progs lvm2 ];
2 changes: 1 addition & 1 deletion pkgs/servers/home-assistant/component-packages.nix
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@
"amcrest" = ps: with ps; [ amcrest ha-ffmpeg ];
"ampio" = ps: with ps; [ ]; # missing inputs: asmog
"analytics" = ps: with ps; [ aiohttp-cors ];
"android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam
"android_ip_webcam" = ps: with ps; [ pydroid-ipcam ];
"androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ];
"anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant
"anthemav" = ps: with ps; [ ]; # missing inputs: anthemav
4 changes: 4 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -393,6 +393,8 @@ in {

angr = callPackage ../development/python-modules/angr { };

angrop = callPackage ../development/python-modules/angrop { };

aniso8601 = callPackage ../development/python-modules/aniso8601 { };

annexremote = callPackage ../development/python-modules/annexremote { };
@@ -5423,6 +5425,8 @@ in {

pydrive = callPackage ../development/python-modules/pydrive { };

pydroid-ipcam = callPackage ../development/python-modules/pydroid-ipcam { };

pydsdl = callPackage ../development/python-modules/pydsdl { };

pydub = callPackage ../development/python-modules/pydub { };