Commit Graph
100 Commits
Author SHA1 Message Date
Dmitry Kalinkin 4cb3041e49 Merge pull request #77359 from veprbl/pr/blender_darwin_fix
blender: fix on darwin
2020-01-14 20:10:20 -05:00
Dmitry Kalinkin 592e750e2e rivet: fix patch url
The old url is now broken. The new patch uses the new git repository.
2020-01-13 01:01:17 -05:00
Dmitry Kalinkin 66dde827fb krita: set -Wno-deprecated-copy for gcc
This reduces the build log length to fix the build on the Hydra.
2020-01-11 15:15:12 -05:00
Dmitry Kalinkin b74c26a17f Merge pull request #77467 from veprbl/pr/thrift_darwin_fix
thrift: fix checkPhase on darwin
2020-01-10 16:14:11 -05:00
Dmitry Kalinkin ef1a86592b thrift: fix checkPhase on darwin 2020-01-10 15:41:35 -05:00
Dmitry Kalinkin 8aa0e2fe1d blender: switch from openimageio to openimageio2 2020-01-10 13:55:49 -05:00
Dmitry Kalinkin f1d3df98d7 Merge pull request #76592 from snglth/master
flacon: improvements
2020-01-10 11:33:05 -05:00
Dmitry Kalinkin 2287d54e7d blender: fix on darwin
This enables building of Blender.app. The standard build process assumes
that the dependencies are installed in subdirectoris inside $LIBDIR with
libraries built as static. In current implementation we are not looking
to achieve portability, so cmake files are patched to link dynamically
with the libraries in the nix store. Linking to the transitive
dependencies is not needed in the shared case. There are also some minor
inconsistensies in the expected paths, which also need to be patched.

Alternatively, we could patch cmake files to treat darwin as "unix", but
that would require more tweaking to ensure that the frameworks are being
linked properly.
2020-01-09 02:54:50 -05:00
Dmitry Kalinkin 95b8c85331 openimageio: enable on darwin 2020-01-09 02:54:44 -05:00
Dmitry Kalinkin e57392dbc2 blender: switch to OpenJPEG 2.x
Fixes:

-- Could NOT find OpenJPEG (missing: OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR)

and

  - WITH_IMAGE_OPENJPEG         OFF
