diff options
| author | Aristid Breitkreuz <aristidb@gmail.com> | 2015-05-25 15:32:57 +0200 |
|---|---|---|
| committer | Aristid Breitkreuz <aristidb@gmail.com> | 2015-05-25 15:32:57 +0200 |
| commit | 04656c6f89137d901f2fcbbad22caf3e98e7dab2 (patch) | |
| tree | c16f72e93ce96a7da66dd51e8136692b25094a25 /pkgs/top-level | |
| parent | c03c7791cc04fbd6a99718d1ffb36df461fe5464 (diff) | |
| parent | 161fdec0f5cd035c5999ad2863ddd25ef7e2136b (diff) | |
| download | nixlib-04656c6f89137d901f2fcbbad22caf3e98e7dab2.tar nixlib-04656c6f89137d901f2fcbbad22caf3e98e7dab2.tar.gz nixlib-04656c6f89137d901f2fcbbad22caf3e98e7dab2.tar.bz2 nixlib-04656c6f89137d901f2fcbbad22caf3e98e7dab2.tar.lz nixlib-04656c6f89137d901f2fcbbad22caf3e98e7dab2.tar.xz nixlib-04656c6f89137d901f2fcbbad22caf3e98e7dab2.tar.zst nixlib-04656c6f89137d901f2fcbbad22caf3e98e7dab2.zip | |
Merge branch 'master' of github.com:NixOS/nixpkgs
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 587246f2694f..b62ec4e65153 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -748,6 +748,8 @@ let capstone = callPackage ../development/libraries/capstone { }; + catch = callPackage ../development/libraries/catch { }; + catdoc = callPackage ../tools/text/catdoc { }; cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; @@ -3120,6 +3122,8 @@ let tftp_hpa = callPackage ../tools/networking/tftp-hpa {}; + tidy-html5 = callPackage ../tools/text/tidy-html5 { }; + tigervnc = callPackage ../tools/admin/tigervnc { fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; @@ -3698,7 +3702,8 @@ let isl = isl_0_14; })); - gfortran = gfortran48; + gfortran = if !stdenv.isDarwin then gfortran48 + else callPackage ../development/compilers/gcc/gfortran-darwin.nix {}; gfortran48 = wrapCC (gcc48.cc.override { name = "gfortran"; @@ -4497,7 +4502,7 @@ let teyjus = callPackage ../development/compilers/teyjus { omake = omake_rc1; }; - + thrust = callPackage ../development/tools/thrust { gconf = pkgs.gnome.GConf; }; @@ -8802,15 +8807,20 @@ let postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; + prom2json = callPackage ../servers/monitoring/prometheus/prom2json { }; prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager { }; prometheus-cli = callPackage ../servers/monitoring/prometheus/cli { }; + prometheus-collectd-exporter = + callPackage ../servers/monitoring/prometheus/collectd_exporter { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy_exporter { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos_exporter { }; + prometheus-mysqld-exporter = + callPackage ../servers/monitoring/prometheus/mysqld_exporter { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node_exporter { }; prometheus-pushgateway = @@ -9803,7 +9813,7 @@ let smem = callPackage ../os-specific/linux/smem { }; - statifier = builderDefsPackage (import ../os-specific/linux/statifier) { }; + statifier = callPackage ../os-specific/linux/statifier { }; spl = callPackage ../os-specific/linux/spl { configFile = "user"; @@ -13669,8 +13679,8 @@ let guile = guile_1_8; }; - tetgen = callPackage ../applications/science/geometry/tetgen { }; - + tetgen = callPackage ../applications/science/geometry/tetgen { }; # AGPL3+ + tetgen_1_4 = callPackage ../applications/science/geometry/tetgen/1.4.nix { }; # MIT ### SCIENCE/BIOLOGY |