diff options
Diffstat (limited to 'pkgs/servers')
31 files changed, 293 insertions, 195 deletions
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index d55dd14601e8..b8ae0bc4e852 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -1,24 +1,27 @@ { stdenv, lib, fetchurl, zip, unzip -, jzmq, jdk, python -, confFile ? "", extraLibraryPaths ? [], extraJars ? [] }: +, jdk, python +, confFile ? "" +, extraLibraryPaths ? [] +, extraJars ? [] +}: stdenv.mkDerivation rec { - name = "apache-storm-" + version; - version = "1.2.1"; + pname = "apache-storm"; + version = "2.1.0"; + name = "${pname}-${version}"; + src = fetchurl { - url = - "mirror://apache/storm/${name}/${name}.tar.gz"; - sha256 = "177dqgbviagrpvalg8h67mwiwwgmiqsg0hh97hcqqcjg71ypnjkv"; + url = "mirror://apache/storm/${name}/${name}.tar.gz"; + sha256 = "1i3z08rfy7aavshrbrskv9dmlhx1fjgrhhqm0pczfam4vnas8yg2"; }; - buildInputs = [ zip unzip jzmq ]; + buildInputs = [ zip unzip ]; installPhase = '' mkdir -p $out/share/${name} mv public $out/docs mv examples $out/share/${name}/. - rm -f lib/jzmq* || exit 1 mv external extlib* lib $out/. mv conf bin $out/. mv log4j2 $out/conf/. @@ -35,21 +38,22 @@ stdenv.mkDerivation rec { -e "s|STORM_CONF_DIR = .*|STORM_CONF_DIR = os.getenv('STORM_CONF_DIR','$out/conf')|" \ -e 's|STORM_LOG4J2_CONF_DIR =.*|STORM_LOG4J2_CONF_DIR = os.path.join(STORM_CONF_DIR, "log4j2")|' \ $out/bin/storm.py + # Default jdk location sed -i -e 's|#.*export JAVA_HOME=.*|export JAVA_HOME="${jdk.home}"|' \ $out/conf/storm-env.sh - unzip $out/lib/storm-core-${version}.jar defaults.yaml; - zip -d $out/lib/storm-core-${version}.jar defaults.yaml; + ls -lh $out/lib + unzip $out/lib/storm-client-${version}.jar defaults.yaml; + zip -d $out/lib/storm-client-${version}.jar defaults.yaml; sed -i \ - -e 's|java.library.path: .*|java.library.path: "${jzmq}/lib:${lib.concatStringsSep ":" extraLibraryPaths}"|' \ + -e 's|java.library.path: .*|java.library.path: "${lib.concatStringsSep ":" extraLibraryPaths}"|' \ -e 's|storm.log4j2.conf.dir: .*|storm.log4j2.conf.dir: "conf/log4j2"|' \ defaults.yaml ${if confFile != "" then ''cat ${confFile} >> defaults.yaml'' else ""} mv defaults.yaml $out/conf; - # Link to jzmq jar and extra jars + # Link to extra jars cd $out/lib; - ln -s ${jzmq}/share/java/*.jar; ${lib.concatMapStrings (jar: "ln -s ${jar};\n") extraJars} ''; diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index fbffecbafafe..5e4d625c187b 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -13,23 +13,26 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex libtool which ]; - # Makefile(.in) contains "clientparse.c clientparse.h: clientparse.y" which - # causes bison to run twice, and break the build when this happens in - # parallel. Test with "make -j clientparse.c clientparse.h". The error - # message may be "mv: cannot move 'y.tab.c' to 'clientparse.c'". - enableParallelBuilding = false; + # In earlier versions, parallel building was not supported but it's OK with 1.13 + enableParallelBuilding = true; patchPhase = "patch -p0 < ${./buildfix.diff}"; + configureFlags = [ "--enable-dictorg" "--datadir=/run/current-system/sw/share/dictd" + "--sysconfdir=/etc" ]; + postInstall = '' + install -Dm444 -t $out/share/doc/${pname} NEWS README + ''; + meta = with stdenv.lib; { description = "Dict protocol server and client"; - homepage = "http://www.dict.org"; - license = licenses.gpl2; + homepage = "http://www.dict.org"; + license = licenses.gpl2; maintainers = with maintainers; [ ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/dns/ncdns/default.nix b/pkgs/servers/dns/ncdns/default.nix index 15e400ebad5f..de28c01474cb 100644 --- a/pkgs/servers/dns/ncdns/default.nix +++ b/pkgs/servers/dns/ncdns/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "12q5al48mkjhgyk7z5wyklzzrdbcqhwxl79axa4gh9ld75prghbq"; }; - patches = [ ./fix-tpl-path.nix ]; + patches = [ ./fix-tpl-path.patch ]; buildInputs = [ libcap ]; diff --git a/pkgs/servers/dns/ncdns/fix-tpl-path.nix b/pkgs/servers/dns/ncdns/fix-tpl-path.patch index 850fb4d1b189..850fb4d1b189 100644 --- a/pkgs/servers/dns/ncdns/fix-tpl-path.nix +++ b/pkgs/servers/dns/ncdns/fix-tpl-path.patch diff --git a/pkgs/servers/gemini/molly-brown/default.nix b/pkgs/servers/gemini/molly-brown/default.nix new file mode 100644 index 000000000000..216a4015ef95 --- /dev/null +++ b/pkgs/servers/gemini/molly-brown/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoPackage, fetchgit, nixosTests }: + +buildGoPackage rec { + pname = "molly-brown"; + version = "unstable-2020-07-06"; + rev = "2e510328ef1737c67641c588095e4628e3dfa8d3"; + + goPackagePath = "tildegit.org/solderpunk/molly-brown"; + + src = fetchgit { + inherit rev; + url = "https://tildegit.org/solderpunk/molly-brown.git"; + sha256 = "0c2pmkcs5a04h2vwzbhj6rg47mb9wcmkh22i56kx7clh51wbbvc4"; + }; + + goDeps = ./deps.nix; + + passthru.tests.basic = nixosTests.molly-brown; + + meta = with lib; { + description = "Full-featured Gemini server"; + homepage = "https://tildegit.org/solderpunk/molly-brown"; + maintainers = with maintainers; [ ehmry ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/servers/gemini/molly-brown/deps.nix b/pkgs/servers/gemini/molly-brown/deps.nix new file mode 100644 index 000000000000..95427e8f7907 --- /dev/null +++ b/pkgs/servers/gemini/molly-brown/deps.nix @@ -0,0 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } +] diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix index 2b474d818ad2..e8e03a3779fa 100644 --- a/pkgs/servers/gobetween/default.nix +++ b/pkgs/servers/gobetween/default.nix @@ -1,38 +1,27 @@ -{ rsync, buildGoModule, fetchFromGitHub, lib, runCommand, enableStatic ? false }: +{ buildGoModule, fetchFromGitHub, lib, enableStatic ? false }: buildGoModule rec { pname = "gobetween"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "yyyar"; repo = "gobetween"; rev = version; - sha256 = "f01593509ccece063acd47002c4fc52261fbbbcdbf14b088d813b7d8e38fcca8"; + sha256 = "0bxf89l53sqan9qq23rwawjkcanv9p61sw56zjqhyx78f0bh0zbc"; }; - patches = [ ./gomod.patch ]; deleteVendor = true; + patches = [ + ./gomod.patch + ]; + buildPhase = '' make -e build${lib.optionalString enableStatic "-static"} ''; - lxd = fetchFromGitHub { - owner = "lxc"; - repo = "lxd"; - rev = "41efd98813f3b42f1752ff6c2c7569a054924623"; - sha256 = "02vnvjjkzl7b0i2cn03f1lb3jgj5rd3wdkii4pqi9bvmhzszg0l2"; - }; - - overrideModAttrs = (_: { - postBuild = '' - rm -r vendor/github.com/lxc/lxd - cp -r --reflink=auto ${lxd} vendor/github.com/lxc/lxd - ''; - }); - - vendorSha256 = "1pd0zrjwpw6yv2s86a818yy2ma2fkazd3sb2h6zfp9mvyixgxgri"; + vendorSha256 = "1nkni9ikpc0wngh5v0qmlpn5s9v85lb2ih22f3h3lih7nc29yv87"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/servers/gobetween/gomod.patch b/pkgs/servers/gobetween/gomod.patch index 98181e3fe794..2f0fb408061f 100644 --- a/pkgs/servers/gobetween/gomod.patch +++ b/pkgs/servers/gobetween/gomod.patch @@ -1,21 +1,13 @@ -diff --git a/go.mod b/go.mod -index 536631a..f91e862 100644 ---- a/go.mod -+++ b/go.mod -@@ -7,7 +7,7 @@ require ( - github.com/burntsushi/toml v0.3.1 - github.com/elgs/gojq v0.0.0-20160421194050-81fa9a608a13 - github.com/elgs/gosplitargs v0.0.0-20161028071935-a491c5eeb3c8 // indirect -- github.com/flosch/pongo2 v0.0.0-20181225140029-79872a7b2769 // indirect -+ github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4 // indirect - github.com/fsouza/go-dockerclient v1.3.6 - github.com/gin-contrib/cors v0.0.0-20190301062745-f9e10995c85a - github.com/gin-gonic/gin v1.3.0 -@@ -20,7 +20,6 @@ require ( +diff --git a/src/go.mod b/src/go.mod +index 3242342..795c306 100644 +--- a/src/go.mod ++++ b/src/go.mod +@@ -28,7 +28,7 @@ require ( github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a // indirect github.com/juju/persistent-cookiejar v0.0.0-20171026135701-d5e5a8405ef9 // indirect - github.com/juju/schema v0.0.0-20181210140654-64a6158e9071 // indirect -- github.com/juju/utils v0.0.0-20180820210520-bf9cc5bdd62d // indirect - github.com/juju/webbrowser v0.0.0-20180907093207-efb9432b2bcb // indirect - github.com/julienschmidt/httprouter v1.2.0 // indirect - github.com/lxc/lxd v0.0.0-20190314233831-41efd98813f3 + github.com/juju/webbrowser v1.0.0 // indirect +- github.com/lxc/lxd v0.0.0-20200706202337-814c96fcec74 ++ github.com/lxc/lxd v0.0.0-20200727014606-0d408e8e8ebb + github.com/mattn/go-colorable v0.1.7 // indirect + github.com/miekg/dns v1.1.30 + github.com/mitchellh/go-testing-interface v1.14.0 // indirect diff --git a/pkgs/servers/gotify/source-sha.nix b/pkgs/servers/gotify/source-sha.nix index ddac1b246142..2d7375fc9b57 100644 --- a/pkgs/servers/gotify/source-sha.nix +++ b/pkgs/servers/gotify/source-sha.nix @@ -1 +1 @@ -"18y2kaf0v7275a0b8ab5y3qk7qwh19aqxyy0gmlflzgr2nimpmrn" \ No newline at end of file +"0agnbpqzz751643c4s0fs10b3zw98pp8r9kys9p1vxbb3d6r2anb" \ No newline at end of file diff --git a/pkgs/servers/gotify/vendor-sha.nix b/pkgs/servers/gotify/vendor-sha.nix index 0705f436316d..e8f403723390 100644 --- a/pkgs/servers/gotify/vendor-sha.nix +++ b/pkgs/servers/gotify/vendor-sha.nix @@ -1 +1 @@ -"1ha0zgz1n07sd3if6823fi83j7yajysjdzfbwqk9rpsi6zv3cfh3" \ No newline at end of file +"0cczw8h1mibxmfgy2z6xnqq11x31ai17gnq2z4j5751b5finhqng" \ No newline at end of file diff --git a/pkgs/servers/gotify/version.nix b/pkgs/servers/gotify/version.nix index fdfe425152c3..7473811783eb 100644 --- a/pkgs/servers/gotify/version.nix +++ b/pkgs/servers/gotify/version.nix @@ -1 +1 @@ -"2.0.16" +"2.0.17" diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 44aba8299a52..a3a14af16af9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.112.3"; + version = "0.113.0"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; @@ -28,7 +28,7 @@ "amcrest" = ps: with ps; [ ha-ffmpeg]; # missing inputs: amcrest "ampio" = ps: with ps; [ ]; # missing inputs: asmog "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam - "androidtv" = ps: with ps; [ ]; # missing inputs: adb-shell androidtv pure-python-adb + "androidtv" = ps: with ps; [ ]; # missing inputs: adb-shell[async] androidtv[async] pure-python-adb "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant "anthemav" = ps: with ps; [ ]; # missing inputs: anthemav "apache_kafka" = ps: with ps; [ aiokafka]; @@ -90,6 +90,7 @@ "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected "bom" = ps: with ps; [ ]; # missing inputs: bomradarloop + "bond" = ps: with ps; [ ]; # missing inputs: bond-home "braviatv" = ps: with ps; [ bravia-tv]; "broadlink" = ps: with ps; [ broadlink]; "brother" = ps: with ps; [ ]; # missing inputs: brother @@ -160,6 +161,7 @@ "device_sun_light_trigger" = ps: with ps; [ ]; "device_tracker" = ps: with ps; [ ]; "devolo_home_control" = ps: with ps; [ ]; # missing inputs: devolo-home-control-api + "dexcom" = ps: with ps; [ ]; # missing inputs: pydexcom "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT "dialogflow" = ps: with ps; [ aiohttp-cors]; "digital_ocean" = ps: with ps; [ digital-ocean]; @@ -175,7 +177,7 @@ "dnsip" = ps: with ps; [ aiodns]; "dominos" = ps: with ps; [ aiohttp-cors]; # missing inputs: pizzapi "doods" = ps: with ps; [ pillow]; # missing inputs: pydoods - "doorbird" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: doorbirdpy home-assistant-frontend + "doorbird" = ps: with ps; [ aiohttp-cors]; # missing inputs: doorbirdpy "dovado" = ps: with ps; [ ]; # missing inputs: dovado "downloader" = ps: with ps; [ ]; "dsmr" = ps: with ps; [ ]; # missing inputs: dsmr_parser @@ -338,7 +340,7 @@ "home_connect" = ps: with ps; [ aiohttp-cors]; # missing inputs: homeconnect "homeassistant" = ps: with ps; [ ]; "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf]; # missing inputs: PyTurboJPEG base36 fnvhash - "homekit_controller" = ps: with ps; [ ]; # missing inputs: aiohomekit[IP] + "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf]; # missing inputs: aiohomekit[IP] "homematic" = ps: with ps; [ pyhomematic]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks @@ -606,6 +608,7 @@ "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts "point" = ps: with ps; [ aiohttp-cors]; # missing inputs: pypoint + "poolsense" = ps: with ps; [ ]; # missing inputs: poolsense "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall "prezzibenzina" = ps: with ps; [ ]; # missing inputs: prezzibenzina-py "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix @@ -773,7 +776,7 @@ "switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot "switcher_kis" = ps: with ps; [ ]; # missing inputs: aioswitcher "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate - "syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru + "syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru url-normalize "synology" = ps: with ps; [ ]; # missing inputs: py-synology "synology_chat" = ps: with ps; [ ]; "synology_dsm" = ps: with ps; [ ]; # missing inputs: python-synology diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f2a75459b46d..8c2a39485767 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -27,11 +27,6 @@ let (mkOverride "astral" "1.10.1" "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") - # Required by cast component. Can probably be removed in 0.113.x - # https://github.com/home-assistant/core/commit/86c27b50f1282658b75fe71f9f6fd2fcabc2eaa2 - (mkOverride "PyChromecast" "6.0.0" - "05f8r3b2pdqbl76hwi5sv2xdi1r7g9lgm69x8ja5g22mn7ysmghm") - # We have 3.x in nixpkgs which is incompatible with home-assistant atm: # https://github.com/home-assistant/core/blob/dev/requirements_all.txt (mkOverride "pyowm" "2.10.0" @@ -77,7 +72,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.112.3"; + hassVersion = "0.113.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -86,7 +81,7 @@ in with py.pkgs; buildPythonApplication rec { disabled = pythonOlder "3.5"; patches = [ - ./0001-setup.py-relax-dependencies.patch + ./relax-dependencies.patch ]; inherit availableComponents; @@ -96,7 +91,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1azfbjnyaamdnl2f3cllh6pd3kinl1wjqb4hlb569gb8zqs5bsx2"; + sha256 = "1yb943wkiawh5p4mj5089qcsjfnwb91ga666qriz32bzpfgrzrna"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 54ef4d04e199..9f03633d62ab 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20200702.1"; + version = "20200716.0"; src = fetchPypi { inherit pname version; - sha256 = "0ikzqwwm4m15x2m5byy7r005cfdxk7ajfyz9ljv4nsa3y3g2riw4"; + sha256 = "07h8llin0rx06c5v2skkij5756gqdq079ysxzmrm6xnzk9mcvfsk"; }; # no Python tests implemented diff --git a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch b/pkgs/servers/home-assistant/relax-dependencies.patch index 7009a0361375..081e3fafc17f 100644 --- a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch +++ b/pkgs/servers/home-assistant/relax-dependencies.patch @@ -1,5 +1,5 @@ diff --git a/setup.py b/setup.py -index 4e46f63217..b1aafee59d 100755 +index c2042ab245..98f348510f 100755 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ PROJECT_URLS = { @@ -20,6 +20,5 @@ index 4e46f63217..b1aafee59d 100755 + "requests>=2.23.0", + "ruamel.yaml>=0.15.100", "voluptuous==0.11.7", -- "voluptuous-serialize==2.3.0", -+ "voluptuous-serialize>=2.3.0", + "voluptuous-serialize==2.4.0", ] diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix index b564a9b5c961..ff754a5390c1 100644 --- a/pkgs/servers/irc/ngircd/default.nix +++ b/pkgs/servers/irc/ngircd/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, zlib, openssl, pam, libiconv }: stdenv.mkDerivation rec { - name = "ngircd-25"; + pname = "ngircd"; + version = "26"; src = fetchurl { - url = "https://ngircd.barton.de/pub/ngircd/${name}.tar.xz"; - sha256 = "0kpf5qi98m9f833r4rx9n6h9p31biwk798jwc1mgzmix7sp7r6f4"; + url = "https://ngircd.barton.de/pub/ngircd/${pname}-${version}.tar.xz"; + sha256 = "1ijmv18fa648y7apxb9vp4j9iq6fxq850kz5v36rysaq614cdp2n"; }; configureFlags = [ diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 4d63a7b39c70..210863aa0078 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -4,6 +4,7 @@ , enableAuthDovecot ? false, dovecot , enablePAM ? false, pam , enableSPF ? true, libspf2 +, enableDMARC ? true, opendmarc }: stdenv.mkDerivation rec { @@ -21,7 +22,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals enableMySQL [ libmysqlclient zlib ] ++ stdenv.lib.optional enableAuthDovecot dovecot ++ stdenv.lib.optional enablePAM pam - ++ stdenv.lib.optional enableSPF libspf2; + ++ stdenv.lib.optional enableSPF libspf2 + ++ stdenv.lib.optional enableDMARC opendmarc; preBuild = '' sed ' @@ -71,6 +73,10 @@ stdenv.mkDerivation rec { s:^# \(SUPPORT_SPF\)=.*:\1=yes: s:^# \(LDFLAGS += -lspf2\):\1: ''} + ${stdenv.lib.optionalString enableDMARC '' + s:^# \(SUPPORT_DMARC\)=.*:\1=yes: + s:^# \(LDFLAGS += -lopendmarc\):\1: + ''} #/^\s*#.*/d #/^\s*$/d ' < src/EDITME > Local/Makefile diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index da4f77e3394c..8d5349dbf366 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -1,15 +1,17 @@ -{ lib, python3, mautrix-telegram }: +{ lib, python3, mautrix-telegram, fetchFromGitHub }: with python3.pkgs; buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.8.1"; + version = "0.8.2"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "1gz6d28dq3ykvr3wp85wkc05lbppdzf5j9i62pgx0blmx3jh0yrk"; + src = fetchFromGitHub { + owner = "tulir"; + repo = pname; + rev = "v${version}"; + sha256 = "0mhy9b933haz1bldkglvn81warjxdjdzgkviiv5k6fykghq473jf"; }; postPatch = '' diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index a85e6bbf71ea..f7d96fb52139 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.35.4"; + version = "0.36.0"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1mggrkd4ih8fak4nk3a8z5677nblvihjvkvgmix080cps44bcfd8"; + sha256 = "19nfr0mryc0m4qg2vjixxnpkbp6is0c21c7mkb0qisvd2d939yd0"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index 1d6bb7198e5b..8c851715e07c 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -18,6 +18,10 @@ buildGoModule rec { vendorSha256 = null; + postInstall = '' + install -Dm444 -t $out/lib/systemd/system $src/packaging/etc/systemd/system/do-agent.service + ''; + meta = with lib; { description = "DigitalOcean droplet system metrics agent"; longDescription = '' @@ -30,4 +34,4 @@ buildGoModule rec { maintainers = with maintainers; [ yvt ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index 6f2e51fffd61..0a15daf71c61 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kapacitor"; - version = "1.5.5"; + version = "1.5.6"; goPackagePath = "github.com/influxdata/kapacitor"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "kapacitor"; rev = "v${version}"; - sha256 = "17zk7fs6yl5hmhr3inwkafwmg2ihaicj43gdi5888dinhpa9bij1"; + sha256 = "1jb04lnxjrms7x5nlrsd1s465rramm9z4zkqpfw1vfdsqa2dd8rc"; }; meta = with lib; { diff --git a/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view-4-2.patch b/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view-4-2.patch new file mode 100644 index 000000000000..3720dd9ba319 --- /dev/null +++ b/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view-4-2.patch @@ -0,0 +1,22 @@ +--- a/src/third_party/asio-master/asio/include/asio/detail/config.hpp ++++ b/src/third_party/asio-master/asio/include/asio/detail/config.hpp +@@ -831,20 +831,8 @@ + # endif // (__cplusplus >= 201402) + # endif // (_LIBCPP_VERSION < 7000) + # else // defined(ASIO_HAS_CLANG_LIBCXX) +-# if (__cplusplus >= 201402) +-# if __has_include(<experimental/string_view>) +-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1 +-# endif // __has_include(<experimental/string_view>) +-# endif // (__cplusplus >= 201402) + # endif // // defined(ASIO_HAS_CLANG_LIBCXX) + # endif // defined(__clang__) +-# if defined(__GNUC__) +-# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4) +-# if (__cplusplus >= 201402) +-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1 +-# endif // (__cplusplus >= 201402) +-# endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4) +-# endif // defined(__GNUC__) + # endif // !defined(ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW) + #endif // !defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW) \ No newline at end of file diff --git a/pkgs/servers/nosql/mongodb/forget-build-dependencies-4-2.patch b/pkgs/servers/nosql/mongodb/forget-build-dependencies-4-2.patch new file mode 100644 index 000000000000..6d65238f22ab --- /dev/null +++ b/pkgs/servers/nosql/mongodb/forget-build-dependencies-4-2.patch @@ -0,0 +1,36 @@ +# MongoDB keeps track of its build parameters, which tricks nix into +# keeping dependencies to build inputs in the final output. +# We remove the build flags from buildInfo data. +--- a/site_scons/mongo/generators.py ++++ b/site_scons/mongo/generators.py +@@ -33,30 +33,12 @@ def default_buildinfo_environment_data(): + True, + False, + ), +- ( +- 'ccflags', +- '$CCFLAGS', +- True, +- False, +- ), + ( + 'cxx', + '$CXX_VERSION', + True, + False, + ), +- ( +- 'cxxflags', +- '$CXXFLAGS', +- True, +- False, +- ), +- ( +- 'linkflags', +- '$LINKFLAGS', +- True, +- False, +- ), + ( + 'target_arch', + '$TARGET_ARCH', \ No newline at end of file diff --git a/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch b/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch index 897618cceb12..37b4c259f2ac 100644 --- a/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch +++ b/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch @@ -1,3 +1,6 @@ +# MongoDB keeps track of its build parameters, which tricks nix into +# keeping dependencies to build inputs in the final output. +# We remove the build flags from buildInfo data. --- a/site_scons/mongo/generators.py +++ b/site_scons/mongo/generators.py @@ -18,10 +18,7 @@ def default_buildinfo_environment_data(): diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index 46aa22291845..f57ff7461989 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp -, sasl, openssl, libpcap, python27, curl, Security, CoreFoundation, cctools }: +, sasl, openssl, libpcap, python27, python38, curl, Security, CoreFoundation, cctools }: # Note: # The command line tools are written in Go as part of a different package (mongodb-tools) @@ -11,6 +11,17 @@ with stdenv.lib; }@args: let + variants = if versionAtLeast version "4.2" + then { python = python38.withPackages (ps: with ps; [ pyyaml cheetah3 psutil setuptools ]); + scons = sconsPackages.scons_latest; + mozjsVersion = "60"; + mozjsReplace = "defined(HAVE___SINCOS)"; + } + else { python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]); + scons = sconsPackages.scons_3_1_2; + mozjsVersion = "45"; + mozjsReplace = "defined(HAVE_SINCOS)"; + }; python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]); system-libraries = [ "boost" @@ -34,7 +45,7 @@ in stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ variants.scons ]; buildInputs = [ boost curl @@ -43,7 +54,7 @@ in stdenv.mkDerivation rec { libyamlcpp openssl pcre-cpp - python + variants.python sasl snappy zlib @@ -59,7 +70,7 @@ in stdenv.mkDerivation rec { substituteInPlace SConstruct \ --replace "env = Environment(" "env = Environment(ENV = os.environ," '' + stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace src/third_party/mozjs-45/extract/js/src/jsmath.cpp --replace 'defined(HAVE_SINCOS)' 0 + substituteInPlace src/third_party/mozjs-${variants.mozjsVersion}/extract/js/src/jsmath.cpp --replace '${variants.mozjsReplace}' 0 substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder substituteInPlace src/third_party/s2/s1interval.cc --replace drem remainder diff --git a/pkgs/servers/nosql/mongodb/v4_2.nix b/pkgs/servers/nosql/mongodb/v4_2.nix new file mode 100644 index 000000000000..3ebe69daca1b --- /dev/null +++ b/pkgs/servers/nosql/mongodb/v4_2.nix @@ -0,0 +1,17 @@ +{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: + +let + buildMongoDB = callPackage ./mongodb.nix { + inherit sasl; + inherit boost; + inherit Security; + inherit CoreFoundation; + inherit cctools; + }; +in buildMongoDB { + version = "4.2.8"; + sha256 = "13yvhi1258skdni00bh6ph609whqsmhiimhyqy1gs2liwdvh5278"; + patches = + [ ./forget-build-dependencies-4-2.patch ] + ++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ]; +} diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index ef7740f6ca6c..2ca829b62b12 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests }: stdenv.mkDerivation rec { - version = "6.0.5"; + version = "6.0.6"; pname = "redis"; src = fetchurl { url = "http://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "15pmk3w3cjhnv40jibdavfkn446hsjn9dnpwk2w5396j2jhqdks2"; + sha256 = "151x6qicmrmlxkmiwi2vdq8p50d52b9gglp8csag6pmgcfqlkb8j"; }; # Cross-compiling fixes diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index c916a0949d93..bc429e395016 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.19.4.2935-79e214ead"; + version = "1.19.5.3112-b23ab3896"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0wzbdr89janyrbilvxrxfvhy02c1j5dsrcyjxnj4ryab0qc4sv04"; + sha256 = "0lh0yqpp1xyhb3bkc8wqg1afdyvaqhv3bmbyjqalpj2ikkk5lxwk"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index a5924e37331d..9c08f392042d 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -1,65 +1,68 @@ -{ alsaLib, alsaUtils, cifs-utils, fetchurl, ffmpeg_3, libav, mono, stdenv }: - -with stdenv.lib; -stdenv.mkDerivation rec { +{ alsaLib +, alsaUtils +, autoPatchelfHook +, cifs-utils +, fetchurl +, ffmpeg +, freetype +, lib +, makeWrapper +, stdenv +, zlib +}: stdenv.mkDerivation rec { name = "roon-server"; - version = "100600401"; + version = "100700571"; src = fetchurl { url = "http://download.roonlabs.com/updates/stable/RoonServer_linuxx64_${version}.tar.bz2"; - sha256 = "121mmdh35q4bpgsqhcps6a6q1f4ld9v4hq9gp181bf2n779pk8sh"; + sha256 = "191vlzf10ypkk1prp6x2rszlmsihdwpd3wvgf2jg6ckwyxy2hc6k"; }; - installPhase = '' - runHook preInstall - - # Check script - sed -i '3i PATH=$PATH:${makeBinPath [ cifs-utils ffmpeg_3 libav ]}' check.sh - sed -i '/check_ulimit$/d' check.sh - - # Start script - sed -i '3i PATH=$PATH:${makeBinPath [ alsaUtils cifs-utils ffmpeg_3 libav ]}' start.sh + buildInputs = [ + alsaLib + alsaUtils + cifs-utils + ffmpeg + freetype + zlib + ]; - # Debug logging - sed -i '/--debug--gc=sgen --server/exec "$HARDLINK" --debug --gc=sgen --server "$SCRIPT.exe" "$@" -storagetrace -watchertrace' Appliance/RoonAppliance - - # Binaries - sed -i '/# boost ulimit/,+2 d' Appliance/RAATServer - sed -i '/# boost ulimit/,+2 d' Appliance/RoonAppliance - sed -i '/# boost ulimit/,+2 d' Server/RoonServer - sed -i '/ln -sf/ d' Appliance/RAATServer - sed -i '/ln -sf/ d' Appliance/RoonAppliance - sed -i '/ln -sf/ d' Server/RoonServer - mkdir -p $out/opt - mv * $out/opt - ln -sf $out/opt/RoonMono/bin/mono-sgen $out/opt/RoonMono/bin/RoonServer - ln -sf $out/opt/RoonMono/bin/mono-sgen $out/opt/RoonMono/bin/RoonAppliance - ln -sf $out/opt/RoonMono/bin/mono-sgen $out/opt/RoonMono/bin/RAATServer + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + installPhase = '' + runHook preInstall + mkdir -p $out + mv * $out runHook postInstall ''; - preFixup = '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${alsaLib}/lib" \ - $out/opt/RoonMono/bin/mono-sgen + postFixup = + let + linkFix = bin: '' + sed -i '/ulimit/d' ${bin} + sed -i '/ln -sf/d' ${bin} + ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin} + ''; + wrapFix = bin: '' + wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsaUtils cifs-utils ffmpeg ]} + ''; + in + '' + ${linkFix "$out/Appliance/RAATServer"} + ${linkFix "$out/Appliance/RoonAppliance"} + ${linkFix "$out/Server/RoonServer"} - # Checkers - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${alsaLib}/lib" \ - $out/opt/Appliance/check_alsa - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/opt/Appliance/check_bincompat - ''; + sed -i '/which avconv/c\ WHICH_AVCONV=1' $out/check.sh + sed -i '/^check_ulimit/d' $out/check.sh + ${wrapFix "$out/check.sh"} + ${wrapFix "$out/start.sh"} + ''; - meta = { + meta = with lib; { description = "The music player for music lovers."; - homepage = "https://roonlabs.com"; - license = licenses.unfree; - maintainers = with maintainers; [ steell ]; - platforms = platforms.linux; + homepage = "https://roonlabs.com"; + license = licenses.unfree; + maintainers = with maintainers; [ lovesegfault steell ]; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 0aae779106a5..e9812e9884e9 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -31,7 +31,6 @@ , enableProfiling ? true , enableMDNS ? false, avahi , enableDomainController ? false, gpgme, lmdb -, enableKerberos ? true, krb5Full , enableRegedit ? true, ncurses , enableCephFS ? false, libceph , enableGlusterFS ? false, glusterfs, libuuid @@ -92,7 +91,6 @@ stdenv.mkDerivation rec { ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi ++ optionals enableDomainController [ gpgme lmdb ] - ++ optional enableKerberos krb5Full ++ optional enableRegedit ncurses ++ optional (enableCephFS && stdenv.isLinux) libceph ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ] @@ -116,13 +114,9 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--disable-rpath" - ] ++ singleton (if enableDomainController - then "--with-experimental-mit-ad-dc" - else "--without-ad-dc") - ++ optionals enableKerberos [ - "--with-system-mitkrb5" - "--with-system-mitkdc=${krb5Full}" - ] ++ optionals (!enableLDAP) [ + ] ++ optional (!enableDomainController) + "--without-ad-dc" + ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ] ++ optional enableProfiling "--with-profiling-data" diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix index 2849f8c7e743..b807d1f0d267 100644 --- a/pkgs/servers/udpt/default.nix +++ b/pkgs/servers/udpt/default.nix @@ -1,45 +1,21 @@ -{ stdenv, fetchFromGitHub, boost, sqlite, cmake, gtest }: +{ stdenv, rustPlatform, fetchFromGitHub }: -stdenv.mkDerivation { +rustPlatform.buildRustPackage rec { pname = "udpt"; - version = "2017-09-27"; - - enableParallelBuilding = true; - - # Suitable for a network facing daemon. - hardeningEnable = [ "pie" ]; + version = "3.1.0"; src = fetchFromGitHub { owner = "naim94a"; repo = "udpt"; - rev = "e0dffc83c8ce76b08a41a4abbd5f8065535d534f"; - sha256 = "187dw96mzgcmh4k9pvfpb7ckbb8d4vlikamr2x8vkpwzgjs3xd6g"; + rev = "${pname}-${version}"; + sha256 = "1g6l0y5x9pdra3i1npkm474glysicm4hf2m01700ack2rp43vldr"; }; - doCheck = true; - - checkPhase = '' - runHook preCheck - - make test - - runHook postCheck - ''; - - buildInputs = [ boost sqlite cmake gtest ]; - - postPatch = '' - # Enabling optimization (implied by fortify hardening) causes htons - # to be re-defined as a macro, turning this use of :: into a syntax error. - sed -i '104a#undef htons' src/udpTracker.cpp - ''; + cargoSha256 = "1cmd80ndjxdmyfjpm1f04rwf64501nyi6wdsj7lxidgd1v92wy2c"; + verifyCargoDeps = true; - installPhase = '' - mkdir -p $out/bin $out/etc/ - cp udpt $out/bin - cp ../udpt.conf $out/etc/ - # without this, the resulting binary is unstripped. - runHook postInstall + postInstall = '' + install -D udpt.toml $out/share/udpt/udpt.toml ''; meta = { |