Commit Graph
100 Commits
Author SHA1 Message Date
Frederik Rietdijk 0e5f6ea243 pythonpackages.gspread: fix build 2019-08-17 17:57:55 +02:00
Frederik Rietdijk c68f58d95c Merge master into staging-next 2019-08-17 09:30:16 +02:00
Frederik Rietdijk 8d56f2472e Merge master into staging-next 2019-08-14 13:45:54 +02:00
Frederik Rietdijk 9bd78cb048 Merge master into staging-next 2019-08-09 14:00:27 +02:00
Frederik Rietdijk 33a876e619 anki: fix with pyqtwebengine 2019-08-03 16:04:34 +02:00
Frederik Rietdijk 888b8c819e pythonPackages.spyder: 3.3.4 -> 3.3.6 and fix with pyqt5 5.13 2019-08-03 16:04:34 +02:00
Frederik Rietdijk e65102bde7 pythonPackages.spyder-kernels: 0.4.4 -> 0.5.1 2019-08-03 16:04:34 +02:00
Frederik Rietdijk 03a820d3ea pythonPackages.sip: 4.19.14 -> 4.19.18 2019-08-03 16:04:34 +02:00
Frederik Rietdijk a12aeebedb Merge staging into staging-next 2019-08-03 08:21:54 +02:00
Frederik Rietdijk 658c0f0ce9 python38: 3.8.0b2 -> 3.8.0b3 2019-08-03 08:14:25 +02:00
Frederik Rietdijk 257c6529b1 Revert "pythonPackages.simplejson: 3.16.0 -> 3.16.1"
Mass-rebuild, should go to staging.

This reverts commit af70ce2873.
2019-08-03 07:52:10 +02:00
Frederik Rietdijk 4afe7a7bf3 Merge staging-next into staging 2019-08-03 07:48:19 +02:00
Frederik Rietdijk fbf4028074 Merge master into staging-next 2019-08-03 07:47:54 +02:00
Frederik Rietdijk 53328909da Merge staging-next into master, closes #65497 2019-08-03 07:42:50 +02:00
Frederik Rietdijk cd9846239a and another gdk_pixbuf rename 2019-08-03 07:10:13 +02:00
Frederik Rietdijk d20a59d2e5 Merge master into staging-next 2019-08-02 23:27:18 +02:00
Frederik Rietdijk 6f723b9bad Merge master into staging-next 2019-08-02 09:18:37 +02:00
Frederik Rietdijk 4ca8e53e1d Merge staging-next into staging 2019-08-01 09:44:06 +02:00
Frederik Rietdijk 55e4555b77 Merge master into staging-next 2019-08-01 09:42:54 +02:00
Frederik Rietdijk 1190f69d34 calibre: use qt5.wrapQtAppsHook, partially fixes #65313
Still fails due to Qt issue.
2019-07-30 13:16:18 +02:00
Frederik Rietdijk 92cb811455 git-cola: use qt5.wrapQtAppsHook 2019-07-30 13:16:18 +02:00
Frederik Rietdijk bf39fc17d4 Revert "qt 5.12.0 -> 5.12.3"
Segmentation faults. See https://github.com/NixOS/nixpkgs/issues/65448

This reverts commit 552803f6f5.
2019-07-28 12:16:29 +02:00
Frederik Rietdijk c220e00d7a Revert "qt512: Update qtbase.patch"
Segmentation faults. See https://github.com/NixOS/nixpkgs/issues/65448

