diff options
Diffstat (limited to 'pkgs/servers')
48 files changed, 1013 insertions, 680 deletions
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 581dbc3b1f7..e6102c84f13 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn, +{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn, fetchpatch, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux, dmidecode, libuuid, binutils, newt, lua, speex, @@ -18,8 +18,17 @@ let # This patch changes the runtime behavior to look for state # directories in /var rather than ${out}/var. ./runtime-vardirs.patch + (fetchpatch { + url = "http://sources.debian.net/data/main/a/asterisk/1:13.14.1~dfsg-1/debian/patches/pjsip_unresolved_symbol.patch"; + sha256 = "0i6a6zplvzbjcvxqlmr87jmrfza7c3qx0rlym2nlmzzp2m7qpnfp"; + }) ]; + # Disable MD5 verification for pjsip + postPatch = '' + sed -i 's|$(verify_tarball)|true|' third-party/pjproject/Makefile + ''; + src = fetchurl { url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz"; inherit sha256; @@ -64,9 +73,9 @@ let }; }; - pjproject-255 = fetchurl { - url = http://www.pjsip.org/release/2.5.5/pjproject-2.5.5.tar.bz2; - sha256 = "1wq8lpfcd4dfrbl7bgy2yzgp3ldjzq5430fqkhcqad0xfrxj0fdb"; + pjproject-26 = fetchurl { + url = http://www.pjsip.org/release/2.6/pjproject-2.6.tar.bz2; + sha256 = "1d67c58jn22f7h6smkykk5vwl3sqpc7xi2vm3j3lbn3lq6hisnig"; }; mp3-202 = fetchsvn { @@ -79,19 +88,19 @@ in { asterisk-lts = common { - version = "13.13.1"; - sha256 = "0yh097rrp1i681qclvwyh7l1gg2i5wx5pjrcvwpbj6g949mc98vd"; + version = "13.15.0"; + sha256 = "0i2qzfa1iyh66nma39kdigb9lp5gz3sn46znd2djz24wgmamb2lb"; externals = { - "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; + "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26; "addons/mp3" = mp3-202; }; }; asterisk-stable = common { - version = "14.2.1"; - sha256 = "193yhyjn0fwrd7hsmr3qwcx3k2pc6cq70v1mnfdwidix4cqm32xj"; + version = "14.4.0"; + sha256 = "095slnhl74hs1c36rgg378azan9zwgryp8him7py4am60lbk3n3w"; externals = { - "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; + "externals_cache/pjproject-2.6.tar.bz2" = pjproject-26; "addons/mp3" = mp3-202; }; }; diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 579cd9f4a0e..aafb30441d7 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.0.3"; + version = "6.1.1"; src = fetchurl { url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "0dg5sb2qv2xskvhlrxmidl25kyg1w0dp31a3k8f3las72fhmkpb7"; + sha256 = "0klb8hxsmgcwjcp20xa7823jm040q7wdqicc6g7s27gjzvbqj800"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index d0a278d2ef0..1f2601ab0d5 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.3.0"; + version = "7.3.4"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0i2r60gzs382i6b9r9cx60j6d1xnr4hrj773d4mbbf8r7sg1n8r0"; + sha256 = "0xkwf8n37hwv52rl3dbqkacr1fyxz4bd7gkcmpg0wshnxmyq4vg7"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix new file mode 100644 index 00000000000..9249d7cc347 --- /dev/null +++ b/pkgs/servers/cayley/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "cayley-${version}"; + version = "0.6.1"; + + goPackagePath = "github.com/cayleygraph/cayley"; + + src = fetchFromGitHub { + owner = "cayleygraph"; + repo = "cayley"; + rev = "v${version}"; + sha256 = "1r0kw3y32bqm7g37svzrch2qj9n45p93xmsrf7dj1cg4wwkb65ry"; + }; + + goDeps = ./deps.nix; + + buildFlagsArray = '' + -ldflags= + -X=main.Version=${version} + ''; + + meta = { + homepage = "https://cayley.io/"; + description = "A graph database inspired by Freebase and Knowledge Graph"; + maintainers = with stdenv.lib.maintainers; [ sigma ]; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/servers/cayley/deps.nix b/pkgs/servers/cayley/deps.nix new file mode 100644 index 00000000000..1e6fadf9f4d --- /dev/null +++ b/pkgs/servers/cayley/deps.nix @@ -0,0 +1,272 @@ +[ + { + goPackagePath = "github.com/badgerodon/peg"; + fetch = { + type = "git"; + url = "https://github.com/badgerodon/peg"; + rev = "9e5f7f4d07ca576562618c23e8abadda278b684f"; + sha256 = "12vd7hzdgknn8byz77lmvcrz9m5lvmffdnz2wwk83304przkra11"; + }; + } + { + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "a705895fdad108f053eae7ee011ed94a0541ee13"; + sha256 = "0ql67l2hmjhplkl80j9a49qlra4qx671il5rgn58afkvk20cgq2r"; + }; + } + { + goPackagePath = "github.com/cznic/mathutil"; + fetch = { + type = "git"; + url = "https://github.com/cznic/mathutil"; + rev = "f9551431b78e71ee24939a1e9d8f49f43898b5cd"; + sha256 = "1158mlwzryyna1qslr9v88i0k8x6m8vs4rljnnwh04rmd63ksj75"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "2df174808ee097f90d259e432cc04442cf60be21"; + sha256 = "0jghd5dmwqpcjbxij9yjj8sjzll9s65i2qnxd8rdzwh77xdsfm9g"; + }; + } + { + goPackagePath = "github.com/dlclark/regexp2"; + fetch = { + type = "git"; + url = "https://github.com/dlclark/regexp2"; + rev = "4009c9dc49dd8906bfd4d479c255470d6a477ce5"; + sha256 = "1r6f0q1jvn1lkwqlrmmg5d90p6zss8s64jyp91hp6i97vpahq8xz"; + }; + } + { + goPackagePath = "github.com/dop251/goja"; + fetch = { + type = "git"; + url = "https://github.com/dop251/goja"; + rev = "64f863c4eb0329df18ecd1dab1e03609556bfaca"; + sha256 = "0smipfs7fja286nvlr7q4b8f815br0nia0k4xp8y5fvprrzrm64h"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "50d1bd39ce4e7a96b75e3e040be9caf79dbb4c61"; + sha256 = "09cad9j98pdqh1sp191j92ng6lvw9la3k3v6m5mv38nwirpwzra1"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "888eb0692c857ec880338addf316bd662d5e630e"; + sha256 = "1vhx2dwr71hma9z3dfb3l1yrkjlry0glwxknxzyp9ds51i6pjiq0"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "ad28ea4487f05916463e2423a55166280e8254b5"; + sha256 = "0xw0qas3ixg8p2xh09hhc81km0mfn9lbnfgrdb309hzcwhmiyqjm"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "b59a38004596b696aca7aa2adccfa68760864d86"; + sha256 = "0j1w2fkcghyw3lcsc13lwf2zqar9xyni2g7fqp4aq8g08ii7paac"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "0dad96c0b94f8dee039aa40467f767467392a0af"; + sha256 = "06c38iy37251mh8jy9s8n97b01pjnqpq8ii77nnmqh1dsph37jz4"; + }; + } + { + goPackagePath = "github.com/linkeddata/gojsonld"; + fetch = { + type = "git"; + url = "https://github.com/linkeddata/gojsonld"; + rev = "a223ef39bb925d36d4c410d3e35b0e34e370cc31"; + sha256 = "1i3vl7gbkq2xl2wyv0kszj0x32vp8jw1cf0ngpdqdhdvnbfi1w7i"; + }; + } + { + goPackagePath = "github.com/pborman/uuid"; + fetch = { + type = "git"; + url = "https://github.com/pborman/uuid"; + rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4"; + sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"; + }; + } + { + goPackagePath = "github.com/peterh/liner"; + fetch = { + type = "git"; + url = "https://github.com/peterh/liner"; + rev = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced"; + sha256 = "05ihxpmp6x3hw71xzvjdgxnyvyx2s4lf23xqnfjj16s4j4qidc48"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"; + sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"; + }; + } + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "d1b4d8ef0e0e4b088c8328c95ca63ab9ebd8fc9d"; + sha256 = "0i31p3paz3n7qi2v1g77lm3cx2hssgwgcfpar4qc2vj7m4766884"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "17bb7999de6cfb791d4f8986cc00b3309b370cdb"; + sha256 = "1md0sjw69mj359cb4c8ghzllcbn2lnkvby1203wl0pf5wbyfvm5s"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "8e87604bec3c645a4eeaee97dfec9f25811ff20d"; + sha256 = "05b6yj23c3xx446kanhaj1l83av8676z7si8n1f4sqy2pp7s966v"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "08a8a7c27e3d058a8989316a850daad1c10bf4ab"; + sha256 = "1fbh1b42alvpbw87v0v2hanliaqp6fm4h9n7byk921mcv6dai8fl"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "f390dcf405f7b83c997eac1b06768bb9f44dec18"; + sha256 = "1l3z0ggdcjspfmm6k9glmh52a9x50806k6yldxql73p4bpynsd9g"; + }; + } + { + goPackagePath = "github.com/syndtr/goleveldb"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/goleveldb"; + rev = "4875955338b0a434238a31165cb87255ab6e9e4a"; + sha256 = "0786j6kizrlskqz196ng4d13363d44whl849jcv1q07yab2nq40i"; + }; + } + { + goPackagePath = "github.com/syndtr/gosnappy"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/gosnappy"; + rev = "156a073208e131d7d2e212cb749feae7c339e846"; + sha256 = "08lf8smnp4imj5fkph9sbqzb4a5n191q9m6b2c5kamp19i9h2y6z"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "6a513affb38dc9788b449d59ffed099b8de18fa0"; + sha256 = "1g07c05s3ccq0086f0f200k9cfjjzxd4r9nrdilkmy44lbhhrval"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "a646d33e2ee3172a661fc09bca23bb4889a41bc8"; + sha256 = "1jniqg2nv5zhdzfm9gwfx0s9q8mwxrgcxdbkd6cddk9w0qgji9dc"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "5a42fa2464759cbb7ee0af9de00b54d69f09a29c"; + sha256 = "0far6mb2ikwzr7icn0yqi9ygl8kv2wsaasyprbqb9qapr0dqjw0s"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "4f7eeb5305a4ba1966344836ba4af9996b7b4e05"; + sha256 = "09pgvlk5ay3f0avi1bawpy8khi3rmkfl36l2yr3ryp8z12i9k2qj"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a"; + sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034"; + sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5"; + }; + } + { + goPackagePath = "github.com/dennwc/graphql"; + fetch = { + type = "git"; + url = "https://github.com/dennwc/graphql"; + rev = "fd5c4aa13f2119414084f229600de0d73f174436"; + sha256 = "11f9jwfc2j646732gkcjb332ih9fxh04j31zmhvqswx75gvk9wzs"; + }; + } +] diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix new file mode 100644 index 00000000000..fc35dfdda47 --- /dev/null +++ b/pkgs/servers/clickhouse/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, libtool, boost, double_conversion, gperftools, icu, libmysql, lz4, openssl, poco, re2, readline, sparsehash, unixODBC, zookeeper_mt, zstd }: + +stdenv.mkDerivation rec { + name = "clickhouse-${version}"; + + version = "1.1.54190"; + + src = fetchFromGitHub { + owner = "yandex"; + repo = "ClickHouse"; + rev = "v${version}-stable"; + sha256 = "03snzrhz3ai66fqy3rh89cgmpiaskg3077zflkwzqxwx69jkmqix"; + }; + + patches = [ ./prefix.patch ./termcap.patch ]; + + nativeBuildInputs = [ cmake libtool ]; + + buildInputs = [ boost double_conversion gperftools icu libmysql lz4 openssl poco re2 readline sparsehash unixODBC zookeeper_mt zstd ]; + + cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ]; + + NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-function" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://clickhouse.yandex/; + description = "Column-oriented database management system"; + license = licenses.asl20; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/clickhouse/prefix.patch b/pkgs/servers/clickhouse/prefix.patch new file mode 100644 index 00000000000..a311bf83dd9 --- /dev/null +++ b/pkgs/servers/clickhouse/prefix.patch @@ -0,0 +1,30 @@ +From ccc3596aa3ca041f457bf44d3437d935f56e82a4 Mon Sep 17 00:00:00 2001 +From: Orivej Desh <orivej@gmx.fr> +Date: Sun, 26 Mar 2017 23:57:32 +0000 +Subject: [PATCH] Do not override CMAKE_INSTALL_PREFIX + +--- + CMakeLists.txt | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 517b25e..6d8ced2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,12 +141,7 @@ if (ENABLE_TESTS) + endif (ENABLE_TESTS) + + # Installation prefix +-if (NOT CMAKE_SYSTEM MATCHES "FreeBSD") +- set (CMAKE_INSTALL_PREFIX /usr) +- set (CLICKHOUSE_ETC_DIR /etc) +-else () +- set (CLICKHOUSE_ETC_DIR ${CMAKE_INSTALL_PREFIX}/etc) +-endif () ++set (CLICKHOUSE_ETC_DIR ${CMAKE_INSTALL_PREFIX}/etc) + + + option (UNBUNDLED "Try find all libraries in system (if fail - use bundled from contrib/)" OFF) +-- +2.12.0 + diff --git a/pkgs/servers/clickhouse/termcap.patch b/pkgs/servers/clickhouse/termcap.patch new file mode 100644 index 00000000000..e030d095690 --- /dev/null +++ b/pkgs/servers/clickhouse/termcap.patch @@ -0,0 +1,25 @@ +From c2105ecdf6a6cc1fbb4c1ae01475db6a65fee32f Mon Sep 17 00:00:00 2001 +From: Orivej Desh <orivej@gmx.fr> +Date: Mon, 27 Mar 2017 01:39:11 +0000 +Subject: [PATCH] Search for termcap in ncurses + +--- + cmake/find_readline_edit.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/find_readline_edit.cmake b/cmake/find_readline_edit.cmake +index 26f2768..f520ece 100644 +--- a/cmake/find_readline_edit.cmake ++++ b/cmake/find_readline_edit.cmake +@@ -7,7 +7,7 @@ endif () + + list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .so.2) + +-find_library (TERMCAP_LIB NAMES termcap) ++find_library (TERMCAP_LIB NAMES ncurses) + find_library (EDIT_LIB NAMES edit) + + set(READLINE_INCLUDE_PATHS "/var/empty/local/var/empty/readline/include") +-- +2.12.0 + diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 41a0bea1cdd..cc566e712c2 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -17,6 +17,10 @@ buildGoPackage rec { # Keep consul.ui for backward compatability passthru.ui = consul-ui; + preBuild = '' + buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") + ''; + meta = with stdenv.lib; { description = "Tool for service discovery, monitoring and configuration"; homepage = "https://www.consul.io/"; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 8dc062b7504..ab14ee92a24 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, openssl, libevent }: -with { inherit (stdenv.lib) optional; }; +let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "coturn-${version}"; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 1174f5badba..97c0da86ec9 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -2,7 +2,7 @@ , systemd, nettle, libedit, zlib, libiconv, fetchpatch }: -with { inherit (stdenv.lib) optional optionals; }; +let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index bc9e35f88c4..f388302f4bf 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.2.4"; + version = "1.2.6"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "630b2ad0bfdcf59164957a377adef8b1fddc37a58a7e1d10e76a1b497a30f036"; + sha256 = "31e1b8899c5592433e5265a8e9685126fc5aeff3bd6b10884154b2e34b786f3c"; }; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ knot-dns luajit libuv gnutls ] ++ optional stdenv.isLinux lmdb # system lmdb causes some problems on Darwin - ## optional dependencies + ## optional dependencies; TODO: libedit, dnstap? ++ optional doInstallCheck cmocka ++ optional stdenv.isLinux systemd # socket activation ++ [ diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 89845fff9c6..e69b25c5b94 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -13,11 +13,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.14"; + name = "nsd-4.1.15"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "bdfc61c5f3bf11febd8f4776eef1d4f2d95ed70f12f11d4eeee943c186ffd802"; + sha256 = "494a862cfcd26a525a4bf06306eb7ab0387b34678ac6d37767507438e3a23a4b"; }; buildInputs = [ libevent openssl ]; diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 780baa018a7..f88b82675da 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.2.8"; + version = "3.2.12"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "0jscbaznacp44cz9mjswd3fkyf2y9cx78mqm2dkf26rnfmwbx7vq"; + sha256 = "0vbb7ax3100djz6zl8vji04a1x3r9vrrgkar605sc2w9n1j1msp2"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 16189fb4723..15ea30aa16c 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { name = "etcd-${version}"; - version = "3.0.6"; # After updating check that nixos tests pass + version = "3.1.6"; # After updating check that nixos tests pass rev = "v${version}"; goPackagePath = "github.com/coreos/etcd"; @@ -13,10 +13,16 @@ buildGoPackage rec { inherit rev; owner = "coreos"; repo = "etcd"; - sha256 = "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75"; + sha256 = "1qgi6zxnijzr644w2da2gbn3gw2qwk6a3z3qmdln0r2rjnm70sx0"; }; - goDeps = ./deps.nix; + subPackages = [ + "cmd/etcd" + "cmd/etcdctl" + "cmd/tools/benchmark" + "cmd/tools/etcd-dump-db" + "cmd/tools/etcd-dump-logs" + ]; buildInputs = [ libpcap ]; diff --git a/pkgs/servers/etcd/deps.nix b/pkgs/servers/etcd/deps.nix deleted file mode 100644 index 2c07817a980..00000000000 --- a/pkgs/servers/etcd/deps.nix +++ /dev/null @@ -1,335 +0,0 @@ -[ -{ - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; - }; -} -{ - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "583e8937c61f1af6513608ccc75c97b6abdf4ff9"; - sha256 = "0cp5v9iypg9ysiq40k3h3lg7aisxplnmxshha7nama6b170izyay"; - }; -} -{ - goPackagePath = "github.com/cloudfoundry-incubator/candiedyaml"; - fetch = { - type = "git"; - url = "https://github.com/cloudfoundry-incubator/candiedyaml"; - rev = "99c3df83b51532e3615f851d8c2dbb638f5313bf"; - sha256 = "106nibg7423642gbkg88c5x2jxfz6nmxbribhwb8cr1rn9vpjaxs"; - }; -} -{ - goPackagePath = "github.com/cockroachdb/cmux"; - fetch = { - type = "git"; - url = "https://github.com/cockroachdb/cmux"; - rev = "b64f5908f4945f4b11ed4a0a9d3cc1e23350866d"; - sha256 = "1by4f3x7j3r3z1sdx1v04r494hn6jaag7lc03prrgx455j8i0jlh"; - }; -} -{ - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd.git"; - rev = "9efa00d1030d4bf62eb8e5ec130023aeb1b8e2d0"; - sha256 = "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75"; - }; -} -{ - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "8ab6407b697782a06568d4b7f1db25550ec2e4c6"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; -} -{ - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "5c49e4850c879a0ddc061e8f4adcf307de8a8bc2"; - sha256 = "1w16bnrgfjb5rwha7g8rdjhpgjf8bzmlzhrda5bfvc9ymj3qjibk"; - }; -} -{ - goPackagePath = "github.com/coreos/pkg"; - fetch = { - type = "git"; - url = "https://github.com/coreos/pkg"; - rev = "3ac0863d7acf3bc44daf49afef8919af12f704ef"; - sha256 = "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l"; - }; -} -{ - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "aa0c862057666179de291b67d9f093d12b5a8473"; - sha256 = "0cbc78n8l7h1gdzhrvahplcvr4v7n8v23vkgskfp843rcx5h6isr"; - }; -} -{ - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "f20a1444730c7d9949b880a0309e737d007def25"; - sha256 = "12wa3r2cb2v1m65phbkh692ldlklk459z4x6avpc6im0zkr6r73c"; - }; -} -{ - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "f592bd283e9ef86337a432eb50e592278c3d534d"; - sha256 = "01gxhzn9m6jz6ihwxfycnx39zf5pmkan61l278cnynsb8mibdpvb"; - }; -} -{ - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "7d79101e329e5a3adf994758c578dab82b90c017"; - sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0"; - }; -} -{ - goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/grpc-gateway"; - rev = "5e0e028ba0a015710eaebf6e47af18812c9f2767"; - sha256 = "00s4wxzs6lz5al7y2hxi6r4bxhx5b0ajk5rwxrnb4a4mhlaii8pk"; - }; -} -{ - goPackagePath = "github.com/jonboulle/clockwork"; - fetch = { - type = "git"; - url = "https://github.com/jonboulle/clockwork"; - rev = "e3653ace2d63753697e0e5b07b9393971c0bba9d"; - sha256 = "1avzqhks12a8x2yzpvjsf3k0gv9cy7zx2z88hn0scacnxkphisvc"; - }; -} -{ - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; -} -{ - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "c5b7fccd204277076155f10851dad72b76a49317"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; - }; -} -{ - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; -} -{ - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "ebdfc6da46522d58825777cf1f90490a5b1ef1d8"; - sha256 = "0js62pj8600773wx6labpd772yyhz5ivim7dnl7b862wblbmc8mq"; - }; -} -{ - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"; - sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws"; - }; -} -{ - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "7c674d9e72017ed25f6d2b5e497a1368086b6a6f"; - sha256 = "0an935r7lc11a744mvdrsy56rs2w0ah3gdclvr4gzd5iqr9ap3dr"; - }; -} -{ - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "6454a84b6da0ea8b628d5d8a26759f62c6c161b4"; - sha256 = "06rfi73jhkncn8gxy6klgmba5947k9gpwdswipdpz680yxczcwna"; - }; -} -{ - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "4a1cb5252a6951f715a85d0e4be334c2a2dbf2a2"; - sha256 = "0izpijk3piihl4fnqg8ncnp5ivbq41pg3xf7iagg4fbg5id4pxbx"; - }; -} -{ - goPackagePath = "github.com/xiang90/probing"; - fetch = { - type = "git"; - url = "https://github.com/xiang90/probing"; - rev = "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2"; - sha256 = "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2"; - }; -} -{ - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "88d0005bf4c3ec17306ecaca4281a8d8efd73e91"; - sha256 = "1d3x0rwfd4cml06ka8gy74wxrw94m2z7qgz6ky0rgmxcr7p5iikz"; - }; -} -{ - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "7394c112eae4dba7e96bfcfe738e6373d61772b4"; - sha256 = "1p8wsxnbsp2lq6hbza2n0zgv4sgpxzzjjlrmcngkhxj47kp3hin7"; - }; -} -{ - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "0032a855ba5c8a3c8e0d71c2deef354b70af1584"; - sha256 = "0qkynp65jwk6jk932k7kwxs5v6fzlfsb1fay71a00dwr36f44s67"; - }; -} -{ - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "168c95418e66e019fe17b8f4f5c45aa62ff80e23"; - sha256 = "1gdvvim2f1zigcmbpcgypgn7nvpnlr87grbg7lw13fbpy6fnlw2n"; - }; -} -{ - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "d6bea18f789704b5f83375793155289da36a3c7f"; - sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; - }; -} -{ - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "daf2955e742cf123959884fdff4685aa79b63135"; - sha256 = "1fvl251ms7qmzfbi853kdgghqkrmyy6n1605mfy50nhgvw03z203"; - }; -} -{ - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8"; - sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k"; - }; -} -{ - goPackagePath = "github.com/bgentry/speakeasy"; - fetch = { - type = "git"; - url = "https://github.com/bgentry/speakeasy"; - rev = "a1ccbf2c40dfc8ce514b5c5c6e6d1429ea6880da"; - sha256 = "0xqpc1qhdcs5blp1mkrppfb1x0rcv4a445mj0yzdwshbzkw5di01"; - }; -} -{ - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "ce7fa45920dc37a92de8377972e52bc55ffa8d57"; - sha256 = "0mdlr2mmwjznw2id0l4200xjajq9dh1kxn3z7d3ksn0b5fwinzmk"; - }; -} -{ - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "a6b377e3400b08991b80d6805d627f347f983866"; - sha256 = "125a6zdaxj916yp2rlrkg8xw00vjf5ga9xwdg4clby8wj4fysma2"; - }; -} -{ - goPackagePath = "gopkg.in/cheggaaa/pb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/cheggaaa/pb.v1"; - rev = "9453b2db37f4d8bc63751daca63bbe7049eb5e74"; - sha256 = "0py7dxvm3ydxcw260x7r7xbjww1vkil3rhyy3f9njmjydyb303rb"; - }; -} -{ - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; -} -{ - goPackagePath = "github.com/spacejam/loghisto"; - fetch = { - type = "git"; - url = "https://github.com/spacejam/loghisto"; - rev = "9d1d8c1fd2a4ac852bf2e312f2379f553345fda7"; - sha256 = "0r31y4ci35pp11wqdyarimdq5a703byk3cf6d67adsa4nw0ysfm1"; - }; -} -{ - goPackagePath = "github.com/akrennmair/gopcap"; - fetch = { - type = "git"; - url = "https://github.com/akrennmair/gopcap"; - rev = "00e11033259acb75598ba416495bb708d864a010"; - sha256 = "0xfw7x5a36w0g76imjvgk055360xg0nva42qhmflfvll7ldxq96a"; - }; -} -] diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index a9f3d74e99c..348aba5338c 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.11.10"; - sha256 = "0gak6pcsn1m8fsz0g95z4b72nn12ivy35vlxrmagfcvnn2mkr2vp"; + version = "1.13.0"; + sha256 = "1mq56rl3rq3bhnrqsywxfrwh0y5m0n0q0sck8ca4x18ganv2mxbr"; }) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 3b3f2e0cc0f..db4ae804533 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.7.1197"; + version = "0.7.1308"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "0p9xdfbb8pda5a3knnw6145jky3bf10y1dj2clgsbbygi2xnam2v"; + sha256 = "07yadywizhq7j986ax5d9dbjn1s5bqw6zrlqp6l32ppc119qhjwf"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 2d5ad9e2742..85ebb5a8043 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -24,13 +24,13 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.19.3"; + version = "0.20.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "0dnlv2rgda94zlgwkpryjsypcf995l7zdp19d2xiq7zpd13x6yag"; + sha256 = "1ss89dd4xn80y0zafs6dc9c24ba1kxk20jhjvqbcbbng6mlynj9h"; }; patches = [ ./matrix-synapse.patch ]; @@ -41,6 +41,7 @@ in pythonPackages.buildPythonApplication rec { signedjson systemd twisted ujson unpaddedbase64 pyyaml matrix-angular-sdk bleach netaddr jinja2 psycopg2 psutil msgpack lxml matrix-synapse-ldap3 + phonenumbers jsonschema ]; # Checks fail because of Tox. diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index bc2bbb13c44..28b6136d90e 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "minio-${shortVersion}"; - shortVersion = "20170125"; - longVersion = "2017-01-25T03-14-52Z"; + shortVersion = "20170316"; + longVersion = "2017-03-16T21-50-32Z"; src = fetchurl { url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; - sha256 = "0yh8fdgl50sza182kl4jly0apf0dw0ya954ky6j8a8hmdcmk6wzk"; + sha256 = "1331lxsfr22x1sh7cyh9xz3aa70715wm1bk1f1r053kyz03q903c"; }; buildInputs = [ go ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 6c7b7ff001a..dbcebf84239 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.1.2"; - ts = "1486989747"; + version = "4.2.0"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -10,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0x2knb2lrs6sbj3svcjn70p46fzdy71gh8fgi801g1l0yp9s5yrg"; + sha256 = "0zzvdzakswqidxbsss98nfa8rw80r36f45yviai12xsns9jzmj7z"; }; srcStatic = fetchurl { - url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-${ts}.linux-x64.tar.gz"; - sha256 = "1i7n1a2xn65flwy2zqs3kqg1ch51653r52qn3gfh5hp92k81q4dq"; + url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}.linux-x64.tar.gz"; + sha256 = "1cs7ghkp13znz9yxv108770xjfsp8vks6xkzpqqhsjis5h5y0g9w"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 8bf9eef6cd0..78cd69714e8 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.5.1"; + version = "0.6.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "1z0f8jqbd4v00634qcs41h1zb70ahl63svlzn33gavripk84hwzq"; + sha256 = "04969hqig0llfkvk3b0yqrywcxm6rgd7ph6nn5rx8pnq21i77sqm"; }; # Tests exist, but seem to clash with the firewall. @@ -27,6 +27,17 @@ buildGoPackage rec { -X ${t}.GoVersion=${stdenv.lib.getVersion go} ''; + postBuild = '' + $NIX_BUILD_TOP/go/bin/artifacts + ''; + + postInstall = '' + rm $bin/bin/artifacts + mkdir -p $bin/share/man/man1 $bin/etc/bash_completion.d + cp -v amtool*.1 $bin/share/man/man1 + cp -v amtool_completion.sh $bin/etc/bash_completion.d + ''; + meta = with stdenv.lib; { description = "Alert dispatcher for the Prometheus monitoring system"; homepage = https://github.com/prometheus/alertmanager; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 1115ca85f23..2d2fb26324c 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "node_exporter-${version}"; - version = "0.13.0"; + version = "0.14.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/node_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "03xk8zns0dvzs13jgiwl2dxj9aq4bbfmwsg0wq5piravxpszs09q"; + sha256 = "0rm43jjqv7crfahl973swi4warqmqnmv740cg800yvzvnlp37kl4"; }; # FIXME: megacli test fails diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock index ee425b6edf9..0d01c227145 100644 --- a/pkgs/servers/monitoring/sensu/Gemfile.lock +++ b/pkgs/servers/monitoring/sensu/Gemfile.lock @@ -12,51 +12,54 @@ GEM em-worker (0.0.2) eventmachine eventmachine (1.2.2) - ffi (1.9.17) - oj (2.14.6) + ffi (1.9.18) + oj (2.18.1) parse-cron (0.1.4) - sensu (0.28.0) + sensu (0.29.0) em-http-server (= 0.1.8) eventmachine (= 1.2.2) parse-cron (= 0.1.4) sensu-extension (= 1.5.1) - sensu-extensions (= 1.7.1) - sensu-json (= 2.0.1) + sensu-extensions (= 1.9.0) + sensu-json (= 2.1.0) sensu-logger (= 1.2.1) - sensu-redis (= 2.1.0) - sensu-settings (= 9.9.0) + sensu-redis (= 2.1.1) + sensu-settings (= 10.0.0) sensu-spawn (= 2.2.1) sensu-transport (= 7.0.2) sensu-extension (1.5.1) eventmachine - sensu-extensions (1.7.1) + sensu-extensions (1.9.0) sensu-extension + sensu-extensions-check-dependencies (= 1.0.1) sensu-extensions-debug (= 1.0.0) sensu-extensions-json (= 1.0.0) - sensu-extensions-occurrences (= 1.1.0) + sensu-extensions-occurrences (= 1.2.0) sensu-extensions-only-check-output (= 1.0.0) sensu-extensions-ruby-hash (= 1.0.0) sensu-json (>= 1.1.0) sensu-logger sensu-settings + sensu-extensions-check-dependencies (1.0.1) + sensu-extension sensu-extensions-debug (1.0.0) sensu-extension sensu-extensions-json (1.0.0) sensu-extension - sensu-extensions-occurrences (1.1.0) + sensu-extensions-occurrences (1.2.0) sensu-extension sensu-extensions-only-check-output (1.0.0) sensu-extension sensu-extensions-ruby-hash (1.0.0) sensu-extension - sensu-json (2.0.1) - oj (= 2.14.6) + sensu-json (2.1.0) + oj (= 2.18.1) sensu-logger (1.2.1) eventmachine sensu-json - sensu-redis (2.1.0) + sensu-redis (2.1.1) eventmachine - sensu-settings (9.9.0) + sensu-settings (10.0.0) parse-cron sensu-json (>= 1.1.0) sensu-spawn (2.2.1) @@ -76,4 +79,4 @@ DEPENDENCIES sensu BUNDLED WITH - 1.14.4 + 1.14.6 diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix index 273496e2fb4..1df8d419cb6 100644 --- a/pkgs/servers/monitoring/sensu/gemset.nix +++ b/pkgs/servers/monitoring/sensu/gemset.nix @@ -50,18 +50,18 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07hnyr47mndsjfanzh348wm3fxjx9nx68mdb3cpsdvfqrxnz97s7"; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; type = "gem"; }; - version = "1.9.17"; + version = "1.9.18"; }; oj = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0pa9vmbxivplphad4ddjy30ylbb3bi61y13vmwx4llz3svl8r8kk"; + sha256 = "147whmq8h2n04chskl3v4a132xhz5i6kk6vhnz83jwng4vihin5f"; type = "gem"; }; - version = "2.14.6"; + version = "2.18.1"; }; parse-cron = { source = { @@ -74,10 +74,10 @@ sensu = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1dbyc1wylg9ligr1slv60myhbzdbja96v3srb3xrirv6vl33npqx"; + sha256 = "0931qccqhwmvqf4jj3jwip25xwkg7rf1yxxpkdhiyi2yndyfb8x7"; type = "gem"; }; - version = "0.28.0"; + version = "0.29.0"; }; sensu-extension = { source = { @@ -90,10 +90,18 @@ sensu-extensions = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0axjqak7yhhznhs9f4q8km7ikha5khglwqsc33scck13hsvw9l6g"; + sha256 = "1r09mdbbnh5cg9yvqw78sxbhlb8xqld1vwbr4hsjw6k3x1xpnnr9"; type = "gem"; }; - version = "1.7.1"; + version = "1.9.0"; + }; + sensu-extensions-check-dependencies = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0clgvf2abvwz549f28ny3zd6q7z6y7m49i8pp91ll10jp1vsy4b2"; + type = "gem"; + }; + version = "1.0.1"; }; sensu-extensions-debug = { source = { @@ -114,10 +122,10 @@ sensu-extensions-occurrences = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xi9888gp3lz5fik1k32bc1c6sjp7rr551p8dr5i3hsm5ii7blja"; + sha256 = "0lx5wsbblfs0rvkxfg09bsz0g2mwmckrhga7idnarsnm8m565v1v"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; sensu-extensions-only-check-output = { source = { @@ -138,10 +146,10 @@ sensu-json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "08bn8a5fscbhc9mcjg5avwjjbwxn28b48336bdxx87yng0wyafm4"; + sha256 = "02qkh86jddv7gha39vjx6g9hi7vkq7r433dr86bwmm9c7lqkgyl9"; type = "gem"; }; - version = "2.0.1"; + version = "2.1.0"; }; sensu-logger = { source = { @@ -154,18 +162,18 @@ sensu-redis = { source = { remotes = ["https://rubygems.org"]; - sha256 = "10axrjg2q569bjdchpjsdillzszifkgkayaz390hnf876mssqwcg"; + sha256 = "1nqk2046g6nldpiqy40f805gms8r856v2zxm53j0c8ni03sgz2a3"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; sensu-settings = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0bs66zmhs7yrwywvfhbld051d83f3nypmk2rf8dfn19ijzk4ch9i"; + sha256 = "0fb3wgqll5cq5akgmqhx6vgjvmcpcjyx68qqs8hb106b07gdpmli"; type = "gem"; }; - version = "9.9.0"; + version = "10.0.0"; }; sensu-spawn = { source = { diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index d58005f7be2..572cfe1f17d 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,lib/eventstore/clusternode} cp -r bin/clusternode/* $out/lib/eventstore/clusternode/ cat > $out/bin/clusternode << EOF - #!/bin/sh + #!${stdenv.shell} exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@" EOF chmod +x $out/bin/clusternode diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 122d5bd7dc9..618bc17d0a7 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.3.3.3148"; - vsnHash = "b38628e"; - sha256 = "1dx8z27l1dwigr3ipcdzn25hnj0206255ihxh9rnh2qchrcqmb5y"; + version = "1.5.5.3634"; + vsnHash = "995f1dead"; + sha256 = "0zk2zv7r4mf582gfbv4ahxzl8pbspzkf3514qmqhhx2z4grng49h"; }; in stdenv.mkDerivation rec { @@ -36,7 +36,14 @@ in stdenv.mkDerivation rec { # Now we need to patch up the executables and libraries to work on Nix. # Side note: PLEASE don't put spaces in your binary names. This is stupid. - for bin in "Plex Media Server" "Plex DLNA Server" "Plex Media Scanner" "Plex Script Host" "Plex Transcoder" "Plex Relay"; do + for bin in "Plex Media Server" \ + "Plex DLNA Server" \ + "Plex Media Scanner" \ + "Plex Media Server Tests" \ + "Plex Relay" \ + "Plex Script Host" \ + "Plex Transcoder" \ + "Plex Tuner Service" ; do patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin" patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin" done @@ -67,7 +74,7 @@ in stdenv.mkDerivation rec { homepage = http://plex.tv/; license = licenses.unfree; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice pjones ]; description = "Media / DLNA server"; longDescription = '' Plex is a media server which allows you to store your media and play it diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 680c9dfcb60..ba514ccdbcb 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { meta = { description = "Sound server for POSIX and Win32 systems"; homepage = http://www.pulseaudio.org/; - licenses = lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ lovek323 wkennington ]; platforms = lib.platforms.unix; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 446927745a9..af6cea97d2f 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radarr-${version}"; - version = "0.2.0.535"; + version = "0.2.0.654"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "1ccvblklqn5iki7gc16bzzbwms28mv4kxzv1nwhlm9vf0cw4qxbr"; + sha256 = "05sb3zk8gvydmkiy7g9ha5cmiqzqfwcydljm401zjndzwzhkz698"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index 47bdad75343..a701ad5d833 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -9,13 +9,13 @@ pythonPackages.buildPythonApplication rec { sha256 = "1c5lv8qca21mndkx350wxv34qypqh6gb4rhzms4anr642clq3jg2"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [ pythonPackages.flup pythonPackages.ldap pythonPackages.sqlalchemy ]; - doCheck = true; + doCheck = !pythonPackages.isPy3k; meta = with stdenv.lib; { homepage = http://www.radicale.org/; @@ -29,6 +29,6 @@ pythonPackages.buildPythonApplication rec { ''; license = licenses.gpl3Plus; platform = platforms.all; - maintainers = with maintainers; [ edwtjo pSub ]; + maintainers = with maintainers; [ edwtjo pSub aneeshusa ]; }; } diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index deec6589dbb..82818037072 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -1,5 +1,35 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, buildEnv, fetchurl, perl, perlPackages, makeWrapper }: +# This package isn't extremely useful as it is, but is getting close. +# After running: +# +# nix-build . -A rt +# +# I created a config file named myconfig.pm with: +# +# use utf8; +# Set($rtname, '127.0.0.1'); +# # These dirs need to be pre-created: +# Set($MasonSessionDir, '/home/grahamc/foo/sessiondir/'); +# Set($MasonDataDir, '/home/grahamc/foo/localstate/'); +# Set($WebPort, 8080); +# +# Set($DatabaseType, "SQLite"); +# Set( $DatabaseName, '/home/grahamc/projects/foo/my.db' ); +# +# 1; +# +# and ran +# +# RT_SITE_CONFIG=$(pwd)/myconfig.pm ./result/bin/rt-setup-database --action init +# +# Then: +# +# RT_SITE_CONFIG=$(pwd)/myconfig.pm ./result/bin/rt-server +# +# Make sure to check out result/etc/RT_Config.pm +# +# Good luck. stdenv.mkDerivation rec { name = "rt-${version}"; @@ -12,14 +42,58 @@ stdenv.mkDerivation rec { patches = [ ./override-generated.patch ]; - buildInputs = [ perl ]; + buildInputs = [ + makeWrapper + perl + (buildEnv { + name = "rt-perl-deps"; + paths = (with perlPackages; [ + ApacheSession BusinessHours CGIEmulatePSGI CGIPSGI + CSSMinifierXP CSSSquish ConvertColor CryptEksblowfish + CryptSSLeay DBDSQLite DBDmysql DBIxSearchBuilder DataGUID + DataICal DataPagePageset DateExtract DateManip + DateTimeFormatNatural DevelGlobalDestruction EmailAddress + EmailAddressList FCGI FCGIProcManager FileShareDir FileWhich + GD GDGraph GnuPGInterface GraphViz HTMLFormatTextWithLinks + HTMLFormatTextWithLinksAndTables HTMLMason + HTMLMasonPSGIHandler HTMLQuoted HTMLRewriteAttributes + HTMLScrubber IPCRun IPCRun3 JSON JavaScriptMinifierXS LWP + LWPProtocolHttps LocaleMaketextFuzzy LocaleMaketextLexicon + LogDispatch MIMETools MIMETypes MailTools ModuleRefresh + ModuleVersionsReport MozillaCA NetCIDR NetIP PerlIOeol Plack + RegexpCommon RegexpCommonnetCIDR RegexpIPv6 RoleBasic + ScopeUpper Starlet SymbolGlobalName TermReadKey + TextPasswordPronounceable TextQuoted TextTemplate + TextWikiFormat TextWrapper TimeParseDate TreeSimple + UNIVERSALrequire XMLRSS + ]); + }) + ]; - dontBuild = true; + preConfigure = '' + configureFlags="$configureFlags --with-web-user=$UID" + configureFlags="$configureFlags --with-web-group=$(id -g)" + configureFlags="$configureFlags --with-rt-group=$(id -g)" + configureFlags="$configureFlags --with-bin-owner=$UID" + configureFlags="$configureFlags --with-libs-owner=$UID" + configureFlags="$configureFlags --with-libs-group=$(id -g)" + ''; + configureFlags = [ + "--enable-graphviz" + "--enable-gd" + "--enable-gpg" + "--with-db-type=SQLite" + ]; + + buildPhase = '' + make testdeps | grep -i missing | sort + ''; - installPhase = '' - mkdir $out - cp -a {bin,docs,etc,lib,sbin,share} $out - find $out -name '*.in' -exec rm '{}' \; + preFixup = '' + for i in $(find $out/bin -type f; find $out/sbin -type f); do + wrapProgram $i \ + --prefix PERL5LIB ':' $PERL5LIB + done ''; meta = { diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 3e340ba7df4..535571f46e2 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -6,9 +6,10 @@ }: let - mkFlag = trueStr: falseStr: cond: name: val: - if cond == null then null else - "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; + mkFlag = trueStr: falseStr: cond: name: val: "--" + + (if cond then trueStr else falseStr) + + name + + stdenv.lib.optionalString (val != null && cond != false) "=${val}"; mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 8eecfa1e276..3395be9b9c1 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }: stdenv.mkDerivation rec { - name = "sipwitch-1.9.8"; + name = "sipwitch-1.9.15"; src = fetchurl { url = "mirror://gnu/sipwitch/${name}.tar.gz"; - sha256 = "0117c5iid1vrwl7sl3pys2jlinpmx2vfp8wcdwk93m7cc6k9793b"; + sha256 = "2a7aa86a653f6810b3cd9cce6c37b3f70e937e7d14b09fd5c2a70d70588a9482"; }; buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ]; diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix new file mode 100644 index 00000000000..18dbed4d1f3 --- /dev/null +++ b/pkgs/servers/slimserver/default.nix @@ -0,0 +1,97 @@ +{ stdenv, buildPerlPackage, fetchurl +, perl, perlPackages }: + +buildPerlPackage rec { + name = "slimserver-${version}"; + version = "7.9.0"; + + src = fetchurl { + url = "https://github.com/Logitech/slimserver/archive/${version}.tar.gz"; + sha256 = "07rhqipg7m28x0nqdd83nyzi88dp9cf8rr2pamdyrfcwyp1h1b44"; + }; + + buildInputs = [ + perl + perlPackages.AnyEvent + perlPackages.AudioScan + perlPackages.CarpClan + perlPackages.CGI + perlPackages.ClassXSAccessor + perlPackages.DataDump + perlPackages.DataURIEncode + perlPackages.DBDSQLite + perlPackages.DBI + perlPackages.DBIxClass + perlPackages.DigestSHA1 + perlPackages.EV + perlPackages.ExporterLite + perlPackages.FileBOM + perlPackages.FileCopyRecursive + perlPackages.FileNext + perlPackages.FileReadBackwards + perlPackages.FileSlurp + perlPackages.FileWhich + perlPackages.HTMLParser + perlPackages.HTTPCookies + perlPackages.HTTPDaemon + perlPackages.HTTPMessage + perlPackages.ImageScale + perlPackages.IOSocketSSL + perlPackages.IOString + perlPackages.JSONXSVersionOneAndTwo + perlPackages.Log4Perl + perlPackages.LWPUserAgent + perlPackages.NetHTTP + perlPackages.ProcBackground + perlPackages.SubName + perlPackages.TemplateToolkit + perlPackages.TextUnidecode + perlPackages.TieCacheLRU + perlPackages.TieCacheLRUExpires + perlPackages.TieRegexpHash + perlPackages.TimeDate + perlPackages.URI + perlPackages.URIFind + perlPackages.UUIDTiny + perlPackages.XMLParser + perlPackages.XMLSimple + perlPackages.YAMLLibYAML + ]; + + + prePatch = '' + mkdir CPAN_used + # slimserver doesn't work with current DBIx/SQL versions, use bundled copies + mv CPAN/DBIx CPAN/SQL CPAN_used + rm -rf CPAN + rm -rf Bin + touch Makefile.PL + ''; + + preConfigurePhase = ""; + + buildPhase = " + mv lib tmp + mkdir -p lib/perl5/site_perl + mv CPAN_used/* lib/perl5/site_perl + cp -rf tmp/* lib/perl5/site_perl + "; + + doCheck = false; + + installPhase = '' + cp -r . $out + ''; + + outputs = [ "out" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/Logitech/slimserver; + description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server"; + # the firmware is not under a free license! + # https://github.com/Logitech/slimserver/blob/public/7.9/License.txt + license = licenses.unfree; + maintainers = [ maintainers.phile314 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index af0b17bfb3a..de147e31da7 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4645"; + version = "2.0.0.4689"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "13a1ly2rm0ha355h4q2x8v699d43arcq3iyn7nm921rkswajvvb8"; + sha256 = "056ndn98byn6gkiq46vn8pl0s715ni7wklxnmid2hk5xwyjy7bwk"; }; buildInputs = [ diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix new file mode 100644 index 00000000000..a394d584536 --- /dev/null +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, cmake, bison, ncurses, openssl, zlib, libaio, perl }: + +stdenv.mkDerivation rec { + name = "percona-server-${version}"; + version = "5.6.35-80.0"; + + src = fetchurl { + url = "https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${version}/source/tarball/percona-server-${version}.tar.gz"; + sha256 = "0szjywx902da09pg8yqj8l2acplmh69hn5smrk45i291qsi5m6r5"; + }; + + buildInputs = [ cmake bison ncurses openssl zlib libaio perl ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DFEATURE_SET=community" + "-DBUILD_CONFIG=mysql_release" + "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + "-DWITH_SSL=yes" + "-DWITH_READLINE=no" + "-DWITH_EMBEDDED_SERVER=no" + "-DWITH_EDITLINE=bundled" + "-DWITH_ZLIB=yes" + "-DHAVE_IPV6=no" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_SYSCONFDIR=etc/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_SCRIPTDIR=bin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + ]; + + NIX_LDFLAGS = "-lgcc_s"; + + prePatch = '' + sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake + ''; + postInstall = '' + sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db + rm -r $out/mysql-test $out/sql-bench $out/data "$out"/lib/*.a + rm $out/share/man/man1/mysql-test-run.pl.1 + ''; + + passthru.mysqlVersion = "5.6"; + + meta = with stdenv.lib; { + homepage = "https://www.percona.com"; + description = "a free, fully compatible, enhanced, open source drop-in replacement for MySQL that provides superior performance, scalability and instrumentation"; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ grahamc ]; + }; +} diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 5f6b3904155..b0b8f926d9e 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { description = "SQL/RDF database used by, e.g., KDE-nepomuk"; homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; platforms = platforms.linux; - maintainers = [ maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index 2087829084f..a24daa70812 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; #configure: The current version [...] can only be built on 64bit platforms platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 8a411f0c1a5..a11618d24f5 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "5.4.11"; + version = "5.4.14"; src = fetchurl { url = "https://dl.ubnt.com/unifi/${version}/UniFi.unix.zip"; - sha256 = "18hd0w1zif6x9yxmfpwm7vbd07n705lf36yhg3z8fy04an6njgv2"; + sha256 = "16scryd8g0dsswawwadxxqsirir6mn0jaawv3qcszqj52vlz878w"; }; buildInputs = [ unzip ]; diff --git a/pkgs/servers/web-apps/pump.io/composition.nix b/pkgs/servers/web-apps/pump.io/composition.nix index d413475389f..ee4dab5ad64 100644 --- a/pkgs/servers/web-apps/pump.io/composition.nix +++ b/pkgs/servers/web-apps/pump.io/composition.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/web-apps/pump.io/node-packages.nix b/pkgs/servers/web-apps/pump.io/node-packages.nix index a275ef4ca40..ca27c79fab9 100644 --- a/pkgs/servers/web-apps/pump.io/node-packages.nix +++ b/pkgs/servers/web-apps/pump.io/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -13,13 +13,13 @@ let sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"; }; }; - "bunyan-1.8.8" = { + "bunyan-1.8.9" = { name = "bunyan"; packageName = "bunyan"; - version = "1.8.8"; + version = "1.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.8.tgz"; - sha1 = "6549ed6db088e4d82b7be3bcc6d0697159f6e209"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.9.tgz"; + sha1 = "2c7c9d422ea64ee2465d52b4decd72de0657401a"; }; }; "colors-1.1.2" = { @@ -131,13 +131,13 @@ let sha1 = "0c2903ee5c54e63d65a96170764703550665a3de"; }; }; - "express-session-1.15.1" = { + "express-session-1.15.2" = { name = "express-session"; packageName = "express-session"; - version = "1.15.1"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.15.1.tgz"; - sha1 = "9abba15971beea7ad98da5a4d25ed92ba4a2984e"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz"; + sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4"; }; }; "gm-1.23.0" = { @@ -149,13 +149,13 @@ let sha1 = "80a2fe9cbf131515024846444658461269f52661"; }; }; - "helmet-3.4.1" = { + "helmet-3.5.0" = { name = "helmet"; packageName = "helmet"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/helmet/-/helmet-3.4.1.tgz"; - sha1 = "27d37629227f25a110f2a128bfe1b1028648a397"; + url = "https://registry.npmjs.org/helmet/-/helmet-3.5.0.tgz"; + sha1 = "e1d6de27d2e3317d3182e00d672df3d0e1e12539"; }; }; "jade-1.11.0" = { @@ -185,13 +185,13 @@ let sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e"; }; }; - "method-override-2.3.7" = { + "method-override-2.3.8" = { name = "method-override"; packageName = "method-override"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz"; - sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5"; + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.8.tgz"; + sha1 = "178234bf4bab869f89df9444b06fc6147b44828c"; }; }; "mkdirp-0.5.1" = { @@ -374,13 +374,13 @@ let sha1 = "dd476b81b8200269ea0cc85f6b6decd05799bce9"; }; }; - "databank-lrucache-0.1.2" = { + "databank-lrucache-0.1.3" = { name = "databank-lrucache"; packageName = "databank-lrucache"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.2.tgz"; - sha1 = "846d3bbc3d908ea2880baf9a611d86a28697c640"; + url = "https://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.3.tgz"; + sha1 = "a68fbf6bb5f2e1dab81f5a410065484889a0eeef"; }; }; "bindings-1.2.1" = { @@ -428,13 +428,13 @@ let sha1 = "81a098f447e4bbc3ff3312a243521bc060ef5911"; }; }; - "moment-2.17.1" = { + "moment-2.18.1" = { name = "moment"; packageName = "moment"; - version = "2.17.1"; + version = "2.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz"; - sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82"; + url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; + sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; }; }; "nan-2.5.1" = { @@ -896,13 +896,13 @@ let sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; }; }; - "compressible-2.0.9" = { + "compressible-2.0.10" = { name = "compressible"; packageName = "compressible"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.9.tgz"; - sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz"; + sha1 = "feda1c7f7617912732b29bf8cf26252a20b9eecd"; }; }; "vary-1.0.1" = { @@ -914,13 +914,13 @@ let sha1 = "99e4981566a286118dfb2b817357df7993376d10"; }; }; - "mime-types-2.1.14" = { + "mime-types-2.1.15" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.14"; + version = "2.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"; - sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"; + sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed"; }; }; "negotiator-0.5.3" = { @@ -932,13 +932,13 @@ let sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; }; }; - "mime-db-1.26.0" = { + "mime-db-1.27.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.26.0"; + version = "1.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"; - sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"; + sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1"; }; }; "ms-0.7.1" = { @@ -950,22 +950,13 @@ let sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }; }; - "csrf-3.0.5" = { + "csrf-3.0.6" = { name = "csrf"; packageName = "csrf"; - version = "3.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.0.5.tgz"; - sha1 = "3c3aa86f395dd39f86d68fcf1734a2380f466112"; - }; - }; - "base64-url-1.3.3" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.3.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz"; - sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f"; + url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz"; + sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a"; }; }; "rndm-1.2.0" = { @@ -1202,13 +1193,13 @@ let sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; }; }; - "node-uuid-1.4.7" = { + "node-uuid-1.4.8" = { name = "node-uuid"; packageName = "node-uuid"; - version = "1.4.7"; + version = "1.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; - sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; + sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; }; }; "set-immediate-0.1.1" = { @@ -1391,13 +1382,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.2.0" = { + "hosted-git-info-2.4.1" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.2.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz"; - sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz"; + sha1 = "4b0445e41c004a8bd1337773a4ff790ca40318c8"; }; }; "is-builtin-module-1.0.0" = { @@ -1850,13 +1841,13 @@ let sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; }; }; - "debug-2.6.1" = { + "debug-2.6.3" = { name = "debug"; packageName = "debug"; - version = "2.6.1"; + version = "2.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; - sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; + url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz"; + sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d"; }; }; "array-parallel-0.1.3" = { @@ -1895,13 +1886,13 @@ let sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e"; }; }; - "which-1.2.12" = { + "which-1.2.14" = { name = "which"; packageName = "which"; - version = "1.2.12"; + version = "1.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz"; - sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192"; + url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; + sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; }; }; "pseudomap-1.0.2" = { @@ -1913,22 +1904,22 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "yallist-2.0.0" = { + "yallist-2.1.2" = { name = "yallist"; packageName = "yallist"; - version = "2.0.0"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"; - sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4"; + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; - "isexe-1.1.2" = { + "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; - version = "1.1.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz"; - sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0"; + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; "connect-3.6.0" = { @@ -1967,13 +1958,13 @@ let sha1 = "7bcad469ee7b96e91d12ceb3959c78235a9272e9"; }; }; - "helmet-csp-2.3.0" = { + "helmet-csp-2.4.0" = { name = "helmet-csp"; packageName = "helmet-csp"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.3.0.tgz"; - sha1 = "bc341939dfef5266cc817abcf53f079f61fe7e3f"; + url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.4.0.tgz"; + sha1 = "7e53a157167a0645aadd7177d12ae6c605c1842e"; }; }; "hide-powered-by-1.0.0" = { @@ -2039,6 +2030,15 @@ let sha1 = "898afb93869b24661cf9c52f9ee8db8ed0764dd9"; }; }; + "debug-2.6.1" = { + name = "debug"; + packageName = "debug"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; + sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; + }; + }; "finalhandler-1.0.0" = { name = "finalhandler"; packageName = "finalhandler"; @@ -2156,13 +2156,13 @@ let sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; }; }; - "uglify-js-2.8.9" = { + "uglify-js-2.8.20" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.8.9"; + version = "2.8.20"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.9.tgz"; - sha1 = "01194b91cc0795214093c05594ef5ac1e0b2e900"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; + sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; }; }; "void-elements-2.0.1" = { @@ -2345,15 +2345,6 @@ let sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; }; }; - "uglify-to-browserify-1.0.2" = { - name = "uglify-to-browserify"; - packageName = "uglify-to-browserify"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; - }; - }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -2363,6 +2354,15 @@ let sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; + "uglify-to-browserify-1.0.2" = { + name = "uglify-to-browserify"; + packageName = "uglify-to-browserify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + }; + }; "camelcase-1.2.1" = { name = "camelcase"; packageName = "camelcase"; @@ -2462,13 +2462,13 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "is-buffer-1.1.4" = { + "is-buffer-1.1.5" = { name = "is-buffer"; packageName = "is-buffer"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"; - sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b"; + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; + sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; }; }; "acorn-1.2.2" = { @@ -2543,13 +2543,13 @@ let sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"; }; }; - "request-2.80.0" = { + "request-2.81.0" = { name = "request"; packageName = "request"; - version = "2.80.0"; + version = "2.81.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.80.0.tgz"; - sha1 = "8cc162d76d79381cdefdd3505d76b80b60589bd0"; + url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; + sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; }; }; "sax-1.2.2" = { @@ -2840,13 +2840,22 @@ let sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; }; }; - "qs-6.3.2" = { + "qs-6.4.0" = { name = "qs"; packageName = "qs"; - version = "6.3.2"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz"; - sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c"; + url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; + sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + }; + }; + "safe-buffer-5.0.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; + sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; }; }; "stringstream-0.0.5" = { @@ -2858,13 +2867,13 @@ let sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; }; }; - "tunnel-agent-0.4.3" = { + "tunnel-agent-0.6.0" = { name = "tunnel-agent"; packageName = "tunnel-agent"; - version = "0.4.3"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; - sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; }; "delayed-stream-1.0.0" = { @@ -2885,13 +2894,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "ajv-4.11.4" = { + "ajv-4.11.5" = { name = "ajv"; packageName = "ajv"; - version = "4.11.4"; + version = "4.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.4.tgz"; - sha1 = "ebf3a55d4b132ea60ff5847ae85d2ef069960b45"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz"; + sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd"; }; }; "har-schema-1.0.5" = { @@ -2975,13 +2984,13 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.3.1" = { + "jsprim-1.4.0" = { name = "jsprim"; packageName = "jsprim"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; - sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; + sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; }; }; "sshpk-1.11.0" = { @@ -2993,6 +3002,15 @@ let sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"; }; }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; "extsprintf-1.0.2" = { name = "extsprintf"; packageName = "extsprintf"; @@ -3029,15 +3047,6 @@ let sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; }; }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -3119,22 +3128,13 @@ let sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; }; }; - "debug-2.3.3" = { - name = "debug"; - packageName = "debug"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; - sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; - }; - }; - "vary-1.1.0" = { + "vary-1.1.1" = { name = "vary"; packageName = "vary"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz"; - sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140"; + url = "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz"; + sha1 = "67535ebb694c1d52257457984665323f587e8d37"; }; }; "minimist-0.0.8" = { @@ -3236,13 +3236,13 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; - "readable-stream-2.2.3" = { + "readable-stream-2.2.6" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.3"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.3.tgz"; - sha1 = "9cf49463985df016c8ae8813097a9293a9b33729"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz"; + sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816"; }; }; "dom-serializer-0.1.0" = { @@ -3587,13 +3587,13 @@ let sha1 = "ef063df1f1aaceb8507ce70f7de6cb32980e874b"; }; }; - "mongodb-2.2.24" = { + "mongodb-2.2.25" = { name = "mongodb"; packageName = "mongodb"; - version = "2.2.24"; + version = "2.2.25"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.24.tgz"; - sha1 = "80f40d6ec5bdec0ddecf0f9ce0144e794c46449a"; + url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.25.tgz"; + sha1 = "d3b25dad00eda2bdfcbc996210ba082ac686a6b6"; }; }; "setimmediate-1.0.5" = { @@ -3614,13 +3614,13 @@ let sha1 = "ec56233868032909207170c39448e24449dd1fc4"; }; }; - "mongodb-core-2.1.8" = { + "mongodb-core-2.1.9" = { name = "mongodb-core"; packageName = "mongodb-core"; - version = "2.1.8"; + version = "2.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.8.tgz"; - sha1 = "b33e0370d0a59d97b6cb1ec610527be9e95ca2c0"; + url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.9.tgz"; + sha1 = "85aa71ee4fb716196e06b787557bf139f801daf5"; }; }; "readable-stream-2.1.5" = { @@ -3677,15 +3677,6 @@ let sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; }; }; - "lru-cache-2.3.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; - sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; - }; - }; }; args = { name = "pump.io"; @@ -3699,7 +3690,7 @@ let sources."nan-2.3.5" ]; }) - (sources."bunyan-1.8.8" // { + (sources."bunyan-1.8.9" // { dependencies = [ (sources."dtrace-provider-0.8.1" // { dependencies = [ @@ -3742,7 +3733,7 @@ let ]; }) sources."safe-json-stringify-1.0.4" - sources."moment-2.17.1" + sources."moment-2.18.1" ]; }) sources."colors-1.1.2" @@ -3774,17 +3765,17 @@ let dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) sources."negotiator-0.5.3" ]; }) - (sources."compressible-2.0.9" // { + (sources."compressible-2.0.10" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) sources."vary-1.0.1" @@ -3798,9 +3789,8 @@ let sources."content-type-1.0.2" (sources."csurf-1.8.3" // { dependencies = [ - (sources."csrf-3.0.5" // { + (sources."csrf-3.0.6" // { dependencies = [ - sources."base64-url-1.3.3" sources."rndm-1.2.0" sources."tsscmp-1.0.5" (sources."uid-safe-2.1.4" // { @@ -3822,9 +3812,9 @@ let dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) sources."negotiator-0.6.1" @@ -3908,9 +3898,9 @@ let }) sources."batch-0.5.3" sources."escape-html-1.0.3" - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) ]; @@ -3923,9 +3913,9 @@ let (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) ]; @@ -3943,7 +3933,7 @@ let (sources."connect-databank-1.0.3" // { dependencies = [ sources."async-1.5.2" - sources."node-uuid-1.4.7" + sources."node-uuid-1.4.8" sources."set-immediate-0.1.1" ]; }) @@ -3967,9 +3957,9 @@ let (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) ]; @@ -4007,7 +3997,7 @@ let sources."minimist-1.2.0" (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.1" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -4178,12 +4168,12 @@ let sources."vary-1.0.1" ]; }) - (sources."express-session-1.15.1" // { + (sources."express-session-1.15.2" // { dependencies = [ sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."crc-3.4.4" - (sources."debug-2.6.1" // { + (sources."debug-2.6.3" // { dependencies = [ sources."ms-0.7.2" ]; @@ -4208,12 +4198,12 @@ let (sources."lru-cache-4.0.2" // { dependencies = [ sources."pseudomap-1.0.2" - sources."yallist-2.0.0" + sources."yallist-2.1.2" ]; }) - (sources."which-1.2.12" // { + (sources."which-1.2.14" // { dependencies = [ - sources."isexe-1.1.2" + sources."isexe-2.0.0" ]; }) ]; @@ -4225,7 +4215,7 @@ let }) ]; }) - (sources."helmet-3.4.1" // { + (sources."helmet-3.5.0" // { dependencies = [ (sources."connect-3.6.0" // { dependencies = [ @@ -4254,7 +4244,7 @@ let sources."dns-prefetch-control-0.1.0" sources."dont-sniff-mimetype-1.0.0" sources."frameguard-3.0.0" - (sources."helmet-csp-2.3.0" // { + (sources."helmet-csp-2.4.0" // { dependencies = [ sources."camelize-1.0.0" (sources."content-security-policy-builder-1.1.0" // { @@ -4342,10 +4332,9 @@ let }) ]; }) - (sources."uglify-js-2.8.9" // { + (sources."uglify-js-2.8.20" // { dependencies = [ sources."source-map-0.5.6" - sources."uglify-to-browserify-1.0.2" (sources."yargs-3.10.0" // { dependencies = [ sources."camelcase-1.2.1" @@ -4357,7 +4346,7 @@ let dependencies = [ (sources."kind-of-3.1.0" // { dependencies = [ - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" ]; }) sources."longest-1.0.1" @@ -4373,7 +4362,7 @@ let dependencies = [ (sources."kind-of-3.1.0" // { dependencies = [ - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" ]; }) sources."longest-1.0.1" @@ -4389,6 +4378,7 @@ let sources."window-size-0.1.0" ]; }) + sources."uglify-to-browserify-1.0.2" ]; }) sources."void-elements-2.0.1" @@ -4436,7 +4426,7 @@ let }) sources."nwmatcher-1.3.9" sources."parse5-1.5.1" - (sources."request-2.80.0" // { + (sources."request-2.81.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.6.0" @@ -4455,7 +4445,7 @@ let }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.4" // { + (sources."ajv-4.11.5" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -4479,8 +4469,9 @@ let (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.1" // { + (sources."jsprim-1.4.0" // { dependencies = [ + sources."assert-plus-1.0.0" sources."extsprintf-1.0.2" sources."json-schema-0.2.3" sources."verror-1.3.6" @@ -4504,16 +4495,17 @@ let sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" - sources."qs-6.3.2" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" ]; }) sources."sax-1.2.2" @@ -4532,16 +4524,16 @@ let sources."xml-name-validator-2.0.1" ]; }) - (sources."method-override-2.3.7" // { + (sources."method-override-2.3.8" // { dependencies = [ - (sources."debug-2.3.3" // { + (sources."debug-2.6.3" // { dependencies = [ sources."ms-0.7.2" ]; }) sources."methods-1.1.2" sources."parseurl-1.3.1" - sources."vary-1.1.0" + sources."vary-1.1.1" ]; }) (sources."mkdirp-0.5.1" // { @@ -4605,7 +4597,7 @@ let }) sources."entities-1.1.1" sources."inherits-2.0.3" - (sources."readable-stream-2.2.3" // { + (sources."readable-stream-2.2.6" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -4713,7 +4705,7 @@ let }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.1" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -4828,15 +4820,15 @@ let sources."setimmediate-1.0.5" ]; }) - (sources."debug-2.6.1" // { + (sources."debug-2.6.3" // { dependencies = [ sources."ms-0.7.2" ]; }) - (sources."mongodb-2.2.24" // { + (sources."mongodb-2.2.25" // { dependencies = [ sources."es6-promise-3.2.1" - (sources."mongodb-core-2.1.8" // { + (sources."mongodb-core-2.1.9" // { dependencies = [ sources."bson-1.0.4" (sources."require_optional-1.0.0" // { @@ -4869,11 +4861,16 @@ let sources."underscore-1.6.0" ]; }) - (sources."databank-lrucache-0.1.2" // { + (sources."databank-lrucache-0.1.3" // { dependencies = [ - sources."underscore-1.5.2" - sources."lru-cache-2.3.1" - sources."set-immediate-0.1.1" + sources."databank-1.0.1" + (sources."lru-cache-4.0.2" // { + dependencies = [ + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + ]; + }) + sources."setimmediate-1.0.5" ]; }) ]; diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 4efb1ca9de6..c7067ffbd53 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wallabag-${version}"; - version = "2.1.6"; + version = "2.2.2"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { - url = "https://framabag.org/wallabag-release-${version}.tar.gz"; - sha256 = "0znywkrjlmxhacfkdyba2cjhgmrh509mayrfsrnc0rx3haxam7fx"; + url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; + sha256 = "0l8zba2risi8lsmff0fbgplfqdiqp7jz0f93z4lbqv8iavaqpna0"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 2d247148aee..878e8480bb9 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,8 +2,8 @@ { fetchFromGitHub, lib } : fetchFromGitHub { owner = "WordPress"; repo = "WordPress"; - rev = "4.7.3"; - sha256 = "05gggm40065abylp6bdc0zn0q6ahcggyh4q6rk0ak242q8v5fm5b"; + rev = "4.7.4"; + sha256 = "1ia9d3n085x2r6pvdrv4rk6gdp6xhjhpsq5g7a6448xzv9hf14ri"; meta = { homepage = https://wordpress.org; description = "WordPress is open source software you can use to create a beautiful website, blog, or app."; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 49e71614bf9..a4de1ecda43 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1604,11 +1604,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.23.0"; + name = "xf86-input-libinput-0.25.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2; - sha256 = "1p596v3kbmjpdz3kz8z19bnd79l860f1pbwjvma7bz7qx3gynlqb"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2; + sha256 = "0vsmijamfzf6vcljrr0am2qcz33zl2l0lj2mzmbwgrm7ixjx2zxv"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1670,11 +1670,11 @@ let }) // {inherit ;}; xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { - name = "xf86-video-amdgpu-1.2.0"; + name = "xf86-video-amdgpu-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2; - sha256 = "13vcwxswhzq611ly890fcl11vkpai7gs303l7nx5azqjbyn1lnr7"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2; + sha256 = "0w2f7xz44pym2k5kr76p983dwbc2f2p2jazpff999giqi4i0yqy1"; }; buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1703,11 +1703,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.8.0"; + name = "xf86-video-ati-7.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2; - sha256 = "1ynnm4v4261xmg94b7jam9hjyym4n2nqba23rv23v3wjfbkms7s0"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2; + sha256 = "0xcq0lncb5p4sas5866qpkjyp1v8ksalw7m1gmqb3brhccp8gb9w"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1869,11 +1869,11 @@ let }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; xf86videonouveau = (mkDerivation "xf86videonouveau" { - name = "xf86-video-nouveau-1.0.13"; + name = "xf86-video-nouveau-1.0.14"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2; - sha256 = "1js7vak68g2800f1cy5r41wl5x2j7dbmbd7zxypzfgcw2fx454kd"; + url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.14.tar.bz2; + sha256 = "1h9izq510m2pvg77d0y9krc0cvvbhp2y3xlrrz6id7y47jdzkpsd"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1891,11 +1891,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoopenchrome = (mkDerivation "xf86videoopenchrome" { - name = "xf86-video-openchrome-0.3.3"; + name = "xf86-video-openchrome-0.6.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2; - sha256 = "1v8j4i1r268n4fc5gq54zg1x50j0rhw71f3lba7411mcblg2z7p4"; + url = mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2; + sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; }; buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2364,11 +2364,11 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.19.2"; + name = "xorg-server-1.19.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.19.2.tar.bz2; - sha256 = "1fw4b2lf75nsqkiyhn95b1c2if1l3cw5a188a1szx1d8l7sbk2jg"; + url = mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2; + sha256 = "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7"; }; buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c7a4ff20a73..99c9ffa14c2 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -340,7 +340,6 @@ in xf86videoglide = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videoi128 = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videonewport = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; - xf86videoopenchrome = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videotga = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videov4l = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videovoodoo = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 4aeace9f0c2..ee85de75b40 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -122,16 +122,16 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-nouveau-1.0.14.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 @@ -148,7 +148,7 @@ mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 -mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2 +mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 @@ -185,7 +185,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index 2a87eeb7cb5..ebdc73aec30 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed -e '/configFiles/iimport os' -i config.py cp * $out/share/${name} cat > $out/bin/pyIRCt <<EOF - #! /bin/sh + #!${stdenv.shell} cd $out/share/${name} ./irc.py \"$@\" EOF diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index deb8b8ce7d1..aeed7484f82 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sed -e '/configFiles/iimport os' -i config.py cp * $out/share/$name cat > $out/bin/pyMAILt <<EOF - #! /bin/sh + #!${stdenv.shell} cd $out/share/${name} ./mail.py \"$@\" EOF |