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: 499d72936b9e
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: e81404fdedad
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 20, 2019

  1. ip2unix: 2.1.0 -> 2.1.1 

    This is just a small bugfix release (essentially adds two lines of code)
which fixes a segfault if using with a program that doesn't pass a
sockaddr buffer to accept() or accept4().

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit d69bc56)
    @aszlig
    aszlig committed Sep 20, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    aszlig
    GPG key ID: 684089CE67EBB691
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3f2ffe1 View commit details

  2. httpie: add missing 'setuptools' to propagatedBuildInputs 

    As a side-effect of f7e28bf, the build no longer propagated 'setuptools', which
is a run-time dependency. See #68314 for further details.

(cherry picked from commit 55bf3b4)
    @madjar @Ma27
    madjar authored and Ma27 committed Sep 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e81404f View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 pkgs/tools/networking/httpie/default.nix
  2. +2 −2 pkgs/tools/networking/ip2unix/default.nix
2 changes: 1 addition & 1 deletion pkgs/tools/networking/httpie/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "103fcigpxf4nqmrdqjnyz7d9n4n16906slwmmqqc0gkxv8hnw6vd";
};

propagatedBuildInputs = with pythonPackages; [ pygments requests ];
propagatedBuildInputs = with pythonPackages; [ pygments requests setuptools ];

doCheck = false;

4 changes: 2 additions & 2 deletions pkgs/tools/networking/ip2unix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

stdenv.mkDerivation rec {
pname = "ip2unix";
version = "2.1.0";
version = "2.1.1";

src = fetchFromGitHub {
owner = "nixcloud";
repo = "ip2unix";
rev = "v${version}";
sha256 = "1hbc7csicgza1w43aq1q189w8gzwkc2v5mxpnhaiwggwsa5vvkl0";
sha256 = "121ygj50i7ja9bv76y51qsjbjmmydhpi0sd3xb6pysmlzv0bxn17";
};

nativeBuildInputs = [