This reverts commit 02afb228e2.
2019-07-28 12:16:29 +02:00
Frederik Rietdijk cb3ce5d26d Merge master into staging-next 2019-07-28 12:11:37 +02:00
Frederik Rietdijk c40307b8c9 doc: fix phases to include installCheckPhase 2019-07-28 12:08:39 +02:00
Frederik Rietdijk 802f51b920 way-cooler: fix eval 2019-07-28 10:55:26 +02:00
Frederik Rietdijk 3a14d2750b way-cooler: fix eval 2019-07-28 10:55:04 +02:00
Frederik Rietdijk 084fcf09e3 Merge staging into staging-next 2019-07-28 09:59:12 +02:00
Frederik Rietdijk 15564fbb4d wire-desktop: fix evaluating on other platforms
to unblock tarball job
2019-07-28 09:31:48 +02:00
Frederik Rietdijk 8af32fb4cd Merge staging-next into master
This brings in the NIX_PYTHONEXECUTABLE change to unblock the
nixos-unstable channel.
2019-07-28 09:15:27 +02:00
Frederik Rietdijk cca5ee9c07 Merge staging-next into staging 2019-07-28 09:10:03 +02:00
Frederik Rietdijk f441d3e3a5 Merge master into staging-next 2019-07-28 09:00:35 +02:00
Frederik Rietdijk 66ce9ba14b python: Cython: 0.29.12 -> 0.29.13 2019-07-27 12:19:54 +02:00
Frederik Rietdijk d09a85de5e python: statsmodels: 0.10.0 -> 0.10.1 2019-07-27 12:19:17 +02:00
Frederik Rietdijk 55d82d5430 python: numpy: 1.16.4 -> 1.17.0 2019-07-27 12:19:17 +02:00
Frederik Rietdijk bd47c5721f Python: introduce NIX_PYTHONEXECUTABLE in order to set sys.executable
This is needed in case of `python.buildEnv` to make sure sys.executable
does not point to the unwrapped executable.
2019-07-27 11:52:49 +02:00
Frederik Rietdijk 0f6bda38fe Merge staging-next into staging 2019-07-26 14:45:31 +02:00
Frederik Rietdijk 34eebf6844 Merge master into staging-next 2019-07-25 11:52:18 +02:00
Frederik Rietdijk 3d00d8e4ee pythonPackages.pyyaml_3: init , instead of multiple pyyaml overrides
Temporary attribute until we can get rid of it everywhere.

This was triggered due to the libyaml 0.2.2 incompatibilty requiring
patches and still not building.
2019-07-25 11:51:55 +02:00
Frederik Rietdijk b11049d562 Merge staging-next into staging 2019-07-22 14:16:15 +02:00
Frederik Rietdijk db6c38a075 Merge master into staging-next 2019-07-22 14:15:32 +02:00
Frederik Rietdijk 835f6b67bf Revert "strip setup hook: Strip using --strip-unneeded instead of --strip-debug."
This broke the bootstrapping of Darwin.

This reverts commit 3e867d16cd.
2019-07-22 09:15:01 +02:00
Frederik Rietdijk 36162c8c99 python: widgetsnbextension: 3.4.2 -> 3.5.0 2019-07-21 08:38:23 +02:00
Frederik Rietdijk 685386d8d7 python: tqdm: 4.32.1 -> 4.32.2 2019-07-21 08:38:23 +02:00
Frederik Rietdijk 32b76da844 pythonPackages.cmd_2_9: remove alias 2019-07-21 08:38:23 +02:00
Frederik Rietdijk e18dc13e50 Revert "pythonPackages.jsonschema: 2.6.0 -> 3.0.1"
Too soon. We need to wait till it is better supported.

This reverts commit ba4384d865.
2019-07-21 08:38:23 +02:00
Frederik Rietdijk b038b6db3d python: toolz: 0.9.0 -> 0.10.0 2019-07-21 08:38:23 +02:00
Frederik Rietdijk 7d0603501a python: xarray: 0.12.2 -> 0.12.3 2019-07-21 08:38:23 +02:00
Frederik Rietdijk 536341c91b python3Packages.pandas: 0.24.2 -> 0.25.0 2019-07-21 08:38:23 +02:00
Frederik Rietdijk 1665bde593 python: numba: 0.44.0 -> 0.45.0 2019-07-21 08:38:23 +02:00
Frederik Rietdijk 2d52072942 python: jupyter_core: 4.4.0 -> 4.5.0 2019-07-21 08:38:23 +02:00
Frederik Rietdijk 82b0f8645d python: jupyter_client: 5.2.4 -> 5.3.1 2019-07-21 08:38:23 +02:00
Frederik Rietdijk 68433031c3 python: ipywidgets: 7.4.2 -> 7.5.0 2019-07-21 08:38:23 +02:00
Frederik Rietdijk 6fd5726759 python3Packages.ipykernel: 5.1.0 -> 5.1.1 2019-07-21 08:38:23 +02:00
Frederik Rietdijk 6006bc4630 pythonPackages.cytoolz: 0.9.0.1 -> 0.10.0 2019-07-21 08:38:23 +02:00
Frederik Rietdijk 48ddd81780 python: Cython: 0.29.10 -> 0.29.12 2019-07-21 08:38:22 +02:00
Frederik Rietdijk c2bcf46a8a python3.pkgs.ipython: 7.5.0 -> 7.6.1 2019-07-21 08:38:22 +02:00
Frederik Rietdijk 56146c0cfa Revert "spotify: 1.0.96.181.gf6bc1b6b-12 -> 1.1.5.153.gf614956d-16"
Segmentation fault.

