mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Code Issues Wiki Activity
173178 commits 234 branches 124 tags 7.1 GiB
Commit graph

173178 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 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 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
Jean-Baptiste Giraudeau 0333d877c2
Use same user for both prometheus 1 and 2. Use StateDirectory. 2019-03-25 14:49:22 +01:00
Jean-Baptiste Giraudeau 5ae25922b5
Prometheus2: --web.external-url need two dash. 2019-03-25 14:36:48 +01:00
Jean-Baptiste Giraudeau bfbae97cfa
Rollback versionning of services.prometheus.{exporters, alertmanager}. 2019-03-25 14:36:46 +01:00
Alberto Berti e17b464a43
Fix alertmanager service definition. Thanks to @eonpatapon 2019-03-25 14:36:45 +01:00
Alberto Berti 1b6ce80c2b
Make it pass a minimal test 2019-03-25 14:36:44 +01:00
Alberto Berti 11b89720b7
Add prometheus2 configuration to the prometheus modules 
As the configuration for the exporters and alertmanager is unchanged
between the two major versions this patch tries to minimize
duplication while at the same time as there's no upgrade path from 1.x
to 2.x, it allows running the two services in parallel. See also #56037
 2019-03-25 14:36:44 +01:00
Daiderd Jordan 373488e6f4
Merge pull request #57868 from Kaali/coreaudio-sox 
Add CoreAudio to sox on macOS
 2019-03-19 19:11:13 +01:00
zimbatm 8403965d01 pythonPackages.invoke: patch the default bash path (#57908) 
Use a reasonable path :)
 2019-03-19 17:38:55 +01:00
Robert Schütz 0cbe2fa18c python.pkgs.msrest: cleanup 
I accidentally pushed fcf74c6 in a premature state.
 2019-03-19 16:40:24 +01:00
Robert Schütz fcf74c6dc0 python.pkgs.msrest: 0.6.2 -> 0.6.4 2019-03-19 16:34:24 +01:00
Robert Schütz fc172b3590 python.pkgs.aiodns: 1.2.0 -> 2.0.0 2019-03-19 16:34:24 +01:00
Robert Schütz 99cd4a1063 python.pkgs.pycares: 2.4.0 -> 3.0.0 2019-03-19 16:34:24 +01:00
Robert Schütz 5c52dcf1d9 python.pkgs.simpleparse: fix build 2019-03-19 16:34:24 +01:00
Will Dietz b9045b073d
Merge pull request #57884 from dtzWill/update/libssh2-1.8.1 
libssh2: 1.8.0 -> 1.8.1 (SECURITY)
 2019-03-19 09:31:53 -05:00
Jan Tojnar f4ffeaf9a5
Merge pull request #57889 from mat8913/flatpak-bubblewrap-paths 
flatpak: Fix bubblewrap paths for icon-validator
 2019-03-19 15:11:29 +01:00
Ryan Mulligan f4db78b4f2
Merge pull request #57334 from r-ryantm/auto-update/now-cli 
now-cli: 13.1.2 -> 14.0.3
 2019-03-19 07:03:46 -07:00
Tim Steinbach 6a9896b411
linux: 5.0.2 -> 5.0.3 2019-03-19 08:56:06 -04:00
Tim Steinbach 4adf858377
linux: 4.20.16 -> 4.20.17 2019-03-19 08:55:56 -04:00
Tim Steinbach b1c72326ce
linux: 4.19.29 -> 4.19.30 2019-03-19 08:55:47 -04:00
Tim Steinbach 08414dd72e
linux: 4.14.106 -> 4.14.107 2019-03-19 08:55:35 -04:00
Tim Steinbach 9e2adb4e36
linux: 4.9.163 -> 4.9.164 2019-03-19 08:51:04 -04:00
Jörg Thalheim 03050e9749
dino: 2019-02-06 -> 2019-03-07 2019-03-19 10:57:35 +00:00
Jörg Thalheim 5e888d1854
Merge pull request #57896 from dotlambda/asyncio-remove 
python.pkgs.asyncio: remove
 2019-03-19 10:55:37 +00:00
