quodlibet: 2.6.3 -> 3.9.1 #29404

sauyon · 2017-09-14T23:42:45Z

Motivation for this change

Quod Libet 2.6.3 is ancient

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
- Linux
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.

FRidh

Python packages need some work, meta is missing.

FRidh · 2017-09-15T10:19:47Z

pkgs/top-level/python-packages.nix

@@ -5596,6 +5596,15 @@ in {
    buildInputs = with self; [ fudge_9 nose ];
  };

+  faulthandler = buildPythonPackage rec {


Can you move this expression to python-modules/faulthandler/default.nix.

FRidh · 2017-09-15T10:19:54Z

pkgs/top-level/python-packages.nix

+  faulthandler = buildPythonPackage rec {
+    name = "faulthandler-${version}";
+    version = "2.6";
+    src = pkgs.fetchurl {


FRidh · 2017-09-15T10:20:15Z

pkgs/top-level/python-packages.nix

@@ -17465,6 +17474,14 @@ in {
    };
  };

+  pyobjc = buildPythonPackage rec {


python-modules/pyobjc/default/nix

FRidh · 2017-09-15T10:20:19Z

pkgs/top-level/python-packages.nix

+  pyobjc = buildPythonPackage rec {
+    name = "pyobjc-${version}";
+    version = "4.0b1";
+    src = pkgs.fetchurl {


sauyon · 2017-09-16T23:36:57Z

The license for quodlibet is stated to be

Quod Libet and all associated modules are free software distributed entirely under the terms of the GNU GPL version 2. Alternate licensing terms (such as GNU GPL “version 2 or later”, or the GNU LGPL) may be available for certain files or modules; see the files for details.

so I put gpl2.

FRidh · 2017-09-17T07:08:13Z

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

+
+  meta = {
+    description = "A bridge between the Python and Objective-C programming languages";
+    license = stdenv.lib.licenses.mit;


undefined variable ‘stdenv’ at /nix/store/9nl1fs575ayk3hk1bjymp03plh84wnrp-quodlibet.tar.gz/pkgs/development/python-modules/pyobjc/default.nix:16:24

Please do test.

can't, don't have a mac :/

actually I could've caught that... added licenses after building, whoops.

That's irrelevant. I got this evaluation error on NixOS. stdenv is not passed in.

Yea, its a common error. Happens to me as well.

FRidh · 2017-09-17T07:47:14Z

Something has gone wrong here with merging/rebasing. We need a single commit per package/expression.

sauyon · 2017-09-17T07:50:19Z

Yeah, I did the merge on github thinking "this'll be relatively easy to squash" like an idiot

sauyon · 2017-09-17T07:53:49Z

Do you want me to separate the python packages into their own commits?

FRidh · 2017-09-17T07:55:27Z

Preferably, yes.

orivej · 2017-10-01T10:03:49Z

@sauyon faulthandler should be disabled for python3, otherwise python36Packages.faulthandler is reachable and fails to build with ERROR: faulthandler is a builtin module since Python 3.3.

rycee · 2017-11-02T14:25:04Z

pkgs/top-level/python-packages.nix

@@ -5512,6 +5512,8 @@ in {
    buildInputs = with self; [ fudge_9 nose ];
  };

+  faulthandler = if ! isPy3k then callPackage ../development/python-modules/faulthandler {} else throw "faulthandler is built into ${python.executable}";


This line is very long, I think it would be clearer as

faulthandler = if ! isPy3k then callPackage ../development/python-modules/faulthandler {} else throw "faulthandler is built into ${python.executable}";

rycee · 2017-11-02T14:30:03Z

When attempting to build this on my NixOS box I get a problem with pyobjc:

rycee@beta:~/devel/nixpkgs$ nix-build -A python2Packages.pyobjc
these derivations will be built:
  /nix/store/p7w6vw0a4p7drshch389vsj9w1ggzf2z-python2.7-pyobjc-4.0b1.drv
building path(s) ‘/nix/store/jc240j31v04spa5mv8cq2c1gkn44cr32-python2.7-pyobjc-4.0b1’
unpacking sources
unpacking source archive /nix/store/30yzmj23wqhdgp41h92qs5kjd6s6i00m-pyobjc-4.0b1.tar.gz
source root is pyobjc-4.0b1
setting SOURCE_DATE_EPOCH to timestamp 1503862173 of file pyobjc-4.0b1/setup.cfg
patching sources
configuring
building
ERROR: Requires macOS to install or build
builder for ‘/nix/store/p7w6vw0a4p7drshch389vsj9w1ggzf2z-python2.7-pyobjc-4.0b1.drv’ failed with exit code 1
error: build of ‘/nix/store/p7w6vw0a4p7drshch389vsj9w1ggzf2z-python2.7-pyobjc-4.0b1.drv’ failed
rycee@beta (✗ 100):~/devel/nixpkgs$

sauyon · 2017-11-04T04:21:11Z

I've reformatted and disabled pyobjc for non-darwin (it's only for mac os)

rycee · 2017-11-04T11:23:39Z

pkgs/top-level/python-packages.nix

+    then callPackage ../development/python-modules/pyobjc {}
+    else throw "pyobjc can only be built on Mac OS";
+
+  pyodbc = buildPythonPackage rec {


I think your rebase got mixed up. There is already a

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

below. This results in an evaluation error:

error: attribute ‘pyodbc’ at /home/rycee/devel/nixpkgs/pkgs/top-level/python-packages.nix:16599:3 already defined at /home/rycee/devel/nixpkgs/pkgs/top-level/python-packages.nix:16579:3

sauyon · 2017-11-04T14:50:03Z

@rycee should be fixed.

rycee · 2017-11-04T23:02:49Z

Ok, looks good to me now but you must remove the unrelated "php: fix ldap paths when header exists on host system" commit before a merge can happen.

sauyon · 2017-11-05T14:38:37Z

@rycee odd, should be fixed.

rycee · 2017-11-05T20:04:27Z

Ok, now I could do a nox review and it looks good for me on NixOS. I'm a bit concerned about the error on the mac Travis though: https://travis-ci.org/NixOS/nixpkgs/jobs/297566861#L1081-L1082 Is this something that needs to be resolved? It seems limited to Python 3.6, which quodlibet does not use…

sauyon · 2017-11-05T20:07:08Z

@rycee it might make sense to disable it for python3, yeah. I don't know anything about it; I don't use a mac and am not the maintainer of the project.

EDIT: gone ahead and done so.

rycee · 2017-11-05T20:36:56Z

Rebased to master in 7486ae8. Thanks!

sauyon requested a review from FRidh as a code owner September 14, 2017 23:42

sauyon force-pushed the quodlibet branch 6 times, most recently from 99a4b36 to ceadedd Compare September 15, 2017 03:19

FRidh requested changes Sep 15, 2017

View reviewed changes

sauyon force-pushed the quodlibet branch 4 times, most recently from 468b8b0 to 1b3a523 Compare September 16, 2017 23:35

FRidh requested changes Sep 17, 2017

View reviewed changes

sauyon force-pushed the quodlibet branch from 7c3117f to 5990a64 Compare September 17, 2017 07:10

sauyon mentioned this pull request Sep 17, 2017

Quodlibet plugins aren't installed and don't work #27830

Closed

sauyon force-pushed the quodlibet branch from 7b8a3c7 to 1168347 Compare September 17, 2017 07:52

sauyon force-pushed the quodlibet branch 2 times, most recently from 01f3259 to 2d7f1a9 Compare September 17, 2017 08:07

sauyon force-pushed the quodlibet branch 2 times, most recently from f683cd9 to 30f035d Compare October 6, 2017 18:10

sauyon force-pushed the quodlibet branch from 30f035d to db5f69f Compare October 15, 2017 05:53

sauyon force-pushed the quodlibet branch from db5f69f to 35111af Compare October 29, 2017 02:00

GrahamcOfBorg added 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Oct 29, 2017

rycee reviewed Nov 2, 2017

View reviewed changes

sauyon force-pushed the quodlibet branch 2 times, most recently from 054bafb to b67681b Compare November 4, 2017 04:20

rycee reviewed Nov 4, 2017

View reviewed changes

sauyon force-pushed the quodlibet branch from b67681b to 7a0bd0d Compare November 4, 2017 14:48

sauyon added 2 commits November 5, 2017 14:38

python.pkgs.faulthandler: init at 2.6

6d3e85c

python.pkgs.pyobjc: init at 4.0b1

8ae1c6c

sauyon force-pushed the quodlibet branch from 7a0bd0d to 0860891 Compare November 5, 2017 14:38

quodlibet: 2.6.3 -> 3.9.1

aa548b4

sauyon force-pushed the quodlibet branch from 0860891 to aa548b4 Compare November 5, 2017 20:08

rycee closed this Nov 5, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

quodlibet: 2.6.3 -> 3.9.1 #29404

quodlibet: 2.6.3 -> 3.9.1 #29404

sauyon commented Sep 14, 2017

FRidh left a comment

FRidh Sep 15, 2017

FRidh Sep 15, 2017

FRidh Sep 15, 2017

FRidh Sep 15, 2017

sauyon commented Sep 16, 2017

FRidh Sep 17, 2017

sauyon Sep 17, 2017

sauyon Sep 17, 2017

FRidh Sep 17, 2017

FRidh Sep 17, 2017

FRidh commented Sep 17, 2017

sauyon commented Sep 17, 2017

sauyon commented Sep 17, 2017

FRidh commented Sep 17, 2017

orivej commented Oct 1, 2017

rycee Nov 2, 2017

rycee commented Nov 2, 2017

sauyon commented Nov 4, 2017

rycee Nov 4, 2017

sauyon commented Nov 4, 2017

rycee commented Nov 4, 2017

sauyon commented Nov 5, 2017

rycee commented Nov 5, 2017

sauyon commented Nov 5, 2017 •

edited

Loading

rycee commented Nov 5, 2017

quodlibet: 2.6.3 -> 3.9.1 #29404

quodlibet: 2.6.3 -> 3.9.1 #29404

Conversation

sauyon commented Sep 14, 2017

Motivation for this change

Things done

FRidh 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

sauyon commented Sep 16, 2017

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

FRidh commented Sep 17, 2017

sauyon commented Sep 17, 2017

sauyon commented Sep 17, 2017

FRidh commented Sep 17, 2017

orivej commented Oct 1, 2017

Choose a reason for hiding this comment

rycee commented Nov 2, 2017

sauyon commented Nov 4, 2017

Choose a reason for hiding this comment

sauyon commented Nov 4, 2017

rycee commented Nov 4, 2017

sauyon commented Nov 5, 2017

rycee commented Nov 5, 2017

sauyon commented Nov 5, 2017 • edited Loading

rycee commented Nov 5, 2017

sauyon commented Nov 5, 2017 •

edited

Loading