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: 21be1354d29f
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 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
    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
    Copy the full SHA
    e81404f View commit details

  3. httpie: use python3 by default 

    This package is intended to be used as application and supports
python3[1] (and is about to deprecated python2.7 support[2]),
so there's no reason to not use it in 2019.

[1] https://github.com/jakubroztocil/httpie/tree/1.0.3#python-version
[2] httpie/cli@b3d2c18

(cherry picked from commit a7f002a)
    @Ma27
    Ma27 committed Sep 20, 2019
    Copy the full SHA
    6868fcd View commit details

  4. csvs-to-sqlite: 0.9 -> 1.0 

    (cherry picked from commit 527fc00)
    @B4dM4n @Ma27
    B4dM4n authored and Ma27 committed Sep 20, 2019
    Copy the full SHA
    21be135 View commit details
Showing with 10 additions and 10 deletions.
  1. +4 −4 pkgs/development/python-modules/csvs-to-sqlite/default.nix
  2. +4 −4 pkgs/tools/networking/httpie/default.nix
  3. +2 −2 pkgs/tools/networking/ip2unix/default.nix
8 changes: 4 additions & 4 deletions pkgs/development/python-modules/csvs-to-sqlite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy3k
, pytestrunner
, click
, dateparser
@@ -12,17 +13,16 @@

buildPythonPackage rec {
pname = "csvs-to-sqlite";
version = "0.9";
version = "1.0";
disabled = !isPy3k;

src = fetchFromGitHub {
owner = "simonw";
repo = pname;
rev = version;
sha256 = "0js86m4kj70g9n9gagr8l6kgswqllg6hn1xa3yvxwv95i59ihpz5";
sha256 = "0n80y9a6qhbhhbz64jdpscx0nha9jn9nygp9nkgszmw04ri5j5hm";
};

buildInputs = [ pytestrunner ];

propagatedBuildInputs = [
click
dateparser
8 changes: 4 additions & 4 deletions pkgs/tools/networking/httpie/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, pythonPackages }:
{ stdenv, fetchurl, python3Packages }:

pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "httpie";
version = "1.0.3";

src = pythonPackages.fetchPypi {
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "103fcigpxf4nqmrdqjnyz7d9n4n16906slwmmqqc0gkxv8hnw6vd";
};

propagatedBuildInputs = with pythonPackages; [ pygments requests ];
propagatedBuildInputs = with python3Packages; [ 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 = [