Commit Graph
100 Commits
Author SHA1 Message Date
Bas van Dijk 6ac10cd764 Merge pull request #53399 from LumiGuide/feat-wordpress-copy-plugins
apache-httpd/wordpress: copy plugins and themes instead of symlinking
2019-01-07 13:41:29 +01:00
Bas van Dijk 8ad610b040 Merge pull request #53523 from jacereda/futhark-darwin
Fix futhark build on Darwin
2019-01-07 12:13:13 +01:00
Bas van Dijk f2eda0105b Merge pull request #53289 from LumiGuide/feat-wordpress-upgrade
Wordpress: 4.9.1 -> 5.0.2
2019-01-03 11:14:46 +01:00
Bas van Dijk 559916f648 haskellPackages.inline-c-cpp: disable test-suite on darwin to fix the build 2019-01-01 16:51:24 +01:00
Bas van Dijk 4b033e3e49 Merge pull request #52794 from LumiGuide/opencv_contrib-4.0.1
opencv4: opencv_contrib: 4.0.0 -> 4.0.1
2018-12-24 23:56:38 +01:00
Bas van Dijk e36ab216ec opencv4: opencv_contrib: 4.0.0 -> 4.0.1 2018-12-24 23:37:12 +01:00
Bas van Dijk 5747c7114e Merge pull request #52689 from LumiGuide/pgmanage-11.0.1
pgmanage: 10.3.1 -> 11.0.1
2018-12-22 18:37:12 +01:00
Bas van Dijk ee42dab330 Merge pull request #52687 from LumiGuide/opencv-4.0.1
OpenCV: 3.4.5 & 4.0.1
2018-12-22 18:36:44 +01:00
Bas van Dijk f1f1de32f3 pgmanage: 10.3.1 -> 11.0.1 2018-12-22 17:39:15 +01:00
Bas van Dijk 8347028c21 opencv4: 4.0.0 -> 4.0.1 2018-12-22 17:26:12 +01:00
Bas van Dijk b2ea557879 opencv3: 3.4.4 -> 3.4.5 2018-12-22 17:24:21 +01:00
Bas van Dijk 72eae72223 openblas: fix build on x86_64-darwin
See: https://github.com/xianyi/OpenBLAS/issues/1926
2018-12-20 13:25:44 +01:00
Bas van Dijk 6267a02d9c opencv4: fix OpenCV issue 13207
This is the same fix as for opencv3 in commit:
2572dd11accf701feeefd6fd4ee45be98cb47016
2018-12-20 10:49:40 +01:00
Bas van Dijk 49965e61d7 opencv3: fix OpenCV issue 13207
See: https://github.com/opencv/opencv/pull/13232

This also fixes the test of haskell-opencv HEAD where we got the
following error:

    Feature Detection
      houghLinesP:
