diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-09 11:24:35 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-09 11:24:35 +0200 |
| commit | 994036d8573155da8b39ea6ea9c8a0b4f29cb60a (patch) | |
| tree | 0b13fa47e4c2a6904df384da3668f07e6b6ef633 /pkgs/top-level | |
| parent | 416979f3f77a855b4460fa15cab52445378f660e (diff) | |
| parent | 28cd0f240a0fc73e579899adb9a6296adf3bd761 (diff) | |
| download | nixlib-994036d8573155da8b39ea6ea9c8a0b4f29cb60a.tar nixlib-994036d8573155da8b39ea6ea9c8a0b4f29cb60a.tar.gz nixlib-994036d8573155da8b39ea6ea9c8a0b4f29cb60a.tar.bz2 nixlib-994036d8573155da8b39ea6ea9c8a0b4f29cb60a.tar.lz nixlib-994036d8573155da8b39ea6ea9c8a0b4f29cb60a.tar.xz nixlib-994036d8573155da8b39ea6ea9c8a0b4f29cb60a.tar.zst nixlib-994036d8573155da8b39ea6ea9c8a0b4f29cb60a.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1400181
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/rust-packages.nix | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9183ad14a79..95146c9a6219 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1902,6 +1902,10 @@ with pkgs; epsxe = callPackage ../misc/emulators/epsxe { }; + escrotum = callPackage ../tools/graphics/escrotum { + inherit (pythonPackages) buildPythonApplication pygtk numpy; + }; + ethtool = callPackage ../tools/misc/ethtool { }; ettercap = callPackage ../applications/networking/sniffers/ettercap { }; @@ -2594,6 +2598,8 @@ with pkgs; host = bind.host; + hotpatch = callPackage ../development/libraries/hotpatch { }; + hotspot = libsForQt56.callPackage ../development/tools/analysis/hotspot { }; hping = callPackage ../tools/networking/hping { }; @@ -11790,6 +11796,7 @@ with pkgs; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; + prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { }; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index a4fd5ca54ee2..92230993d58f 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,13 +7,13 @@ { stdenv, fetchFromGitHub, git }: stdenv.mkDerivation { - name = "rustRegistry-2017-10-03"; + name = "rustRegistry-2017-10-08"; src = fetchFromGitHub { owner = "rust-lang"; repo = "crates.io-index"; - rev = "f9e21955350caf67db45c4a4a38dbab2f2250bfc"; - sha256 = "1yk0l0r9idn7crnnw44sig69kvvyq3ycv417s88hd16m1fpl5y77"; + rev = "78ab44cf22c2ce5d40e562ffc7df7ab10ac12b86"; + sha256 = "0fa3l3px6b89ap63h40bhn2x50zf5j65jrgbb7j103j0cdayk2l0"; }; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' |