Update my packages by matthiasbeyer · Pull Request #38456 · NixOS/nixpkgs

matthiasbeyer · 2018-04-05T10:24:06Z

Motivation for this change

Update packages I maintain.

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

This reverts commit e50f34e.

matthiasbeyer · 2018-04-05T10:24:38Z

@GrahamcOfBorg build pythonPackages.atomicwrites
@GrahamcOfBorg build pythonPackages.Babel
@GrahamcOfBorg build fava

GrahamcOfBorg · 2018-04-05T10:25:11Z

Success on x86_64-linux (full log)

Attempted: pythonPackages.atomicwrites

Partial log (click to expand)

no previously-included directories found matching 'docs/_build'
writing manifest file 'atomicwrites.egg-info/SOURCES.txt'
running build_ext

----------------------------------------------------------------------
Ran 0 tests in 0.000s


OK
/nix/store/wrj2n2xqmxf4ym6lfi0ijjpynmf2fsx3-python2.7-atomicwrites-1.1.5

GrahamcOfBorg · 2018-04-05T10:25:15Z

Success on x86_64-darwin (full log)

Attempted: pythonPackages.atomicwrites

Partial log (click to expand)

reading manifest template 'MANIFEST.in'
no previously-included directories found matching 'docs/_build'
writing manifest file 'atomicwrites.egg-info/SOURCES.txt'
running build_ext

----------------------------------------------------------------------
Ran 0 tests in 0.000s

OK
/nix/store/abv44yjdlmrwsswa6bjq3n9n5sp9jwdy-python2.7-atomicwrites-1.1.5

matthiasbeyer · 2018-04-05T10:25:15Z

The uritemplate packages update was reverted because it broke fava. Shall I rewrite the revert commit to be hold more explanation?

GrahamcOfBorg · 2018-04-05T10:25:24Z

Success on aarch64-linux (full log)

Attempted: pythonPackages.atomicwrites

Partial log (click to expand)

reading manifest template 'MANIFEST.in'
no previously-included directories found matching 'docs/_build'
writing manifest file 'atomicwrites.egg-info/SOURCES.txt'
running build_ext

----------------------------------------------------------------------
Ran 0 tests in 0.000s

OK
/nix/store/cpw2qgfwpf02mr3k6dacb8il0c3q0fg4-python2.7-atomicwrites-1.1.5

GrahamcOfBorg · 2018-04-05T10:25:41Z

Success on x86_64-linux (full log)

Attempted: pythonPackages.Babel

Partial log (click to expand)

Ran 248 tests in 1.496s

OK
ine 1: \
WARNING: Start of line didn't match any expected keyword.
WARNING: Problem on line 1: \
WARNING: Start of line didn't match any expected keyword.
WARNING: Problem on line 1: \
WARNING: msg has more translations than num_plurals of catalog
WARNING: Problem on line 28:

GrahamcOfBorg · 2018-04-05T10:25:45Z

Success on aarch64-linux (full log)

Attempted: pythonPackages.Babel

Partial log (click to expand)


OK
 on line 1: \
WARNING: Start of line didn't match any expected keyword.
WARNING: Problem on line 1: \
WARNING: Start of line didn't match any expected keyword.
WARNING: Problem on line 1: \
WARNING: Start of line didn't match any expected keyword.
WARNING: Problem on line 1: \
/nix/store/xxnwg26bx2fk1zdb9yqc45wz87za4svh-python2.7-Babel-2.5.3

GrahamcOfBorg · 2018-04-05T10:25:49Z

Success on x86_64-darwin (full log)

Attempted: pythonPackages.Babel

Partial log (click to expand)

WARNING: Start of line didn't match any expected keyword.
WARNING: Problem on line 1: \
WARNING: Start of line didn't match any expected keyword.
WARNING: Problem on line 1: \
WARNING: Start of line didn't match any expected keyword.
WARNING: Problem on line 1: \
WARNING: Start of line didn't match any expected keyword.
WARNING: Problem on line 1: \
WARNING: msg has more translations than num_plurals of catalog
WARNING: Problem on line 28:

GrahamcOfBorg · 2018-04-05T10:26:19Z

Success on aarch64-linux (full log)

Attempted: fava

Partial log (click to expand)