libgomp: Out of memory allocating 927712937064 bytes
Test suite test-opencv: FAIL
2018-12-20 10:49:40 +01:00
Bas van Dijk 9c53047262 Merge pull request #51256 from LumiGuide/elasticsearch-curator-5.6.0
elasticsearch-curator: 5.5.4 -> 5.6.0
2018-12-13 21:14:45 +01:00
Bas van Dijk 5d970e740e pythonPackages.elasticsearch-curator: 5.5.4 -> 5.6.0 2018-12-13 20:58:58 +01:00
Bas van Dijk 1ce2cc47fc pythonPackages.certifi: 2018.10.15 -> 2018.11.29 2018-12-13 20:58:25 +01:00
Bas van Dijk b560dd9047 elasticsearch: make sure to patchelf the x-pack-ml binaries 2018-12-02 15:54:20 +01:00
Bas van Dijk 7035598251 Merge pull request #51225 from LumiGuide/elk-6.5.1
elk: 6.3.2 -> 6.5.1
2018-12-02 14:44:47 +01:00
Bas van Dijk fbf0efc6a7 elk: 6.3.2 -> 6.5.1 2018-12-01 12:47:12 +01:00
Bas van Dijk 274e72aa29 Merge pull request #51027 from LumiGuide/opencv-4.0.0
opencv4: init at 4.0.0
2018-11-30 23:56:36 +01:00
Bas van Dijk e03512878b Merge pull request #51021 from LumiGuide/opencv-3.4.4
opencv3: 3.4.3 -> 3.4.4
2018-11-30 23:56:20 +01:00
Bas van Dijk aa358e6ee7 opencv3: 3.4.3 -> 3.4.4 2018-11-30 23:07:52 +01:00
Bas van Dijk 2b87ed7c32 opencv4: init at 4.0.0 2018-11-30 22:45:57 +01:00
Bas van Dijk d429dc3b06 Merge pull request #50879 from ElvishJerricco/bump-ghcjs-2018-11-21
Bump GHCJS 8.4
2018-11-22 13:02:52 +01:00
Bas van Dijk 0b381dd9ca Merge pull request #49197 from LumiGuide/strongswan-swanctl-5.7.1
strongswan-swanctl: adapt options to strongswan-5.7.1
2018-10-27 09:34:53 +01:00
Bas van Dijk ca655e8b14 strongswan-swanctl: adapt options to strongswan-5.7.1
The changes were found by executing the following in the strongswan
repo (https://github.com/strongswan/strongswan):

git diff 5.6.3..5.7.1 src/swanctl/swanctl.opt
2018-10-26 23:46:02 +02:00
Bas van Dijk 945c6b9981 Merge pull request #48699 from ElvishJerricco/overridable-buildFromSdist
haskell.lib.buildFromSdist: Allow overrideCabal
2018-10-26 11:17:24 +01:00
Bas van Dijk 5ea9d9d097 haskell: add GitHub issues to non-hackage-packages.nix 2018-10-12 14:17:48 +02:00
Bas van Dijk b64193f69b haskellPackages.multi-ghc-travis: removed in favour of haskell-ci
multi-ghc-travis has been renamed to haskell-ci which is now also on Hackage.
2018-10-12 14:17:24 +02:00
Bas van Dijk 7b49b870cb haskell: have a dedicated file for non Hackage packages
We had a few "overrides" in configuration-common.nix that were really
extensions. They introduced packages that weren't in hackage-packages.nix.

The advantage of having a dedicated file for these packages is that we can still
place Nix-specific overrides to these packages in configuration-nix.nix. We
weren't able do this before because configuration-nix.nix extended only the
packages from hackage-packages.nix.
2018-10-12 14:12:29 +02:00
Bas van Dijk 0c25079958 futhark: introduce the top-level futhark attribute
The fact that futhark is a Haskell package is an implementation detail. To
install it users should just have to specify `futhark` instead of
`haskellPackages.futhark`.

Additionally futhark is overridden with `haskell.lib.justStaticExecutables` to
reduce closure size.
2018-10-12 14:12:29 +02:00
Bas van Dijk fceab3ec62 lib: fix wording of the overrideScope warning 2018-10-11 17:23:47 +02:00
Bas van Dijk 0ab8fa2181 Merge pull request #47424 from Taneb/dontcheck-generic-lens
haskellPackages.generic-lens: dontCheck
2018-09-28 10:55:38 +02:00
Bas van Dijk 5af67a3dbe Merge pull request #47456 from srhb/haskellPackages-term-rewriting
haskellPackages.term-rewriting: doJailbreak and dontCheck
2018-09-28 10:44:55 +02:00
Bas van Dijk 36e8d638d4 haskellPackages.haddock-api: fix build
Also remove haddock-library == 1.4.4 since it's not needed anymore
2018-09-24 01:57:09 +02:00
Bas van Dijk e1d51fa9e6 haskellPackages.yi-core: use overrideScope instead of override 2018-09-24 01:57:09 +02:00
Bas van Dijk 1d7b922238 haskellPackages.safe-money-*: use overrideScope instead of override 2018-09-24 01:57:09 +02:00
Bas van Dijk 38467261c3 haskellPackages.Frames: use overrideScope instead of override 2018-09-24 01:57:09 +02:00
Bas van Dijk 9b67908e67 haskellPackages.Euterpea: fix build by using PortMidi == 0.2 2018-09-23 22:50:04 +02:00
Bas van Dijk 73cf1c26d8 haskellPackages.Frames-beam: disable tests because it requires a running PostgreSQL server 2018-09-23 21:57:17 +02:00
Bas van Dijk ff6122c993 haskellPackages.Frames: fix build by using vinyl-0.10.0 2018-09-23 21:54:25 +02:00
Bas van Dijk 73862bf812 haskellPackages.mandrill: fix build for ghc843 2018-09-21 19:08:25 +02:00
Bas van Dijk b2042983ef Merge pull request #46956 from Taneb/sbv-fix-z3
haskellPackages.sbv: fix location of z3 executable
2018-09-20 14:03:36 +02:00
Bas van Dijk 8228c787b4 Merge pull request #46837 from Taneb/JuicyPixels-docs
haskellPackages.JuicyPixels: re-enable Haddock
2018-09-18 21:46:06 +02:00
Bas van Dijk 0a30853461 Merge pull request #46512 from michaelpj/imp/haskell-benchmarks
haskell lib: add --enable-benchmarks in doBenchmark
2018-09-18 14:57:03 +02:00
Bas van Dijk d05a8bb410 Merge pull request #44424 from dhess/callCaball2nixWithOption
haskell-modules: add callCabal2nixWithOptions.
2018-09-11 09:00:03 +02:00
Bas van Dijk deda080e32 Merge pull request #46043 from vaibhavsagar/bump-all-cabal-hashes
all-cabal-hashes: update snapshot to Hackage at 2018-09-04T11:59:40Z
2018-09-06 17:48:04 +02:00
Bas van Dijk 7158e7442f Merge pull request #46103 from teto/haskell_mnist
haskellPackages.tensorflow-mnist-input-data: fetch
2018-09-06 09:28:50 +02:00
Bas van Dijk 1fc5a6d2b6 haskell: build the tensorflow packages on hydra since they now build successfully 2018-09-06 09:15:56 +02:00
Bas van Dijk 6e14b9fc2d Revert "libtensorflow: 1.9.0 -> 1.10.0"
This reverts commit 713991132e.

libtensorflow is only used by the Haskell tensorflow packages and they
don't work with tensorflow-1.10 yet. So the easiest solution is to
just revert this commit and add it back when they do gain support.
2018-09-06 09:15:56 +02:00
Bas van Dijk 39d35e77ee Revert "libtensorflow: fix hashes for darwin and cuda downloads"
This reverts commit 93ed13f86b.

libtensorflow is only used by the Haskell tensorflow packages and they
don't work with tensorflow-1.10 yet. So the easiest solution is to
just revert this commit and add it back when they do gain support.
2018-09-06 09:15:56 +02:00
Bas van Dijk a5f08c17e5 haskellPackages.tensorflow-mnist: fix missing dependency on tensorflow-mnist-input-data 2018-09-06 09:15:56 +02:00
Bas van Dijk 641025d410 haskellPackages.tensorflow-mnist-input-data: link data files instead of copying
This prevents duplication in the nix store.
2018-09-06 09:15:56 +02:00
Bas van Dijk 6bd8799448 haskellPackages.tensorflow-mnist-input-data: use an attribute set to specify the data files
This is more understandable and safer than using a nested list.
2018-09-06 09:15:50 +02:00
Bas van Dijk 252c0d4c82 opencv: 3.4.2 -> 3.4.3 2018-09-03 12:38:50 +02:00
Bas van Dijk 97a4d29545 haskell: disable library profiling for static executables
Haskell packages overridden with justStaticExecutables
(like cabal-install, stack, pandoc, darcs, etc.) don't provide
libraries in the end result so it's futile to build them with library
profiling enabled because it will just take extra time.
2018-08-27 14:31:34 +02:00
Bas van Dijk 7f3f9ffc14 Merge pull request #45633 from typetetris/hunspell-hs-fix
hunspell-hs: fix build
2018-08-26 22:04:06 +02:00
Bas van Dijk a144c798e5 Merge pull request #44340 from shmish111/es-curator
nixos/curator: init elasticsearch curator
2018-08-26 01:33:34 +02:00
Bas van Dijk 954eb34a53 elasticsearch-curator: explain why we disable the test-suite 2018-08-26 01:20:15 +02:00
Bas van Dijk d5e7d48f5e requests-aws4auth: only disable tests on python >= 3 2018-08-26 01:12:16 +02:00
Bas van Dijk 228705fc33 elasticsearch-curator: add note to the NixOS release notes 2018-08-25 18:59:32 +02:00
Bas van Dijk 241377ee76 nixos/tests/elk.nix: make sure the test doesn't wait for too long on elasticsearch-curator 2018-08-25 18:53:10 +02:00
Bas van Dijk 8aa3318741 elasticsearch-curator: disable test-suite because it hangs 2018-08-25 18:53:10 +02:00
Bas van Dijk 61b646741c pythonPackages.requests-aws4auth: init at 0.9
Needed by elasticsearch-curator.
2018-08-25 18:53:10 +02:00
Bas van Dijk 16ce3c8f74 elasticsearch-curator: include missing boto3 dependency
TODO: we're still missing the requests-aws4auth>=0.9 dependency
2018-08-25 18:53:10 +02:00
Bas van Dijk 32200033a6 elasticsearch-curator: include the module in the module-list & fix bug 2018-08-25 18:53:10 +02:00
Bas van Dijk 7d04961c95 Merge pull request #44389 from Mic92/es6
elasticsearch: use 6.x as default version, remove unsupported releases
2018-08-25 17:04:07 +02:00
Bas van Dijk de8ed9edbf Merge pull request #45564 from r-ryantm/auto-update/libtensorflow
libtensorflow: 1.9.0 -> 1.10.0
2018-08-25 13:55:29 +02:00
Bas van Dijk 93ed13f86b libtensorflow: fix hashes for darwin and cuda downloads 2018-08-25 12:20:21 +02:00
Bas van Dijk 551fec4467 Merge branch 'master' into es6 2018-08-23 23:41:27 +02:00
Bas van Dijk 170b8a85d2 Merge pull request #45053 from carlosdagos/skip-check-mattermost-api
haskellPackages.mattermost-api: skip check
2018-08-21 03:04:53 +02:00
Bas van Dijk a70fbb8d9e haskell: upgrade the tensorflow packages
Also enable building on GHC-8.4.
2018-08-13 20:07:43 +02:00
Bas van Dijk dd70c12732 libtensorflow: 1.8.0 -> 1.9.0 2018-08-13 20:07:43 +02:00
Bas van Dijk 9968d0f053 Merge pull request #44948 from Izorkin/servant
servant-sphinx-documentation: fix sha256sum
2018-08-13 12:39:16 +02:00
Bas van Dijk b26fcaa5c0 pgmanage: 10.3.0 -> 10.3.1 2018-08-11 15:49:32 +02:00
Bas van Dijk 9481513360 cabal2nix: fix build by overriding hpack to 0.29.6
Fixes: https://github.com/NixOS/cabal2nix/issues/369
2018-08-11 10:44:27 +02:00
Bas van Dijk e9b7e73120 Merge pull request #44356 from ElvishJerricco/callcabal2nix-passthru-deriver
callCabal2nix: Passthru deriver
2018-08-11 10:34:06 +02:00
Bas van Dijk 5a43f6ffeb graphite: make systemd create /run directory for us (#44392) 2018-08-04 20:55:59 +02:00
Bas van Dijk 3f889f30be nixos/doc: mention the ELK changes in the 18.09 release notes 2018-08-03 15:06:47 +01:00
Bas van Dijk 70e7235510 nixos/doc: add the new strongswan-swanctl service to the 18.09 release notes 2018-08-03 16:06:02 +02:00
Bas van Dijk 3328ea7749 haskellPackages.sexpr: fix build 2018-08-03 02:00:47 +02:00
Bas van Dijk 0aae3fda06 graphite: 1.0.2 -> 1.1.3 & moved dependencies to python-modules (#44276)
Fixes #30891

* Upgrade `graphite-web`, `carbon` and `whisper` from 1.0.2 -> 1.1.3.

* Replaced the deprecated `pythonPackages.graphite_influxdb` with
  `pythonPackages.influxgraph.`

* Renamed `pythonPackages.graphite_web` to `pythonPackages.graphite-web`
  to be consistent with the Python package name.

* Replaced the unmaintained `pythonPackages.graphite_pager` with
  `pythonPackages.graphitepager`

* Moved all new packages from `python-packages.nix` to
  `pkgs/development/python-modules`
2018-08-02 16:39:57 +02:00
Bas van Dijk 353b568255 Merge pull request #44331 from jerith666/language-ecmascript-jailbreak
lift version restrictions on language-ecmascript inputs
2018-08-02 16:00:08 +02:00
Bas van Dijk 72f3a5cf5c Merge pull request #44038 from LumiGuide/elk-6.3.0
elk: 6.2.4 -> 6.3.2
2018-07-28 00:33:18 +02:00
Bas van Dijk ebcdb822f8 elk: 6.2.4 -> 6.3.2
* The ELK stack is upgraded to 6.3.2.

* `elasticsearch6`, `logstash6` and `kibana6` now come with X-Pack which is
  a suite of additional features. These are however licensed under the unfree
  "Elastic License".

* Fortunately they also provide OSS versions which are now packaged
  under: `elasticsearch6-oss`, `logstash6-oss` and `kibana6-oss`.
  Note that the naming of the attributes is consistent with upstream.

* The test `nix-build nixos/tests/elk.nix -A ELK-6` will test the OSS
  version by default. You can also run the test on the unfree ELK using:
  `NIXPKGS_ALLOW_UNFREE=1 nix-build nixos/tests/elk.nix -A ELK-6 --arg enableUnfree true`
2018-07-28 00:01:31 +02:00
Bas van Dijk 980674f08c opencv: 3.4.1 -> 3.4.2 2018-07-27 16:13:21 +02:00
Bas van Dijk 7098bcac27 libtensorflow: support building on OS X and add optional cuda support 2018-07-24 22:08:38 +02:00
Bas van Dijk cbbabf7c08 Merge pull request #44039 from endgame/move-blank-canvas-dontcheck
haskellPackages.blank-canvas: Move fixes to configuration-common.nix
2018-07-24 03:11:28 +02:00
Bas van Dijk f30bfcd623 doctest-discover: move override out of configuration-nix.nix
and move it to configuration-common.nix where it belongs.
configuration-nix.nix is only for fixing build failures
due to Nix.
2018-07-24 01:42:43 +02:00
Bas van Dijk 3d4ea59f20 Merge pull request #43959 from endgame/dontCheck-doctest-discover
haskellPackages.doctest-discover: Disable tests
2018-07-24 01:24:19 +02:00
Bas van Dijk 5fe904b7ec .github/CODEOWNERS: add basvandijk to Haskell 2018-07-23 12:52:22 +02:00
Bas van Dijk 0ac253da1c hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.10.1-8-gd90c8cc from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/f98093ee9fe704f27615dcf8d8d8c26ead893504.
2018-07-22 17:45:01 +02:00
Bas van Dijk e60f4eef8d haskell: fix build of all tensorflow packages
* Since this commit changes configuration-hackage2nix.yaml it
  requires a hackage-packages.nix upgrade.

* Moved the tensorflow overrides out of configuration-ghc-8.2.x.nix
  and into the dedicated file configuration-tensorflow-ghc-8.2.x.nix
  for better readability.

* Add overrides for all the packages in the tensorflow-haskell
  repository.
2018-07-22 16:37:51 +02:00
Bas van Dijk ab4bff2b77 haskell: fix build of tensorflow on GHC-8.2 2018-07-21 16:22:13 +02:00
Bas van Dijk 7b510c47e1 haskell: add extra dependencies of tensorflow-proto 2018-07-21 16:22:13 +02:00
Bas van Dijk 1c48e89eb1 libtensorflow: init at 1.8.0
Required for haskell.packages.ghc822.tensorflow
2018-07-21 16:22:13 +02:00
Bas van Dijk 401370287a strongswan-swanctl: adapt options to strongswan-5.6.3
This time there was only one change between 5.6.2..5.6.3:

https://github.com/strongswan/strongswan/commit/2c7a4b07045786ee493021020e2ad5bd6bb4d045
2018-06-24 11:32:10 +02:00
Bas van Dijk 68fa306be6 pgmanage: remove deprecated postage alias
The following has been removed:

* The `services.postage` alias for the `services.pgmanage` module
* The `postage` alias for the `pgmanage` package
2018-06-23 13:32:13 +02:00
Bas van Dijk e385630434 pgmanage: 10.1.1 -> 10.3.0
Release notes: https://github.com/pgManage/pgManage/releases/tag/v10.3.0

Also fixes #40247
2018-06-23 13:24:14 +02:00