This reverts commit 3670450fc6.
2019-07-21 08:29:11 +02:00
Frederik Rietdijk be25210e89 Merge staging-next into staging 2019-07-20 09:21:59 +02:00
Frederik Rietdijk 0ce55a10d2 Merge master into staging-next 2019-07-19 16:33:38 +02:00
Frederik Rietdijk 594ca3f1cf ccache.links: make it a function of unwrappedCC
That way we can use a ccacheStdenv with e.g. a different CC:

stdenv = overrideCC gcc8Stdenv (ccacheWrapper.override { unwrappedCC
= gcc8Stdenv.cc.cc; });
2019-07-19 11:27:56 +02:00
Frederik Rietdijk 99bca19c10 Merge staging into staging-next 2019-07-17 10:58:12 +02:00
Frederik Rietdijk 0d832585b7 Merge staging-next into staging 2019-07-17 10:14:29 +02:00
Frederik Rietdijk 69476b4d90 Merge master into staging-next 2019-07-17 10:14:04 +02:00
Frederik Rietdijk a28a9ac156 Merge master into staging-next 2019-07-16 11:15:46 +02:00
Frederik Rietdijk e29cf29086 libyaml: actually use 0.2.2
The archive that was used turned out to be incorrect.
https://github.com/yaml/pyyaml/issues/320

By now a correct tarball has been uploaded but in order
to prevent issues like these we fetch now instead from GitHub.
2019-07-16 11:14:40 +02:00
Frederik Rietdijk 7da15d9b36 buildPythonPackage: add support for setupPyGlobalFlags (2) 2019-07-15 17:47:57 +02:00
Frederik Rietdijk a55c726f6b nodePackages.scuttlebot -> nodePackages.ssb-server, updated nodePackages_10_x
Package was renamed upstream.
2019-07-14 10:37:21 +02:00
Frederik Rietdijk 271b57c219 Revert "buildPythonPackage: add support for setupPyDistFlags"
I merged this a bit too quick. We need to have a closer look at it.
See the points brought up in https://github.com/NixOS/nixpkgs/pull/64682.

This reverts commit 1e0ebdb8a4.
2019-07-13 13:25:32 +02:00
Frederik Rietdijk 4aee94629d Merge staging-next into staging 2019-07-13 09:46:03 +02:00
Frederik Rietdijk 54065ae20d Merge master into staging-next 2019-07-13 09:45:40 +02:00
Frederik Rietdijk ec7f569211 python.buildEnv: use NIX_PYTHONPATH 2019-07-13 09:37:33 +02:00
Frederik Rietdijk 46409b5c32 Python: add sitecustomize.py, listen to NIX_PYTHONPATH
This commit adds a Nix-specific module that recursively adds paths that
are on `NIX_PYTHONPATH` to `sys.path`. In order to process possible
`.pth` files `site.addsitedir` is used.

The paths listed in `PYTHONPATH` are added to `sys.path` afterwards, but
they will be added before the entries we add here and thus take
precedence.

