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: b0d53b7fe523
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 77ffd8d5e023
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Jul 5, 2020

  1. python3Packages.docker: 4.2.1 -> 4.2.2 

    https://github.com/docker/docker-py/releases/tag/4.2.2
    @Ma27
    Ma27 committed Jul 5, 2020
    Copy the full SHA
    088c4c0 View commit details

  2. docker-compose: 1.25.5 -> 1.26.2 

    https://github.com/docker/compose/releases/tag/1.26.0
https://github.com/docker/compose/releases/tag/1.26.1
https://github.com/docker/compose/releases/tag/1.26.2
    @Ma27
    Ma27 committed Jul 5, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: A0E01EF44C27BF00
    Learn about vigilant mode
    Copy the full SHA
    9e924bd View commit details

  3. ell: 0.31 -> 0.32 

    https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.32
    @Ma27
    Ma27 committed Jul 5, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: A0E01EF44C27BF00
    Learn about vigilant mode
    Copy the full SHA
    8683ac0 View commit details

  4. iwd: 1.7 -> 1.8 

    https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog?h=1.8
    @Ma27
    Ma27 committed Jul 5, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: A0E01EF44C27BF00
    Learn about vigilant mode
    Copy the full SHA
    77ffd8d View commit details
8 changes: 4 additions & 4 deletions pkgs/applications/virtualization/docker-compose/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,16 +4,16 @@
, pyyaml, backports_ssl_match_hostname, colorama, docopt
, dockerpty, docker, ipaddress, jsonschema, requests
, six, texttable, websocket_client, cached-property
, enum34, functools32, paramiko
, enum34, functools32, paramiko, distro, python-dotenv
}:

buildPythonApplication rec {
version = "1.25.5";
version = "1.26.2";
pname = "docker-compose";

src = fetchPypi {
inherit pname version;
sha256 = "1ijhg93zs3lswkljnm0rhww7gdy0g94psvsya2741prz2zcbcbks";
sha256 = "0c3v30z7jlbxm9nxs42vv3nbja0zsppkcd6fnd0mjcm1s60hyssp";
};

# lots of networking and other fails
@@ -23,7 +23,7 @@ buildPythonApplication rec {
propagatedBuildInputs = [
pyyaml backports_ssl_match_hostname colorama dockerpty docker
ipaddress jsonschema requests six texttable websocket_client
docopt cached-property paramiko
docopt cached-property paramiko distro python-dotenv
] ++
stdenv.lib.optional (pythonOlder "3.4") enum34 ++
stdenv.lib.optional (pythonOlder "3.2") functools32;
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/docker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@

buildPythonPackage rec {
pname = "docker";
version = "4.2.1";
version = "4.2.2";

src = fetchPypi {
inherit pname version;
sha256 = "380a20d38fbfaa872e96ee4d0d23ad9beb0f9ed57ff1c30653cbeb0c9c0964f2";
sha256 = "0m4vgk2831yfdjy8vqyvvfnmwv270a44z358frdzb672wzfbmvi6";
};

nativeBuildInputs = lib.optional isPy27 mock;
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/ell/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,14 +7,14 @@

stdenv.mkDerivation rec {
pname = "ell";
version = "0.31";
version = "0.32";

outputs = [ "out" "dev" ];

src = fetchgit {
url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
rev = version;
sha256 = "1qlpc906xd78fzxvvj2kxi3aikgnw0c0h3x620s131apax4qrnqa";
sha256 = "07hm9lrhhb5y53l13yja2kr3xmjgs0azk3x7w2si99cplwkgxak2";
};

patches = [
6 changes: 4 additions & 2 deletions pkgs/os-specific/linux/iwd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,14 +13,16 @@

stdenv.mkDerivation rec {
pname = "iwd";
version = "1.7";
version = "1.8";

src = fetchgit {
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
rev = version;
sha256 = "1qi25qav1rv8gm5lbrip8ayq5vwynmyv2q4ar7bbmnjh6cglvyh2";
sha256 = "0ds8nhbnkhxzhnnsi7vj3y2v8wq0nxqbmidhiac7mpxgjkc684gf";
};

outputs = [ "out" "man" ];

nativeBuildInputs = [
autoreconfHook
docutils