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

Commits on Dec 23, 2020

  1. python3Packages.web: 0.61 -> 0.62, fix build

    @SuperSandro2000
    SuperSandro2000 committed Dec 23, 2020
    Copy the full SHA
    c1011fc View commit details

  2. pythonPackages.cheroot: 8.4.5 -> 8.4.8

    @SuperSandro2000
    SuperSandro2000 committed Dec 23, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    674d6ef View commit details

  3. pythonPackages.dbutils: init at 2.0

    @SuperSandro2000
    SuperSandro2000 committed Dec 23, 2020

    Unverified

    The key that signed this doesn't have usage flags that allow signing.
    GPG key ID: 86E30E5A0F5FC59C
    Learn about vigilant mode
    Copy the full SHA
    b76763d View commit details

Commits on Jan 3, 2021

  1. pythonPackages.WSME: Disable on python 3.9

    @SuperSandro2000
    SuperSandro2000 committed Jan 3, 2021
    Copy the full SHA
    15ec468 View commit details

  2. Merge pull request #105198 from SuperSandro2000/fix-web-py

    @SuperSandro2000
    SuperSandro2000 authored Jan 3, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2f50374 View commit details
3 changes: 3 additions & 0 deletions pkgs/development/python-modules/WSME/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonAtLeast
, pbr
, six
, simplegeneric
@@ -23,6 +24,8 @@ buildPythonPackage rec {
pname = "WSME";
version = "0.10.0";

disabled = pythonAtLeast "3.9";

src = fetchPypi {
inherit pname version;
sha256 = "965b9ce48161e5c50d84aedcf50dca698f05bf07e9d489201bccaec3141cd304";
10 changes: 8 additions & 2 deletions pkgs/development/python-modules/cheroot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k
, jaraco_functools
, jaraco_text
, more-itertools
, portend
@@ -23,12 +24,17 @@ buildPythonPackage rec {

src = fetchPypi {
inherit pname version;
sha256 = "1089c28a9c320d19fdf9a4b0ed6ace23a0948db1c171a36ac985f3741bc62865";
sha256 = "0r98qqdp9ww5r5ma6wf1n66r9813rrmfvc54z7yij39jkj5c528h";
};

nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ];

propagatedBuildInputs = [ more-itertools six ];
propagatedBuildInputs = [
# install_requires
jaraco_functools

more-itertools six
];

checkInputs = [
jaraco_text
21 changes: 21 additions & 0 deletions pkgs/development/python-modules/dbutils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }:

buildPythonPackage rec {
version = "2.0";
pname = "dbutils";

src = fetchPypi {
inherit version;
pname = "DBUtils";
sha256 = "131ifm2c2a7bipij597i8fvjka0dk2qv1xr2ghcvbc30jlkvag2g";
};

checkInputs = [ pytestCheckHook ];

meta = with stdenv.lib; {
description = "Database connections for multi-threaded environments";
homepage = "https://webwareforpython.github.io/DBUtils/";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}
19 changes: 13 additions & 6 deletions pkgs/development/python-modules/web/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy3k
{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook
, cheroot
, dbutils, mysqlclient, pymysql, mysql-connector, psycopg2
}:

buildPythonPackage rec {
version = "0.62";
pname = "web.py";
disabled = isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "5ce684caa240654cae5950da8b4b7bc178812031e08f990518d072bd44ab525e";
};

propagatedBuildInputs = [ cheroot ];

# requires multiple running databases
doCheck = false;

pythonImportsCheck = [ "web" ];

checkInputs = [ pytestCheckHook dbutils mysqlclient pymysql mysql-connector psycopg2 ];

meta = with stdenv.lib; {
description = "Makes web apps";
longDescription = ''
@@ -22,7 +29,7 @@ buildPythonPackage rec {
'';
homepage = "https://webpy.org/";
license = licenses.publicDomain;
maintainers = with maintainers; [ layus ];
maintainers = with maintainers; [ layus SuperSandro2000 ];
};

}
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1552,6 +1552,8 @@ in {

dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkgconfig; };

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

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

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