Pascal Wittmann ed5bee9415
Merge pull request #57772 from dywedir/wmfocus 
wmfocus: 1.0.2 -> 1.1.2
 2019-03-19 11:36:41 +01:00
Robert Hensing 2f410841b8
Merge pull request #57536 from roberth/ngrok-update 
Ngrok update + update script
 2019-03-19 11:07:33 +01:00
Robert Schütz 180c68d88a
python.pkgs.cairocffi: make withXcffib work again (#57855) 2019-03-19 10:20:05 +01:00
Will Dietz b517554ea6 nnn: 2.3 -> 2.4 (#57890) 
https://github.com/jarun/nnn/releases/tag/v2.4
 2019-03-19 10:17:25 +01:00
Robert Schütz 271835909e python.pkgs.aioeventlet: 0.5.1 -> 0.5.2 2019-03-19 10:17:16 +01:00
Robert Schütz a4a61777e8 python.pkgs.asyncio: remove 
> This version is only relevant for Python 3.3,
> which does not include asyncio in its stdlib.
We don't ship 3.3 anymore.
 2019-03-19 10:11:23 +01:00
Robert Schütz 3172140c19
Merge pull request #57724 from dotlambda/pyalgotrade-fix 
python.pkgs.pyalgotrade: fix build
 2019-03-19 09:57:03 +01:00
Robert Schütz 4cf0a12d34 python.pkgs.pyalgotrade: fix build 2019-03-19 09:39:38 +01:00
Robert Schütz ae5b83683a python.pkgs.ws4py: enable for all Python versions 2019-03-19 09:39:37 +01:00
Cedric Cellier 913e33897c ocaml-syslog: init at 1.5 2019-03-19 09:31:12 +01:00
Aleksey Kladov c5c886f091 jumpapp: init at 1.0 (#57893) 2019-03-19 10:20:21 +02:00
Matthew Harm Bekkema f2d6e4ab04 flatpak: Fix bubblewrap paths for icon-validator 
Otherwise, `flatpak-validate-icon --sandbox` gives error:
  bwrap: Can't find source path /etc/ld.so.cache: No such file or directory
 2019-03-19 15:57:43 +11:00
worldofpeace e6ccb67e23
Merge pull request #57886 from NixOS/ryantm-copying 
COPYING: include 2019
 2019-03-18 23:37:35 -04:00
worldofpeace d04c4ff1c2 pantheon.contractor: add wrapGAppsHook 
Probably got tossed out somehow.
 2019-03-18 23:32:08 -04:00
worldofpeace 201de89641 pantheon.wingpanel: 2.2.2 -> 2.2.3 2019-03-18 23:31:12 -04:00
worldofpeace 735b047ead pantheon.switchboard-plug-security-privacy: 2.2.0 -> 2.2.1 
https://github.com/elementary/switchboard-plug-security-privacy/releases/tag/2.2.1
 2019-03-18 23:31:12 -04:00
worldofpeace 5b2d2abd3c pantheon.elementary-code: 3.1.0 -> 3.1.1 
https://github.com/elementary/code/releases/tag/3.1.1
 2019-03-18 23:31:12 -04:00
worldofpeace 6e72318904 lollypop: 0.9.923 -> 1.0 
Large release, regressions expected.

Changes: https://gitlab.gnome.org/World/lollypop/compare/0.9.923...1.0

Release Notes:
* https://gitlab.gnome.org/World/lollypop/tags/0.9.924
* https://gitlab.gnome.org/World/lollypop/tags/0.9.925
* https://gitlab.gnome.org/World/lollypop/tags/1.0
 2019-03-18 23:31:12 -04:00
Ryan Mulligan a46b89df91
COPYING: include 2019 2019-03-18 19:55:33 -07:00
Ryan Mulligan e4c9a026c1
Merge pull request #57844 from vbgl/dune-1.8.2 
dune: 1.6.2 -> 1.8.2
 2019-03-18 19:20:37 -07:00
Dmitry Kalinkin 631ec69639
Merge pull request #57048 from 0x4A6F/master-tayga 
tayga: init at 0.9.2
 2019-03-18 21:28:43 -04:00