diff options
Diffstat (limited to 'pkgs/servers')
108 files changed, 1705 insertions, 391 deletions
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 4cc187846d0d..22a9aef8edab 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, runCommand +{ stdenv, fetchurl , erlang, python, libxml2, libxslt, xmlto , docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync , AppKit, Carbon, Cocoa diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index b1d60d8c1456..b2b681bcc8bd 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn, fetchpatch, +{ stdenv, lib, fetchurl, fetchsvn, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux, dmidecode, libuuid, newt, lua, speex, diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index d89e59d662e7..ee403ab49f09 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "caddy-${version}"; - version = "0.10.12"; + version = "0.11.0"; goPackagePath = "github.com/mholt/caddy"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "0vmgswln72qqay73z39qn135sl5k71zlybr2jdrcjlmp4i7hrf88"; + sha256 = "0lvzvsblw4zpdfigaad4y577wfh7skx1ln5xhiz0k7vaqfj96ijy"; }; buildFlagsArray = '' diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index 90c87f8019d0..8335e40de98f 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchurl, zip, unzip, makeWrapper +{ stdenv, lib, fetchurl, zip, unzip , jzmq, jdk, python -, logsDir ? "", confFile ? "", extraLibraryPaths ? [], extraJars ? [] }: +, confFile ? "", extraLibraryPaths ? [], extraJars ? [] }: stdenv.mkDerivation rec { name = "apache-storm-" + version; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index d2ad5d0bd8e8..5cf192791000 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, consul-ui, fetchFromGitHub }: +{ stdenv, buildGoPackage, consul-ui, fetchFromGitHub }: buildGoPackage rec { name = "consul-${version}"; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index f83ef4cef388..0891b72cd1e9 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchFromGitHub, openssl, libevent }: -let inherit (stdenv.lib) optional; in - stdenv.mkDerivation rec { name = "coturn-${version}"; version = "4.5.0.7"; diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix index 13a78d61098b..8a1bb6313ad2 100644 --- a/pkgs/servers/dict/dictd-wordnet.nix +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -1,4 +1,4 @@ -{stdenv, fetchsvn, python, wordnet, writeScript}: +{stdenv, python, wordnet, writeScript}: stdenv.mkDerivation rec { version = "542"; diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 6dcb8fbbd772..bc01d9946c71 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "miekg"; repo = "coredns"; rev = "v${version}"; - sha256 = "11wvy3xp9in5ny6h7hp24dq6asc013vrwc6bqiky83dlzasjwkf6"; + sha256 = "15q8l4apspaw1xbbb9j1d8s2cc5zrgycan6iq597ga9m0vyf7wiw"; }; goDeps = ./deps.nix; diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index 772292b0a57e..6757542050af 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -2,11 +2,11 @@ , boost, libsodium, libedit, re2 , net_snmp, lua, protobuf, openssl }: stdenv.mkDerivation rec { name = "dnsdist-${version}"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; - sha256 = "025sgvpi3ps0n4mzfwkk6a5ang90a3c7s2fi9vni6jj0p16wsrxa"; + sha256 = "1i3b1vpk9a8zbx9aby2s1ckkzhlvzgn11hcgj3b8x2j1b9771rqb"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index ef99772a082d..2bdd758b9802 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn +{ stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gnutls liburcu libidn + gnutls liburcu libidn2 libunistring nettle libedit libiconv lmdb libintl # without sphinx &al. for developer documentation diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index bfa610b57d8a..1d7e5722ea78 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -2,13 +2,13 @@ , knot-dns, luajit, libuv, lmdb, gnutls, nettle , cmocka, systemd, dns-root-data, makeWrapper , extraFeatures ? false /* catch-all if defaults aren't enough */ -, hiredis, libmemcached, luajitPackages +, luajitPackages }: let # un-indented, over the whole file result = if extraFeatures then wrapped-full else unwrapped; -inherit (stdenv.lib) optional optionals optionalString concatStringsSep; +inherit (stdenv.lib) optional concatStringsSep; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 2c82b0bf33a8..1ac1d3948942 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, libevent, openssl +{ stdenv, fetchurl, libevent, openssl , bind8Stats ? false , checking ? false , ipv6 ? true diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 29cb8c2223c0..d6b71f816083 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, libpcap, buildGoPackage, fetchFromGitHub }: +{ lib, libpcap, buildGoPackage, fetchFromGitHub }: with lib; diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index c1234606291d..5e2381ada1d1 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildMaven, maven, jdk, makeWrapper, stdenv, ... }: +{ fetchFromGitHub, maven, jdk, makeWrapper, stdenv, ... }: stdenv.mkDerivation rec { name = "exhibitor-${version}"; version = "1.5.6"; diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 24ed1dffd4d8..caf7d8360f07 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libedit, ncurses, automake, autoconf, libtool +{stdenv, fetchurl, libedit, automake, autoconf, libtool , # icu = null: use icu which comes with firebird diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index ecefc1d8fabd..461b90bc978c 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -53,7 +53,9 @@ let patches = [ # For 5.2+, we need a slightly adjusted patch to fix all the ldflags (if lib.versionAtLeast version "5.2" - then ./ldflags.patch + then (if lib.versionAtLeast version "6.0" + then ./ldflags-6.0.patch + else ./ldflags-5.2.patch) else ./ldflags-5.1.patch) ] ++ # for 6.0+, we do NOT need to apply this version fix, since we can specify @@ -77,10 +79,20 @@ let --replace 'exit 1' '#exit 1' patchShebangs . + '' + lib.optionalString (lib.versionAtLeast version "6.0") '' + substituteInPlace ./Makefile \ + --replace 'TLS_LIBS +=' '#TLS_LIBS +=' \ + --replace 'LDFLAGS :=' 'LDFLAGS := -ltls -lssl -lcrypto' ''; enableParallelBuilding = true; - makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ]; + + makeFlags = [ "all" "fdb_java" ] + # Don't compile FDBLibTLS if we don't need it in 6.0 or later; + # it gets statically linked in + ++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ] + # Needed environment overrides + ++ [ "KVRELEASE=1" ]; # on 6.0 and later, we can specify all this information manually configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") '' @@ -93,7 +105,9 @@ let mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb cp -v ./lib/libfdb_c.so $lib/lib + '' + lib.optionalString (!lib.versionAtLeast version "6.0") '' cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so + '' + '' cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb @@ -131,15 +145,16 @@ in with builtins; { }; foundationdb52 = makeFdb rec { - version = "5.2.5"; + version = "5.2.6"; branch = "release-5.2"; - sha256 = "00csr4v9cwl9y8r63p73grc6cvhlqmzcniwrf80i0klxv5asg7q7"; + rev = "refs/tags/v5.2.6"; # seemed to be tagged incorrectly + sha256 = "1q3lq1hqq0f53n51gd4cw5cpayyw65dmkfplhsw1m5mghymzmskk"; }; foundationdb60 = makeFdb rec { - version = "6.0.0pre2227_${substring 0 8 rev}"; - branch = "master"; - rev = "8caa6eaecf1eeec0298fc77db334761b0c1d1523"; - sha256 = "1q200rpsphl5fzwzp2vk7ifgsnqh95k0xfiicfi1c8253ylnsgll"; + version = "6.0.2pre2430_${substring 0 8 rev}"; + branch = "release-6.0"; + rev = "7938d247a5eaf886a176575de6592b76374df58c"; + sha256 = "0g8h2zs0f3aacs7x4hyjh0scybv33gjj6dqfb789h4n6r4gd7d9h"; }; } diff --git a/pkgs/servers/foundationdb/ldflags.patch b/pkgs/servers/foundationdb/ldflags-5.2.patch index ee5911e495f8..ee5911e495f8 100644 --- a/pkgs/servers/foundationdb/ldflags.patch +++ b/pkgs/servers/foundationdb/ldflags-5.2.patch diff --git a/pkgs/servers/foundationdb/ldflags-6.0.patch b/pkgs/servers/foundationdb/ldflags-6.0.patch new file mode 100644 index 000000000000..1fa17a9615aa --- /dev/null +++ b/pkgs/servers/foundationdb/ldflags-6.0.patch @@ -0,0 +1,78 @@ +diff --git a/bindings/c/local.mk b/bindings/c/local.mk +index c861a29c..ff886e93 100644 +--- a/bindings/c/local.mk ++++ b/bindings/c/local.mk +@@ -30,8 +30,8 @@ fdb_c_tests_HEADERS := -Ibindings/c + CLEAN_TARGETS += fdb_c_tests_clean + + ifeq ($(PLATFORM),linux) +- fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl +- fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete ++ fdb_c_LIBS += lib/libstdc++.a ++ fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl + fdb_c_tests_LIBS += -lpthread + endif + +diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk +index 2ef4fcb7..6e59625c 100644 +--- a/bindings/flow/tester/local.mk ++++ b/bindings/flow/tester/local.mk +@@ -35,8 +35,7 @@ _fdb_flow_tester_clean: + @rm -rf bindings/flow/bin + + ifeq ($(PLATFORM),linux) +- fdb_flow_tester_LIBS += -ldl -lpthread -lrt +- fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + else ifeq ($(PLATFORM),osx) + fdb_flow_tester_LDFLAGS += -lc++ + endif +diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk +index ca5dbab6..012f0130 100644 +--- a/fdbbackup/local.mk ++++ b/fdbbackup/local.mk +@@ -26,8 +26,7 @@ fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB + fdbbackup_STATIC_LIBS := $(TLS_LIBS) + + ifeq ($(PLATFORM),linux) +- fdbbackup_LIBS += -ldl -lpthread -lrt +- fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + + # GPerfTools profiler (uncomment to use) + # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 +diff --git a/fdbcli/local.mk b/fdbcli/local.mk +index fd738876..3af026b9 100644 +--- a/fdbcli/local.mk ++++ b/fdbcli/local.mk +@@ -22,14 +22,13 @@ + + fdbcli_CFLAGS := $(fdbclient_CFLAGS) + fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS) +-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl $(FDB_TLS_LIB) ++fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB) + fdbcli_STATIC_LIBS := $(TLS_LIBS) + + fdbcli_GENERATED_SOURCES += versions.h + + ifeq ($(PLATFORM),linux) +- fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc +- fdbcli_LIBS += -lpthread -lrt ++ fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl + else ifeq ($(PLATFORM),osx) + fdbcli_LDFLAGS += -lc++ + endif +diff --git a/fdbserver/local.mk b/fdbserver/local.mk +index 690916d0..475abbaf 100644 +--- a/fdbserver/local.mk ++++ b/fdbserver/local.mk +@@ -26,8 +26,7 @@ fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB + fdbserver_STATIC_LIBS := $(TLS_LIBS) + + ifeq ($(PLATFORM),linux) +- fdbserver_LIBS += -ldl -lpthread -lrt +- fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc ++ fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt + + # GPerfTools profiler (uncomment to use) + # fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1 diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index 89f1821981fc..ebade244bdf7 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "gotty-${version}"; diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 3cb0d3931db3..7636dca15d8d 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, flex, bison, texinfo +{ stdenv, fetchurl, automake, autoconf, libtool, flex, bison, texinfo, fetchpatch # Optional Dependencies , ncurses ? null @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { }; postPatch = '' - sed '1i#include <sys/types.h>' -i src/daemon/open_console.c substituteInPlace src/prog/gpm-root.y --replace __sigemptyset sigemptyset ''; @@ -22,6 +21,22 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + patches = [ + # musl compat patches, safe everywhere + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-musl-missing-headers.patch"; + sha256 = "1g338m6j1sba84wlqp1r6rpabj5nm6ki577hjalg46czg0lfp20h"; + }) + # Touches same code as glibc fix in postPatch above, but on the non-glibc route + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-musl-portable-sigaction.patch"; + sha256 = "0hfdqm9977hd5dpzn05y0a6jbj55w1kp4hd9gyzmg9wslmxni4rg"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch"; + sha256 = "0lg4l9phvy2n8gy17qsn6zn0qq52vm8g01pgq5kqpr8sd3fb21c2"; + }) + ]; preConfigure = '' ./autogen.sh ''; diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index fc9d4c0508ed..c4be1f3c3b34 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, jre, makeWrapper, unzip }: +{ stdenv, fetchzip, jre, makeWrapper }: stdenv.mkDerivation rec { name = "h2-${version}"; diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index dcd81fa44b05..6a33ac638d21 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ stdenv, fetchurl, makeWrapper }: stdenv.mkDerivation rec { name = "hbase-${version}"; version = "0.98.24"; diff --git a/pkgs/servers/holochain-go/default.nix b/pkgs/servers/holochain-go/default.nix new file mode 100644 index 000000000000..95ec267dba24 --- /dev/null +++ b/pkgs/servers/holochain-go/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "holochain-go${version}"; + version = "0.1.0-alpha"; + rev = "a17510b910a7a377441c152b8dccdbae1999f63f"; + + goPackagePath = "github.com/holochain/holochain-proto"; + + + src = fetchFromGitHub { + inherit rev; + owner = "holochain"; + repo = "holochain-proto"; + sha256 = "19l29jnr63ximmyn4i4llv2mdwh306c2mpzmx2anj9z12wjpach0"; + }; + + goDeps = ./deps.nix; + + meta = { + description = "core implementation of validating DHT dApps in go"; + longDescription = "Holographic storage for distributed applications -- a validating monotonic DHT backed by authoritative hashchains for data provenance"; + homepage = "https://holochain.org/"; + downloadPage = "https://developer.holochain.org/"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ gavin ]; + + }; +} diff --git a/pkgs/servers/holochain-go/deps.nix b/pkgs/servers/holochain-go/deps.nix new file mode 100644 index 000000000000..bad01c01a6bd --- /dev/null +++ b/pkgs/servers/holochain-go/deps.nix @@ -0,0 +1,1056 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"; + sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; + }; + } + { + goPackagePath = "github.com/agl/ed25519"; + fetch = { + type = "git"; + url = "https://github.com/agl/ed25519"; + rev = "5312a61534124124185d41f09206b9fef1d88403"; + sha256 = "1v8mhkf1m3ga5262s75vabskxvsw5rpqvi5nwhxwiv7gfk6h823i"; + }; + } + { + goPackagePath = "github.com/btcsuite/btcd"; + fetch = { + type = "git"; + url = "https://github.com/btcsuite/btcd"; + rev = "675abc5df3c5531bc741b56a765e35623459da6d"; + sha256 = "1sg7dmns8smsfcjpn9dnqapzf4b6r1vrp62j753izmbmc55rjm0f"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "e214231b295a8ea9479f11b70b35d5acf3556d9b"; + sha256 = "0770h1mpig2j5sbiha3abnwaw8p6dg9i87r8pc7cf6m4kwml3sc9"; + }; + } + { + goPackagePath = "github.com/docker/spdystream"; + fetch = { + type = "git"; + url = "https://github.com/docker/spdystream"; + rev = "bc6354cbbc295e925e4c611ffe90c1f287ee54db"; + sha256 = "08746a15snvmax6cnzn2qy7cvsspxbsx97vdbjpdadir3pypjxya"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "507f6050b8568533fb3f5504de8e5205fa62a114"; + sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7"; + }; + } + { + goPackagePath = "github.com/fd/go-nat"; + fetch = { + type = "git"; + url = "https://github.com/fd/go-nat"; + rev = "dcaf50131e4810440bed2cbb6f7f32c4f4cc95dd"; + sha256 = "094aqkjv9qfmy1k8xrg7cl4njbvamm51fdilay9c75wcax9p41jv"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "e9ed3c6dfb39bb1a32197cb10d527906fe4da4b6"; + sha256 = "07cf0j3wbsl1gmn175mdgljcarfz4xbqd6pgc7b08a5lcn7zwhjz"; + }; + } + { + goPackagePath = "github.com/glycerine/blake2b"; + fetch = { + type = "git"; + url = "https://github.com/glycerine/blake2b"; + rev = "3c8c640cd7bea3ca78209d812b5854442ab92fed"; + sha256 = "1hw0y15yf4fhjkfgh8jnk257chhmpzyppgnnck9aijhkvk41rply"; + }; + } + { + goPackagePath = "github.com/glycerine/goconvey"; + fetch = { + type = "git"; + url = "https://github.com/glycerine/goconvey"; + rev = "83515ca83cca5aef8af8eab6eb7368f8e7500976"; + sha256 = "1n9drlng7pbyqfxyfa14vik8vd3vj4m2b7v73410fxll36djj4s8"; + }; + } + { + goPackagePath = "github.com/glycerine/greenpack"; + fetch = { + type = "git"; + url = "https://github.com/glycerine/greenpack"; + rev = "3f7f38f101dc36e64a4176ded8443684516d76c2"; + sha256 = "0w468v8zpsmgml1bgr51rzfvcymlfpdzy091wid67i1z25gwyik0"; + }; + } + { + goPackagePath = "github.com/glycerine/liner"; + fetch = { + type = "git"; + url = "https://github.com/glycerine/liner"; + rev = "72909af234e0e355af10d0ace679446a6c5d7ec3"; + sha256 = "118dig6vg1pz5jq2w1kyq0102rvgq676z8zsdyi13ynw8phlpcnc"; + }; + } + { + goPackagePath = "github.com/glycerine/zebrapack"; + fetch = { + type = "git"; + url = "https://github.com/glycerine/zebrapack"; + rev = "7858d9b3e1a2ca613b770bb4cdce84ad04cefbbb"; + sha256 = "0wgk719q428q415628hw2glj9divw172iqnrn02hkgiwfnv005rp"; + }; + } + { + goPackagePath = "github.com/glycerine/tmframe"; + fetch = { + type = "git"; + url = "https://github.com/glycerine/tmframe"; + rev = "092b9413cc9ce8cb9fffadbfbf9038bb0bad5418"; + sha256 = "19h9hq53g8wf12h15w07qlz7035x3k2z3zs6bj1dzm68xca26lcn"; + }; + } + { + goPackagePath = "github.com/glycerine/zygomys"; + fetch = { + type = "git"; + url = "https://github.com/glycerine/zygomys"; + rev = "22c88044c7c2a3f845b8bbd1df6d990e8ee4f29c"; + sha256 = "1psbx4p022c19bq58bf9fs0mlm7mqavpbggsdkw7wqga0yn1vp18"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "1ef32a8b9fc3f8ec940126907cedb5998f6318e4"; + sha256 = "0zk2n0n35ksskr5cd83k5k8wg21ckrcggjy88bym2s21ngj5w4fh"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "dec09d789f3dba190787f8b4454c7d3c936fed9e"; + sha256 = "1hc4w67p6zkh2qk7wm1yrl69jjrjjk615mly5ll4iidn1m4mzi4i"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785"; + sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy"; + }; + } + { + goPackagePath = "github.com/gxed/hashland"; + fetch = { + type = "git"; + url = "https://github.com/gxed/hashland"; + rev = "d9f6b97f8db22dd1e090fd0bbbe98f09cc7dd0a8"; + sha256 = "1q23y4lacsz46k9gmgfw4iwwydw36j2601rbidmmswl94grpc386"; + }; + } + { + goPackagePath = "github.com/gxed/eventfd"; + fetch = { + type = "git"; + url = "https://github.com/gxed/eventfd"; + rev = "80a92cca79a8041496ccc9dd773fcb52a57ec6f9"; + sha256 = "1p15rsimkcp2flj6wb41flac72zhf97zd8jxrahsw05nyfbp58z5"; + }; + } + { + goPackagePath = "github.com/gxed/GoEndian"; + fetch = { + type = "git"; + url = "https://github.com/gxed/GoEndian"; + rev = "0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7"; + sha256 = "0fn28h9gs1finrpfs388a3ycavlcf3qylsn803cflmrwaj5piqia"; + }; + } + { + goPackagePath = "github.com/huin/goupnp"; + fetch = { + type = "git"; + url = "https://github.com/huin/goupnp"; + rev = "1395d1447324cbea88d249fbfcfd70ea878fdfca"; + sha256 = "03fp94757vzclkv5khmydhvcm2gjhxgd0mi8q7wqksy9l93ixgl4"; + }; + } + { + goPackagePath = "github.com/ipfs/go-ipfs-util"; + fetch = { + type = "git"; + url = "https://github.com/ipfs/go-ipfs-util"; + rev = "9ed527918c2f20abdf0adfab0553cd87db34f656"; + sha256 = "03lq5378p31c6ghfa20vwa7b1vgd96ypc9dmwp1p62bddz6apci6"; + }; + } + { + goPackagePath = "github.com/ipfs/go-log"; + fetch = { + type = "git"; + url = "https://github.com/ipfs/go-log"; + rev = "0ef81702b797a2ecef05f45dcc82b15298f54355"; + sha256 = "0q375wbh014hca8n6g3z2x875f5m9cads75chs0sqlhr5rfgncal"; + }; + } + { + goPackagePath = "github.com/ipfs/go-todocounter"; + fetch = { + type = "git"; + url = "https://github.com/ipfs/go-todocounter"; + rev = "1e832b829506383050e6eebd12e05ea41a451532"; + sha256 = "0cydbwivwp2k3x63rl6crhiw3svglc184saxyjrahvp7rv6cqdbq"; + }; + } + { + goPackagePath = "github.com/jackpal/gateway"; + fetch = { + type = "git"; + url = "https://github.com/jackpal/gateway"; + rev = "cbcf4e3f3baee7952fc386c8b2534af4d267c875"; + sha256 = "1ird5xmizj632l3dq24s2xgb8w1dn6v8xznlqz252gvngyr2gjl1"; + }; + } + { + goPackagePath = "github.com/jackpal/go-nat-pmp"; + fetch = { + type = "git"; + url = "https://github.com/jackpal/go-nat-pmp"; + rev = "28a68d0c24adce1da43f8df6a57340909ecd7fdd"; + sha256 = "17l8vh4g1akhgm7hbw5n9k2hdphlsvm5vwdc8z3mzlxjmdww5z70"; + }; + } + { + goPackagePath = "github.com/jbenet/go-base58"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-base58"; + rev = "6237cf65f3a6f7111cd8a42be3590df99a66bc7d"; + sha256 = "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf"; + }; + } + { + goPackagePath = "github.com/jbenet/go-temp-err-catcher"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-temp-err-catcher"; + rev = "aac704a3f4f27190b4ccc05f303a4931fd1241ff"; + sha256 = "1fyqkcggnrzwxa8iii15g60w2jikdm26sr7l36km7y0nc2kvf7jc"; + }; + } + { + goPackagePath = "github.com/jbenet/goprocess"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/goprocess"; + rev = "b497e2f366b8624394fb2e89c10ab607bebdde0b"; + sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s"; + }; + } + { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "77f18212c9c7edc9bd6a33d383a7b545ce62f064"; + sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h"; + }; + } + { + goPackagePath = "github.com/lestrrat/go-jspointer"; + fetch = { + type = "git"; + url = "https://github.com/lestrrat/go-jspointer"; + rev = "d5f7c71bfd03c8e9489a636874cd106c22d3a47c"; + sha256 = "10b94qdnvla9ax8b3djzwqz35gvqcvqrcafhqn0r4lay6y2i3241"; + }; + } + { + goPackagePath = "github.com/lestrrat/go-jsref"; + fetch = { + type = "git"; + url = "https://github.com/lestrrat/go-jsref"; + rev = "50df7b2d07d799426a9ac43fa24bdb4785f72a54"; + sha256 = "16mz2mm1ggvdighglmf48qkir070gig64cf26vmiwfq3z5w47s7p"; + }; + } + { + goPackagePath = "github.com/lestrrat/go-jsschema"; + fetch = { + type = "git"; + url = "https://github.com/lestrrat/go-jsschema"; + rev = "a6a42341b50d8d7e2a733db922eefaa756321021"; + sha256 = "0cyz9pzw53haabpxhxsqp1gb9z742gs6l6dp45skag6abdwgpi13"; + }; + } + { + goPackagePath = "github.com/lestrrat/go-jsval"; + fetch = { + type = "git"; + url = "https://github.com/lestrrat/go-jsval"; + rev = "cf70aae60f5b41a32922066c41287b0168e55904"; + sha256 = "06ba6rh9f0nwqsam3bvmazcv6y8zma6njljbhjswjamylsfhclcs"; + }; + } + { + goPackagePath = "github.com/lestrrat/go-pdebug"; + fetch = { + type = "git"; + url = "https://github.com/lestrrat/go-pdebug"; + rev = "569c97477ae8837e053e5a50bc739e15172b8ebe"; + sha256 = "0r56ppr6l6z3gcbxyyr3kiiw07a9gr3qxr26w8sbiq1np3zzpmzw"; + }; + } + { + goPackagePath = "github.com/lestrrat/go-structinfo"; + fetch = { + type = "git"; + url = "https://github.com/lestrrat/go-structinfo"; + rev = "8204d40bbcd79eb7603cd4c2c998e60eb2479ded"; + sha256 = "0p52xp2x4zyv91k820pnarz8xidgil8191cwfr1rasp8z07a9d3j"; + }; + } + { + goPackagePath = "github.com/libp2p/go-addr-util"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-addr-util"; + rev = "3bd34419494fb7f15182ddd19a5d92ac017a27c6"; + sha256 = "11f0g9zd4barbdqplmflxbm3yp2plby5qbsk66zbad3xd28kllc0"; + }; + } + { + goPackagePath = "github.com/libp2p/go-flow-metrics"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-flow-metrics"; + rev = "3b3bcfcf78f2dc0e85be13ef3c3adc64cc5a9347"; + sha256 = "06kgn72bmvljigycgdbw2nywss3g3r0ysfcw4k48938akxydgc6d"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-circuit"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-circuit"; + rev = "772fa57b88017ff6bce887a8d1486b228cacf488"; + sha256 = "03jl9b2g6z82pgkiqanvhlm3wyddp9x07b31h72r79g40lw6j7kz"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-conn"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-conn"; + rev = "5c445d258745408186410e0ad5128224b00e47fe"; + sha256 = "01a8hnkpxg73v48i2gbr3y8fs6881h5g965nak4bn05iy6jn1cr8"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-crypto"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-crypto"; + rev = "18915b5467c77ad8c07a35328c2cab468667a4e8"; + sha256 = "00pgxh53g60ij18mb2l5g8id9c46sw4pfsaw3cprv5mqacc1dlfg"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-host"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-host"; + rev = "acf01b322989cf731f66ce70b1ed7c41fe007798"; + sha256 = "0gxqyw6azsp65yam6f667gdidwdfzlxri8xb7iwyqp58y9973i9c"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-interface-conn"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-interface-conn"; + rev = "47718f905cc3ccd621b65fc106c521555c4040d3"; + sha256 = "1ykd46mdqjy9yj2i4srx6m0f5jwaw2f5pm4pfdcrq4wh30r0xg3j"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-interface-connmgr"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-interface-connmgr"; + rev = "d00fbee4d35c7b5fdbd12499f673a236c6303865"; + sha256 = "1ynmn8p0d145mbykr375lqzxl4h0gdcxdiz3bxfxnwxcl5x73pah"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-interface-pnet"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-interface-pnet"; + rev = "c6acc383ec0b7b98112971df590d6702885ca821"; + sha256 = "1micl8nvk29sac9zhvzxb0mgadp83kz725jbl4hs3a9a0ar9gxln"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-loggables"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-loggables"; + rev = "3a7ad4dd32462b4d9c07a85021e0f5e1110debb2"; + sha256 = "12h5lxxwnh5b8ch8q7fk6nky4fx5ajhf83bjxm0cdapv85y3cjz2"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-metrics"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-metrics"; + rev = "2b4a2757a26649c9a603519647cc9d4478ade5c6"; + sha256 = "1d2rfvkmaccajbljb7p1dwscf422la0qy1xl7h5d9ks4pk5pgcxr"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-nat"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-nat"; + rev = "d090f00e553d1b6582e1ec829608a8a9bbf262e1"; + sha256 = "1j6m3rs80zizgd6sy0rclfa95k7i9dxa6yfy6ca52lfqmwhh9ghk"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-net"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-net"; + rev = "70a8d93f2d8c33b5c1a5f6cc4d2aea21663a264c"; + sha256 = "04l67xnghr4bbgpdi5fw570zb6nl4k2nj0jpl6hmwbw0jhdd9hkn"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-peer"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-peer"; + rev = "aa0e03e559bde9d4749ad8e38595e15a6fe808fa"; + sha256 = "1rmfsnwaij3klby30aqgvx85hk5swhp5dlxg1z255z6r4mmvvdwk"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-peerstore"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-peerstore"; + rev = "7ac092e7f77f5bda1cb6e4ef95efbe911e97db41"; + sha256 = "1kmj3dwnvkl08hb8j3zfispl2q582p5b5v76hk5yn46drs7da276"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-protocol"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-protocol"; + rev = "b29f3d97e3a2fb8b29c5d04290e6cb5c5018004b"; + sha256 = "1xgjfnx9zcqglg9li29wdqywsp8hz22wx6phns9zscni2jsfidld"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-secio"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-secio"; + rev = "146b7055645501f741c5644d4a3d207614f08899"; + sha256 = "1df5f2r7wc34l6nycc1f4ni06cd2hhjncjyvzzw4vnmlqsncrx1w"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-swarm"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-swarm"; + rev = "48d6d0ff2d2a4724f6b47f1ed5ffc0ae63e30460"; + sha256 = "1z595f71p1i89fhc5qc63mcgnfiy0p1gyda77p6jmzxyzgzwvlmz"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-transport"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-transport"; + rev = "49533464477a869fee537c8cc3fcee286aa8bdcd"; + sha256 = "0dj0rzrykjmhnhpn8ac5696zvql8rq0amw87bj62qn4hpi7ri64h"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p"; + rev = "3b8f2275a2b24de5777aaa4fc77f1af57c5c4387"; + sha256 = "0jyk4zvhipknnwn1w3i11lsrzybh30p190xrkj7zgh5whz2rdqj1"; + }; + } + { + goPackagePath = "github.com/libp2p/go-maddr-filter"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-maddr-filter"; + rev = "3c9947befbb92277cc5f85057d387097debc4139"; + sha256 = "022xmvv6djpycbcaw4hhxhbspl2g72yjla218j08xp8l0gp6w0hq"; + }; + } + { + goPackagePath = "github.com/libp2p/go-msgio"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-msgio"; + rev = "d82125c9907e1365775356505f14277d47dfd4d6"; + sha256 = "0jawhcr6hm9apmdbl09s12mmqzwnphzn8k6wqwxfbmhs7gg2s1wq"; + }; + } + { + goPackagePath = "github.com/libp2p/go-peerstream"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-peerstream"; + rev = "2679b7430e519fc39f9cfbb0c7b7d016705b4ce1"; + sha256 = "10rxbn21hp7c8x1hzc770hnh9zgcz13dn9mjd94fg2yxkf7fq6mn"; + }; + } + { + goPackagePath = "github.com/libp2p/go-reuseport"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-reuseport"; + rev = "15a1cd37f0502f3b2eccb6d71a7958edda314633"; + sha256 = "1pcy6qpz804apsgxmh8irkj80viz5zrh2f3a0ipxkzq2nb6jx36k"; + }; + } + { + goPackagePath = "github.com/libp2p/go-sockaddr"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-sockaddr"; + rev = "f3e9f73a53d14d8257cb9da3d83dda07bbd8b2fe"; + sha256 = "04saphhq5zbphzbd87lfpjkdf8k21x7q4hn8d03f8ykm19d51nlg"; + }; + } + { + goPackagePath = "github.com/libp2p/go-stream-muxer"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-stream-muxer"; + rev = "6ebe3f58af097068454b167a89442050b023b571"; + sha256 = "1w1hypcg010npzlbabigrz65c4inj7w9js9ai4iw6z2d3s7ymc6v"; + }; + } + { + goPackagePath = "github.com/libp2p/go-tcp-transport"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-tcp-transport"; + rev = "2852032418949429c7d683502e7ea9bff2e951e7"; + sha256 = "0j4cm890qbgj3ry757pcd21j4q2i3bkksc5z8y8hszyq8njc7ac5"; + }; + } + { + goPackagePath = "github.com/libp2p/go-ws-transport"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-ws-transport"; + rev = "2c20090616127904f706139653cd40ecac600227"; + sha256 = "0yirawpv416fs9amzp0i6r2j0lmpw9bplqxiqixcvi7kkinb42hq"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "efa589957cd060542a26d2dd7832fd6a6c6c3ade"; + sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "01d59357d468872339068bcd5d55a00e2463051f"; + sha256 = "0m595w0azrsvlfqqvrsrf0yd0myavn129rg1nsq1mnfy9c8768xa"; + }; + } + { + goPackagePath = "github.com/minio/blake2b-simd"; + fetch = { + type = "git"; + url = "https://github.com/minio/blake2b-simd"; + rev = "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4"; + sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd"; + }; + } + { + goPackagePath = "github.com/minio/sha256-simd"; + fetch = { + type = "git"; + url = "https://github.com/minio/sha256-simd"; + rev = "ad98a36ba0da87206e3378c556abbfeaeaa98668"; + sha256 = "0yfnqn3kqdnlfm54yvc4fr5vpdmwdi2kw571nlkbpmy8ldhsqqfi"; + }; + } + { + goPackagePath = "github.com/mr-tron/base58"; + fetch = { + type = "git"; + url = "https://github.com/mr-tron/base58"; + rev = "c1bdf7c52f59d6685ca597b9955a443ff95eeee6"; + sha256 = "1dq6i8619manxdhb0fwhdm9ar23kx88pc2xwl1pjla9djrgql6a8"; + }; + } + { + goPackagePath = "github.com/multiformats/go-multiaddr"; + fetch = { + type = "git"; + url = "https://github.com/multiformats/go-multiaddr"; + rev = "123a717755e0559ec8fda308019cd24e0a37bb07"; + sha256 = "0lx2m83y0ffqn7ygqppa1ri1ykdrbvl1qzb4x2w8k97chxfjx4ip"; + }; + } + { + goPackagePath = "github.com/multiformats/go-multiaddr-dns"; + fetch = { + type = "git"; + url = "https://github.com/multiformats/go-multiaddr-dns"; + rev = "c3d4fcd3cbaf54a24b0b68f1461986ede1d59859"; + sha256 = "13a8xbr5zb49aq570b51a5japb3rnsnwjncgqsd91bnqr8v68vdb"; + }; + } + { + goPackagePath = "github.com/multiformats/go-multiaddr-net"; + fetch = { + type = "git"; + url = "https://github.com/multiformats/go-multiaddr-net"; + rev = "97d80565f68c5df715e6ba59c2f6a03d1fc33aaf"; + sha256 = "0gsncnwn8b9i2hyh0kgiw51sz96wswww5m032dr87jld2zl7kdrb"; + }; + } + { + goPackagePath = "github.com/multiformats/go-multihash"; + fetch = { + type = "git"; + url = "https://github.com/multiformats/go-multihash"; + rev = "265e72146e710ff649c6982e3699d01d4e9a18bb"; + sha256 = "1yzjqwwwwd1yb22g2vf12y5w4gbgsa4g9arf66xk5m2r7r79h8hq"; + }; + } + { + goPackagePath = "github.com/multiformats/go-multistream"; + fetch = { + type = "git"; + url = "https://github.com/multiformats/go-multistream"; + rev = "612ce31c03aebe1d5adbd3c850ee89e05a82b16d"; + sha256 = "0yg7pkg8nvgz8ywcg55kqm1jk264qbdyilkjsnn32siyh5xwmcd1"; + }; + } + { + goPackagePath = "github.com/nats-io/nats"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/go-nats"; + rev = "247b2a84d8d0ff15cbc6faafc77ef15ea4317011"; + sha256 = "0ig494i7j94wr0f8mpaai9hy5knbvqlhqj280m969m219h8di2qy"; + }; + } + { + goPackagePath = "github.com/nats-io/go-nats"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/go-nats"; + rev = "247b2a84d8d0ff15cbc6faafc77ef15ea4317011"; + sha256 = "0ig494i7j94wr0f8mpaai9hy5knbvqlhqj280m969m219h8di2qy"; + }; + } + { + goPackagePath = "github.com/nats-io/nuid"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/nuid"; + rev = "3e58d42c9cfe5cd9429f1a21ad8f35cd859ba829"; + sha256 = "05xzdfcji3jv63c5sysmfypzg6xc2mm92gdcck7qvk10n60dndp4"; + }; + } + { + goPackagePath = "github.com/op/go-logging"; + fetch = { + type = "git"; + url = "https://github.com/op/go-logging"; + rev = "970db520ece77730c7e4724c61121037378659d9"; + sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; + }; + } + { + goPackagePath = "github.com/opentracing/opentracing-go"; + fetch = { + type = "git"; + url = "https://github.com/opentracing/opentracing-go"; + rev = "6c572c00d1830223701e155de97408483dfcd14a"; + sha256 = "1qw5s858zd2gsg1962jg3jpz38awpldv3vajlsj78qvzi0v0pmq4"; + }; + } + { + goPackagePath = "github.com/philhofer/fwd"; + fetch = { + type = "git"; + url = "https://github.com/philhofer/fwd"; + rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136"; + sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "816c9085562cd7ee03e7f8188a1cfd942858cded"; + sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k"; + }; + } + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "6c383dd335ef8dcccef05e651ce1eccfe4d0f011"; + sha256 = "1n6h7c8gi6wv4nklqd7ygzx2afvh7ddxbml9w9x0jxwcfb3bdy17"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "36e9d2ebbde5e3f13ab2e25625fd453271d6522e"; + sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/shirou/gopsutil"; + rev = "57f370e13068146efe1cb7129f79e5d51da8a242"; + sha256 = "1ij0bbnfjj65afin8vhccr3cxvg6r0awmvcvb2ilza5wbbsslggb"; + }; + } + { + goPackagePath = "github.com/shurcooL/go-goon"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/go-goon"; + rev = "37c2f522c041b74919a9e5e3a6c5c47eb34730a5"; + sha256 = "17ac6j6msdcxbmfhq6pxhw5z339b87bd6ciln9909drjv2szyxqv"; + }; + } + { + goPackagePath = "github.com/shurcooL/go"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/go"; + rev = "47fa5b7ceee66c60ac3a281416089035bf526a3c"; + sha256 = "1wr4fgb8w1zi3z7b76wjr68h0152lrcamphyhpbljc0sx8ygv8xd"; + }; + } + { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "7678a5452ebea5b7090a6b163f844c133f523da2"; + sha256 = "0df2z0f4l0yzbx38bphwyjsyxfgsza1yw4cq46zikbnknqjb8s1c"; + }; + } + { + goPackagePath = "github.com/smartystreets/goconvey"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/goconvey"; + rev = "ef6db91d284a0e7badaa1f0c404c30aa7dee3aed"; + sha256 = "16znlpsms8z2qc3airawyhzvrzcp70p9bx375i19bg489hgchxb7"; + }; + } + { + goPackagePath = "github.com/spaolacci/murmur3"; + fetch = { + type = "git"; + url = "https://github.com/spaolacci/murmur3"; + rev = "f09979ecbc725b9e6d41a297405f65e7e8804acc"; + sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; + }; + } + { + goPackagePath = "github.com/tidwall/btree"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/btree"; + rev = "9876f1454cf0993a53d74c27196993e345f50dd1"; + sha256 = "0rys4pw7cf2yqr0qdls33ndbpas6d1qxi0wn8zacb315j1dd7cnp"; + }; + } + { + goPackagePath = "github.com/tidwall/buntdb"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/buntdb"; + rev = "75d89283d5ba2a97e02ada50dc800fd65b601b7b"; + sha256 = "11sgfwqfgn33fy62spqrqqx9lbp1cpb7f93wp2ngic5svpza0ykl"; + }; + } + { + goPackagePath = "github.com/tidwall/gjson"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/gjson"; + rev = "3cd3a1192327ac5e24f7e87824be578b0b07c604"; + sha256 = "1v9fmbz7j4ny5cnbmzs1nnv3nm34f129grfk8kxl0klydixg2jvx"; + }; + } + { + goPackagePath = "github.com/tidwall/grect"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/grect"; + rev = "ba9a043346eba55344e40d66a5e74cfda3a9d293"; + sha256 = "0iz948vwqk7n47pkrrmw20rd4f0m67qdhgs9xijc5swyrlj6yr61"; + }; + } + { + goPackagePath = "github.com/tidwall/match"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/match"; + rev = "1731857f09b1f38450e2c12409748407822dc6be"; + sha256 = "14nv96h0mjki5q685qx8y331h4yga6hlfh3z9nz6acvnv284q578"; + }; + } + { + goPackagePath = "github.com/tidwall/rtree"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/rtree"; + rev = "6cd427091e0e662cb4f8e2c9eb1a41e1c46ff0d3"; + sha256 = "0s3h3zjmz60d92gsb3vfqfbrgnjyai607adxg78674s1vdlm221l"; + }; + } + { + goPackagePath = "github.com/tidwall/tinyqueue"; + fetch = { + type = "git"; + url = "https://github.com/tidwall/tinyqueue"; + rev = "1e39f55115634cad2c504631c8bfcc292f2c9c55"; + sha256 = "0yyl7qskmn9fb9h11z71ri30cml7d1k576wf1573wbqv59b81f2x"; + }; + } + { + goPackagePath = "github.com/tinylib/msgp"; + fetch = { + type = "git"; + url = "https://github.com/tinylib/msgp"; + rev = "3b5c87ab5fb00c660bf85b888445d9a01db64db4"; + sha256 = "0n30zjip3kips23w6wlp41nh4z2qc5cg8s1hf17kc3shnaj04n1n"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "f3cacc17c85ecb7f1b6a9e373ee85d1480919868"; + sha256 = "1g5jcxans5vjvg8k4wksilfx50izfhb9g0jdmcknlqbn17ww1fir"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff"; + sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/go-logging"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/go-logging"; + rev = "0457bb6b88fc1973573aaf6b5145d8d3ae972390"; + sha256 = "1bl180mhg03hdqhyr5sfjcg16ns2ppal625g9ag5m10l2pvlwnqn"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/go-notifier"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/go-notifier"; + rev = "097c5d47330ff6a823f67e3515faa13566a62c6f"; + sha256 = "081h4a33603n0mlh53by1mg21rr42xjvxk7r10x8l4v671bq0kha"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/go-smux-multistream"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/go-smux-multistream"; + rev = "afa6825376c14a0462fd420a7d4b4d157c937a42"; + sha256 = "14vimxvlz48js4mkq5fp2ni8qbs0h2spv3qjgnqbg3jfbi8ynn5k"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/go-smux-spdystream"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/go-smux-spdystream"; + rev = "a6182ff2a058b177f3dc7513fe198e6002f7be78"; + sha256 = "1x2p5h73q90rz221xvhm29sampqbimhrajb5bglj8lqkh502ip7g"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/go-smux-yamux"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/go-smux-yamux"; + rev = "49f324a2b63e778df703cf8e5a502bd56a683ef3"; + sha256 = "15ndv8qr2n9k1icsxd7yismzdis0aasi28xcxqgw8nq2ldj9j9dz"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/mafmt"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/mafmt"; + rev = "ab6a47300c1df531e468771e7d08fcd6d33f032e"; + sha256 = "03is8fjnjpkp1pipgachf7cx76wa1wrlgijgw25qygkycyxins06"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/mdns"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/mdns"; + rev = "348bb87e5cd39b33dba9a33cb20802111e5ee029"; + sha256 = "0z1qwras8yh3q05zvdifw1s3phbppbc0659qndamxsfq8jlds462"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/multiaddr-filter"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/multiaddr-filter"; + rev = "e903e4adabd70b78bc9293b6ee4f359afb3f9f59"; + sha256 = "0ksd8vnp207dvphmhrazwldj8if900fnyc1pqa9pfvj04qp92640"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/yamux"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/yamux"; + rev = "63d22127b261bf7014885d25fabe034bed14f04b"; + sha256 = "0xifqmpcj1awjhqif2fc62vj7bds34q95lw1a3pi0sqmla6r8xhc"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "8b1d31080a7692e075c4681cb2458454a1fe0706"; + sha256 = "1l5n2vjyxrsmhqn5nas68mf58f2kcnb5zyqrcar608bxh9dlsnsl"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "640f4622ab692b87c2f3a94265e6f579fe38263d"; + sha256 = "097m4qhcljhp180171j5fjhq4740iirfkkajfd7yrxqhp4s9hljx"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "78d5f264b493f125018180c204871ecf58a2dce1"; + sha256 = "0x23n60wskys39dwybz5za77ldky9i518kp58ragpd5528kcc68s"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f"; + sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "3f83fa5005286a7fe593b055f0d7771a7dce4655"; + sha256 = "19vwb6qlcyh3nh6pkk0bynwmr5cmi6mm4hdz01lwb4ybnkzxryc7"; + }; + } + { + goPackagePath = "gopkg.in/sourcemap.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/sourcemap.v1"; + rev = "6e83acea0053641eff084973fee085f0c193c61a"; + sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } +] diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 493131795034..d921eee49cfc 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchpatch }: +{ lib, python3 }: let python = python3.override { diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 9c645d59b2c7..16084ca4ae4f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.73.1"; + version = "0.73.2"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3642fb6b16d6..e37da61958ce 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -68,7 +68,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.73.1"; + hassVersion = "0.73.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -83,7 +83,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1hcxwsyj15qks2il06dbwk1ycwspz97pgrwydp00qgcraw0yafmp"; + sha256 = "1hfxwm49hgikdh827jnlzgfz9h51rjz1gm841f5iz1vwz301l6sk"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index dd076606da5b..4822b5109e81 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.33"; + version = "2.4.34"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05"; + sha256 = "1w1q2smdgf6ln0x741lk5pv5r0gzrxj2iza1vslhifzy65bcjlzs"; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index f94ff56373d4..80caa3779912 100644 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "couchdb-${version}"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; - sha256 = "1k3v9v05417087b6fcj5yv03wl6i61xqrrhp0prl9b3ir2mmbwnm"; + sha256 = "1c1ghrmrcyjd3s3pzml6akxf8xxcqy4mfzn5xf8jg158dzarmk53"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 43334819dc56..5a873c7e84b1 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man, python +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man , sphinx, which, file, pkgconfig, getopt }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/servers/http/jboss/jdbc/mysql/default.nix index dbc5c73414cd..fd2dec44c7f3 100644 --- a/pkgs/servers/http/jboss/jdbc/mysql/default.nix +++ b/pkgs/servers/http/jboss/jdbc/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, jboss, mysql_jdbc }: +{ stdenv, mysql_jdbc }: stdenv.mkDerivation { name = "jboss-mysql-jdbc"; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 448695930039..643e7ed719a4 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat +{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt , gd, geoip , withDebug ? false , withStream ? true , withMail ? false , modules ? [] -, hardening ? true , version, sha256, ... }: diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 71cb6fc72ab9..5afd73c88686 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.13.12"; - sha256 = "1pl5ii1w2ycxprxk8zdnxlpdd1dia6hyrns7mnqkm3fv5ihgb4pv"; + version = "1.15.1"; + sha256 = "0q2lkpnfqf74p22vrcldx0gcnss3is7rnp54fgpvhcpqsxc6h867"; }) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 1919cfddf62d..0910a6d05844 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchurl, lib, pkgs }: +{ fetchFromGitHub, lib, pkgs }: { brotli = { @@ -15,24 +15,6 @@ inputs = [ pkgs.brotli ]; }; - ipscrub = { - src = fetchFromGitHub { - owner = "masonicboom"; - repo = "ipscrub"; - rev = "99230f66d5afe1f929cf4ed217901acb6206f620"; - sha256 = "0mfrwkg4srql38w713pg6qxi0h4hgy8inkvgc9cm80bwlv2ng9s1"; - } + "/ipscrub"; - }; - - rtmp ={ - src = fetchFromGitHub { - owner = "arut"; - repo = "nginx-rtmp-module"; - rev = "v1.2.1"; - sha256 = "0na1aam176irz6w148hnvamqy1ilbn4abhdzkva0yrm35a3ksbzn"; - }; - }; - dav = { src = fetchFromGitHub { owner = "arut"; @@ -43,31 +25,13 @@ inputs = [ pkgs.expat ]; }; - moreheaders = { - src = fetchFromGitHub { - owner = "openresty"; - repo = "headers-more-nginx-module"; - rev = "v0.26"; - sha256 = "0zhr3ai4xf5yghxvlbrwv8n06fgx33f1n1d4a6gmsczdfjzf8g6g"; - }; - }; - - modsecurity = { - src = "${pkgs.modsecurity_standalone.nginx}/nginx/modsecurity"; - inputs = [ pkgs.curl pkgs.apr pkgs.aprutil pkgs.apacheHttpd pkgs.yajl ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.aprutil.dev}/include/apr-1 -I${pkgs.apacheHttpd.dev}/include -I${pkgs.apr.dev}/include/apr-1 -I${pkgs.yajl}/include" - ''; - }; - - modsecurity-nginx = { + develkit = { src = fetchFromGitHub { - owner = "SpiderLabs"; - repo = "ModSecurity-nginx"; - rev = "v1.0.0"; - sha256 = "0zzpdqhbdqqy8kjkszv0mrq6136ah9v3zwr1jbh312j8izmzdyi7"; + owner = "simpl"; + repo = "ngx_devel_kit"; + rev = "v0.3.1rc1"; + sha256 = "00vqvpx67qra2hr85hkvj1dha4h7x7v9sblw7w1df11nq1gzsdbb"; }; - inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ]; }; echo = { @@ -79,35 +43,21 @@ }; }; - develkit = { + fancyindex = { src = fetchFromGitHub { - owner = "simpl"; - repo = "ngx_devel_kit"; - rev = "v0.3.0"; - sha256 = "1br1997zqsjcb1aqm6h6xmi5yx7akxk0qvk8wxc0fnvmyhgzxgx0"; + owner = "aperezdc"; + repo = "ngx-fancyindex"; + rev = "v0.4.3"; + sha256 = "12xdx6a76sfrq0yciylvyjlnvyczszpadn31jqya8c2dzdkyyx7f"; }; }; - lua = { - src = fetchFromGitHub { - owner = "openresty"; - repo = "lua-nginx-module"; - rev = "v0.10.10"; - sha256 = "1dlqnlkpn3pnhk2m09jdx3iw3m6xk31pw2m5xrpcmqk3bll68mw6"; - }; - inputs = [ pkgs.luajit ]; - preConfigure = '' - export LUAJIT_LIB="${pkgs.luajit}/lib" - export LUAJIT_INC="${pkgs.luajit}/include/luajit-2.0" - ''; - }; - - set-misc = { + fastcgi-cache-purge = { src = fetchFromGitHub { - owner = "openresty"; - repo = "set-misc-nginx-module"; - rev = "v0.28"; - sha256 = "1vixj60q0liri7k5ax85grj7q9vvgybkx421bwphbhai5xrjip96"; + owner = "FRiCKLE"; + repo = "ngx_cache_purge"; + rev = "2.3"; + sha256 = "0ib2jrbjwrhvmihhnzkp4w87fxssbbmmmj6lfdwpm6ni8p9g60dw"; }; }; @@ -120,41 +70,54 @@ }; }; - pam = { + ipscrub = { src = fetchFromGitHub { - owner = "stogh"; - repo = "ngx_http_auth_pam_module"; - rev = "v1.4"; - sha256 = "068zwyrc1dji55rlaj2kx6n0v2n5rpj7nz26ipvz26ida712md35"; - }; - inputs = [ pkgs.pam ]; + owner = "masonicboom"; + repo = "ipscrub"; + rev = "v1.0.1"; + sha256 = "0qcx15c8wbsmyz2hkmyy5yd7qn1n84kx9amaxnfxkpqi05vzm1zz"; + } + "/ipscrub"; + inputs = [ pkgs.libbsd ]; }; - statsd = { + lua = { src = fetchFromGitHub { - owner = "apcera"; - repo = "nginx-statsd"; - rev = "2147d61dc31dd4865604be92349e6192a905d21a"; - sha256 = "19s3kwjgf51jkwknh7cfi82p6kifl8rl146wxc3ijds12776ilsv"; + owner = "openresty"; + repo = "lua-nginx-module"; + rev = "v0.10.13"; + sha256 = "19mpc76lfhyyvkfs2n08b4rc9cf2v7rm8fskkf60hsdcf6qna822"; }; + inputs = [ pkgs.luajit ]; + preConfigure = '' + export LUAJIT_LIB="${pkgs.luajit}/lib" + export LUAJIT_INC="${pkgs.luajit}/include/luajit-2.0" + ''; }; - upstream-check = { + modsecurity = { + src = "${pkgs.modsecurity_standalone.nginx}/nginx/modsecurity"; + inputs = [ pkgs.curl pkgs.apr pkgs.aprutil pkgs.apacheHttpd pkgs.yajl ]; + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.aprutil.dev}/include/apr-1 -I${pkgs.apacheHttpd.dev}/include -I${pkgs.apr.dev}/include/apr-1 -I${pkgs.yajl}/include" + ''; + }; + + modsecurity-nginx = { src = fetchFromGitHub { - owner = "yaoweibin"; - repo = "nginx_upstream_check_module"; - rev = "10782eaff51872a8f44e65eed89bbe286004bcb1"; - sha256 = "0h98a8kiw2qkqfavysm1v16kf4cs4h39j583wapif4p0qx3bbm89"; + owner = "SpiderLabs"; + repo = "ModSecurity-nginx"; + rev = "v1.0.0"; + sha256 = "0zzpdqhbdqqy8kjkszv0mrq6136ah9v3zwr1jbh312j8izmzdyi7"; }; + inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ]; }; - # For an example usage, see https://easyengine.io/wordpress-nginx/tutorials/single-site/fastcgi-cache-with-purging/ - fastcgi-cache-purge = { + moreheaders = { src = fetchFromGitHub { - owner = "FRiCKLE"; - repo = "ngx_cache_purge"; - rev = "2.3"; - sha256 = "0ib2jrbjwrhvmihhnzkp4w87fxssbbmmmj6lfdwpm6ni8p9g60dw"; + owner = "openresty"; + repo = "headers-more-nginx-module"; + rev = "v0.33"; + sha256 = "1cgdjylrdd69vlkwwmn018hrglzjwd83nqva1hrapgcfw12f7j53"; }; }; @@ -188,12 +151,67 @@ inputs = [ pkgs.zlib pkgs.libuuid ]; # psol deps }; - shibboleth = { - src = fetchFromGitHub { - owner = "nginx-shib"; - repo = "nginx-http-shibboleth"; - rev = "48b70d87bf7796d7813813a837e52b3a86e6f6f4"; - sha256 = "0k8xcln5sf0m4r0m550dkhl07zhncp285dpysk6r4v6vqzqmhzdc"; - }; + pam = { + src = fetchFromGitHub { + owner = "stogh"; + repo = "ngx_http_auth_pam_module"; + rev = "v1.5.1"; + sha256 = "031q006bcv10dzxi3mzamqiyg14p48v0bzd5mrwz073pbf0ba2fl"; + }; + inputs = [ pkgs.pam ]; + }; + + rtmp ={ + src = fetchFromGitHub { + owner = "arut"; + repo = "nginx-rtmp-module"; + rev = "v1.2.1"; + sha256 = "0na1aam176irz6w148hnvamqy1ilbn4abhdzkva0yrm35a3ksbzn"; + }; + }; + + set-misc = { + src = fetchFromGitHub { + owner = "openresty"; + repo = "set-misc-nginx-module"; + rev = "v0.32"; + sha256 = "048a6jwinbjgxiprjj9ml3fdp0mhkx89g6ggams57fsx9m5vaxax"; + }; + }; + + shibboleth = { + src = fetchFromGitHub { + owner = "nginx-shib"; + repo = "nginx-http-shibboleth"; + rev = "48b70d87bf7796d7813813a837e52b3a86e6f6f4"; + sha256 = "0k8xcln5sf0m4r0m550dkhl07zhncp285dpysk6r4v6vqzqmhzdc"; + }; + }; + + sla = { + src = fetchFromGitHub { + owner = "goldenclone"; + repo = "nginx-sla"; + rev = "7778f0125974befbc83751d0e1cadb2dcea57601"; + sha256 = "1x5hm6r0dkm02ffny8kjd7mmq8przyd9amg2qvy5700x6lb63pbs"; }; + }; + + statsd = { + src = fetchFromGitHub { + owner = "apcera"; + repo = "nginx-statsd"; + rev = "b970e40467a624ba710c9a5106879a0554413d15"; + sha256 = "1x8j4i1i2ahrr7qvz03vkldgdjdxi6mx75mzkfizfcc8smr4salr"; + }; + }; + + upstream-check = { + src = fetchFromGitHub { + owner = "yaoweibin"; + repo = "nginx_upstream_check_module"; + rev = "9aecf15ec379fe98f62355c57b60c0bc83296f04"; + sha256 = "1cjisxw1wykll683nw09k0i1nvzslp4dr59x58cvarpk43paim2y"; + }; + }; } diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index 33801c8cd326..479c9e41aa91 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl +{stdenv , coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl , lighttpd, iproute }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 1155bac75703..1fe48e84fac7 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, postgresql, libxml2, libxslt, +{ stdenv, fetchurl, openssl, zlib, pcre, postgresql, libxml2, libxslt, gd, geoip, perl }: with stdenv.lib; diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 098825d59ce8..8fe34cd6183d 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -2,7 +2,7 @@ let - common = { versionMajor, versionMinor, sha256 } @ args: stdenv.mkDerivation (rec { + common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec { name = "apache-tomcat-${version}"; version = "${versionMajor}.${versionMinor}"; diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix new file mode 100644 index 000000000000..22191e199766 --- /dev/null +++ b/pkgs/servers/hydron/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, ffmpeg-full, graphicsmagick +, quicktemplate, go-bindata, easyjson }: + +buildGoPackage rec { + name = "hydron-unstable-${version}"; + version = "2018-07-15"; + goPackagePath = "github.com/bakape/hydron"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + rev = "3906ace0b4cf48ba9acccf372377c7feb0665be4"; + owner = "bakape"; + repo = "hydron"; + sha256 = "079a88740wxgq73sq8w96zppfng7af76k7h484x3w695qk83j33r"; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ffmpeg-full graphicsmagick quicktemplate go-bindata easyjson ]; + + # Temporary workaround for https://github.com/NixOS/nixpkgs/issues/43593 + preBuild = '' + rm go/src/github.com/bakape/hydron/ico.syso + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/bakape/hydron"; + description = "High performance media tagger and organizer"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ chiiruno ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix new file mode 100644 index 000000000000..9ef0fd23b455 --- /dev/null +++ b/pkgs/servers/hydron/deps.nix @@ -0,0 +1,93 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/Masterminds/squirrel"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/squirrel"; + rev = "b127ed9be03443fe3c0877e391130e3dd3f3107a"; + sha256 = "04vgwm5g5486188656hiw1x56mrkv27s5g2s8mc1lz7z1ig5g5bg"; + }; + } + { + goPackagePath = "github.com/bakape/thumbnailer"; + fetch = { + type = "git"; + url = "https://github.com/bakape/thumbnailer"; + rev = "fa88f595f3882773bc425b382eee71e3e2fa1291"; + sha256 = "19xfn8aj1nhh5dj93hskzrhaa07sayd8agmz1vkkh6varqrldanf"; + }; + } + { + goPackagePath = "github.com/dimfeld/httptreemux"; + fetch = { + type = "git"; + url = "https://github.com/dimfeld/httptreemux"; + rev = "7f532489e7739b3d49df5c602bf63549881fe753"; + sha256 = "0hkw04rsvljvx8ynqjgz9cb743x09fd2xiiycrgz5vbsa8q9iyyk"; + }; + } + { + goPackagePath = "github.com/gorilla/handlers"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/handlers"; + rev = "13a38d26174b16d5b4bf6f1094c1389ec9879572"; + sha256 = "0zg43blpyyy667y0kpiifk5a2w35jh8qkk4zwlabb365c0lzrv6v"; + }; + } + { + goPackagePath = "github.com/lann/builder"; + fetch = { + type = "git"; + url = "https://github.com/lann/builder"; + rev = "1b87b36280d04fe7882d1512bf038ea2967ad534"; + sha256 = "015q46awbyp47vld07yi7d27i0lkd82r7qn5230bb9qxl4mcfiqc"; + }; + } + { + goPackagePath = "github.com/lann/ps"; + fetch = { + type = "git"; + url = "https://github.com/lann/ps"; + rev = "62de8c46ede02a7675c4c79c84883eb164cb71e3"; + sha256 = "10yhcyymypvdiiipchsp80jbglk8c4r7lq7h54v9f4mxmvz6xgf7"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; + sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "3aefd9f0a162514f66d0e4ceda3edc44e66b502e"; + sha256 = "0as2kqmlvd21r481vxl457n5lxxp4i1jdjkmyqsjf5vg6xr9gd2d"; + }; + } + { + goPackagePath = "github.com/valyala/bytebufferpool"; + fetch = { + type = "git"; + url = "https://github.com/valyala/bytebufferpool"; + rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7"; + sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; + }; + } + { + goPackagePath = "github.com/valyala/quicktemplate"; + fetch = { + type = "git"; + url = "https://github.com/valyala/quicktemplate"; + rev = "a91e0946457b6583004fbfc159339b8171423aed"; + sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc"; + }; + } +] diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix deleted file mode 100644 index fbe226d3e3d3..000000000000 --- a/pkgs/servers/inginious/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ pkgs, lib, python2Packages }: -with lib; - -let - pythonPackages = python2Packages; - - docker_1_7_2 = pythonPackages.docker.overrideAttrs (oldAttrs: rec { - name = "docker-py-1.7.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/docker-py/${name}.tar.gz"; - sha256 = "0k6hm3vmqh1d3wr9rryyif5n4rzvcffdlb1k4jvzp7g4996d3ccm"; - }; - }); - - webpy-custom = pythonPackages.web.override { - name = "web.py-INGI"; - src = pkgs.fetchFromGitHub { - owner = "UCL-INGI"; - repo = "webpy-INGI"; - # tip of branch "ingi" - rev = "f487e78d65d6569eb70003e588d5c6ace54c384f"; - sha256 = "159vwmb8554xk98rw380p3ah170r6gm861r1nqf2l452vvdfxscd"; - }; - }; - -in pythonPackages.buildPythonApplication rec { - version = "0.3a2.dev0"; - name = "inginious-${version}"; - - disabled = pythonPackages.isPy3k; - - patchPhase = '' - # transient failures - substituteInPlace inginious/backend/tests/TestRemoteAgent.py \ - --replace "test_update_task_directory" "noop" - ''; - - propagatedBuildInputs = with pythonPackages; [ - requests - cgroup-utils docker_1_7_2 docutils PyLTI mock pygments - pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib - websocket_client watchdog webpy-custom flup - ]; - - buildInputs = with pythonPackages; [ nose selenium virtual-display ]; - - /* Hydra fix exists only on github for now. - src = pkgs.fetchurl { - url = "mirror://pypi/I/INGInious/INGInious-${version}.tar.gz"; - }; - */ - src = pkgs.fetchFromGitHub { - owner = "UCL-INGI"; - repo = "INGInious"; - rev = "07d111c0a3045c7cc4e464d4adb8aa28b75a6948"; - sha256 = "0kldbkc9yw1mgg5w5q5v8k2hz089c5c4rvxb5xhbagkzgm2gn230"; - }; - - # Only patch shebangs in /bin, other scripts are run within docker - # containers and will fail if patched. - dontPatchShebangs = true; - preFixup = '' - patchShebangs $prefix/bin - ''; - - meta = { - broken = true; - description = "An intelligent grader that allows secured and automated testing of code made by students"; - homepage = https://github.com/UCL-INGI/INGInious; - license = licenses.agpl3; - maintainers = with maintainers; [ layus ]; - }; -} diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index 0df055f9690f..f57c94cd1084 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, sudo, coreutils, systemd, cryptsetup +{ sudo, coreutils, systemd, cryptsetup , mount, umount , buildGoPackage, fetchFromGitHub }: diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index befb4039ea09..332372830d69 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -1,28 +1,30 @@ -{ stdenv, fetchFromGitHub, bison, flex, openssl }: +{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, openssl, gnutls }: stdenv.mkDerivation rec { - name = "charybdis-3.5.5"; + name = "charybdis-4.1"; src = fetchFromGitHub { owner = "charybdis-ircd"; repo = "charybdis"; rev = name; - sha256 = "16bl516hcj1chgzkfnpg9bf9s6zr314pqzhlz6641lgyzaw1z3w0"; + sha256 = "1j0fjf4rdiyvakxqa97x272xra64rzjhbj8faciyb4b13pyrdsmw"; }; - patches = [ - ./remove-setenv.patch - ]; + postPatch = '' + substituteInPlace include/defaults.h --replace 'PKGLOCALSTATEDIR "' '"/var/lib/charybdis' + ''; + + autoreconfPhase = "sh autogen.sh"; configureFlags = [ "--enable-epoll" "--enable-ipv6" "--enable-openssl=${openssl.dev}" "--with-program-prefix=charybdis-" - "--sysconfdir=/etc/charybdis" ]; - buildInputs = [ bison flex openssl ]; + nativeBuildInputs = [ autoreconfHook bison flex ]; + buildInputs = [ openssl gnutls ]; meta = with stdenv.lib; { description = "IRCv3 server designed to be highly scalable"; diff --git a/pkgs/servers/irc/charybdis/remove-setenv.patch b/pkgs/servers/irc/charybdis/remove-setenv.patch deleted file mode 100644 index c53c1ff294e0..000000000000 --- a/pkgs/servers/irc/charybdis/remove-setenv.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/bandbi.c b/src/bandbi.c -index 03dd907..3698e85 100644 ---- a/src/bandbi.c -+++ b/src/bandbi.c -@@ -82,7 +82,6 @@ start_bandb(void) - const char *suffix = ""; - #endif - -- rb_setenv("BANDB_DBPATH", PKGLOCALSTATEDIR "/ban.db", 1); - if(bandb_path == NULL) - { - rb_snprintf(fullpath, sizeof(fullpath), "%s/bandb%s", PKGLIBEXECDIR, suffix); diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 5aafe55512be..9e8a9dc9ec60 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python2, fetchurl, fetchFromGitHub }: +{ stdenv, python2, fetchFromGitHub }: let python = python2.override { packageOverrides = self: super: { diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 52c19d819d7e..ec825f856ce5 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.8.1209"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "0vql7h6diswvvh1a0rcisc541bk4ilp0ab1nn4z4dq16hcy0fv61"; + sha256 = "1hj6ilhv98yzhfjvrgqrsgaz7bd1yqaayifir8ivsvqq8085nlf6"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 6826df5f6e86..4276a51715a6 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, pam, nspr, nss, openldap +{ stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap , db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages }: let diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index 105223f31a5b..2e17001abc50 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Official Go implementation of the Livepeer protocol"; - homepage = http://livepeer.org; + homepage = https://livepeer.org; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ elitak ]; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 70f2bf9d61ef..5a9d8e61b1fe 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, perl, pkgconfig, systemd, openssl +{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl , bzip2, zlib, lz4, inotify-tools, pam, libcap , clucene_core_2, icu, openldap, libsodium, libstemmer # Auth modules @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.2"; + name = "dovecot-2.3.2.1"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "14z3vbva1inck2lrrgdj5fbrpqhs7pls7c1m63q2g13nc3xg0j3f"; + sha256 = "0d2ffbicgl3wswbnyjbw6qigz7r1aqzprpchbwp5cynw122i2raa"; }; preConfigure = '' diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index f11400c190af..98b270ad7d41 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 302aa8d55932..8c86cc6577a7 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, stdenv, pythonPackages, fetchurl, fetchFromGitHub, fetchpatch }: +{ stdenv, pythonPackages, fetchurl, fetchFromGitHub }: let matrix-angular-sdk = pythonPackages.buildPythonPackage rec { name = "matrix-angular-sdk-${version}"; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 305ee174bf3c..0654da927769 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }: let - version = "5.0.0"; + version = "5.1.0"; mattermost-server = buildGoPackage rec { name = "mattermost-server-${version}"; @@ -10,7 +10,7 @@ let owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "12wiw8k5is78ppazrf26y2xq73kwbafa9w75wjnb1839v2k9sark"; + sha256 = "069ihmfr6np991mbgg001y0kyafghn57nsv3kpyyvfmhv07p0qbc"; }; goPackagePath = "github.com/mattermost/mattermost-server"; @@ -27,7 +27,7 @@ let src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "1pal65di6w9idf3rwxh77la1v816h8kama1ilkbs40cpp2vazw3b"; + sha256 = "1bm5nqnhk2w3sy8mvm81k7d65j6bgpvakgphgwqgnlm864i4253z"; }; installPhase = '' diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index d489deb5944f..6707055eaa6b 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "matterircd-${version}"; - version = "0.16.5"; + version = "0.18.2"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "1rsmc2dpf25rkl8c085xwssbry3hv1gv318m7rdj616agx4m7yr2"; + sha256 = "0g57g91v7208yynf758k9v73jdhz4fbc1v23p97rzrl97aq0rd5r"; }; goPackagePath = "github.com/42wim/matterircd"; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 44e1c65c7514..a9d8714476cb 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.8"; + version = "1.5.9"; name = "memcached-${version}"; src = fetchurl { url = "https://memcached.org/files/${name}.tar.gz"; - sha256 = "1ppnhsqv9047vm0rrmqla56y972f8qqjdb780iz6v922jjcc723k"; + sha256 = "01hx4hs8lgmjzpqj1iv5fpdwv1ymrii6bp4nh1s0mjvipxymgwsa"; }; buildInputs = [cyrus_sasl libevent]; diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix index 53c87745e67a..fe1f1c6760d8 100644 --- a/pkgs/servers/mesos-dns/default.nix +++ b/pkgs/servers/mesos-dns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "mesos-dns-${version}"; diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix index 98ac1534cf8a..10c8811c548f 100644 --- a/pkgs/servers/mirrorbits/default.nix +++ b/pkgs/servers/mirrorbits/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchpatch +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch , pkgconfig, zlib, geoip }: buildGoPackage rec { diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 0480d056c592..0e256d907dc2 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, fetchFromGitHub }: +{ stdenv, go, fetchFromGitHub }: stdenv.mkDerivation rec { name = "cadvisor-${version}"; diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index 646a7856788b..a888549bb6aa 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "consul-alerts-${version}"; diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 34b4e87bf65c..96eaa5ef0cc4 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPerlPackage, perlPackages, gnused, nix, dmidecode, pciutils, usbutils, iproute, nettools +{ stdenv, lib, fetchurl, buildPerlPackage, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools , fetchFromGitHub, makeWrapper }: diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index 409801e8b7dc..0e21069bbb0e 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { name = "kapacitor-${version}"; diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index 859849f7b2c7..af5f2880a0f8 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig -, doxygen, freetype, libX11, libftdi, libftdi1, libusb, libusb1, ncurses, perl }: +, doxygen, freetype, libX11, libftdi, libusb, libusb1, ncurses, perl }: stdenv.mkDerivation rec { name = "lcdproc-${version}"; diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index 957aee43691a..5d93f4c53496 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, buildPerlPackage, autoreconfHook, makeWrapper +{ stdenv, fetchFromGitHub, fetchurl, autoreconfHook, makeWrapper , perl, DBDsybase, NetSNMP, coreutils, gnused, gnugrep }: let diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 2f9016b74991..38b789261773 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "alertmanager-${version}"; - version = "0.14.0"; + version = "0.15.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "0f6yi19zffxnp3dlr4zs52b7bllks3kjxkdn9zvvi5lvpkzmba5j"; + sha256 = "110l8xy3bkgq137hvvz2v5cr464j02fy43lvgd3l8n5v8qmv81vy"; }; # Tests exist, but seem to clash with the firewall. diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 798f31c3458e..1f342adebaa0 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "blackbox_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 2bd9b6af0748..0d6fbac60e5d 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "collectd-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 2e7a4932de62..1271b3d40e14 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "fritzbox-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix new file mode 100644 index 000000000000..ca1dc83e96ad --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, jre, makeWrapper }: + +let + version = "0.10"; + jarName = "jmx_prometheus_httpserver-${version}-jar-with-dependencies.jar"; + mavenUrl = "http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_httpserver/${version}/${jarName}"; +in stdenv.mkDerivation { + inherit version jarName; + + name = "jmx-prometheus-httpserver-${version}"; + + src = fetchurl { + url = mavenUrl; + sha256 = "1pvqphrirq48xhmx0aa6vkxz6qy1cx2q6jxsh7rin432iap7j62f"; + }; + + buildInputs = [ jre makeWrapper ]; + + phases = "installPhase"; + + installPhase = '' + mkdir -p $out/libexec + mkdir -p $out/bin + cp $src $out/libexec/$jarName + makeWrapper "${jre}/bin/java" $out/bin/jmx_prometheus_httpserver --add-flags "-jar $out/libexec/$jarName" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/prometheus/jmx_exporter; + description = "A process for exposing JMX Beans via HTTP for Prometheus consumption"; + license = licenses.asl20; + maintainers = [ maintainers.offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index ea17c0b18b23..ffba472bdc33 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub, lib }: +{ buildGoPackage, fetchFromGitHub, lib }: buildGoPackage rec { name = "prometheus-json-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index 42ff2496df12..ade9bb87d993 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "mesos_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index 59314f1f282a..8b6c54d41f91 100644 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { name = "minio-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 788fe8633967..5e4ebb581400 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "prom2json-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index 9692354ad8a8..29454dd44d2b 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, net_snmp }: +{ stdenv, buildGoPackage, fetchFromGitHub, net_snmp }: buildGoPackage rec { name = "snmp_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix index f4d9f5a85037..e5480e020372 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "statsd_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 13e17d0b0192..0c5cc6267659 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "surfboard_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index 44a670b95ab4..18fa3f98db23 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "unifi-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index d83aa5b46658..b23270cd8c1e 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }: +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }: buildGoPackage rec { name = "prometheus_varnish_exporter-${version}"; diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index d3816cf1ecdb..9f1a2baeb9ac 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext +{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib , enableJabber ? false, minmay ? null }: assert enableJabber -> minmay != null; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index bc5556d4bc00..bf3849e6524b 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext +{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib , net_snmp , libssh2, openldap , enableJabber ? false, minmay ? null , enableSnmp ? false diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix index 69b3577720f5..047ce0a5130e 100644 --- a/pkgs/servers/monitoring/zabbix/3.4.nix +++ b/pkgs/servers/monitoring/zabbix/3.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, pcre, libevent, libiconv }: +{ stdenv, fetchurl, pcre, libiconv }: let diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index fde66a71e2e6..f8523e8607d3 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, glib, systemd, boost, darwin +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, systemd, boost, darwin , alsaSupport ? true, alsaLib , avahiSupport ? true, avahi, dbus , flacSupport ? true, flac @@ -34,7 +34,7 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.20"; - minor = "18"; + minor = "20"; in stdenv.mkDerivation rec { name = "mpd-${version}"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "020vdn94fwjbldnkgr2h3dk9sm6f5k59qic568mw88yi7cr3mjsh"; + sha256 = "0v7xpsr8b4d0q9vh1wni0qbkbkxdjpn639qm2q553ckk5idas4lm"; }; patches = [ ./x86.patch ]; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 0121d748129b..3d6a1aa9c6fa 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name= "nextcloud-${version}"; diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix new file mode 100644 index 000000000000..124daa4a5ccb --- /dev/null +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, openssl, zlib }: + +stdenv.mkDerivation rec { + name = "aerospike-server-${version}"; + version = "4.2.0.4"; + + src = fetchFromGitHub { + owner = "aerospike"; + repo = "aerospike-server"; + rev = version; + sha256 = "1vqi3xir4l57v62q1ns3713vajxffs6crss8fpvbcs57p7ygx3s7"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ autoconf automake libtool ]; + buildInputs = [ openssl zlib ]; + + preBuild = '' + patchShebangs build/gen_version + substituteInPlace build/gen_version --replace 'git describe' 'echo ${version}' + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/udf + cp target/Linux-x86_64/bin/asd $out/bin/asd + cp -dpR modules/lua-core/src $out/share/udf/lua + ''; + + meta = with stdenv.lib; { + description = "Flash-optimized, in-memory, NoSQL database"; + homepage = http://aerospike.com/; + license = licenses.agpl3; + #platforms = [ "x86_64-linux" ]; # breaks eval of nixos manual for aarch64 + platforms = platforms.linux; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 347af1c4de9f..f3d3fed23a41 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub -, openssl, zlib, python2Packages, readline, cmake, python }: +, openssl, zlib, readline, cmake, python }: let in stdenv.mkDerivation rec { - version = "3.3.11"; + version = "3.3.12"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "0x1sq2gvag7adba5nsx913dax2b2259h73623r0b7gn4v01ivq21"; + sha256 = "18mx7bcxll1za91q090g3hps3mwrlqdg40lvs61kibci3amma7j2"; }; buildInputs = [ diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index f97a3a5c1842..1d3240fae716 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, git, mono, v8 }: +{ stdenv, fetchFromGitHub, git, mono, v8 }: # There are some similarities with the pinta derivation. We should # have a helper to make it easy to package these Mono apps. diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index b9e850e8dfd4..c62ade1a20bb 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy -, zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security +, zlib, libyamlcpp, sasl, openssl, libpcap, Security }: # Note: diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index e935b5d09879..d6ee407e3418 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, m4, python +{ stdenv, fetchurl, which, m4 , protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool , python2Packages, makeWrapper }: diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix index 9075756c1621..cf807e70596d 100644 --- a/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak +{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam , Carbon ? null, Cocoa ? null }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix index a064049072c9..1524ca207009 100644 --- a/pkgs/servers/nosql/riak-cs/stanchion.nix +++ b/pkgs/servers/nosql/riak-cs/stanchion.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak +{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam , Carbon ? null, Cocoa ? null }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index e4c9b90ab145..b041aa9f35fc 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, erlang, which, pam, coreutils }: +{ stdenv, lib, fetchurl, unzip, erlang, which, pam }: let solrName = "solr-4.10.4-yz-2.tgz"; diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix index fa78c876c1ec..d48587c924e7 100644 --- a/pkgs/servers/nsq/default.nix +++ b/pkgs/servers/nsq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "nsq-${version}"; diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix index 3f92299c2a0a..22f09994ebf0 100644 --- a/pkgs/servers/openafs/1.6/default.nix +++ b/pkgs/servers/openafs/1.6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc +{ stdenv, fetchurl, which, autoconf, automake, flex, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43 , ncurses # Extra ncurses utilities. Only needed for debugging. , tsmbac ? null # Tivoli Storage Manager Backup Client from IBM diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix index 8cd9287a7772..bf4f36bb250b 100644 --- a/pkgs/servers/openafs/1.6/module.nix +++ b/pkgs/servers/openafs/1.6/module.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, autoconf, automake, flex, yacc +{ stdenv, fetchurl, which, autoconf, automake, flex, bison , kernel, glibc, perl }: with (import ./srcs.nix { inherit fetchurl; }); @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { name = "openafs-${version}-${kernel.version}"; inherit version src; - nativeBuildInputs = [ autoconf automake flex perl yacc which ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ autoconf automake flex perl bison which ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index 59c15839b393..fc6b1bc2426b 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc +{ stdenv, fetchurl, which, autoconf, automake, flex, yacc , glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43 , libtool_2, removeReferencesTo , ncurses # Extra ncurses utilities. Only needed for debugging. diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix index f02e67740b62..14a4a2868f0e 100644 --- a/pkgs/servers/owncloud/default.nix +++ b/pkgs/servers/owncloud/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: let - common = { versiona, sha256 } @ args: stdenv.mkDerivation (rec { + common = { versiona, sha256 }: stdenv.mkDerivation (rec { name= "owncloud-${version}"; version= versiona; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index ed4a8889c67d..73af65ef2561 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -5,9 +5,6 @@ , sbc, bluez5, udev, openssl, fftwFloat , speexdsp, systemd, webrtc-audio-processing, gconf ? null -# Database selection -, tdb ? null, gdbm ? null - , x11Support ? false , useSystemd ? true diff --git a/pkgs/servers/rippled/data-api.nix b/pkgs/servers/rippled/data-api.nix index 230e0aee2181..04d520b412c1 100644 --- a/pkgs/servers/rippled/data-api.nix +++ b/pkgs/servers/rippled/data-api.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, fetchurl, nodePackages }: +{ lib, fetchgit, nodePackages }: with lib; diff --git a/pkgs/servers/rippled/package.nix b/pkgs/servers/rippled/package.nix index 6f5bb1d3a71f..87f4326c48c3 100644 --- a/pkgs/servers/rippled/package.nix +++ b/pkgs/servers/rippled/package.nix @@ -1,4 +1,4 @@ -{ self, fetchurl, fetchgit ? null, lib }: +{ self, fetchurl ? null }: { by-spec."abbrev"."1" = diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 0ff7f88911f2..eec80cb66bcc 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl , fetchpatch -, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc +, docbook_xml_dtd_42, readline, talloc , popt, iniparser, libbsd, libarchive, libiconv, gettext , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs -, gnutls, libgcrypt, libgpgerror +, gnutls , ncurses, libunwind, libibverbs, librdmacm, systemd , enableInfiniband ? false diff --git a/pkgs/servers/samba/master.nix b/pkgs/servers/samba/master.nix index df1f9feb4de5..21038a0f2183 100644 --- a/pkgs/servers/samba/master.nix +++ b/pkgs/servers/samba/master.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ fetchFromGitHub , samba4 , nettle } : diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index ade2ea944534..b93d8c2203d7 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, fetchFromGitHub, unzip, elasticsearch }: +{ pkgs, stdenv, fetchurl, unzip, elasticsearch }: with pkgs.lib; diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index f7a9fc658352..e880e490a6af 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,11 +2,11 @@ , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "3.1.7"; + version = "3.2"; name = "shairport-sync-${version}"; src = fetchFromGitHub { - sha256 = "1ip8vlyly190fhcd55am5xvqisvch8mnw50xwbm663dapdb1f8ys"; + sha256 = "07b0g5iyjmqyq6zxx5mv72kri66jw6wv6i3gzax6jhkdiag06lwm"; rev = version; repo = "shairport-sync"; owner = "mikebrady"; diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index ccb174371e0c..7bfea23c78b5 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "skydns-${version}"; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d12621a4608a..121e42f7a978 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy , libiconv, openssl, pcre, boost, judy, bison, libxml2 -, libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl +, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl , fixDarwinDylibNames, cctools, CoreServices , asio, buildEnv, check, scons }: @@ -22,14 +22,14 @@ galeraLibs = buildEnv { }; common = rec { # attributes common to both builds - version = "10.2.15"; + version = "10.2.16"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "04ds6vkb7k2lqpcdz663z4ll1jx1zz2hqxz5nj7gs8pwb18j1pik"; + sha256 = "1i2dwpp96ywjk147qqpcad8vqcy4rxmfbv2cb8ww3sffpa9yx0n1"; name = "mariadb-${version}.tar.gz"; }; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 5d348c129437..a727b60dd9d4 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -2,7 +2,7 @@ let - common = { version, sha256, psqlSchema } @ args: + common = { version, sha256, psqlSchema }: let atLeast = lib.versionAtLeast version; in stdenv.mkDerivation (rec { name = "postgresql-${version}"; @@ -95,33 +95,33 @@ let in { postgresql93 = common { - version = "9.3.22"; + version = "9.3.23"; psqlSchema = "9.3"; - sha256 = "06p9rk2bav41ybp8ra1bpf44avw9kl5s1wyql21n5awvlm5fs60v"; + sha256 = "1jzncs7b6zrcgpnqjbjcc4y8303a96zqi3h31d3ix1g3vh31160x"; }; postgresql94 = common { - version = "9.4.17"; + version = "9.4.18"; psqlSchema = "9.4"; - sha256 = "1inpkwbr2xappz3kq3jr3hsn6mwn167nijcx406q8aq56p9hqcks"; + sha256 = "1h64yjyrlz3ppsp9k6sm4jihg6n9i7mqhkx4p0hymqzmnbr3g0s2"; }; postgresql95 = common { - version = "9.5.12"; + version = "9.5.13"; psqlSchema = "9.5"; - sha256 = "167nlrpsnqz63gafgn21j4yc2f5g1mpfkz8qxjxk2xs6crf6zs02"; + sha256 = "1vm55q9apja6lg672m9xl1zq3iwv2zwnn0d0qr003zan1dmbh22l"; }; postgresql96 = common { - version = "9.6.8"; + version = "9.6.9"; psqlSchema = "9.6"; - sha256 = "0w7bwf19wbdd3jjbjv03cnx56qka4801srcbsayk9v792awv7zga"; + sha256 = "0biy8j69dbvdmrag55pdszpc0702agzqhhcwdx21xp02mzim4ydr"; }; postgresql100 = common { - version = "10.3"; + version = "10.4"; psqlSchema = "10.0"; - sha256 = "06lkcwsf851z49zqcws5yc77s2yrbaazf2nvbk38hpp31rw6i8kf"; + sha256 = "0j000bcs9w8wrllg8m7j1lxsd3n2x0yzkack5p35cmxx20iq2q0v"; }; } diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix index ce298cb2745d..1eaa7775793c 100644 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "0.9.2"; + version = "0.10.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "1zgyd407skqbsw2zj3l9hixwlisnj82yb6hbq5khjg9k0ifvvgyp"; + sha256 = "07qkkf7lbwaig26iia54vdakwmv33f71p8saqifz9lf0zy6xn0w0"; }; # Fix the install phase which tries to install into the pgsql extension dir, @@ -34,6 +34,13 @@ stdenv.mkDerivation rec { done ''; + postInstall = '' + # work around an annoying bug, by creating $out/bin, so buildEnv doesn't freak out later + # see https://github.com/NixOS/nixpkgs/issues/22653 + + mkdir -p $out/bin + ''; + meta = with stdenv.lib; { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; homepage = https://www.timescale.com/; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index bde6f78e130c..4045db5e5f22 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -49,11 +49,11 @@ in stdenv.mkDerivation rec { name = "uwsgi-${version}"; - version = "2.0.17"; + version = "2.0.17.1"; src = fetchurl { url = "https://projects.unbit.it/downloads/${name}.tar.gz"; - sha256 = "1wlbaairsmhp6bx5wv282q9pgh6w7w6yrb8vxjznfaxrinsfkhix"; + sha256 = "0xxjb9dyivq5531birvxq2gnyxf2x5q7gz54440acra6qwsq4cfj"; }; nativeBuildInputs = [ python3 pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1c4201c0082a..a1b458986e50 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -171,7 +171,7 @@ let sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -183,7 +183,7 @@ let sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -195,7 +195,7 @@ let sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -207,7 +207,7 @@ let sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -219,7 +219,7 @@ let sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -243,7 +243,7 @@ let sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -255,7 +255,7 @@ let sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -267,7 +267,7 @@ let sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -279,7 +279,7 @@ let sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -291,7 +291,7 @@ let sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -303,7 +303,7 @@ let sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -315,7 +315,7 @@ let sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -327,7 +327,7 @@ let sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -339,7 +339,7 @@ let sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -351,7 +351,7 @@ let sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -363,7 +363,7 @@ let sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -375,7 +375,7 @@ let sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -387,7 +387,7 @@ let sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -399,7 +399,7 @@ let sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -411,7 +411,7 @@ let sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -423,7 +423,7 @@ let sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -435,7 +435,7 @@ let sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -447,7 +447,7 @@ let sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -459,7 +459,7 @@ let sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -471,7 +471,7 @@ let sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -483,7 +483,7 @@ let sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -495,7 +495,7 @@ let sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -507,7 +507,7 @@ let sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -519,7 +519,7 @@ let sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -531,7 +531,7 @@ let sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -543,7 +543,7 @@ let sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -567,7 +567,7 @@ let sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -591,7 +591,7 @@ let sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -603,7 +603,7 @@ let sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -1676,11 +1676,11 @@ let }) // {inherit ;}; xeyes = (mkDerivation "xeyes" { - name = "xeyes-1.1.1"; + name = "xeyes-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2; - sha256 = "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp"; + url = mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2; + sha256 = "0lq5j7fryx1wn998jq6h3icz1h6pqrsbs3adskjzjyhn5l6yrg2p"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext libXmu libXrender libXt ]; @@ -2420,11 +2420,11 @@ let }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;}; xkbcomp = (mkDerivation "xkbcomp" { - name = "xkbcomp-1.4.0"; + name = "xkbcomp-1.4.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2; - sha256 = "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw"; + url = mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2; + sha256 = "0944rrkkf0dxp07vhh9yr4prslxhqyw63qmbjirbv1bypswvrn3d"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile xproto ]; @@ -2468,11 +2468,11 @@ let }) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (mkDerivation "xkeyboardconfig" { - name = "xkeyboard-config-2.23.1"; + name = "xkeyboard-config-2.24"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.23.1.tar.bz2; - sha256 = "1wq27cs1c9y7d1d7zp5yhq29paj9smajdb68lyvm28d2zq2vqjra"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2; + sha256 = "1my4786pd7iv5x392r9skj3qclmbd26nqzvh2fllwkkbyj08bcci"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index f45ee7500ed0..2438c49d9cb9 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -8,18 +8,6 @@ let malloc0ReturnsNullCrossFlag = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-malloc0returnsnull"; - - gitRelease = { libName, version, rev, sha256 } : attrs : attrs // { - name = libName + "-" + version; - src = args.fetchgit { - url = git://anongit.freedesktop.org/xorg/lib/ + libName; - inherit rev sha256; - }; - buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ]; - preConfigure = (attrs.preConfigure or "") + "\n./autogen.sh"; - }; - - compose = f: g: x: f (g x); in { bdftopcf = attrs: attrs // { diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 9c133f9d5d99..3fc7aaea9c93 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, substituteAll, xterm, makeWrapper, ruby -, openssl, quartz-wm, fontconfig, xlsfonts, xfontsel +{ stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, xterm, makeWrapper, ruby +, quartz-wm, fontconfig, xlsfonts, xfontsel , ttf_bitstream_vera, freefont_ttf, liberation_ttf , shell ? "${bashInteractive}/bin/bash" }: |