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: 4b6a9628c903
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 24406568e626
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Apr 2, 2019

  1. python37Packages.ldap: 3.1.0 -> 3.2.0 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-python-ldap/versions
    @r-ryantm
    r-ryantm committed Apr 2, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    8171f0d View commit details

Commits on Apr 5, 2019

  1. python.pkgs.ldap: add meta

    Robert Schütz committed Apr 5, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    e94148e View commit details

  2. python.pkgs.ldappool: fix build

    Robert Schütz committed Apr 5, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    836621f View commit details

  3. Merge pull request #58833 from r-ryantm/auto-update/python3.7-python-… 

    …ldap

python37Packages.ldap: 3.1.0 -> 3.2.0
    @dotlambda
    dotlambda authored Apr 5, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    2440656 View commit details
Showing with 15 additions and 4 deletions.
  1. +8 −2 pkgs/development/python-modules/ldap/default.nix
  2. +7 −2 pkgs/development/python-modules/ldappool/default.nix
10 changes: 8 additions & 2 deletions pkgs/development/python-modules/ldap/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

buildPythonPackage rec {
pname = "python-ldap";
version = "3.1.0";
version = "3.2.0";

src = fetchPypi {
inherit pname version;
sha256 = "41975e79406502c092732c57ef0c2c2eb318d91e8e765f81f5d4ab6c1db727c5";
sha256 = "13nvrhp85yr0jyxixcjj012iw8l9wynxxlykm9j3alss6waln73x";
};

propagatedBuildInputs = [ pyasn1 pyasn1-modules ];
@@ -28,4 +28,10 @@ buildPythonPackage rec {
'';

doCheck = !stdenv.isDarwin;

meta = with stdenv.lib; {
description = "Python modules for implementing LDAP clients";
homepage = https://www.python-ldap.org/;
license = licenses.psfl;
};
}
9 changes: 7 additions & 2 deletions pkgs/development/python-modules/ldappool/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
, pbr, ldap, fixtures, testresources, testtools }:
, pbr, ldap, prettytable, fixtures, testresources, testtools }:

buildPythonPackage rec {
name = "ldappool-${version}";
@@ -11,9 +11,14 @@ buildPythonPackage rec {
sha256 = "d9c9ec29be3f3e64164be84fe080a3087108836f307a12ec62f7d18988293df3";
};

postPatch = ''
# Tests run without most of the dependencies
echo "" > test-requirements.txt
'';

nativeBuildInputs = [ pbr ];

propagatedBuildInputs = [ ldap ];
propagatedBuildInputs = [ ldap prettytable ];

checkInputs = [ fixtures testresources testtools ];