The reason for adding support for this environment variable is that we
can set it in a wrapper without breaking support for `PYTHONPATH`.
2019-07-13 09:37:33 +02:00
Frederik Rietdijk 8931db9f0b make-tarball / lib-tests: reduce duplication
The misc.nix and systems.nix tests were invoked at three different
places. Let's not that.
2019-07-11 18:02:05 +02:00
Frederik Rietdijk 8074133844 pythonPackages.fetchPypi: support SRI hashes 2019-07-11 18:01:04 +02:00
Frederik Rietdijk 30f299027a pythonPackages.fetchPypi: separate url computation from fetchurl 2019-07-11 18:01:04 +02:00
Frederik Rietdijk f2a8117492 pythonPackages.fetchPypi: put expression in own file
Also fixes an evaluation bug.
2019-07-11 18:01:04 +02:00
Frederik Rietdijk 48a28c399c jupyter-kernel: remove traceVal
`traceVal` is only for debugging and should not be delivered.

Partial revert of f72d7c49d5, fixes ofBorg eval.
2019-07-11 13:41:13 +02:00
Frederik Rietdijk 282c794d61 Merge staging-next into staging 2019-07-11 09:40:45 +02:00
Frederik Rietdijk 22cb7f25f2 Merge master into staging-next 2019-07-11 09:40:10 +02:00
Frederik Rietdijk ce2f74df2c Revert "systems/doubles.nix: add Apple doubles"
The lib tests need to be fixed as well.

This unbreaks the tarball job.

This reverts commit 00ba557856.
2019-07-10 12:37:06 +02:00
Frederik Rietdijk 6049c39bdb keybase: fix eval after merge mistake 2019-07-10 10:30:43 +02:00
Frederik Rietdijk fabbe17440 Merge staging into staging-next 2019-07-10 08:53:17 +02:00
Frederik Rietdijk da96a4119f Merge staging-next into staging 2019-07-10 08:52:50 +02:00
Frederik Rietdijk 7f23e982d1 Merge master into staging-next 2019-07-10 08:52:25 +02:00
Frederik Rietdijk 79a03641d5 Merge staging-next into staging 2019-07-09 15:46:26 +02:00
Frederik Rietdijk 74c24385cb Merge master into staging-next 2019-07-09 15:46:00 +02:00
Frederik Rietdijk 7cf5909fad Merge staging-next into staging 2019-07-09 15:44:08 +02:00
Frederik Rietdijk 421a87d94c python38: init at 3.8.0b2 2019-07-09 15:31:37 +02:00
Frederik Rietdijk 46d91410af python37: 3.7.3 -> 3.7.4 2019-07-09 10:04:25 +02:00
Frederik Rietdijk a88e319591 python36: 3.6.8 -> 3.6.9 2019-07-09 10:04:25 +02:00
Frederik Rietdijk f1ff85e61d Docs Python: fix example on how to override the package set
Not passing in the newly created interpreter as `self` results in an
incorrect `passthru`. Solves #64334.
2019-07-05 13:56:03 +02:00
Frederik Rietdijk 8e97d0be6b Merge staging into staging-next 2019-07-03 09:00:23 +02:00
Frederik Rietdijk 25a77b7210 Merge staging-next into staging 2019-07-03 08:59:42 +02:00
Frederik Rietdijk 3ad01beda7 Merge master into staging-next 2019-07-03 08:54:09 +02:00
Frederik Rietdijk d843e16cb8 Merge master into staging-next 2019-06-26 13:22:30 +02:00
Frederik Rietdijk 3fc7e97d5c wxwidgets 3.1: add default libGLSupported, fixes eval 2019-06-25 17:28:41 +02:00
Frederik Rietdijk 4589a04299 Merge master into staging-next 2019-06-25 16:26:29 +02:00
Frederik Rietdijk 32a7e35d17 wxwidgets: fix passthru, fixes tarball job
cc @romildo
2019-06-25 16:25:02 +02:00
Frederik Rietdijk 26335f358e elm: don't import <nixpkgs>, fixes tarball job
Don't import <nixpkgs>, because that is not allowed.
Broken by https://github.com/NixOS/nixpkgs/pull/63477

cc @turboMaCk
2019-06-25 16:14:56 +02:00