2020-01-09 02:53:06 -05:00
Dmitry Kalinkin c0b70f0e35 texlive: make updmap actually regenerate (#76826) (#76867)
* texlive: make updmap actually regenerate (#76826)

The --syncwithtrees flag only updates the config files, so run it
again without --syncwithtrees to generate the actual map files.

* ! fixup

* ! fixup

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
2020-01-07 13:17:40 -05:00
Dmitry Kalinkin 00b7680f28 ! fixup 2020-01-07 11:08:13 -05:00
Dmitry Kalinkin f9d18e5ddc ! fixup 2020-01-07 11:00:36 -05:00
Dmitry Kalinkin bb890c4561 double-conversion: remove the "static" option
pkgsStatic.double-conversion already has CMAKE_BUILD_SHARED set to OFF.
2020-01-03 11:44:23 -05:00
Dmitry Kalinkin 4541012bdb glog: remove the "static" option
pkgsStatic.glog already has CMAKE_BUILD_SHARED set to OFF.
2020-01-03 11:42:52 -05:00
Dmitry Kalinkin 7e2c821e58 gtest: remove the "static" option
pkgsStatic.gtest already has CMAKE_BUILD_SHARED set to OFF.
2020-01-03 11:41:19 -05:00
Dmitry Kalinkin 7e5b495851 fmt: remove the enableShared option
Static libraries are to be provided by the pkgsStatic.fmt package.
2020-01-03 11:31:21 -05:00
Dmitry Kalinkin d05ee9c8ff pkgsStatic: set BUILD_SHARED_LIBS=OFF for cmake 2020-01-03 11:31:17 -05:00
Dmitry Kalinkin d5b0c114a3 pythonPackages.jedi: 0.15.1 -> 0.15.2 2019-12-30 16:46:52 +01:00
Dmitry Kalinkin 4c7a9a0a88 unityhub: switch name to "unityhub"
cc #65391
2019-12-29 10:37:48 -05:00
Dmitry Kalinkin c69b4f8e9c python3Packages.ipykernel: fix build on darwin 2019-12-29 01:25:26 -08:00
Dmitry Kalinkin afacb9d06b python3Packages.ipykernel: use pytestCheckHook, enable all tests
All tests pass on NixOS. Some still fail on Darwin, but it's a different
issue.
2019-12-29 01:25:26 -08:00
Dmitry Kalinkin 596fa28448 Merge pull request #76549 from veprbl/pr/pyslurm_remove
pythonPackages.pyslurm: change maintainer
2019-12-28 15:11:07 -05:00
Dmitry Kalinkin 435b8862c6 Merge pull request #76528 from hamishmack/darktable-macos
darktable: Add openmp when cc.isClang to fix macos
2019-12-27 16:36:49 -05:00
Dmitry Kalinkin c744527e3e gitAndTools.git-annex: fix darwin build
Closes: #76342
Fixes: #73435
2019-12-27 20:37:13 +01:00
Dmitry Kalinkin 2926173123 pythonPackages.pyslurm: add bhipple to maintainers 2019-12-27 13:51:11 -05:00
Dmitry Kalinkin 8e9741ed49 pythonPackages.pyslurm: remove veprbl from maintainers 2019-12-27 13:49:29 -05:00
Dmitry Kalinkin a10ba57d29 Merge pull request #76550 from veprbl/pr/histbook_remove
pythonPackages.histbook: remove
2019-12-26 18:10:39 -05:00
Dmitry Kalinkin 2272e349f1 Merge pull request #76555 from veprbl/pr/remove_ndowens
maintainer-list.nix: remove ndowens
2019-12-26 17:14:13 -05:00
Dmitry Kalinkin 88f77259d4 pythonPackages.histbook: remove
The development of this library has been stopped, the github repo
archived.
2019-12-26 16:06:25 -05:00
Dmitry Kalinkin 984ceb1092 Merge pull request #76541 from veprbl/pr/root_python_wrap
root: wrap python executables
2019-12-26 12:29:12 -05:00
Dmitry Kalinkin 0b28198f23 root: wrap python executables
In normal use of ROOT the PYTHONPATH is intended to be set when user
sources the thisroot.{,s}sh. We do that in the setupHook. This covers
the case when thisroot.sh was not sourced.
2019-12-26 11:49:12 -05:00
Dmitry Kalinkin 613705835f Merge pull request #76327 from veprbl/pr/theano_darwin_fix
pythonPackages.Theano: fix darwin build
2019-12-24 12:51:04 -05:00
Dmitry Kalinkin d4f1fa709c pythonPackages.Theano: fix darwin build
This only formally fixes the name of the compiler. Theano appears to be
working on darwin after this.
2019-12-23 18:08:28 -05:00
Dmitry Kalinkin 8ae72e89bb Merge pull request #76105 from veprbl/pr/pythia_8_244
pythia: 8.243 -> 8.244
2019-12-20 19:51:31 -05:00
Dmitry Kalinkin 4544107ed1 pythia: 8.243 -> 8.244 2019-12-20 10:28:56 -05:00
Dmitry Kalinkin aa934faff2 Merge pull request #75703 from kampka/port-tests-3
Port NixOS tests to python
2019-12-20 09:52:33 -05:00
Dmitry Kalinkin 3e5849adbb Merge pull request #76075 from eadwu/nvidia_x11/2019-12.1
nvidia_x11: 440.36 -> 440.44
2019-12-19 23:41:15 -05:00
Dmitry Kalinkin 9faa37cfdf Merge pull request #75701 from kampka/port-tests-2
Port NixOS tests to python
2019-12-17 21:51:42 -05:00
Dmitry Kalinkin fc47ec691f Merge pull request #75695 from kampka/port-tests
Port NixOS tests to python
2019-12-17 21:45:59 -05:00
Dmitry Kalinkin 5b08ec45fe Merge pull request #75845 from rnhmjoj/fsv
fsv: fix build with gettext 0.20
2019-12-17 18:45:08 -05:00
Dmitry Kalinkin 7891f3d706 Merge pull request #75730 from veprbl/pr/texlive_bin_pygmentex
texlive: provide a working pygmentex executable
2019-12-16 13:21:24 -05:00
Dmitry Kalinkin 83c5184398 Merge pull request #75734 from veprbl/pr/herwig_7_2_0
herwig: 7.1.6 -> 7.2.0
2019-12-16 05:26:52 -05:00
Dmitry Kalinkin 95b0bc0989 herwig: 7.1.6 -> 7.2.0
thepeg: 2.1.6 -> 2.2.0
2019-12-15 20:56:40 -05:00
Dmitry Kalinkin dfc9845838 texlive: provide a working pygmentex executable
The old top-level pygmentex package is replaced with an alias.
2019-12-15 19:52:17 -05:00
Dmitry Kalinkin d4599019c5 Merge pull request #75656 from veprbl/pr/rootpy_remove
pythonPackages.{root_numpy,rootpy}: remove
2019-12-14 13:12:45 -05:00
Dmitry Kalinkin ba3cf09788 pythonPackages.rootpy: remove 2019-12-14 12:07:29 -05:00
Dmitry Kalinkin fc21603717 pythonPackages.root_numpy: remove 2019-12-14 12:05:18 -05:00
Dmitry Kalinkin b6d8873825 root: 6.12.06 -> 6.18.04
Also switch to python3.
2019-12-14 01:28:27 -08:00
Dmitry Kalinkin 5a8b235897 Merge pull request #75631 from veprbl/pr/herwig_7_1_6
herwig: 7.1.5 -> 7.1.6
2019-12-13 22:19:05 -05:00
Dmitry Kalinkin 2f79be40d6 herwig: 7.1.5 -> 7.1.6
thepeg: 2.1.5 -> 2.1.6
2019-12-13 18:52:56 -05:00
Dmitry Kalinkin c644c7578d texlive.bin.dvipng: fix "Fatal error, PK file ends prematurely"
Closes: #75605
2019-12-13 13:14:35 -05:00
Dmitry Kalinkin 9e58ecd4ad Merge pull request #75335 from veprbl/pr/texlive-bin-dvisvgm_fix
texlive.bin.dvisvgm: fix
2019-12-11 00:21:41 -05:00
Dmitry Kalinkin 2f637f4cff texlive.bin.dvisvgm: don't provide dependencies that it ignores
dvisvgm currently uses its own vendored versions for multiple libraries
2019-12-08 23:04:57 -05:00
Dmitry Kalinkin d26ca8bc66 texlive.bin.dvisvgm: fix for our ghostscript 2019-12-08 22:59:45 -05:00
Dmitry Kalinkin 302a0be9db owncloud-client: disable shibboleth 2019-12-08 22:15:57 +01:00
Dmitry Kalinkin 61b7d24d91 nextcloud-client: disable shibboleth
Allows to remove qtwebkit dependency
2019-12-07 23:37:29 -05:00
Dmitry Kalinkin 8a084180cd Merge pull request #73212 from veprbl/pr/awkward1_init
pythonPackages.awkward1: init at 0.1.28
2019-12-07 21:48:31 -05:00
Dmitry Kalinkin cc2334849f pythonPackages.awkward1: init at 0.1.28 2019-12-07 21:47:50 -05:00
Dmitry Kalinkin adbd96a2c5 Merge pull request #74334 from veprbl/pr/tensorflow_darwin_enable
python3Packages.tensorflow-build: enable on darwin
2019-12-07 21:08:56 -05:00
Dmitry Kalinkin ebf645e8e3 Merge pull request #74853 from veprbl/pr/fastparquet_0_3_2
pythonPackages.fastparquet: 0.2.1 -> 0.3.2
2019-12-07 21:08:35 -05:00
Dmitry Kalinkin 318c986f39 Merge pull request #75189 from Luflosi/kitty-no-glfw
kitty: remove unused GLFW dependency
2019-12-07 20:23:46 -05:00
Dmitry Kalinkin 9d2ed2f0bd Merge pull request #74305 from veprbl/pr/texlive_use_tlinfo_snapshot
texlive: use texlive.info snapshot
2019-12-07 14:23:08 -05:00
Dmitry Kalinkin 5af3071079 rivet: fix bug in make-plots 2019-12-05 12:42:15 -05:00
Dmitry Kalinkin 31cf89957a Merge pull request #74979 from Shopify/seb-phantomjs2-clang60
phantomjs2: Fix compilation when using clang60
2019-12-05 12:04:58 -05:00
Dmitry Kalinkin 437a1dd050 fastparquet: enable tests 2019-12-02 17:59:47 -05:00
Dmitry Kalinkin 9f0933cf73 pythonPackages.fastparquet: 0.2.1 -> 0.3.2 2019-12-02 17:39:27 -05:00
Dmitry Kalinkin e678aadb04 Merge pull request #74816 from prusnak/python-fido2
python3Packages.fido2: 0.7.3 -> 0.8.1
2019-12-02 11:05:10 -05:00
Dmitry Kalinkin 8d17a20f6a Merge pull request #73167 from eadwu/nvidia_x11/2019-11.1
nvidia_x11: 2019-11.1
2019-11-30 22:47:47 -05:00
Dmitry Kalinkin d6fdab57cf texlive: use texlive.info snapshot
These are easy to access daily snapshots maintained by one of the
texlive developers.
2019-11-27 10:20:33 -05:00
Dmitry Kalinkin 074dbdd81d python3Packages.tensorflow: use tensorflow-build on darwin
The tensorflow-bin is currently broken.
2019-11-27 08:34:32 -05:00
Dmitry Kalinkin 9c42df8d3e python3Packages.tensorflow-build: enable on darwin 2019-11-27 08:34:25 -05:00
Dmitry Kalinkin 89074b4a15 applgrid: fix build 2019-11-24 22:51:49 -05:00
Dmitry Kalinkin aa7efea848 Merge pull request #73958 from markuskowa/upd-lapack
liblapack: 3.8.0 -> 3.9.0
2019-11-24 20:06:04 -05:00
Dmitry Kalinkin bd0c4dd6ab root: fix setupHook to work with "set -u" 2019-11-24 17:51:46 -05:00
Dmitry Kalinkin 3ff236097b fastjet-contrib: init at 1.042 2019-11-19 09:38:06 -08:00
Dmitry Kalinkin f4ae8d09e7 texlive: remove dvidvi override
Not needed anymore
2019-11-13 16:54:53 -05:00
Dmitry Kalinkin 93ee8095b0 snakemake: 5.4.4 -> 5.7.4 (#72929)
(#72929)
2019-11-13 00:46:56 +01:00
Dmitry Kalinkin a84607a0e9 eagle: use mkDerivation provided by qt5 2019-11-12 11:21:06 -05:00
Dmitry Kalinkin c57018fb3b arrow-cpp: fix tests not being run on linux
Fixes: 8c86e54a ('arrow-cpp: fix/disable some plasma tests on darwin')
2019-11-11 06:18:42 -05:00
Dmitry Kalinkin 418f5506e3 Merge pull request #73203 from veprbl/pr/arrow-cpp_i686
arrow-cpp: fix on i686-linux
2019-11-11 04:15:29 -05:00
Dmitry Kalinkin 03e78496b6 arrow-cpp: fix on i686-linux 2019-11-11 03:23:09 -05:00
Dmitry Kalinkin 21c3fabb44 Merge pull request #72804 from xtruder/pkgs/facetimehd-firmware/update-firmware-link
facetimehd-firmware: 1.43_4 -> 1.43_5
2019-11-09 05:13:34 -05:00
Dmitry Kalinkin 6fa62dbefd Merge pull request #71419 from veprbl/pr/texlive-2019
texlive: 2018 -> 2019, poppler: 0.74.0 -> 0.81.0
2019-11-07 23:51:36 -05:00
Dmitry Kalinkin deaaf825d2 poppler: 0.74.0 -> 0.81.0 2019-11-06 15:43:55 -05:00
Dmitry Kalinkin 81f6fbdb0a inkscape: add compatibility with poppler 0.76.0+ 2019-11-06 15:43:54 -05:00
Dmitry Kalinkin 97dbf112b4 texlive: 2018 -> 2019
biber: 2.12 -> 2.13

Vendored potrace was moved from libs/potrace to
texk/dvisvgm/dvisvgm-src/libs/potrace. Unfortunately, it is not trivial
to remove it from there, so for now dvisvgm seems to be using its
vendored dependencies.
2019-11-06 12:56:10 -05:00
Dmitry Kalinkin 93b2d98726 texlive: UPGRADE.md: Add --location option to allow referrals 2019-11-06 12:56:05 -05:00
Dmitry Kalinkin 7272491194 Merge pull request #72373 from jlesquembre/pulumi-fix
pulumi: install providers and add update script
2019-11-06 11:32:33 -05:00
Dmitry Kalinkin cf8a2d0225 Revert "stdenv/check-meta: getEnv if the attribute is unset (#72376)" (#72752)
This reverts commit 71184f8e15.
2019-11-03 20:38:35 -05:00
Dmitry Kalinkin 3466faf9d8 pythonPackages.setuptoolsBuildHook: fix debug message 2019-11-03 10:34:44 +01:00
Dmitry Kalinkin 3328244936 Merge pull request #72037 from kragniz/openrw-2019-10-26
openrw: 2017-09-17 -> 2019-10-26
2019-10-29 16:15:24 -04:00
Dmitry Kalinkin ddbf53b855 openrw: move cmake to nativeBuildInputs, fix on darwin
Darwin fix as suggested by @risicle
2019-10-29 14:08:29 -04:00
Dmitry Kalinkin f3a97b24cd Merge pull request #72095 from jokogr/f/qt5ct-qmakeflags
qt5ct: qtsvg, qmakeFlags nixification
2019-10-27 15:10:08 -04:00
Dmitry Kalinkin e98a2d752c Merge pull request #71483 from eadwu/sourcehut/update-2
sourcehut: update 2
2019-10-23 17:39:18 -04:00
Dmitry Kalinkin 5d19c11efe Merge pull request #70997 from veprbl/pr/cmake_iframework
cmake: process -iframework in setup-hook
2019-10-13 07:33:35 -04:00
Dmitry Kalinkin c8041d97a5 cmake: process -iframework in setup-hook
This fixes a regression in #26197

Fixes: f496357585 ('cc-wrapper: use -iframework instead of -F')
2019-10-11 18:48:16 -04:00
Dmitry Kalinkin b32d6f1c16 Merge pull request #70987 from freepotion/update-my-email
maintainer-list.nix: email update
2019-10-11 15:42:50 -04:00
Dmitry Kalinkin 1f9882cb29 Merge pull request #70841 from callahad/mariadb
mariadb: fix builds on darwin
2019-10-10 22:58:28 -04:00
Dmitry Kalinkin a7b3728c64 Merge pull request #70255 from eadwu/sourcehut/update-1
sourcehut.*: 2019.10.02
2019-10-09 12:50:58 -04:00