Refactor rabbitvcs #102378

freezeboy · 2020-11-01T18:54:36Z

Motivation for this change

Update the tool and support python3
part of #101964

Needed to update pysvn and add pycxx in the process

Things done

pkgs/development/python-modules/pysvn/default.nix

SuperSandro2000 · 2020-11-01T19:32:58Z

pkgs/development/python-modules/pysvn/default.nix

+
+    # It is not only shebangs, some tests also write scripts dynamically
+    # so it is easier to simply search and replace
+    sed -i "s|/bin/bash|${pkgs.bash}/bin/bash|" ../Tests/test-*.sh


We can't use patchShebangs here?

no test 04 is writing its own script for the tests so we would still need this additionnal sed, so no real interest in using patchShebangs

pkgs/development/python-modules/pysvn/default.nix

pkgs/development/python-modules/pycxx/default.nix

pkgs/development/python-modules/pysvn/default.nix

jonringer · 2020-11-01T19:50:59Z

pkgs/development/python-modules/pysvn/default.nix

  '' + (if !stdenv.isDarwin then "" else ''
    sed -i -e 's|libpython2.7.dylib|lib/libpython2.7.dylib|' Makefile
  '');

-  checkPhase = "make -C ../Tests";
+  checkInputs = [ pkgs.glibcLocales  ];


Suggested change

checkInputs = [ pkgs.glibcLocales ];

checkInputs = [ glibcLocales ];

why do you want to remove the checkPhase ?

SuperSandro2000 · 2020-11-01T19:51:25Z

Result of nixpkgs-review pr 102378 run on x86_64-darwin 1

5 packages failed to build:

python27Packages.pycxx
python27Packages.pysvn
python37Packages.pycxx
python37Packages.pysvn
python38Packages.pysvn

1 package built:

python38Packages.pycxx

SuperSandro2000 · 2020-11-01T20:00:33Z

Result of nixpkgs-review pr 102378 run on x86_64-linux 1

4 packages failed to build:

python27Packages.pycxx
python27Packages.pysvn
python37Packages.pycxx
python37Packages.pysvn

3 packages built:

python38Packages.pycxx
python38Packages.pysvn
rabbitvcs

SuperSandro2000 · 2020-11-02T15:36:17Z

Result of nixpkgs-review pr 102378 run on x86_64-linux 1

7 packages built:

python27Packages.pycxx
python27Packages.pysvn
python37Packages.pycxx
python37Packages.pysvn
python38Packages.pycxx
python38Packages.pysvn
rabbitvcs

SuperSandro2000 · 2020-11-02T16:10:14Z

Result of nixpkgs-review pr 102378 run on x86_64-darwin 1

3 packages failed to build:

python27Packages.pysvn
python37Packages.pysvn
python38Packages.pysvn

3 packages built:

python27Packages.pycxx
python37Packages.pycxx
python38Packages.pycxx

@nix { "action": "setPhase", "phase": "buildPhase" }
building
build flags: SHELL=/nix/store/8i9kyqfxhk2s9dzx32x0sgdk7kyx9wjc-bash-4.4-p23/bin/bash
Info: Make generate_svn_error_codes.hpp
/nix/store/65gmh01007csxmd6bbkvas8zkhlw0k7n-python3-3.8.6/bin/python3.8 -u generate_svn_error_codes/create_svn_error_codes_hpp.py /nix/store/hhs26sndnd1pgfdjx28laj6z3a0mmpr0-subversion-1.12.2-dev/include/subversion-1
Compile: generate_svn_error_codes/generate_svn_error_codes.cpp into generate_svn_error_codes.o
/nix/store/8i9kyqfxhk2s9dzx32x0sgdk7kyx9wjc-bash-4.4-p23/bin/bash: g++: command not found
make: *** [Makefile:203: generate_svn_error_codes.o] Error 127

SuperSandro2000 · 2020-11-04T00:37:41Z

Result of nixpkgs-review pr 102378 run on x86_64-darwin 1

3 packages failed to build:

python27Packages.pysvn
python37Packages.pysvn
python38Packages.pysvn

3 packages built:

python27Packages.pycxx
python37Packages.pycxx
python38Packages.pycxx

building
build flags: SHELL=/nix/store/8i9kyqfxhk2s9dzx32x0sgdk7kyx9wjc-bash-4.4-p23/bin/bash
Info: Make generate_svn_error_codes.hpp
/nix/store/65gmh01007csxmd6bbkvas8zkhlw0k7n-python3-3.8.6/bin/python3.8 -u generate_svn_error_codes/create_svn_error_codes_hpp.py /nix/store/hhs26sndnd1pgfdjx28laj6z3a0mmpr0-subversion-1.12.2-dev/include/subversion-1
Compile: generate_svn_error_codes/generate_svn_error_codes.cpp into generate_svn_error_codes.o
/nix/store/8i9kyqfxhk2s9dzx32x0sgdk7kyx9wjc-bash-4.4-p23/bin/bash: g++: command not found
make: *** [Makefile:203: generate_svn_error_codes.o] Error 127

freezeboy · 2020-11-04T03:01:39Z

Ok I can't run the build on a darwin machine, I'd be grateful if someone can try to fix the build on this platform

nixos-discourse · 2020-11-15T00:22:54Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/368

jonringer

do you mind squashing the darwin fixup commit into the pysvn commit?

jonringer · 2020-11-24T00:30:33Z

cc @SuperSandro2000 for darwin review

jonringer · 2020-11-24T00:31:32Z

we can also do the darwin fix in another PR. Doesn't make sense to force people to support hardware they don't have (and Apple doesn't make it easy for me to emulate)

Mathnerd314

Looks good to me. I'm not using rabbitvcs anymore so if you want to take over maintainership of the package feel free.

SuperSandro2000 · 2020-11-26T00:34:32Z

Result of nixpkgs-review pr 102378 run on x86_64-linux 1

7 packages built:

python27Packages.pycxx
python27Packages.pysvn
python37Packages.pycxx
python37Packages.pysvn
python38Packages.pycxx
python38Packages.pysvn
rabbitvcs

SuperSandro2000 · 2020-11-26T07:54:25Z

Result of nixpkgs-review pr 102378 run on x86_64-darwin 1

3 packages failed to build:

python27Packages.pysvn
python37Packages.pysvn
python38Packages.pysvn

3 packages built:

python27Packages.pycxx
python37Packages.pycxx
python38Packages.pycxx

building
build flags: SHELL=/nix/store/k89nm2jva0qmvd970f84wq2iq1iwm9bs-bash-4.4-p23/bin/bash
Info: Make generate_svn_error_codes.hpp
/nix/store/0mabx9absir73mmijrsv0dsyvyya463r-python3-3.8.6/bin/python3.8 -u generate_svn_error_codes/create_svn_error_codes_hpp.py /nix/store/4vvvp48hqg8pgm5pval8xcl0zqgp9aid-subversion-1.12.2-dev/include/subversion-1
Compile: generate_svn_error_codes/generate_svn_error_codes.cpp into generate_svn_error_codes.o
/nix/store/k89nm2jva0qmvd970f84wq2iq1iwm9bs-bash-4.4-p23/bin/bash: g++: command not found
make: *** [Makefile:203: generate_svn_error_codes.o] Error 127

doronbehar

Mostly looks good.

pkgs/development/python-modules/pysvn/default.nix

doronbehar · 2020-11-28T16:12:43Z

pkgs/development/python-modules/pysvn/default.nix

-  NIX_CFLAGS_COMPILE="-I${pkgs.aprutil.dev}/include/apr-1";
+  NIX_CFLAGS_COMPILE="-I${aprutil.dev}/include/apr-1";
+
+  prePatch = ''


It'd be nice to explain this if possible.

Not needed anymore in fact, I remove this line

Then please squash that last commit into the commit that touches this file.

@freezeboy so do you intend to remove this prePatch ? Even if not, perhaps since it's tests related it'd be best to use postPatch, per https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/patch-phase.md .

Oh I thought your note was about the cflags, indeed I can move this sed call to postPatch

freezeboy · 2020-11-28T16:57:41Z

cc @doronbehar

jonringer

LGTM

https://github.com/NixOS/nixpkgs/pull/102378
7 packages built:
python37Packages.pycxx python37Packages.pysvn python38Packages.pycxx python38Packages.pysvn python39Packages.pycxx python39Packages.pysvn rabbitvcs

I think future improvements can be done later. But the PR is still a benefit

jonringer · 2020-12-05T19:07:41Z

@freezeboy ping me if no one merges in a day or so

Also remove dependency to python2

doronbehar · 2020-12-06T12:15:07Z

nixpkgs-review fails for me with:

builder for '/nix/store/sbyd6kjkpdvzhmaqgg9h22xyi3cc5sxa-pycxx-7.1.4.tar.gz.drv' failed with exit code 1; last 10 log lines:
  100   355  100   355    0     0     25      0  0:00:14  0:00:13  0:00:01   449
  100   154  100   154    0     0     10      0  0:00:15  0:00:14  0:00:01    10
  100   359  100   359    0     0     22      0  0:00:16  0:00:15  0:00:01   600
  100   138  100   138    0     0      8      0  0:00:17  0:00:15  0:00:02     8
  100   355  100   355    0     0     19      0  0:00:18  0:00:17  0:00:01   437
  100   154  100   154    0     0      8      0  0:00:19  0:00:18  0:00:01     8
  100   359  100   359    0     0     18      0  0:00:19  0:00:19 --:--:--   534
  100   138  100   138    0     0      6      0  0:00:23  0:00:20  0:00:03     6
  curl: (47) Maximum (20) redirects followed
  error: cannot download pycxx-7.1.4.tar.gz from any mirror

Probably happens only on my machine.

freezeboy · 2020-12-06T16:10:08Z

Strange, it works like a charm on my side :/

jonringer · 2020-12-06T17:16:28Z

@doronbehar that's probably a transient issue with pypi's hosting. I was able to build it earlier

freezeboy requested review from FRidh and jonringer as code owners November 1, 2020 18:54

ofborg bot added 6.topic: python 8.has: package (new) labels Nov 1, 2020

ofborg bot requested a review from Mathnerd314 November 1, 2020 19:34

ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Nov 1, 2020

SuperSandro2000 reviewed Nov 1, 2020

View reviewed changes

jonringer reviewed Nov 1, 2020

View reviewed changes

freezeboy force-pushed the refactor-rabbitvcs branch from bad862f to 6c56325 Compare November 1, 2020 20:47

jonringer reviewed Nov 24, 2020

View reviewed changes

Mathnerd314 approved these changes Nov 25, 2020

View reviewed changes

doronbehar requested changes Nov 28, 2020

View reviewed changes

freezeboy force-pushed the refactor-rabbitvcs branch from 2a45c79 to c7f5f93 Compare November 28, 2020 16:57

ofborg bot requested a review from Mathnerd314 November 28, 2020 17:26

freezeboy force-pushed the refactor-rabbitvcs branch from c7f5f93 to 3acbf22 Compare November 28, 2020 17:31

Mathnerd314 approved these changes Nov 29, 2020

View reviewed changes

freezeboy force-pushed the refactor-rabbitvcs branch from 3acbf22 to 301b1da Compare December 5, 2020 09:32

ofborg bot requested a review from Mathnerd314 December 5, 2020 09:41

jonringer approved these changes Dec 5, 2020

View reviewed changes

freezeboy added 3 commits December 6, 2020 11:24

python3Packages.pycxx: init at 7.1.4

99c1b97

python3Packages.pysvn: 1.8.0 -> 1.9.12

3e7d791

rabbitvcs: 0.17.1 -> 0.18

e54e408

Also remove dependency to python2

freezeboy force-pushed the refactor-rabbitvcs branch from 301b1da to e54e408 Compare December 6, 2020 10:57

jonringer merged commit 8f94e65 into NixOS:master Dec 6, 2020

freezeboy deleted the refactor-rabbitvcs branch December 6, 2020 19:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor rabbitvcs #102378

Refactor rabbitvcs #102378

freezeboy commented Nov 1, 2020 •

edited

SuperSandro2000 Nov 1, 2020

freezeboy Nov 1, 2020

jonringer Nov 1, 2020

freezeboy Nov 1, 2020

SuperSandro2000 commented Nov 1, 2020

SuperSandro2000 commented Nov 1, 2020

SuperSandro2000 commented Nov 2, 2020 •

edited

SuperSandro2000 commented Nov 2, 2020 •

edited

SuperSandro2000 commented Nov 4, 2020 •

edited

freezeboy commented Nov 4, 2020

nixos-discourse commented Nov 15, 2020

jonringer left a comment

jonringer commented Nov 24, 2020

jonringer commented Nov 24, 2020

Mathnerd314 left a comment

SuperSandro2000 commented Nov 26, 2020

SuperSandro2000 commented Nov 26, 2020 •

edited

doronbehar left a comment

doronbehar Nov 28, 2020

freezeboy Nov 28, 2020

doronbehar Nov 28, 2020

doronbehar Dec 6, 2020

freezeboy Dec 6, 2020

freezeboy commented Nov 28, 2020

jonringer left a comment

jonringer commented Dec 5, 2020

doronbehar commented Dec 6, 2020

freezeboy commented Dec 6, 2020

jonringer commented Dec 6, 2020 •

edited

	checkInputs = [ pkgs.glibcLocales ];
	checkInputs = [ glibcLocales ];

Refactor rabbitvcs #102378

Refactor rabbitvcs #102378

Conversation

freezeboy commented Nov 1, 2020 • edited

Motivation for this change

Things done

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SuperSandro2000 commented Nov 1, 2020

SuperSandro2000 commented Nov 1, 2020

SuperSandro2000 commented Nov 2, 2020 • edited

SuperSandro2000 commented Nov 2, 2020 • edited

SuperSandro2000 commented Nov 4, 2020 • edited

freezeboy commented Nov 4, 2020

nixos-discourse commented Nov 15, 2020

jonringer left a comment

Choose a reason for hiding this comment

jonringer commented Nov 24, 2020

jonringer commented Nov 24, 2020

Mathnerd314 left a comment

Choose a reason for hiding this comment

SuperSandro2000 commented Nov 26, 2020

SuperSandro2000 commented Nov 26, 2020 • edited

doronbehar left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

freezeboy commented Nov 28, 2020

jonringer left a comment

Choose a reason for hiding this comment

jonringer commented Dec 5, 2020

doronbehar commented Dec 6, 2020

freezeboy commented Dec 6, 2020

jonringer commented Dec 6, 2020 • edited

freezeboy commented Nov 1, 2020 •

edited

SuperSandro2000 commented Nov 2, 2020 •

edited

SuperSandro2000 commented Nov 2, 2020 •

edited

SuperSandro2000 commented Nov 4, 2020 •

edited

SuperSandro2000 commented Nov 26, 2020 •

edited

jonringer commented Dec 6, 2020 •

edited