Commit Graph

11 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
f1512dfea3
prometheus-mysqld-exporter: 0.10.0 -> 0.11.0 2019-08-23 16:06:54 +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
Robin Gloster
44f797fa56
prometheus-mysqld-exporter: 0.9.0 -> 0.10.0 2017-08-27 23:02:25 +02:00
Franz Pletz
a07912203e
prometheus-mysqld-exporter: 0.8.1 -> 0.9.0 2016-12-01 02:04:59 +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
bbc37e0eb7 Moving from fetchgit generated by go2nix to fetchFromGitHub where rev is
a tag
2016-06-09 13:08:10 +02:00
Kamil Chmielewski
7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Kamil Chmielewski
f44b557476 prometheus-mysqld-exporter: extracted from goPackages 2016-06-09 11:22:02 +02:00