public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
177,684 Commits 1 Branch 0 Tags
d771036ab2e88c7b84c55c5edffaf71a913c8f4d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bas van Dijk d771036ab2 strongswan: use placeholder instead of configureFlagsArray 2019-04-30 10:27:49 +02:00
Bas van Dijk 710b9675fc Merge pull request #59983 from ivan/prometheus-statsd-exporter-0.9.0 
prometheus-statsd-exporter: 0.4.0 -> 0.9.0
 2019-04-22 23:21:46 +02:00
Bas van Dijk cccc7a93d2 Merge pull request #59828 from basvandijk/prometheus-refactoring 
nixos/prometheus: refactored & added more missing options
 2019-04-18 13:43:53 +02:00
Bas van Dijk cdd82681b3 nixos/prometheus: add more missing options 2019-04-18 12:53:13 +02:00
Bas van Dijk 285fd3c05a nixos/prometheus: abstract over optional option creation 2019-04-18 11:55:43 +02:00
Bas van Dijk 55ef5d4246 nixos/prometheus: set optional attributes to type types.nullOr 
This makes sure that when a user hasn't set a Prometheus option it
won't show up in the prometheus.yml configuration file. This results
in smaller and easier to understand configuration files.
 2019-04-17 14:49:09 +02:00
Bas van Dijk 57e5b75f9c nixos/prometheus: filter out the _module attr in a central place 
We previously filtered out the `_module` attribute in a NixOS
configuration by filtering it using the option's `apply` function.

This meant that every option that had a submodule type needed to have
this apply function. Adding this function is easy to forget thus this
mechanism is error prone.

We now recursively filter out the `_module` attributes at the place we
construct the Prometheus configuration file. Since we now do the filtering
centrally we don't have to do it per option making it less prone to errors.
 2019-04-17 14:08:16 +02:00
Bas van Dijk 4e867661d5 Merge pull request #54691 from thefloweringash/prometheus-ec2 
nixos/prometheus: add `ec2_sd_configs` section to `scrape_configs`
 2019-04-16 17:33:42 +02:00
Bas van Dijk a913d0891c nixos/prometheus: filter out empty srcape_configs attributes 
This results in a smaller prometheus.yml config file.

It also allows us to use the same options for both prometheus-1 and
prometheus-2 since the new options for prometheus-2 default to null
and will be filtered out if they are not set.
 2019-04-16 16:06:11 +02:00
Bas van Dijk a23db5db08 nixos/prometheus: add new ec2_sd_config options for prometheus2 2019-04-16 16:04:33 +02:00
Bas van Dijk 0cfeb78bc5 Merge pull request #59685 from basvandijk/remove-notes-prometheus2-rl-1909 
nixos/doc: remove prometheus2 notes from the 19.09 release notes
 2019-04-16 11:46:01 +02:00
Bas van Dijk ced565b3d3 Merge pull request #59606 from vbgl/dune-1.9.1 
dune: 1.9.0 -> 1.9.1
 2019-04-16 11:37:32 +02:00
Bas van Dijk e7fadde7a7 nixos/doc: remove prometheus2 notes from the 19.09 release notes 
prometheus2 has been backported to 19.03 so it won't be new for 19.09.
 2019-04-16 09:47:45 +02:00
Bas van Dijk e138020e8d Merge pull request #59676 from basvandijk/prometheus-pushgateway-module 
nixos/prometheus/pushgateway: add module and test
 2019-04-16 09:18:34 +02:00
Bas van Dijk d1940beb3a nixos/prometheus/pushgateway: add module and test 2019-04-16 08:09:38 +02:00
Bas van Dijk fd05e3407e Merge pull request #59608 from basvandijk/prometheus-pushgateway-0.8.0 
prometheus-pushgateway: 0.7.0 -> 0.8.0
 2019-04-15 21:52:58 +02:00
Bas van Dijk b0fbe1df3f prometheus-pushgateway: 0.7.0 -> 0.8.0 2019-04-15 16:12:14 +02:00
Bas van Dijk e5724e8e66 Merge pull request #59514 from basvandijk/elk-7.0.0 
elk7: init at 7.0.0
 2019-04-15 07:05:13 +02:00
Bas van Dijk 13352f28d2 elk7: init at 7.0.0 
This adds the following new packages:

+ elasticsearch7
+ elasticsearch7-oss
+ logstash7
+ logstash7-oss
+ kibana7
+ kibana7-oss
+ filebeat7
+ heartbeat7
+ metricbeat7
+ packetbeat7
+ journalbeat7

The default major version of the ELK stack stays at 6. We should
probably set it to 7 in a next commit.
 2019-04-14 21:39:46 +02:00
Bas van Dijk 08b277e0da Merge pull request #56017 from elohmeier/prom-tls 
prometheus: add tls_config
 2019-04-12 12:57:54 +02:00
Bas van Dijk 1a926b82a8 Merge pull request #59263 from Zimmi48/dune-1.9.0 
dune: 1.8.2 -> 1.9.0
 2019-04-11 09:07:14 +02:00
Bas van Dijk 38ae3fe584 Merge pull request #59270 from basvandijk/alertmanager-DynamicUser 
nixos/prometheus/alertmanager: use DynamicUser instead of nobody
 2019-04-10 22:56:17 +02:00
Bas van Dijk cd4486ecc3 nixos/prometheus/alertmanager: use DynamicUser instead of nobody 
See issue #55370
 2019-04-10 20:38:40 +02:00
Bas van Dijk 08d9cf7ad4 Merge pull request #59264 from basvandijk/alertmanager-0.16.2 
alertmanager: 0.15.3 -> 0.16.2
 2019-04-10 16:45:18 +02:00
