Merge branch 'master' into staging

Hydra: ?compare=1400181
This commit is contained in:
Vladimír Čunát 2017-10-09 11:24:35 +02:00
commit 994036d857
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
30 changed files with 448 additions and 48 deletions

View file

@ -375,6 +375,7 @@
./services/monitoring/prometheus/collectd-exporter.nix
./services/monitoring/prometheus/fritzbox-exporter.nix
./services/monitoring/prometheus/json-exporter.nix
./services/monitoring/prometheus/minio-exporter.nix
./services/monitoring/prometheus/nginx-exporter.nix
./services/monitoring/prometheus/node-exporter.nix
./services/monitoring/prometheus/snmp-exporter.nix

View file

@ -0,0 +1,117 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.services.prometheus.minioExporter;
in {
options = {
services.prometheus.minioExporter = {
enable = mkEnableOption "prometheus minio exporter";
port = mkOption {
type = types.int;
default = 9290;
description = ''
Port to listen on.
'';
};
listenAddress = mkOption {
type = types.nullOr types.str;
default = null;
example = "0.0.0.0";
description = ''
Address to listen on for web interface and telemetry.
'';
};
minioAddress = mkOption {
type = types.str;
example = "https://10.0.0.1:9000";
default = if config.services.minio.enable then "http://localhost:9000" else null;
description = ''
The URL of the minio server.
Use HTTPS if Minio accepts secure connections only.
By default this connects to the local minio server if enabled.
'';
};
minioAccessKey = mkOption ({
type = types.str;
example = "BKIKJAA5BMMU2RHO6IBB";
description = ''
The value of the Minio access key.
It is required in order to connect to the server.
By default this uses the one from the local minio server if enabled
and <literal>config.services.minio.accessKey</literal>.
'';
} // optionalAttrs (config.services.minio.enable && config.services.minio.accessKey != "") {
default = config.services.minio.accessKey;
});
minioAccessSecret = mkOption ({
type = types.str;
description = ''
The calue of the Minio access secret.
It is required in order to connect to the server.
By default this uses the one from the local minio server if enabled
and <literal>config.services.minio.secretKey</literal>.
'';
} // optionalAttrs (config.services.minio.enable && config.services.minio.secretKey != "") {
default = config.services.minio.secretKey;
});
minioBucketStats = mkOption {
type = types.bool;
default = false;
description = ''
Collect statistics about the buckets and files in buckets.
It requires more computation, use it carefully in case of large buckets..
'';
};
extraFlags = mkOption {
type = types.listOf types.str;
default = [];
description = ''
Extra commandline options when launching the minio exporter.
'';
};
openFirewall = mkOption {
type = types.bool;
default = false;
description = ''
Open port in firewall for incoming connections.
'';
};
};
};
config = mkIf cfg.enable {
networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
systemd.services.prometheus-minio-exporter = {
description = "Prometheus exporter for Minio server metrics";
unitConfig.Documentation = "https://github.com/joe-pll/minio-exporter";
wantedBy = [ "multi-user.target" ];
after = optional config.services.minio.enable "minio.service";
serviceConfig = {
DynamicUser = true;
Restart = "always";
PrivateTmp = true;
WorkingDirectory = /tmp;
ExecStart = ''
${pkgs.prometheus-minio-exporter}/bin/minio-exporter \
-web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} \
-minio.server ${cfg.minioAddress} \
-minio.access-key ${cfg.minioAccessKey} \
-minio.access-secret ${cfg.minioAccessSecret} \
${optionalString cfg.minioBucketStats "-minio.bucket-stats"} \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
};
};
};
}

View file

@ -59,5 +59,7 @@ in {
};
services.keybase.enable = true;
environment.systemPackages = [ pkgs.kbfs ];
};
}

View file

@ -93,7 +93,6 @@ in
preStop = ''
${pkgs.utillinux}/bin/umount /afs
${openafsPkgs}/sbin/afsd -shutdown
${pkgs.kmod}/sbin/rmmod libafs
'';
};
};

View file