Successfully installed fava-1.7
/build/fava-1.7
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/7kh7365f7y7zk6y285pmjvz7bjy4ar9w-fava-1.7
strip is /nix/store/3zq400fri5dv7d30lpxlqm2v9y1iis6j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/7kh7365f7y7zk6y285pmjvz7bjy4ar9w-fava-1.7/lib  /nix/store/7kh7365f7y7zk6y285pmjvz7bjy4ar9w-fava-1.7/bin
patching script interpreter paths in /nix/store/7kh7365f7y7zk6y285pmjvz7bjy4ar9w-fava-1.7
checking for references to /build in /nix/store/7kh7365f7y7zk6y285pmjvz7bjy4ar9w-fava-1.7...
wrapping `/nix/store/7kh7365f7y7zk6y285pmjvz7bjy4ar9w-fava-1.7/bin/fava'...
/nix/store/7kh7365f7y7zk6y285pmjvz7bjy4ar9w-fava-1.7

GrahamcOfBorg · 2018-04-05T10:26:31Z

Success on x86_64-darwin (full log)

Attempted: fava

Partial log (click to expand)

Requirement already satisfied: rsa>=3.1.4 in /nix/store/5ab8bfhc0ydylqn2cpb0016yqkz46jz2-python3.6-rsa-3.4.2/lib/python3.6/site-packages (from oauth2client->google-api-python-client->beancount>=2.0b15->fava==1.7)
Installing collected packages: fava
Successfully installed fava-1.7
/private/tmp/nix-build-fava-1.7.drv-0/fava-1.7
post-installation fixup
strip is /nix/store/0fzpxnsanc02i4jsb1yhchjp4p62b2n3-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/nxfwq68l6by4yj7zp9jkb10plzq1dpck-fava-1.7/lib  /nix/store/nxfwq68l6by4yj7zp9jkb10plzq1dpck-fava-1.7/bin
patching script interpreter paths in /nix/store/nxfwq68l6by4yj7zp9jkb10plzq1dpck-fava-1.7
wrapping `/nix/store/nxfwq68l6by4yj7zp9jkb10plzq1dpck-fava-1.7/bin/fava'...
/nix/store/nxfwq68l6by4yj7zp9jkb10plzq1dpck-fava-1.7

GrahamcOfBorg · 2018-04-05T10:26:41Z

Success on x86_64-linux (full log)

Attempted: fava

Partial log (click to expand)

