diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/computing/slurm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/dns/nsd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/lighttpd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/unit/default.nix | 67 | ||||
-rw-r--r-- | pkgs/servers/hydron/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/hydron/deps.nix | 34 | ||||
-rw-r--r-- | pkgs/servers/lidarr/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/mail/rspamd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/meguca/default.nix | 12 | ||||
-rw-r--r-- | pkgs/servers/meguca/server_deps.nix | 151 | ||||
-rw-r--r-- | pkgs/servers/minio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/node-exporter.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/mqtt/mosquitto/default.nix | 13 | ||||
-rw-r--r-- | pkgs/servers/nextcloud/default.nix | 10 | ||||
-rw-r--r-- | pkgs/servers/owncloud/default.nix | 65 | ||||
-rw-r--r-- | pkgs/servers/plex/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/sql/mysql/5.5.x.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 14 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 6 |
20 files changed, 214 insertions, 209 deletions
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 053fadc8af58..c30ee04623db 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "18.08.3.1"; + version = "18.08.4.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "1dz5hgnlsld8b8vrbckk3mj7cqrv662wsp0s9z4x8wafygz3zx07"; + sha256 = "1vnlh1fazqa1rhiq5sm3dxgnwf4ipli357686r5w8cgij3m7qj98"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 5f330c4f06e2..8c0fc7377661 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.25"; + name = "nsd-4.1.26"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "0zyzjd3wmq258jiry62ci1z23qfd0rc5ggnpmybc60xvpddgynwg"; + sha256 = "1x0mvj4872dzj1rr9adnchdm4dhn41xmc459p5j4s0r13m1l32lz"; }; prePatch = '' diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 9503fd14907c..cdebbf739e6a 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -13,11 +13,11 @@ assert enableWebDAV -> sqlite != null; assert enableWebDAV -> libuuid != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.51"; + name = "lighttpd-1.4.52"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "10lw9vvivpvf4aw7ajayb2yyq4lp4dq3gq9llszjbw6icnrgvy9a"; + sha256 = "0r57zp7050qxlwg41xqnqnhw3lrl34cg5zvfbqrwddrhqn8hkg17"; }; postPatch = '' diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix new file mode 100644 index 000000000000..38212885541f --- /dev/null +++ b/pkgs/servers/http/unit/default.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchurl +, which +, python +, php71 +, php72 +, php73 +, perl +, perldevel +, ruby_2_3 +, ruby_2_4 +, ruby +, withSSL ? true, openssl ? null +, withIPv6 ? true +, withDebug ? false +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "1.6"; + name = "unit-${version}"; + + src = fetchurl { + url = "https://unit.nginx.org/download/${name}.tar.gz"; + sha256 = "0lws5xpzkcmv0gc7vi8pgnymin02dq4gw0zb41jfzq0vbljxxl14"; + }; + + buildInputs = [ + which + python + php71 + php72 + php73 + perl + perldevel + ruby_2_3 + ruby_2_4 + ruby + ] ++ optional withSSL openssl; + + configureFlags = [ + "--control=unix:/run/control.unit.sock" + "--pid=/run/unit.pid" + ] ++ optional withSSL [ "--openssl" ] + ++ optional (!withIPv6) [ "--no-ipv6" ] + ++ optional withDebug [ "--debug" ]; + + postConfigure = '' + ./configure python --module=python --config=${python}/bin/python-config --lib-path=${python}/lib + ./configure php --module=php71 --config=${php71.dev}/bin/php-config --lib-path=${php71}/lib + ./configure php --module=php72 --config=${php72.dev}/bin/php-config --lib-path=${php72}/lib + ./configure php --module=php73 --config=${php73.dev}/bin/php-config --lib-path=${php73}/lib + ./configure perl --module=perl --perl=${perl}/bin/perl + ./configure perl --module=perl529 --perl=${perldevel}/bin/perl + ./configure ruby --module=ruby23 --ruby=${ruby_2_3}/bin/ruby + ./configure ruby --module=ruby24 --ruby=${ruby_2_4}/bin/ruby + ./configure ruby --module=ruby --ruby=${ruby}/bin/ruby + ''; + + meta = { + description = "Dynamic web and application server, designed to run applications in multiple languages."; + homepage = https://unit.nginx.org/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 012b66e19809..c96eed7a57b3 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -3,15 +3,15 @@ buildGoPackage rec { name = "hydron-unstable-${version}"; - version = "2018-09-25"; + version = "2018-10-08"; goPackagePath = "github.com/bakape/hydron"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "bakape"; repo = "hydron"; - rev = "ad88ec03e5c7a527fddebb6b54909f50ecaae00c"; - sha256 = "074bzl38f4y4xs4vavbn7mgi4srv1fbzkcx4p17mrqipzk6ffbca"; + rev = "0a834bcaf9af3a6bac8873fad981aa3736115258"; + sha256 = "154s1jjcdcwaxial2gsxaqb8bc1hwagz844ld2jr928jxj7ffqww"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix index b2c367cf42d6..92ac9a8325d9 100644 --- a/pkgs/servers/hydron/deps.nix +++ b/pkgs/servers/hydron/deps.nix @@ -1,12 +1,12 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "github.com/Masterminds/squirrel"; fetch = { type = "git"; url = "https://github.com/Masterminds/squirrel"; - rev = "3b6e9e96624526bce05b577b76ca726a20bb3c83"; - sha256 = "16jw3af3lyb5x9yn7anx0rb3mz70bivnixkvh8dzrq16wkkn760h"; + rev = "e5bf00f96d4a5779be0d78f7565598856cae9b47"; + sha256 = "13fkdc4kbdmbl42i80lm5x9aqnwlhj2c6s6y5vsblmw042p7012q"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "326c44736983c316d20c036ce34ca79ce9b96b01"; - sha256 = "1a1dniz0zbihk7971z2ln6hlsbvkk13lghgjz346lw4lfc105kxk"; + rev = "f191a43e9c3c7c9522a67dd81ed1aec9cea0280d"; + sha256 = "065qxhc83ncfxl813gm2f80pydkilnyim0q4wv08xm4gz3010s1x"; }; } { @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/dimfeld/httptreemux"; - rev = "a53c8f73d4b7d82c30b7e5ab6aa155b981c42fb5"; - sha256 = "08s90ggydcwz2683bbsrc33h2b7x2q5ws104gva838b573xzrhqj"; + rev = "0ffa82afd135e2aafd48602dc46843cb86304f7d"; + sha256 = "0akariyk9igr25rbjkvq7v1hwx8llld6d2dalkdla9jsh7iw6ddj"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/handlers"; - rev = "7e0369fae54b097612a946bc6709f3a3fbccb3de"; - sha256 = "00i2is2z7101igf7sr8prmd8m59x7k7xdkhm5h4bjs37k157zm38"; + rev = "350d97a79266938cd77a9192b7d995132d4e2b5b"; + sha256 = "1rk69bnhcp4s4cv7hwsafag8d3fj1mgxli0bkazc69ig90a71h1b"; }; } { @@ -59,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/lib/pq"; - rev = "4ded0e9383f75c197b3a2aaa6d590ac52df6fd79"; - sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; + rev = "9eb73efc1fcc404148b56765b0d3f61d9a5ef8ee"; + sha256 = "17wkjdz265iqf92gj3ljslvjcqvkfblw11jdq2scc3kp1hcsfr10"; }; } { @@ -68,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-sqlite3"; - rev = "e85a2792f3166972d6619b7051f01a2df254192a"; - sha256 = "088bckqifg61xdda0f0hrcyzm3dslr3jzcsgdyk8ccjmjv2112sd"; + rev = "6a9185d7b1f12363e2c904449d374b63b6093b16"; + sha256 = "1yb04vhzkaxnm11i34lpcdgzmcydfnlky3xxj9q2hm1wd7hn3hki"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/valyala/quicktemplate"; - rev = "dc50ff9977a68a543145ce34e0e0030bebcc89be"; - sha256 = "1980q2c5w4jhrlhf1pimc8yrkz005x3jbsi7hk4hnx6d5iy5lmb6"; + rev = "4c04039b1358b0f49af22a699f9193f05d80be40"; + sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5"; }; } { @@ -95,8 +95,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "f04abc6bdfa7a0171a8a0c9fd2ada9391044d056"; - sha256 = "0mygvmprcssixj3bm2djl3xzdnyh4zqhkwhynzml5rha8mvrxknd"; + rev = "351d144fa1fc0bd934e2408202be0c29f25e35a0"; + sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k"; }; } ] diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index 9bffb27665dd..897c061c918d 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lidarr-${version}"; - version = "0.4.0.524"; + version = "0.5.0.583"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.develop.${version}.linux.tar.gz"; - sha256 = "121898v8n9sr9wwys65c28flpmk941wk6df11bb47pfjcalrr3bj"; + sha256 = "0vqnx8vd7mv4lsl7ffsjanl9pm107bk3ndvfka2ky74qisrqcyz7"; }; buildInputs = [ diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index c5dfc4a90fd4..fda7a1a80ef7 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -14,13 +14,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "0al4d8h3ssxcx191d4crywz7dsp61lklc9m5z36a90a8w97v76bv"; + sha256 = "1aikmscb3hywac4sf4xkl4kw0x3syzphfrmxhigz2jjqzxn8f50k"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index f6f4ee2e121e..504df8bae0cb 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -1,27 +1,27 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full, ghostscript -, graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten }: +, graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten, opencv }: buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-08-13"; + version = "2018-12-06"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; src = fetchFromGitHub { owner = "bakape"; repo = "meguca"; - rev = "f8b54370ba74b90f2814e6b42ac003a51fe02ce9"; - sha256 = "1036qlvvz0la3fp514kw5qrplm1zsh23ywn2drigniacmqz4m7dv"; + rev = "300b007cab238838f813faa9aad6abb3f22ad4d2"; + sha256 = "1rvnvhkm8l7h9rvw9vr8pm1qrr3zz5x7vayaw0caqx99xlyp93r9"; fetchSubmodules = true; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten ]; + buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten opencv ]; buildPhase = '' export HOME=`pwd` - export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/go + export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/server cd $HOME/go/src/github.com/bakape/meguca ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules sed -i "/npm install --progress false --depth 0/d" Makefile diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix index cc08645547d3..5dc53820a9d2 100644 --- a/pkgs/servers/meguca/server_deps.nix +++ b/pkgs/servers/meguca/server_deps.nix @@ -1,4 +1,4 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "github.com/ErikDubbelboer/gspt"; @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/squirrel"; - rev = "8a7e65843414bc07f3d85bebaa10d7cc96253c29"; - sha256 = "0n7msdji0h7iysyqsi0iiq9i1hdgyyz9cwzxpc6qppz7cllnfpnn"; + rev = "e5bf00f96d4a5779be0d78f7565598856cae9b47"; + sha256 = "13fkdc4kbdmbl42i80lm5x9aqnwlhj2c6s6y5vsblmw042p7012q"; }; } { @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/PuerkitoBio/goquery"; - rev = "dc2ec5c7ca4d9aae063b79b9f581dd3ea6afd2b2"; - sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2"; + rev = "2d2796f41742ece03e8086188fa4db16a3a0b458"; + sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/andybalholm/cascadia"; - rev = "901648c87902174f774fac311d7f176f8647bdaa"; - sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; + rev = "680b6a57bda4f657485ad44bdea42342ead737bc"; + sha256 = "0v95plagirbjlc4p00y9brhpvv4nm8q0gr63gcfs3shyh1a8xwbm"; }; } { @@ -59,8 +59,26 @@ fetch = { type = "git"; url = "https://github.com/badoux/goscraper"; - rev = "0213ced7087832e81e8892e8d044150cfc153856"; - sha256 = "0bw5g6h0hypd38z8gfbh40pbw824n4qhk3c0kasw6gn4darx972w"; + rev = "363803726ad4e2ab262b4e01362e98458df0b231"; + sha256 = "1p388s7jmyrr6p4ralhcg36jz1cw2mgra9brcp6m32lrc3mpws48"; + }; + } + { + goPackagePath = "github.com/bakape/boorufetch"; + fetch = { + type = "git"; + url = "https://github.com/bakape/boorufetch"; + rev = "4e9f999d98ed9a4e8374a516265dd4c7b4f4cca0"; + sha256 = "0jpf71nxm8msx3imgyl3jdpi8fsai3yp7ajapivghrwj7y0nr1d0"; + }; + } + { + goPackagePath = "github.com/bakape/captchouli"; + fetch = { + type = "git"; + url = "https://github.com/bakape/captchouli"; + rev = "6434ea655cf8f1fed6791877c74e5e2f2c396680"; + sha256 = "1n96g3c7i3gbk8blm6qgw9lcpmwq3s8yjp6l1krdladb0xpanwjm"; }; } { @@ -77,8 +95,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "326c44736983c316d20c036ce34ca79ce9b96b01"; - sha256 = "1a1dniz0zbihk7971z2ln6hlsbvkk13lghgjz346lw4lfc105kxk"; + rev = "f191a43e9c3c7c9522a67dd81ed1aec9cea0280d"; + sha256 = "065qxhc83ncfxl813gm2f80pydkilnyim0q4wv08xm4gz3010s1x"; }; } { @@ -91,21 +109,12 @@ }; } { - goPackagePath = "github.com/dchest/captcha"; - fetch = { - type = "git"; - url = "https://github.com/dchest/captcha"; - rev = "6a29415a8364ec2971fdc62d9e415ed53fc20410"; - sha256 = "0j0yspx5rlyx7fdfcx74viqc8jlq3nwyd62bdx4gvbd56cppldcm"; - }; - } - { goPackagePath = "github.com/dimfeld/httptreemux"; fetch = { type = "git"; url = "https://github.com/dimfeld/httptreemux"; - rev = "7f532489e7739b3d49df5c602bf63549881fe753"; - sha256 = "0hkw04rsvljvx8ynqjgz9cb743x09fd2xiiycrgz5vbsa8q9iyyk"; + rev = "0ffa82afd135e2aafd48602dc46843cb86304f7d"; + sha256 = "0akariyk9igr25rbjkvq7v1hwx8llld6d2dalkdla9jsh7iw6ddj"; }; } { @@ -158,8 +167,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/handlers"; - rev = "7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce"; - sha256 = "0mnw81ayjm4d8462qg8spmcwxmchn24158bf93zxjab51pg8n9gm"; + rev = "350d97a79266938cd77a9192b7d995132d4e2b5b"; + sha256 = "1rk69bnhcp4s4cv7hwsafag8d3fj1mgxli0bkazc69ig90a71h1b"; }; } { @@ -167,17 +176,17 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71"; - sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7"; + rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b"; + sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48"; }; } { - goPackagePath = "github.com/kardianos/osext"; + goPackagePath = "github.com/julienschmidt/httprouter"; fetch = { type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; - sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "26a05976f9bf5c3aa992cc20e8588c359418ee58"; + sha256 = "0bmvrgg373fxwqsr6nri01bmi9qdj6knxkmnbw70h9rmi2d9c585"; }; } { @@ -203,26 +212,17 @@ fetch = { type = "git"; url = "https://github.com/lib/pq"; - rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8"; - sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65"; - sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97"; + rev = "9eb73efc1fcc404148b56765b0d3f61d9a5ef8ee"; + sha256 = "17wkjdz265iqf92gj3ljslvjcqvkfblw11jdq2scc3kp1hcsfr10"; }; } { - goPackagePath = "github.com/mholt/archiver"; + goPackagePath = "github.com/mattn/go-sqlite3"; fetch = { type = "git"; - url = "https://github.com/mholt/archiver"; - rev = "e4ef56d48eb029648b0e895bb0b6a393ef0829c3"; - sha256 = "1krxyh6iq0s0rwhz7gg6dn795j9qq64rsgq9nivav7fhrqpgr6hb"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "6a9185d7b1f12363e2c904449d374b63b6093b16"; + sha256 = "1yb04vhzkaxnm11i34lpcdgzmcydfnlky3xxj9q2hm1wd7hn3hki"; }; } { @@ -230,8 +230,8 @@ fetch = { type = "git"; url = "https://github.com/nwaples/rardecode"; - rev = "e06696f847aeda6f39a8f0b7cdff193b7690aef6"; - sha256 = "1aj7l8ii7hxnn3q4wzxlx3f92b1aspck6ncyqgb4h2g228phcibw"; + rev = "197ef08ef68c4454ae5970a9c2692d6056ceb8d7"; + sha256 = "0vvijw7va283dbdvnf4bgkn7bjngxqzk1rzdpy8sl343r62bmh4g"; }; } { @@ -248,8 +248,8 @@ fetch = { type = "git"; url = "https://github.com/oschwald/maxminddb-golang"; - rev = "c5bec84d1963260297932a1b7a1753c8420717a7"; - sha256 = "0n8vhinm2x0prbn0vhxw38c24iiaizwk1b76s4srg30gk3dfdd39"; + rev = "ed835b22606182ff576f244643e52b25b7d6c4e7"; + sha256 = "0zm4nyxz89s05fkz0fcaab3dmm24cb24iwjbzh06a49dwvcxxrgw"; }; } { @@ -257,8 +257,8 @@ fetch = { type = "git"; url = "https://github.com/otium/ytdl"; - rev = "b071cb3eb1579608df3b52084a017c5753b325e6"; - sha256 = "01ankrjgdcw0ncwv0xzqh74xy22vdl2nza0arga72zrakpgk8nw0"; + rev = "0227c2bacb82a434f2332d7d8c64093615c08a40"; + sha256 = "1g5h6s5c860yamgr606l6ibpqx39676vas75c9426556hwgp3pqs"; }; } { @@ -266,8 +266,8 @@ fetch = { type = "git"; url = "https://github.com/pierrec/lz4"; - rev = "6b9367c9ff401dbc54fabce3fb8d972e799b702d"; - sha256 = "0bxxap7jn3wvqxr2yqn8m3aqgb9y94j9ci6fwjrk01caq575r1qs"; + rev = "623b5a2f4d2a41e411730dcdfbfdaeb5c0c4564e"; + sha256 = "1hhf7vyz5irrqs7ixdmvsvzmy9izv3ha8jbyy0cs486h61nzqkki"; }; } { @@ -275,8 +275,8 @@ fetch = { type = "git"; url = "https://github.com/sevlyar/go-daemon"; - rev = "f9261e73885de99b1647d68bedadf2b9a99ad11f"; - sha256 = "1c4h85a3qfdkd61k8ipk1ffi3sdflq4wqp6d6h43zrca528m9ddc"; + rev = "12616e426b1522ef2099701fafdd6ad9f476e8c1"; + sha256 = "1hakfpdxlqvdbp4c597ldf33s5yalsh5db6ym1xh5y7h27v8bk01"; }; } { @@ -284,8 +284,8 @@ fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "e4b0c6d7829bcf64435536c4a88f4088a3c76203"; - sha256 = "1s3m83wv1wjv95nhkbvml56c12z75x85wlmqill3zqvlm9az6bzg"; + rev = "29d7eb25e8ffa54207ff5a9a5c3d63e95be2cc39"; + sha256 = "1barxwfwnmsa45iqqrppzj830ypm500aq9w234gyyh1gdknijck4"; }; } { @@ -293,8 +293,8 @@ fetch = { type = "git"; url = "https://github.com/ulikunitz/xz"; - rev = "636d36a76670e6c700f22fd5f4588679ff2896c4"; - sha256 = "01d71xnhdd60cmd9xk8zcjiq2n7fhgc6kzxd0s0plvs70y6dk27g"; + rev = "590df8077fbcb06ad62d7714da06c00e5dd2316d"; + sha256 = "07mivr4aiw3b8qzwajsxyjlpbkf3my4xx23lv0yryc4pciam5lhy"; }; } { @@ -302,8 +302,8 @@ fetch = { type = "git"; url = "https://github.com/valyala/bytebufferpool"; - rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7"; - sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; + rev = "cdfbe9377474227bb42120c1e22fd4433e7f69bf"; + sha256 = "0c6cixd85dvl2gvs7sdh0k2wm8r3grl4fw0jg4w7d78cp8s2k7ag"; }; } { @@ -311,8 +311,8 @@ fetch = { type = "git"; url = "https://github.com/valyala/quicktemplate"; - rev = "a91e0946457b6583004fbfc159339b8171423aed"; - sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc"; + rev = "4c04039b1358b0f49af22a699f9193f05d80be40"; + sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5"; }; } { @@ -320,8 +320,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "de0752318171da717af4ce24d0a2e8626afaeb11"; - sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i"; + rev = "505ab145d0a99da450461ae2c1a9f6cd10d1f447"; + sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; }; } { @@ -329,8 +329,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "c39426892332e1bb5ec0a434a079bf82f5d30c54"; - sha256 = "1w26avkg623xilnwnad0cq6768cfbs4mxk875382xh0da6ai50s3"; + rev = "351d144fa1fc0bd934e2408202be0c29f25e35a0"; + sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k"; }; } { @@ -338,8 +338,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "14742f9018cd6651ec7364dc6ee08af0baaa1031"; - sha256 = "17k06vwhnlb18n9rb1cdcdqyjcn353znfrr4c90xb3carz1sqfq5"; + rev = "70b957f3b65e069b4930ea94e2721eefa0f8f695"; + sha256 = "146jwkr39asigqbsnsigxpkpb4vydld4k9q34xvvw0bp10qzjxxw"; }; } { @@ -347,8 +347,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "6e3c4e7365ddcc329f090f96e4348398f6310088"; - sha256 = "1r511ncipn7sdlssn06fpzcpy4mp4spagni4ryxq86p2b0bi8pn4"; + rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2"; + sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj"; }; } { @@ -360,4 +360,13 @@ sha256 = "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc"; }; } + { + goPackagePath = "gopkg.in/mholt/archiver.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mholt/archiver.v2"; + rev = "de0d89e255e17c8d75a40122055763e743ab0593"; + sha256 = "02fsc0za0yi3dg0r5caa8vpxz6kqxjxxlmwzzj5899dlmdvqk57g"; + }; + } ] diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 06ee65b01673..5b19d6dd37eb 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { name = "minio-${version}"; - version = "2018-07-31T02-11-47Z"; + version = "2018-12-06T01-27-43Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "0pngr2x15prn55r8xj59sqjn9yp98hhm5qgi12ybc6cfxx0wls52"; + sha256 = "0j10rhrg98zsv62sdc9wgrh2kdpv2179szvzyg8rm9rb89rzdhd2"; }; goPackagePath = "github.com/minio/minio"; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index eaa21fcd0a5d..c8e49a851e90 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.3.4"; + version = "5.4.2"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1fhzdkd1hr7l9cy7c9r03pgaxklfgj09q21ljrahqr006gcn1wgn"; + sha256 = "113cas1grvigfvgpkz3na6kaf2shfl7mpaikqsxn3z7xab7nqm96"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "06andnnnsh68lmra9gc85rsmyx88cwlq2kwzks1d5axpy2mq5arv"; + sha256 = "0rpq0q84619g5cixrcnzkvx6875g8mxc12gl8y5nzmq7zdavfa32"; }; postPatch = '' diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index bb86e59e4c33..9714a6048e88 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -4,7 +4,7 @@ # https://github.com/prometheus/node_exporter/issues/870 buildGo19Package rec { name = "node_exporter-${version}"; - version = "0.16.0"; + version = "0.17.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/node_exporter"; @@ -13,7 +13,7 @@ buildGo19Package rec { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "0rm6ahccgr1djpwvsa3p1kfal3mpy4a6g5w974pra84gk3krli5a"; + sha256 = "08g4dg6zcr95j88apsxp828jfyx4vq271w1mgkf77c46c16d2nh0"; }; # FIXME: tests fail due to read-only nix store diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 21fe01e8a343..c5ece477ced6 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -3,24 +3,15 @@ stdenv.mkDerivation rec { name = "mosquitto-${version}"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - sha256 = "0bknmnvssix7c1cps6mzjjnw9zxdlyfsy6ksqx4zfglcw41p8gnz"; + sha256 = "0pb38y6m682xqrkzhp41mj54x5ic43761xzschgnw055mzksbgk2"; }; - patches = [ - # https://github.com/eclipse/mosquitto/issues/983 - (fetchpatch { - url = "https://github.com/eclipse/mosquitto/commit/7f1419e4de981f5cc38aa3a9684369b1de27ba46.patch"; - sha256 = "05npr0h79mbaxzjyhdw78hi9gs1cwydf2fv67bqxm81jzj2yhx2s"; - name = "fix_threading_on_cmake.patch"; - }) - ]; - postPatch = '' substituteInPlace man/manpage.xsl \ --replace /usr/share/xml/docbook/stylesheet/ ${docbook_xsl}/share/xml/ diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index ecd3a5e5c9bf..0d9533b30f25 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,19 +2,13 @@ stdenv.mkDerivation rec { name = "nextcloud-${version}"; - version = "14.0.4"; + version = "15.0.0"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "1s20dds4sci3g981ql8kp9d1ynss5sa2y3dsbzqx4jv9f5dd2pag"; + sha256 = "0y7bk1588n5rmmranmmrkajh50074460hr4v052ahg9mf60wbc2v"; }; - patches = [ (fetchpatch { - name = "Mailer-discover-sendmail-path-instead-of-hardcoding-.patch"; - url = https://github.com/nextcloud/server/pull/11404.patch; - sha256 = "1h0cqnfwn735vqrm3yh9nh6a7h6srr9h29p13vywd6rqbcndqjjd"; - }) ]; - installPhase = '' mkdir -p $out/ cp -R . $out/ diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix deleted file mode 100644 index 14a4a2868f0e..000000000000 --- a/pkgs/servers/owncloud/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, fetchurl }: -let - common = { versiona, sha256 }: stdenv.mkDerivation (rec { - - name= "owncloud-${version}"; - version= versiona; - - src = fetchurl { - url = "https://download.owncloud.org/community/${name}.tar.bz2"; - inherit sha256; - }; - - installPhase = - '' - mkdir -p $out - find . -maxdepth 1 -execdir cp -r '{}' $out \; - - substituteInPlace $out/lib/base.php \ - --replace 'OC_Config::$object = new \OC\Config(self::$configDir);' \ - 'self::$configDir = getenv("OC_CONFIG_PATH"); OC_Config::$object = new \OC\Config(self::$configDir);' - ''; - - meta = { - description = "An enterprise file sharing solution for online collaboration and storage"; - homepage = https://owncloud.org; - maintainers = with stdenv.lib.maintainers; [ matejc ]; - license = stdenv.lib.licenses.agpl3Plus; - platforms = with stdenv.lib.platforms; unix; - }; - - }); - -in { - - owncloud70 = common { - versiona = "7.0.15"; - sha256 = "1b2a0fccxlkqyyzsymx7qw8qbhsks3i6h1ybvxv8nn8hgw33nqv7"; - }; - - owncloud80 = common { - versiona = "8.0.16"; - sha256 = "1pgfawrmx6n02h7h6g5wk0sa1kgablqa8ljfiywyw8znxxa5lnrm"; - }; - - owncloud81 = common { - versiona = "8.1.11"; - sha256 = "04izfzj3ckcs0x882kkggp6y7zcrhdihm71wkd9vk6j5fn8k9am0"; - }; - - owncloud82 = common { - versiona = "8.2.9"; - sha256 = "09gzpxd9gjg8h57m8j0r6xnr85fdb951ykwmjby811c6730769pw"; - }; - - owncloud90 = common { - versiona = "9.0.7"; - sha256 = "1j6xrd4dhc0v0maa3z8n392nfc9hrnvbxxyqr8g8kz88w9vbqa6h"; - }; - - owncloud91 = common { - versiona = "9.1.3"; - sha256 = "1sgnsj2ng14lh05n5kc3jv03xk6xnkyx7xj1rasxlqgvzwsyp8g0"; - }; - -} diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 4e783f3a507e..9561af537e30 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.13.9.5456"; - vsnHash = "ecd600442"; - sha256 = "6d1125d4e6eaa94a84f8c600230b867c2d0764644adbc959a96433b8fc210b61"; + version = "1.14.0.5470"; + vsnHash = "9d51fdfaa"; + sha256 = "cf547d286c731e98b19b70954f2777653fe77c30c329faab260c460374984010"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 36f5200d43bc..a24dee07de47 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.60"; + version = "5.5.62"; src = fetchurl { url = "mirror://mysql/MySQL-5.5/${name}.tar.gz"; - sha256 = "071xaamqkbscybqzm79gf2w3bkr9lqlzwafis3gzc8w8fkhi4hd3"; + sha256 = "1mwrzwk9ap09s430fpdkyhvx5j2syd3xj2hyfzvanjphq4xqbrxi"; }; patches = if stdenv.isCygwin then [ @@ -78,5 +78,6 @@ self = stdenv.mkDerivation rec { artistic1 bsd0 bsd2 bsd3 bsdOriginal gpl2 lgpl2 lgpl21 mit publicDomain licenses.zlib ]; + broken = stdenv.isAarch64; }; }; in self diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 6100cb2d1d1f..8c82385c1d84 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,9 +1,14 @@ -{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper, tzdata, systemd }: +{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper, tzdata, systemd, icu, pkgconfig }: let common = { version, sha256, psqlSchema }: - let atLeast = lib.versionAtLeast version; in stdenv.mkDerivation (rec { + let + atLeast = lib.versionAtLeast version; + + # Build with ICU by default on versions that support it + icuEnabled = atLeast "10"; + in stdenv.mkDerivation (rec { name = "postgresql-${version}"; inherit version; @@ -17,9 +22,12 @@ let buildInputs = [ zlib readline openssl libxml2 makeWrapper ] + ++ lib.optionals icuEnabled [ icu ] ++ lib.optionals (atLeast "9.6" && !stdenv.isDarwin) [ systemd ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; + nativeBuildInputs = lib.optionals icuEnabled [ pkgconfig ]; + enableParallelBuilding = !stdenv.isDarwin; makeFlags = [ "world" ]; @@ -37,7 +45,7 @@ let "--with-system-tzdata=${tzdata}/share/zoneinfo" (lib.optionalString (atLeast "9.6" && !stdenv.isDarwin) "--with-systemd") (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") - ]; + ] ++ lib.optionals icuEnabled [ "--with-icu" ]; patches = [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 95e427cf96b8..f7f401c148fa 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -643,11 +643,11 @@ self: super: xf86videointel = super.xf86videointel.overrideAttrs (attrs: { # the update script only works with released tarballs :-/ - name = "xf86-video-intel-2017-10-19"; + name = "xf86-video-intel-2018-12-03"; src = fetchurl { url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/" - + "4798e18b2b2c8b0a05dc967e6140fd9962bc1a73.tar.gz"; - sha256 = "1zpgbibfpdassswfj68zwhhfpvd2p80rpxw92bis6lv81ssknwby"; + + "e5ff8e1828f97891c819c919d7115c6e18b2eb1f.tar.gz"; + sha256 = "01136zljk6liaqbk8j9m43xxzqj6xy4v50yjgi7l7g6pp8pw0gx6"; }; buildInputs = attrs.buildInputs ++ [self.libXfixes self.libXScrnSaver self.pixman]; nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros]; |