@ -12,6 +12,9 @@ import ./make-test.nix ({ pkgs, ...} : {
secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12";
};
environment.systemPackages = [ pkgs.minio-client ];
# Minio requires at least 1GiB of free disk space to run.
virtualisation.diskSize = 4 * 1024;
};
};
@ -20,7 +23,6 @@ import ./make-test.nix ({ pkgs, ...} : {
startAll;
$machine->waitForUnit("minio.service");
$machine->waitForOpenPort(9000);
$machine->succeed("curl --fail http://localhost:9000/minio/index.html");
# Create a test bucket on the server
$machine->succeed("mc config host add minio http://localhost:9000 BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 S3v4");

View file

@ -1,28 +1,27 @@
{ fetchurl, stdenv, pkgconfig, ncurses, boehmgc, perl, help2man }:
stdenv.mkDerivation rec {
name = "zile-2.4.13";
name = "zile-2.4.14";
src = fetchurl {
url = "mirror://gnu/zile/${name}.tar.gz";
sha256 = "03mcg0bxkzprlsx8y6h22w924pzx4a9zr7zm3g11j8j3x9lz75f7";
sha256 = "0x3byaddms8l3g7igx6njycqsq98wgapysdb5c7lhcnajlkp8y3s";
};
nativeBuildInputs = [ pkgconfig perl ]
buildInputs = [ ncurses boehmgc ];
nativeBuildInputs = [ perl pkgconfig ]
# `help2man' wants to run Zile, which won't work when the
# newly-produced binary can't be run at build-time.
++ stdenv.lib.optional
(stdenv.hostPlatform == stdenv.buildPlatform)
help2man;
buildInputs = [ ncurses boehmgc ];
# Tests can't be run because most of them rely on the ability to
# fiddle with the terminal.
doCheck = false;
# XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro.
preConfigure = "export gl_cv_func_fstatat_zero_flag=yes";
gl_cv_func_fstatat_zero_flag="yes";
meta = with stdenv.lib; {
description = "Lightweight Emacs clone";

View file

@ -6,6 +6,6 @@
fetchFromGitHub {
owner = "commercialhaskell";
repo = "all-cabal-hashes";
rev = "b490d26340638934d13c0c0cd4089dec0fb6b85e";
sha256 = "0cz76wcdlh5512g1aviv0ac9qwj1mmy9ncp6q4yywylxrlqgcbj5";
rev = "901c2522e6797270f5ded4495b1a529e6c16ef45";
sha256 = "0wng314y3yn6bbwa5ar254l7p8y99gsvm8ll4z7f3wg77v5fzish";
}

View file

@ -0,0 +1,37 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
name = "hotpatch-0.2";
src = fetchFromGitHub {
owner = "vikasnkumar";
repo = "hotpatch";
rev = "4b65e3f275739ea5aa798d4ad083c4cb10e29149";
sha256 = "169vdh55wsbn6fl58lpzqx64v6ifzh7krykav33x1d9hsk98qjqh";
};
enableParallelBuilding = true;
doCheck = true;
nativeBuildInputs = [ cmake ];
preConfigure = ''
substituteInPlace test/loader.c \
--replace \"/lib64/ld-linux-x86-64.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" \
--replace \"/lib/ld-linux-x86-64.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" \
--replace \"/lib/ld-linux.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)" \
--replace \"/lib32/ld-linux.so.2 \""$(cat $NIX_CC/nix-support/dynamic-linker)"
'';
checkPhase = ''
LD_LIBRARY_PATH=$(pwd)/src make test
'';
meta = with stdenv.lib; {
description = "Hot patching executables on Linux using .so file injection";
homepage = src.meta.homepage;
license = licenses.bsd3;
maintainers = [ maintainers.gnidorah ];
platforms = ["i686-linux" "x86_64-linux"];
};
}

View file

@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
# otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909
NIX_LDFLAGS = [ "-lgcrypt" ];
NIX_CFLAGS_COMPILE = [ "-I${nss.dev}/include/nss" ];
postInstall = ''
moveToOutput "bin/xmlsec1-config" "$dev"

View file

@ -27,12 +27,19 @@ rec {
meta.description = "OCaml compiler libraries repackaged";
};
ppx_ast = janePackage {
ppx_ast = janePackage ({
name = "ppx_ast";
hash = "0p9v4q3cjz8wwdrh6bjidani2npzvhdy8isnqwigqkl6n326dba9";
propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ];
meta.description = "OCaml AST used by Jane Street ppx rewriters";
};
} // (if lib.versionAtLeast ocaml.version "4.06"
then {
version = "0.9.2";
hash = "1h4qf26rg23z21rrw83fakiavw9km7174p3830pg0gg4bwakvba0";
} else {
version = "0.9.1";
hash = "0a9rxwavy2748k0yd4db3hg1ypq7mpqnwq9si5a5qdiclgkhcggw";
}
));
ppx_traverse_builtins = janePackage {
name = "ppx_traverse_builtins";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }:
{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild }:
stdenv.mkDerivation {
name = "ounit-2.0.0";
@ -8,7 +8,13 @@ stdenv.mkDerivation {
sha256 = "118xsadrx84pif9vaq13hv4yh22w9kmr0ypvhrs0viir1jr0ajjd";
};
buildInputs = [ ocaml findlib ocamlbuild camlp4 ];
patches = with stdenv.lib;
optional (versionAtLeast ocaml.version "4.02") (fetchpatch {
url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ounit/ounit.2.0.0/files/safe-string.patch";
sha256 = "0hbd2sqdz75lv5ax82yhsfdk1dlcvq12xpys6n85ysmrl0c3d3lk";
});
buildInputs = [ ocaml findlib ocamlbuild ];
dontAddPrefix = true;

View file

@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
description = "A hierarchical command-line task manager";
license = licenses.gpl2;
maintainers = [ maintainers.woffs ];
platforms = platforms.all;
platforms = platforms.linux;
};
}