Installing collected packages: fava
Successfully installed fava-1.7
/tmp/nix-build-fava-1.7.drv-0/fava-1.7
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/bwmyrpw7qzkg343g7i6nnqjqvaksz81b-fava-1.7
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/bwmyrpw7qzkg343g7i6nnqjqvaksz81b-fava-1.7/lib  /nix/store/bwmyrpw7qzkg343g7i6nnqjqvaksz81b-fava-1.7/bin
patching script interpreter paths in /nix/store/bwmyrpw7qzkg343g7i6nnqjqvaksz81b-fava-1.7
checking for references to /tmp/nix-build-fava-1.7.drv-0 in /nix/store/bwmyrpw7qzkg343g7i6nnqjqvaksz81b-fava-1.7...
wrapping `/nix/store/bwmyrpw7qzkg343g7i6nnqjqvaksz81b-fava-1.7/bin/fava'...

GrahamcOfBorg · 2018-04-05T10:50:09Z

Success on x86_64-linux (full log)

Attempted: fava

Partial log (click to expand)

/nix/store/bwmyrpw7qzkg343g7i6nnqjqvaksz81b-fava-1.7

GrahamcOfBorg · 2018-04-05T10:50:10Z

Success on x86_64-darwin (full log)

Attempted: fava

Partial log (click to expand)

/nix/store/nxfwq68l6by4yj7zp9jkb10plzq1dpck-fava-1.7

GrahamcOfBorg · 2018-04-05T10:50:30Z

Success on aarch64-linux (full log)

Attempted: fava

Partial log (click to expand)

/nix/store/7kh7365f7y7zk6y285pmjvz7bjy4ar9w-fava-1.7

dotlambda · 2018-04-05T11:38:48Z

pkgs/applications/office/fava/default.nix

  pname = "fava";
-  version = "1.6";
+  version = "1.7";
  name = "${pname}-${version}";


This line isn't needed.

dotlambda · 2018-04-05T11:42:07Z

pkgs/top-level/python-packages.nix


  atomicwrites = buildPythonPackage rec {
-    version = "0.1.9";
+    version = "1.1.5";


As atomicwrites was moved to a dedicated directory in #38439, it probably makes sense to rebase on staging.

dotlambda · 2018-04-05T11:42:39Z

pkgs/top-level/python-packages.nix


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


Please use pname and version instead.

dotlambda · 2018-04-05T11:42:46Z

pkgs/top-level/python-packages.nix

-    name = "Babel-2.3.4";
+    name = "Babel-2.5.3";

    src = pkgs.fetchurl {


fetchPypi

dotlambda · 2018-04-05T11:43:27Z

pkgs/top-level/python-packages.nix

@@ -12381,14 +12381,14 @@ in {
  pygit2 = callPackage ../development/python-modules/pygit2 { };

  Babel = buildPythonPackage (rec {


It would be nice if you could move this expression to pkgs/development/python-modules/Babel/default.nix.

dotlambda · 2018-04-05T11:44:35Z

pkgs/top-level/python-packages.nix

@@ -16722,11 +16722,11 @@ in {

  uritemplate = buildPythonPackage rec {
    name = "uritemplate-${version}";


Please use pname = "uritemplate" instead.

dotlambda · 2018-04-05T11:44:43Z

pkgs/top-level/python-packages.nix

-    version = "0.6";
+    version = "3.0.0";

    src = pkgs.fetchurl {


fetchPypi

dotlambda

Instead of reverting the uritemplate bump, you should override the version that fava uses. Have a look at e.g. https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/home-assistant/appdaemon.nix.

Reverted because this file moved in staging This reverts commit 67b9166.

matthiasbeyer · 2018-04-05T12:13:03Z

It seems the nix community develops new schemes of overriding dependencies every other month. Either way, here's the updates I was able to do. Unfortunately, fava does not build now, it cannot find uritemplate.

dotlambda · 2018-04-05T12:21:59Z

pkgs/top-level/python-packages.nix

@@ -16721,12 +16703,12 @@ in {
  update_checker = callPackage ../development/python-modules/update_checker {};

  uritemplate = buildPythonPackage rec {


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

Maybe its done on staging?

No, I just checked again.

dotlambda · 2018-04-05T12:34:22Z

There are several problems with the current situation:

httplib2 and uritemplate aren't dependencies of fava: https://github.com/beancount/fava/blob/v1.7/setup.py#L33
google-api-python-client should be updated to the latest version so that it works with newer uritemplate versions
beancount is currently not in pythonPackages even though it is also used as a library. It should be moved to pythonPackages and a global alias should be added using toPythonApplication

dotlambda · 2018-04-05T15:07:46Z

@matthiasbeyer If you feel like that's too much work, I can do it. Just let me know.

matthiasbeyer · 2018-04-05T19:20:18Z

@dotlambda that'd be awesome!

FRidh · 2018-04-05T19:22:35Z

This will conflict with #38483.

dotlambda · 2018-04-05T21:08:14Z

All changes should be included in #38483.

matthiasbeyer added 5 commits April 5, 2018 12:05

pythonPackages.atomicwrites: 0.1.9 -> 1.1.5

67b9166

pythonPackages.uritemplate: 0.6 -> 3.0.0

e50f34e

Revert "pythonPackages.uritemplate: 0.6 -> 3.0.0"

203663d

This reverts commit e50f34e.

pythonPackages.Babel: 2.3.4 -> 2.5.3

a70c7f2

fava: 1.6 -> 1.7

d7324f3

matthiasbeyer requested a review from FRidh as a code owner April 5, 2018 10:24

dotlambda requested changes Apr 5, 2018

View reviewed changes

matthiasbeyer added 5 commits April 5, 2018 13:58

fixup! fava: 1.6 -> 1.7

f024036

Revert "pythonPackages.atomicwrites: 0.1.9 -> 1.1.5"

15c0962

Reverted because this file moved in staging This reverts commit 67b9166.

fixup! pythonPackages.Babel: 2.3.4 -> 2.5.3

79cc1c7

fixup! pythonPackages.Babel: 2.3.4 -> 2.5.3

2c46565

pythonPackages.Babel: Move package

69b8929

matthiasbeyer added 5 commits April 5, 2018 14:03

fixup! pythonPackages.uritemplate: 0.6 -> 3.0.0

3d3d0f1

pythonPackages.uritemplate: 0.6 -> 3.0.0

c9dea4f

fixup! pythonPackages.Babel: Move package

8404137

fixup! pythonPackages.uritemplate: 0.6 -> 3.0.0

956b31a

fixup! pythonPackages.uritemplate: 0.6 -> 3.0.0

cd042ab

dotlambda reviewed Apr 5, 2018

View reviewed changes

dotlambda closed this Apr 5, 2018

		@@ -12381,14 +12381,14 @@ in {
		pygit2 = callPackage ../development/python-modules/pygit2 { };

		Babel = buildPythonPackage (rec {

		@@ -16722,11 +16722,11 @@ in {

		uritemplate = buildPythonPackage rec {
		name = "uritemplate-${version}";

		@@ -16721,12 +16703,12 @@ in {
		update_checker = callPackage ../development/python-modules/update_checker {};

		uritemplate = buildPythonPackage rec {

Uh oh!

Conversation

matthiasbeyer commented Apr 5, 2018

Motivation for this change

Things done

Uh oh!

matthiasbeyer commented Apr 5, 2018

Uh oh!

GrahamcOfBorg commented Apr 5, 2018

Uh oh!

GrahamcOfBorg commented Apr 5, 2018

Uh oh!

matthiasbeyer commented Apr 5, 2018

Uh oh!

GrahamcOfBorg commented Apr 5, 2018

Uh oh!

GrahamcOfBorg commented Apr 5, 2018

Uh oh!

GrahamcOfBorg commented Apr 5, 2018

Uh oh!

GrahamcOfBorg commented Apr 5, 2018

Uh oh!

GrahamcOfBorg commented Apr 5, 2018

Uh oh!

GrahamcOfBorg commented Apr 5, 2018

Uh oh!

GrahamcOfBorg commented Apr 5, 2018

Uh oh!

GrahamcOfBorg commented Apr 5, 2018

Uh oh!

GrahamcOfBorg commented Apr 5, 2018

Uh oh!

GrahamcOfBorg commented Apr 5, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dotlambda left a comment

Choose a reason for hiding this comment

Uh oh!

matthiasbeyer commented Apr 5, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dotlambda commented Apr 5, 2018

Uh oh!

dotlambda commented Apr 5, 2018

Uh oh!

matthiasbeyer commented Apr 5, 2018

Uh oh!

FRidh commented Apr 5, 2018

Uh oh!

dotlambda commented Apr 5, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants