Progress on fixing package overlays

This commit is contained in:
Jeremy Wall 2021-10-28 21:32:05 -04:00
parent 586f5d0316
commit 994b686556
2 changed files with 110 additions and 23 deletions

View File

@ -4,17 +4,105 @@ with import (builtins.fetchTarball {
sha256 = "18dij8g8p71a3ymr58bjn9j7bl9d3hkmzfccc0bqk5fi887i4z7z";
}) {
overlays = [
# Overlay our SQLParse to be the correct version.
(prev: final: {
sqlparse = prev.sqlparse.overrideAttrPythonAttrs (oldAttrs: rec {
# Overlay our packages to the correct versions.
# TODO my naming here is wrong and therefore confusing
(self: super: {
python39 = super.python39.override {
packageOverrides = (pyself: pysuper: {
sqlparse = pysuper.sqlparse.overrideAttrs (oldAttrs: rec {
version = "0.2.3";
pname = oldAttrs.pname;
src = prev.fetchPypi {
src = pyself.fetchPypi {
inherit pname;
inherit version;
sha256 = "0000000000000000000000000000000000000000000000000000";
sha256 = "1y7gpqjk15ccgya032214iq2j0r4pprgrvffx0fk3pxvrv3prkdy";
};
});
colorama = pysuper.colorama.overrideAttrs (oldAttrs: rec {
version = "0.3.9";
pname = oldAttrs.pname;
src = pyself.fetchPypi {
inherit pname;
inherit version;
sha256 = "1wd1szk0z3073ghx26ynw43gnc140ibln1safgsis6s6z3s25ss8";
};
});
jsonschema = pysuper.jsonschema.overrideAttrs (oldAttrs: rec {
version = "2.6.0";
pname = oldAttrs.pname;
src = pyself.fetchPypi {
inherit pname;
inherit version;
sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg";
};
});
boto3 = pysuper.boto3.overrideAttrs (oldAttrs: rec {
version = "1.6.23";
pname = oldAttrs.pname;
src = pyself.fetchPypi {
inherit pname;
inherit version;
sha256 = "0r28nv8wfrqc0wgacpv939wvw1cqp99wlskwg6nzx3b29d1j6gsj";
};
});
botocore = pysuper.botocore.overrideAttrs (oldAttrs: rec {
version = "1.9.23";
pname = oldAttrs.pname;
src = pyself.fetchPypi {
inherit pname;
inherit version;
sha256 = "147sxvx8gsh2fajxx5rm1r07zvlbhwj42dckkbs5wf3s9j21500m";
};
});
python-dateutil = pysuper.python-dateutil.overrideAttrs (oldAttrs: rec {
version = "2.1";
pname = oldAttrs.pname;
src = pyself.fetchPypi {
inherit pname;
inherit version;
sha256 = "1vlx0lpsxjxz64pz87csx800cwfqznjyr2y7nk3vhmzhkwzyqi2c";
};
pythonImportsCheck = [ ];
});
#networkx = pysuper.networkx.overrideAttrs (oldAttrs: rec {
# version = "1.11";
# pname = oldAttrs.pname;
# src = pyself.fetchPypi {
# inherit pname;
# inherit version;
# sha256 = "1f74s56xb4ggixiq0vxyfxsfk8p20c7a099lpcf60izv1php03hd";
# };
#});
certifi = pyself.buildPythonPackage rec {
version = "2020.6.20";
pname = "certifi";
src = pyself.fetchPypi {
inherit pname;
inherit version;
sha256 = "1lrlxvcaab3kyr5j08dgvw5cvhpij38dldfwp0dx4va92xc5jc2r";
};
pythonImportsCheck = [ "certifi" ];
doCheck = false;
meta = with self.lib; {
homepage = "https://certifi.io/";
description = "Python package for providing Mozilla's CA Bundle";
license = licenses.isc;
};
};
snowflake-connector-python = pysuper.snowflake-connector-python.overrideAttrs (oldAttrs: rec {
version = "2.4.1";
pname = oldAttrs.pname;
src = pyself.fetchPypi {
inherit pname;
inherit version;
sha256 = "1bms4z3zjxzzg0m9smgf0h5cm49h8a41c8w3vyqvx9q22bk814aw";
};
});
});
};
})
];
};
@ -25,16 +113,13 @@ buildPythonPackage rec {
version = "0.12.0";
propagatedBuildInputs = [
agate
attrs
Babel
agate
certifi
cffi
#charset-normalizer
click
colorama
#dbt-extractor
#dbt-postgres
hologram
idna
importlib-metadata
@ -44,8 +129,6 @@ buildPythonPackage rec {
leather
Logbook
markupsafe
#mashumaro
#minimal-snowplow-tracker
msgpack
networkx
packaging
@ -61,14 +144,18 @@ buildPythonPackage rec {
pyyaml
requests
six
# TODO(jwall): We need to override sqlparse here to be exactly version 0.2.3
sqlparse
text-unidecode
typing-extensions
urllib3
werkzeug
zipp
#snowflake-connector-python
snowflake-connector-python
#charset-normalizer
#mashumaro
#minimal-snowplow-tracker
#dbt-extractor
#dbt-postgres
];
doCheck = false;

View File

@ -8,10 +8,10 @@ stdenv.mkDerivation {
git
# Python requirements (enough to get a virtualenv going).
python38Full
python38Packages.virtualenv
python38Packages.pip
python38Packages.setuptools
python39Full
python39Packages.virtualenv
python39Packages.pip
python39Packages.setuptools
];
src = null;
shellHook = ''