Bas van Dijk 739bdff4a4 nixos/prometheus/alertmanager: use ExecStart instead of script 
This results in a simpler service unit which doesn't first have to
start a shell:

  > cat /nix/store/s95nsr8zbkblklanqpkiap49mkwbaq45-unit-alertmanager.service/alertmanager.service
  ...
  ExecStart=/nix/store/4g784lwcy7kp69hg0z2hfwkhjp2914lr-alertmanager-0.16.2-bin/bin/alertmanager \
    --config.file /nix/store/p2c7fyi2jkkwq04z2flk84q4wyj2ggry-checked-config \
    --web.listen-address [::1]:9093 \
    --log.level warn
  ...
 2019-04-10 15:03:09 +02:00
Bas van Dijk 18925d0ceb prometheus-alertmanager: 0.15.3 -> 0.16.2 2019-04-10 14:52:31 +02:00
Bas van Dijk ed426e4df8 Merge pull request #59234 from basvandijk/fluentd-1.4.2 
fluentd: 1.2.3 -> 1.4.2
 2019-04-10 12:47:49 +02:00
Bas van Dijk ad41c1f1c0 fluentd: 1.2.3 -> 1.4.2 2019-04-10 12:46:06 +02:00
Bas van Dijk 2f2e2971d6 Merge pull request #58255 from jbgi/prometheus2 
Add Prometheus 2 service in parallel with 1.x version (continuation)
 2019-04-09 14:14:18 +02:00
Bas van Dijk b423b73adc nixos/doc: add Prometheus stateDir handling to rl-1909.xml 2019-04-09 13:13:44 +02:00
Bas van Dijk c95179b52f nixos/prometheus: add back the option services.prometheus.dataDir 
This is to ensure more backwards compatibility. Note this is not 100%
backwards compatible because we now require dataDir to begin with /var/lib/.
 2019-04-09 13:13:34 +02:00
Bas van Dijk a3fb03df3e Merge pull request #59206 from basvandijk/elk-6.7.1 
elk: 6.5.1 -> 6.7.1
 2019-04-09 13:04:14 +02:00
Bas van Dijk 7062a073e8 elk: 6.5.1 -> 6.7.1 2019-04-09 12:34:01 +02:00
Bas van Dijk 29d7d8f44d nixos/doc: added the Prometheus changes to the 19.09 release notes 2019-04-08 19:39:22 +02:00
Bas van Dijk eed84d1f8d nixos/prometheus: fix indentation and unnecessary parenthesis 2019-04-08 19:14:42 +02:00
Bas van Dijk 13d5f47a84 Merge pull request #59182 from basvandijk/prometheus-2.8.1 
prometheus_2: 2.6.0 -> 2.8.1
 2019-04-08 19:01:10 +02:00
Bas van Dijk 2a722175cd prometheus_2: 2.6.0 -> 2.8.1 
See: https://github.com/prometheus/prometheus/releases/tag/v2.8.1
 2019-04-08 18:06:00 +02:00
Bas van Dijk 65fa918adb Merge pull request #59175 from jbgi/generic-prometheus 
Expose prometheus generic builder.
 2019-04-08 18:03:25 +02:00
Bas van Dijk b6fdd1a0fc prometheus: rename the generic function to buildPrometheus 
Since the `generic` function is now exported it should have a less
generic name, pun intended.
 2019-04-08 16:40:42 +02:00
Bas van Dijk 394970047e nixos/tests: register the prometheus2 test 2019-04-08 15:24:23 +02:00
Bas van Dijk 7cf27feb2f nixos/prometheus: get rid of empty arguments 
Previously the prometheus.service file looked like:

  ExecStart=/nix/store/wjkhfw3xgkmavz1akkqir99w4lbqhak7-prometheus-1.8.2-bin/bin/prometheus -storage.local.path=/var/lib/prometheus/metrics \
    -config.file=/nix/store/zsnvzw51mk3n1cxjd0351bj39k1j6j27-prometheus.yml-check-config-checked \
    -web.listen-address=0.0.0.0:9090 \
    -alertmanager.notification-queue-capacity=10000 \
    -alertmanager.timeout=10s \
     \

  Restart=always

Now it's:

  ExecStart=/nix/store/wjkhfw3xgkmavz1akkqir99w4lbqhak7-prometheus-1.8.2-bin/bin/prometheus \
    -storage.local.path=/var/lib/prometheus/metrics \
    -config.file=/nix/store/zsnvzw51mk3n1cxjd0351bj39k1j6j27-prometheus.yml-check-config-checked \
    -web.listen-address=0.0.0.0:9090 \
    -alertmanager.notification-queue-capacity=10000 \
    -alertmanager.timeout=10s
  Restart=always
 2019-04-08 14:59:12 +02:00
Bas van Dijk a59c92903e nixos/prometheus: use ExecStart instead of a shell script 
This uses fewer lines of code and one less process.
 2019-04-08 14:59:12 +02:00
Bas van Dijk 0b2ae584c9 Merge pull request #57880 from basvandijk/megacli-8.07.14 
megacli: 8.07.07 -> 8.07.14
 2019-03-18 23:31:54 +01:00
Bas van Dijk ef006122f0 megacli: 8.07.07 -> 8.07.14 2019-03-18 22:13:34 +01:00
Bas van Dijk 6b9d8a21fe Merge pull request #57072 from knl/upgrade-strongswan-5.7.2 
strongswan: 5.7.1 -> 5.7.2
 2019-03-08 16:29:49 +01:00
Bas van Dijk e44e2455d3 strongswan-swanctl: fix module by setting the new SWANCTL_DIR envvar 2019-03-08 16:11:38 +01:00
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