Commit graph

12 commits

Author SHA1 Message Date
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Robin Gloster 4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
WilliButz d373b3fbb3
prometheus-nginx-exporter: 0.4.1 -> 0.4.2, run tests 2019-08-11 12:30:41 +02:00
WilliButz 86c884fb5b
prometheus-nginx-exporter: 0.1.0 -> 0.4.1, use official version
Use official exporter from nginxinc.
2019-07-22 16:41:10 +02:00
WilliButz 913ec8736c prometheus-nginx-exporter: 20161107 -> 0.1.0
- added myself as maintainer
- fixed license
2018-05-01 15:45:48 +02:00
Franz Pletz 398bf54f63
prometheus-nginx-exporter: 20161104 -> 20161107 2016-12-01 02:04:59 +01:00
Robin Gloster 605cdd41e2
prometheus-nginx-exporter: 20160524 -> 20161104 2016-11-07 09:47:39 +01:00
Kamil Chmielewski 914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
2016-09-16 00:04:55 +01:00
Svein Ove Aas 31a8eee841 prometheus: Bump all to newest
Disable tests for prometheus-node-exporter because one megacli test fails.

Closes #16575.
2016-07-18 20:27:53 +02:00
Kamil Chmielewski 7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Kamil Chmielewski 0f13eab7c8 prometheus-nginx-exporter: extracted from goPackages 2016-06-09 11:22:02 +02:00