Skip to content

Update my packages #38456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
matthiasbeyer wants to merge 15 commits into from
Closed

Update my packages #38456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
67b9166
pythonPackages.atomicwrites: 0.1.9 -> 1.1.5
matthiasbeyer Apr 5, 2018
e50f34e
pythonPackages.uritemplate: 0.6 -> 3.0.0
matthiasbeyer Apr 5, 2018
203663d
Revert "pythonPackages.uritemplate: 0.6 -> 3.0.0"
matthiasbeyer Apr 5, 2018
a70c7f2
pythonPackages.Babel: 2.3.4 -> 2.5.3
matthiasbeyer Apr 5, 2018
d7324f3
fava: 1.6 -> 1.7
matthiasbeyer Apr 5, 2018
f024036
fixup! fava: 1.6 -> 1.7
matthiasbeyer Apr 5, 2018
15c0962
Revert "pythonPackages.atomicwrites: 0.1.9 -> 1.1.5"
matthiasbeyer Apr 5, 2018
79cc1c7
fixup! pythonPackages.Babel: 2.3.4 -> 2.5.3
matthiasbeyer Apr 5, 2018
2c46565
fixup! pythonPackages.Babel: 2.3.4 -> 2.5.3
matthiasbeyer Apr 5, 2018
69b8929
pythonPackages.Babel: Move package
matthiasbeyer Apr 5, 2018
3d3d0f1
fixup! pythonPackages.uritemplate: 0.6 -> 3.0.0
matthiasbeyer Apr 5, 2018
c9dea4f
pythonPackages.uritemplate: 0.6 -> 3.0.0
matthiasbeyer Apr 5, 2018
8404137
fixup! pythonPackages.Babel: Move package
matthiasbeyer Apr 5, 2018
956b31a
fixup! pythonPackages.uritemplate: 0.6 -> 3.0.0
matthiasbeyer Apr 5, 2018
cd042ab
fixup! pythonPackages.uritemplate: 0.6 -> 3.0.0
matthiasbeyer Apr 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions pkgs/applications/office/fava/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,38 @@
{ stdenv, python3, beancount }:

let
inherit (python3.pkgs) buildPythonApplication fetchPypi;
python = python3.override {
packageOverrides = self: super: {
uritemplate = super.uritemplate.overridePythonAttrs (oldAttrs: rec {
version = "0.6";
src = oldAttrs.src.override {
inherit version;
sha256 = "1zapwg406vkwsirnzc6mwq9fac4az8brm6d9bp5xpgkyxc5263m3";
};
});
};
};
in
buildPythonApplication rec {

python.pkgs.buildPythonApplication rec {
pname = "fava";
version = "1.6";
name = "${pname}-${version}";
version = "1.7";

src = fetchPypi {
src = python.pkgs.fetchPypi {
inherit pname version;
sha256 = "0iif4imx76ra0lsisksrq5vf54wbivnrb3xqz6mkx9lik3pp5sbx";
sha256 = "0bxnh977r821b8vy36z81k40pazbxspx4wa9sp4ppanx7cha9sy4";
};

doCheck = false;

propagatedBuildInputs = with python3.pkgs;
propagatedBuildInputs = with python.pkgs;
[ flask dateutil pygments wheel markdown2 flaskbabel tornado
click beancount ];
click beancount uritemplate httplib2 Babel ];

meta = {
homepage = https://beancount.github.io/fava;
homepage = https://beancount.github.io/fava;
description = "Web interface for beancount";
license = stdenv.lib.licenses.mit;
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
};
}
Expand Down
22 changes: 22 additions & 0 deletions pkgs/development/python-modules/Babel/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ stdenv, fetchPypi, buildPythonPackage, pythonPackages }:

buildPythonPackage rec {
pname = "Babel";
version = "2.5.3";

src = fetchPypi {
inherit pname version;
sha256 = "050zyi300wsyqq1cj0ajrskb5kkv0wxblz124g9yv4s3vmpwpr4c";
};

buildInputs = with pythonPackages; [ pytest freezegun ];
propagatedBuildInputs = with pythonPackages; [ pytz ];

meta = with stdenv.lib; {
homepage = http://babel.edgewall.org;
description = "A collection of tools for internationalizing Python applications";
license = licenses.bsd3;
maintainers = [ garbas ];
};
}

32 changes: 7 additions & 25 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8811,7 +8811,7 @@ in {
keyutils = callPackage ../development/python-modules/keyutils { };

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

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

kombu = buildPythonPackage rec {
Expand Down Expand Up @@ -12380,25 +12380,7 @@ in {

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

Babel = buildPythonPackage (rec {
name = "Babel-2.3.4";

src = pkgs.fetchurl {
url = "mirror://pypi/B/Babel/${name}.tar.gz";
sha256 = "0x98qqqw35xllpcama013a9788ly84z8dm1w2wwfpxh2710c8df5";
};

buildInputs = with self; [ pytest ];
propagatedBuildInputs = with self; [ pytz ];

meta = {
homepage = http://babel.edgewall.org;
description = "A collection of tools for internationalizing Python applications";
license = licenses.bsd3;
maintainers = with maintainers; [ garbas ];
};
});

Babel = callPackage ../development/python-modules/Babel { };
pybfd = callPackage ../development/python-modules/pybfd { };

pyblock = stdenv.mkDerivation rec {
Expand Down Expand Up @@ -16721,12 +16703,12 @@ in {
update_checker = callPackage ../development/python-modules/update_checker {};

uritemplate = buildPythonPackage rec {

@dotlambda dotlambda Apr 5, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should best be moved to its own file as well.

@FRidh FRidh Apr 5, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe its done on staging?

@dotlambda dotlambda Apr 5, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I just checked again.

name = "uritemplate-${version}";
version = "0.6";
pname = "uritemplate";
version = "3.0.0";

src = pkgs.fetchurl {
url = "mirror://pypi/u/uritemplate/${name}.tar.gz";
sha256 = "1zapwg406vkwsirnzc6mwq9fac4az8brm6d9bp5xpgkyxc5263m3";
src = fetchPypi {
inherit pname version;
sha256 = "0781gm9g34wa0asc19dx81ng0nqq07igzv3bbvdqmz13pv7469n0";
};

# No tests in archive
Expand Down