View file

@ -1,6 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4
, ocaml_data_notation, type_conv, ocamlmod, ocamlify, ounit, expect
}:
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }:
stdenv.mkDerivation rec {
version = "0.4.10";
@ -17,11 +15,9 @@ stdenv.mkDerivation rec {
buildInputs =
[
ocaml findlib ocamlbuild type_conv ocamlmod ocamlify ounit camlp4
ocaml findlib ocamlbuild ocamlmod ocamlify
];
propagatedBuildInputs = [ ocaml_data_notation ];
configurePhase = "ocaml setup.ml -configure --prefix $out";
buildPhase = "ocaml setup.ml -build";
installPhase = "ocaml setup.ml -install";

View file

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "An open-source Sega Saturn emulator";
homepage = https://yabause.org/;
license = licenses.gpl2Plus;
maintainers = with maintaines; [ AndersonTorres ];
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
};
}

View file

@ -373,8 +373,10 @@ rec {
}
'';
addRtp = path: derivation:
derivation // { rtp = "${derivation}/${path}"; };
addRtp = path: attrs: derivation:
derivation // { rtp = "${derivation}/${path}"; } // {
overrideAttrs = f: buildVimPlugin (attrs // f attrs);
};
buildVimPlugin = a@{
name,
@ -389,7 +391,7 @@ rec {
addonInfo ? null,
...
}:
addRtp "${rtpPath}/${path}" (stdenv.mkDerivation (a // {
addRtp "${rtpPath}/${path}" a (stdenv.mkDerivation (a // {
name = namePrefix + name;
inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall;

View file

@ -9,7 +9,6 @@ let
url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz";
sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [gpm freetype fontconfig ncurses libx86];
in
stdenv.mkDerivation {
@ -17,7 +16,10 @@ stdenv.mkDerivation {
src = fetchurl {
inherit (s) url sha256;
};
nativeBuildInputs = [ pkgconfig ];
inherit buildInputs;
preConfigure = ''
sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp
sed -e '/install-exec-hook:/,/^[^\t]/{d}; /.NOEXPORT/iinstall-exec-hook:\

View file

@ -47,6 +47,8 @@ let
buildInputs = [ libmnl ];
enableParallelBuilding = true;
makeFlags = [
"WITH_BASHCOMPLETION=yes"
"WITH_WGQUICK=yes"
@ -57,6 +59,11 @@ let
];
buildPhase = "make tools";
postInstall = ''
substituteInPlace $out/lib/systemd/system/wg-quick@.service \
--replace /usr/bin $out/bin
'';
};
in if kernel == null

View file

@ -1,14 +1,13 @@
{ lib, stdenv, fetchurl, go }:
stdenv.mkDerivation rec {
name = "minio-${shortVersion}";
name = "minio-${version}";
shortVersion = "20170613";
longVersion = "2017-06-13T19-01-01Z";
version = "2017-09-29T19-16-56Z";
src = fetchurl {
url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz";
sha256 = "1rrlgn0nsvfn0lr9ffihjdb96n4znsvjlz1h7bwvz8nwhbn0lfsf";
url = "https://github.com/minio/minio/archive/RELEASE.${version}.tar.gz";
sha256 = "1h028gyfvyh5x6k4fsj4s64sgzqy7jgln6kvs27bnxzigj6dp2wx";
};
buildInputs = [ go ];
@ -24,7 +23,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
mkdir -p $out/bin
go build -o $out/bin/minio \
--ldflags "-X github.com/minio/minio/cmd.Version=${longVersion}"
--ldflags "-X github.com/minio/minio/cmd.Version=${version}"
'';
installPhase = "true";
@ -32,7 +31,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = https://www.minio.io/;
description = "An S3-compatible object storage server";
maintainers = [ lib.maintainers.eelco ];
maintainers = with lib.maintainers; [ eelco bachp ];
platforms = lib.platforms.x86_64;
license = lib.licenses.asl20;
};

View file

@ -0,0 +1,26 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "minio-exporter-${version}";
version = "0.1.0";
rev = "v${version}";
goPackagePath = "github.com/joe-pll/minio-exporter";
src= fetchFromGitHub {
inherit rev;
owner = "joe-pll";
repo = "minio-exporter";
sha256 = "14lz4dg0n213b6xy12fh4r20k1rcnflnfg6gjskk5zr8h7978hjx";
};
goDeps = ./deps.nix;
meta = with stdenv.lib; {
description = "A Prometheus exporter for Minio cloud storage server";
homepage = https://github.com/joe-pll/minio-exporter;
license = licenses.asl20;
maintainers = with maintainers; [ bachp ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,156 @@
# This file was generated by go2nix.
[
{
goPackagePath = "github.com/alecthomas/template";
fetch = {
type = "git";
url = "https://github.com/alecthomas/template";
rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
};
}
{
goPackagePath = "github.com/alecthomas/units";
fetch = {
type = "git";
url = "https://github.com/alecthomas/units";
rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
};
}
{
goPackagePath = "github.com/beorn7/perks";
fetch = {
type = "git";
url = "https://github.com/beorn7/perks";
rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
};
}
{
goPackagePath = "github.com/go-ini/ini";
fetch = {
type = "git";
url = "https://github.com/go-ini/ini";
rev = "c787282c39ac1fc618827141a1f762240def08a3";
sha256 = "0c784qichlpqdk1zwafislskchr7f4dl7fy3g3w7xg2w63xpd7r0";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "130e6b02ab059e7b717a096f397c5b60111cae74";
sha256 = "0zk4d7gcykig9ld8f5h86fdxshm2gs93a2xkpf52jd5m4z59q26s";
};
}
{
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
fetch = {
type = "git";
url = "https://github.com/matttproud/golang_protobuf_extensions";
rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
};
}
{
goPackagePath = "github.com/minio/go-homedir";
fetch = {
type = "git";
url = "https://github.com/minio/go-homedir";
rev = "21304a94172ae3a09dee2cd86a12fb6f842138c7";
sha256 = "1kvz91gvdrpzddlpcbf0a2kf75bfqzd40kwzq29jwhf1y5ii6cq4";
};
}
{
goPackagePath = "github.com/minio/minio-go";
fetch = {
type = "git";
url = "https://github.com/minio/minio-go";
rev = "cb3571b7d8d904c4714033deb984d0a0b66955be";
sha256 = "165filzwslnqdgsp8wf5k1zm8wcpnsffsaffw25igy0ik8swr06w";
};
}
{
goPackagePath = "github.com/minio/minio";
fetch = {
type = "git";
url = "https://github.com/minio/minio";
rev = "60cc6184d253efee4a3120683517028342229e21";
sha256 = "0n2l163v45jraylv43jwqm0cxin68vw8cw7k21qniahhr46y4dqf";
};
}
{
goPackagePath = "github.com/prometheus/client_golang";
fetch = {
type = "git";
url = "https://github.com/prometheus/client_golang";
rev = "353b8c3f3776541879f9abfd8fa8b1ae162ab394";
sha256 = "068fk3bdfsaij37973c66065w2cn46ahwjs44pw9v1mqk8bsrn3a";
};
}
{
goPackagePath = "github.com/prometheus/client_model";
fetch = {
type = "git";
url = "https://github.com/prometheus/client_model";
rev = "6f3806018612930941127f2a7c6c453ba2c527d2";
sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4";
};
}
{
goPackagePath = "github.com/prometheus/common";
fetch = {
type = "git";
url = "https://github.com/prometheus/common";
rev = "2f17f4a9d485bf34b4bfaccc273805040e4f86c8";
sha256 = "0r1dyipnd7n9vp4p6gs1y4v7ggq4avj06pr90l4qrjll55h281js";
};
}
{
goPackagePath = "github.com/prometheus/procfs";
fetch = {
type = "git";
url = "https://github.com/prometheus/procfs";
rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2";
sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np";
};
}
{
goPackagePath = "github.com/sirupsen/logrus";
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus";
rev = "89742aefa4b206dcf400792f3bd35b542998eb3b";
sha256 = "0hk7fabx59msg2y0iik6xvfp80s73ybrwlcshbm9ds91iqbkcxi6";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "76eec36fa14229c4b25bb894c2d0e591527af429";
sha256 = "1c57fdg70vhf7pigiwb2xdap6ak0c0s2pzaj9pq000aqfw54i4s8";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "314a259e304ff91bd6985da2a7149bbf91237993";
sha256 = "0vya62c3kmhmqx6awlxx8hc84987xkym9rhs0q28vlhwk9kczdaa";
};
}
{
goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
fetch = {
type = "git";
url = "https://gopkg.in/alecthomas/kingpin.v2";
rev = "1087e65c9441605df944fb12c33f0fe7072d18ca";
sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0";
};
}
]

View file

@ -2576,11 +2576,11 @@ let
}) // {inherit ;};
xorgserver = (mkDerivation "xorgserver" {
name = "xorg-server-1.19.3";
name = "xorg-server-1.19.4";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2;
sha256 = "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7";
url = mirror://xorg/individual/xserver/xorg-server-1.19.4.tar.bz2;
sha256 = "1a690fzv5l5ks45g9zhlzdskdq8q73mcbpb9a3wz3shxm778lxda";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];

View file

@ -562,6 +562,13 @@ in
};
xf86videointel = attrs: attrs // {
# the update script only works with released tarballs :-/
name = "xf86-video-intel-2017-04-18";
src = args.fetchurl {
url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/"
+ "c72bb27a3a68ecc616ce2dc8e9a1d20354504562.tar.gz";
sha256 = "1awxbig135nmq7qa8jzggqr4q32k6ngnal2lckrdkg7zqi40zdv8";
};
buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman];
nativeBuildInputs = attrs.nativeBuildInputs ++ [args.autoreconfHook xorg.utilmacros];
configureFlags = "--with-default-dri=3 --enable-tools";

View file

@ -185,7 +185,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2
mirror://xorg/individual/app/xmag-1.0.6.tar.bz2
mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2
mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.19.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
mirror://xorg/individual/app/xprop-1.2.2.tar.bz2

View file

@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
name = "lambda-mod-zsh-theme-unstable-2017-07-05";
name = "lambda-mod-zsh-theme-unstable-2017-10-08";
src = fetchFromGitHub {
owner = "halfo";
repo = "lambda-mod-zsh-theme";
sha256 = "03kdhifxsnfbly6hqpr1h6kf52kyhdbh82nvwkkyrz1lw2cxl89n";
rev = "ba7d5fea16db91fc8de887e69250f4e501b1e36d";
sha256 = "13yis07zyr192s0x2h04k5bm1yzbk5m3js83aa17xh5573w4b786";
rev = "61c373c8aa5556d51522290b82ad44e7166bced1";
};
buildPhases = [ "unpackPhase" "installPhase" ];

View file

@ -87,7 +87,8 @@ stdenv.mkDerivation rec {
glproto mesa_glu
] ++ xorgserver.buildInputs;
nativeBuildInputs = [ cmake zlib gettext libtool ] ++ xorg.xorgserver.nativeBuildInputs;
nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil ]
++ xorg.xorgserver.nativeBuildInputs;
propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs;

View file

@ -0,0 +1,25 @@
{ lib, fetchFromGitHub, buildPythonApplication
, pygtk
, numpy ? null
}:
buildPythonApplication {
name = "escrotum-2017-01-28";
src = fetchFromGitHub {
owner = "Roger";
repo = "escrotum";
rev = "a51e330f976c1c9e1ac6932c04c41381722d2171";
sha256 = "0vbpyihqgm0fyh22ashy4lhsrk67n31nw3bs14d1wr7ky0l3rdnj";
};
propagatedBuildInputs = [ pygtk numpy ];
meta = with lib; {
homepage = https://github.com/Roger/escrotum;
description = "Linux screen capture using pygtk, inspired by scrot";
platforms = platforms.linux;
maintainers = with maintainers; [ rasendubi ];
license = licenses.gpl3;
};
}

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
name = "fd-${version}";
version = "3.1.0";
version = "4.0.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "fd";
rev = "v${version}";
sha256 = "0sv7iwl44a86n92i3mib2vlzd44q9ncif34yh1s0vqffai5s1rr6";
sha256 = "1aw4pgsmvzzqlvbxzv5jnw42nf316qfhvr50b58iqi2dxy8z8cmv";
};
depsSha256 = "1irfx78k899qphzj8i8vr34pb6zaf9p5nx5c4zpgsrbknvn0ag5l";
depsSha256 = "17fjlmdwp8582dvv68b5h3zzvmd71yd9sw9xalyrrww46h7fd84g";
meta = {
description = "A simple, fast and user-friendly alternative to find";

View file

@ -26,5 +26,6 @@ python3Packages.buildPythonApplication rec {
homepage = https://github.com/garabik/unicode;
license = licenses.gpl3;
maintainers = [ maintainers.woffs ];
platforms = platforms.all;
};
}

View file

@ -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 { };

View file

@ -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 = ''