diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-18 10:32:12 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-18 10:32:12 +0100 |
commit | 63c6875f26635923050ccac4fff8318ff5ac75da (patch) | |
tree | 32af0d0da4ce49cc9ae52efdb14a23904561f1e2 /pkgs/servers | |
parent | 327ecf882af448b45473c34bc24465415a6c67fc (diff) | |
parent | d208fa53ebb3bc04afaf1feb48abfcbb3cff5492 (diff) | |
download | nixlib-63c6875f26635923050ccac4fff8318ff5ac75da.tar nixlib-63c6875f26635923050ccac4fff8318ff5ac75da.tar.gz nixlib-63c6875f26635923050ccac4fff8318ff5ac75da.tar.bz2 nixlib-63c6875f26635923050ccac4fff8318ff5ac75da.tar.lz nixlib-63c6875f26635923050ccac4fff8318ff5ac75da.tar.xz nixlib-63c6875f26635923050ccac4fff8318ff5ac75da.tar.zst nixlib-63c6875f26635923050ccac4fff8318ff5ac75da.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
26 files changed, 155 insertions, 89 deletions
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index b16287f40d79..8af94d4f2d92 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -1,5 +1,5 @@ { stdenv49 -, lib, fetchurl, fetchFromGitHub +, lib, fetchurl, fetchpatch, fetchFromGitHub , which, findutils, m4, gawk , python, openjdk, mono58, libressl @@ -37,6 +37,9 @@ let # in theory newer versions of fdb support newer boost versions, but they # don't :( maybe one day , boost ? boost152 + + # if an release is unofficial/a prerelease, then make sure this is set + , officialRelease ? true }: stdenv.mkDerivation rec { name = "foundationdb-${version}"; inherit version; @@ -47,8 +50,8 @@ let inherit rev sha256; }; - nativeBuildInputs = [ gawk which m4 findutils mono58 ]; - buildInputs = [ python openjdk libressl boost ]; + nativeBuildInputs = [ python openjdk gawk which m4 findutils mono58 ]; + buildInputs = [ libressl boost ]; patches = [ # For 5.2+, we need a slightly adjusted patch to fix all the ldflags @@ -57,10 +60,24 @@ let then ./ldflags-6.0.patch else ./ldflags-5.2.patch) else ./ldflags-5.1.patch) - ] ++ + ] # for 6.0+, we do NOT need to apply this version fix, since we can specify # it ourselves. see configurePhase - (lib.optional (!lib.versionAtLeast version "6.0") ./fix-scm-version.patch); + ++ (lib.optional (!lib.versionAtLeast version "6.0") ./fix-scm-version.patch) + # Versions less than 6.0 have a busted Python 3 build due to an outdated + # use of 'print'. Also apply an update to the six module with many bugfixes, + # which is in 6.0+ as well + ++ (lib.optional (!lib.versionAtLeast version "6.0") (fetchpatch { + name = "update-python-six.patch"; + url = "https://github.com/apple/foundationdb/commit/4bd9efc4fc74917bc04b07a84eb065070ea7edb2.patch"; + sha256 = "030679lmc86f1wzqqyvxnwjyfrhh54pdql20ab3iifqpp9i5mi85"; + })) + ++ (lib.optional (!lib.versionAtLeast version "6.0") (fetchpatch { + name = "import-for-python-print.patch"; + url = "https://github.com/apple/foundationdb/commit/ded17c6cd667f39699cf663c0e87fe01e996c153.patch"; + sha256 = "11y434w68cpk7shs2r22hyrpcrqi8vx02cw7v5x79qxvnmdxv2an"; + })) + ; postPatch = '' # note: this does not do anything for 6.0+ @@ -95,7 +112,7 @@ let # Needed environment overrides ++ [ "KVRELEASE=1" "NOSTRIP=1" - ]; + ] ++ lib.optional officialRelease [ "RELEASE=true" ]; # on 6.0 and later, we can specify all this information manually configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") '' @@ -106,7 +123,6 @@ let installPhase = '' mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb - mkdir -vp $python/lib/${python.libPrefix}/site-packages '' + lib.optionalString (!lib.versionAtLeast version "6.0") '' # we only copy the TLS library on < 6.0, since it's compiled-in otherwise @@ -117,15 +133,21 @@ let cp -v ./lib/libfdb_c.so $lib/lib cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb + cp -v ./fdbclient/vexillographer/fdb.options $dev/include/foundationdb # java cp -v ./bindings/java/foundationdb-client.jar $lib/share/java/fdb-java.jar # python + cp LICENSE ./bindings/python + substitute ./bindings/python/setup.py.in ./bindings/python/setup.py \ + --replace 'VERSION' "${version}" + rm -f ./bindings/python/setup.py.in rm -f ./bindings/python/fdb/*.pth # remove useless files - cp -R ./bindings/python/fdb $python/lib/${python.libPrefix}/site-packages/fdb - # symlink a copy of the shared object into place, so that impl.py can load it - ln -sv $lib/lib/libfdb_c.so $python/lib/${python.libPrefix}/site-packages/fdb/libfdb_c.so + rm -f ./bindings/python/*.rst ./bindings/python/*.mk + + cp -R ./bindings/python/ tmp-pythonsrc/ + tar -zcf $pythonsrc --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/ # binaries for x in fdbbackup fdbcli fdbserver fdbmonitor; do @@ -139,7 +161,7 @@ let ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent ''; - outputs = [ "out" "lib" "dev" "python" ]; + outputs = [ "out" "lib" "dev" "pythonsrc" ]; meta = with stdenv.lib; { description = "Open source, distributed, transactional key-value store"; @@ -165,9 +187,8 @@ in with builtins; { }; foundationdb60 = makeFdb rec { - version = "6.0.11pre2716_${substring 0 8 rev}"; + version = "6.0.15"; branch = "release-6.0"; - rev = "9e8c1941ec2cdbba0c584e1acf00906cffd7a67a"; - sha256 = "11n5yq68w32hsq5r0g34hg5wvyv9n2lkhw60b9a1vvlw1x41wxld"; + sha256 = "1z8104nj1qn738bs1zjiq1mdn8dnj4vksb3fh503mf3ygl54mjbw"; }; } diff --git a/pkgs/servers/foundationdb/python.nix b/pkgs/servers/foundationdb/python.nix new file mode 100644 index 000000000000..55b834c54369 --- /dev/null +++ b/pkgs/servers/foundationdb/python.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage, lib, foundationdb }: + +buildPythonPackage rec { + pname = "foundationdb"; + version = foundationdb.version; + + src = foundationdb.pythonsrc; + unpackCmd = "tar xf $curSrc"; + + patchPhase = '' + substituteInPlace ./fdb/impl.py \ + --replace libfdb_c.so "${foundationdb.lib}/lib/libfdb_c.so" + ''; + + doCheck = false; + + meta = with lib; { + description = "Python bindings for FoundationDB"; + homepage = https://www.foundationdb.org; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} + diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index d921eee49cfc..b3df4a481cd0 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -33,16 +33,16 @@ let in python.pkgs.buildPythonApplication rec { pname = "appdaemon"; - version = "3.0.1"; + version = "3.0.2"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "ad16773da21e34e258970bf5740d1634a36c8202ac72c6925d960308ef1c58cf"; + sha256 = "c32d9139566cc8147c39196a18c317accd1f0b2ef8e6c0ff31bddd4bc0f80bd3"; }; propagatedBuildInputs = with python.pkgs; [ - aiohttp aiohttp-jinja2 astral bcrypt daemonize feedparser iso8601 - jinja2 pyyaml requests sseclient voluptuous websocket_client yarl + daemonize astral requests sseclient websocket_client aiohttp yarl jinja2 + aiohttp-jinja2 pyyaml voluptuous feedparser iso8601 bcrypt paho-mqtt ]; # no tests implemented diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 4aba2f435ba7..79b0dfc52aee 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.82.0"; + version = "0.82.1"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -20,7 +20,7 @@ "alarm_control_panel.envisalink" = ps: with ps; [ ]; "alarm_control_panel.homematicip_cloud" = ps: with ps; [ ]; "alarm_control_panel.ialarm" = ps: with ps; [ ]; - "alarm_control_panel.ifttt" = ps: with ps; [ aiohttp-cors ]; + "alarm_control_panel.ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; "alarm_control_panel.manual" = ps: with ps; [ ]; "alarm_control_panel.manual_mqtt" = ps: with ps; [ paho-mqtt ]; "alarm_control_panel.mqtt" = ps: with ps; [ paho-mqtt ]; @@ -328,7 +328,7 @@ "device_tracker.automatic" = ps: with ps; [ aiohttp-cors ]; "device_tracker.bbox" = ps: with ps; [ ]; "device_tracker.bluetooth_le_tracker" = ps: with ps; [ ]; - "device_tracker.bluetooth_tracker" = ps: with ps; [ ]; + "device_tracker.bluetooth_tracker" = ps: with ps; [ bt_proximity ]; "device_tracker.bmw_connected_drive" = ps: with ps; [ ]; "device_tracker.bt_home_hub_5" = ps: with ps; [ ]; "device_tracker.bt_smarthub" = ps: with ps; [ ]; @@ -482,7 +482,7 @@ "hue.const" = ps: with ps; [ ]; "hue.errors" = ps: with ps; [ ]; "hydrawise" = ps: with ps; [ ]; - "ifttt" = ps: with ps; [ aiohttp-cors ]; + "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; "ihc" = ps: with ps; [ ]; "ihc.const" = ps: with ps; [ ]; "ihc.ihcdevice" = ps: with ps; [ ]; @@ -1121,7 +1121,7 @@ "sensor.vultr" = ps: with ps; [ vultr ]; "sensor.waqi" = ps: with ps; [ ]; "sensor.waterfurnace" = ps: with ps; [ ]; - "sensor.waze_travel_time" = ps: with ps; [ ]; + "sensor.waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; "sensor.whois" = ps: with ps; [ ]; "sensor.wink" = ps: with ps; [ ]; "sensor.wirelesstag" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a8acf277709f..69292e03d0b5 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -85,7 +85,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.82.0"; + hassVersion = "0.82.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -100,7 +100,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1vvq6frzwmbnynpq6269ykifwmvm8zj5zraslsph3jidppx2bnd4"; + sha256 = "0d53xp5miz1vm1b5qfznzx33qzxcxi65plp412dyk4r1ag7rh38v"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 948ef345e10d..19a9be8e86e8 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mod_wsgi-${version}"; - version = "4.6.4"; + version = "4.6.5"; src = fetchurl { url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"; - sha256 = "1hyaxr9km7cj4k6b0d6xx3bplpa8483fhyk9x802sl22m3f2vc1k"; + sha256 = "1q75ifadjd5frr5i2b9swbjiwfv4fr4ny8npsm09w6mjp7w0bgjw"; }; buildInputs = [ apacheHttpd python2 ]; diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index e10799e27f8a..d99a04642deb 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { name = "hiawatha-${version}"; - version = "10.8.1"; + version = "10.8.3"; src = fetchFromGitLab { owner = "hsleisink"; repo = "hiawatha"; rev = "v${version}"; - sha256 = "1428byx0xpzzwyc0j157q70sjx18dykvg6fd5vp70kj85ank0xpa"; + sha256 = "057kglz5grrxg5m2brr7mcncwd3idxzczq5vg8yd1iri2rq63hdc"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index f830f0acee35..93dfbbad2b41 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.15.5"; - sha256 = "0vxfbnc1794al60d9mhjw1w72x5jslfwq51vvs38568liyd8hfhs"; + version = "1.15.6"; + sha256 = "1ikchbnq1dv8wjnsf6jj24xkb36vcgigyps71my8r01m41ycdn53"; }) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index 1b61cb87c9af..e69d9e61eb98 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.14.0"; - sha256 = "1d9c0avfpbwvzyg53b59ks8shpnrxnbnshcd7ziizflsyv5vw5ax"; + version = "1.14.1"; + sha256 = "19542jxcjf4dvrqvgb5vr36mhbzcjrxc3v0xh451rm60610rf2dz"; }) diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 9e8a9dc9ec60..b41115339873 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -1,43 +1,27 @@ { stdenv, python2, fetchFromGitHub }: -let python = python2.override { - packageOverrides = self: super: { - misaka = super.misaka.overridePythonAttrs (old: rec { - version = "1.0.2"; - src = old.src.override { - inherit version; - sha256 = "05rmjxlfhghj90m1kc55lx3z8igabw5y8wmly66p3hphdy4f95v1"; - }; - propagatedBuildInputs = [ ]; - }); - html5lib = super.html5lib.overridePythonAttrs (old: rec { - version = "0.9999999"; - src = old.src.override { - inherit version; - sha256 = "2612a191a8d5842bfa057e41ba50bbb9dcb722419d2408c78cff4758d0754868"; - }; - checkInputs = with self; [ nose flake8 ]; - propagatedBuildInputs = with self; [ six ]; - checkPhase = '' - nosetests - ''; - }); - }; -}; - -in with python.pkgs; buildPythonApplication rec { +with python2.pkgs; buildPythonApplication rec { pname = "isso"; - version = "0.10.6"; + version = "0.11.1"; # no tests on PyPI src = fetchFromGitHub { owner = "posativ"; repo = pname; rev = version; - sha256 = "19x9xbwd15fikhchyl4i1wrqx589hdmh279xhnxdszrq898igywb"; + sha256 = "0545vh0sb5i4cz9c0qgch77smpwgav3rhl1dxk9ij6rx4igjk03j"; }; - propagatedBuildInputs = [ misaka werkzeug ipaddr configparser html5lib ]; + propagatedBuildInputs = [ + bleach + cffi + configparser + html5lib + ipaddr + jinja2 + misaka + werkzeug + ]; checkInputs = [ nose ]; @@ -52,3 +36,4 @@ in with python.pkgs; buildPythonApplication rec { maintainers = with maintainers; [ fgaz ]; }; } + diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index bb8732f3aaec..e23c981e0c1f 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.10.420"; + version = "0.10.434"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "192nj5k3ad8k4xdipr052sb3y3hi9csmyhjadlyy6xl8m2zz6win"; + sha256 = "1vnkppmv7mw2p9bjcfmfxg66g02dq0020ad4z07gbp4dvixpzsnm"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 70112732d273..eaa21fcd0a5d 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.2"; + version = "5.3.4"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1p2vapyaf11d7zri73vnq1rsgwb018pqbjzdkdgppcm5xfrrjh8y"; + sha256 = "1fhzdkd1hr7l9cy7c9r03pgaxklfgj09q21ljrahqr006gcn1wgn"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "067rj2lrdwxda1clcg89m1cnl9sfrl2l9ia5fx2bcxq3yzhchazh"; + sha256 = "06andnnnsh68lmra9gc85rsmyx88cwlq2kwzks1d5axpy2mq5arv"; }; postPatch = '' diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 231124a42efb..21fe01e8a343 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { substituteInPlace man/manpage.xsl \ --replace /usr/share/xml/docbook/stylesheet/ ${docbook_xsl}/share/xml/ + for f in {lib,lib/cpp,src}/CMakeLists.txt ; do + substituteInPlace $f --replace /sbin/ldconfig ldconfig + done + # the manpages are not generated when using cmake pushd man make @@ -39,6 +43,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_THREADING=ON" + "-DWITH_WEBSOCKETS=ON" ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/nas/default.nix b/pkgs/servers/nas/default.nix index 1dba428e0ae9..9b8402ec0e08 100644 --- a/pkgs/servers/nas/default.nix +++ b/pkgs/servers/nas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, imake, bison, flex_2_6_1, gccmakedep +{ stdenv, fetchurl, imake, bison, flex, gccmakedep , xproto, libXau, libXt, libXext, libXaw, libXpm, xorgcffiles }: let @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "17dk0ckm6mp1ajc0cd6bwyi638ynw2f6bhbn7gynrs0wfmiyldng"; }; - nativeBuildInputs = [ imake bison flex_2_6_1 gccmakedep ]; + nativeBuildInputs = [ imake bison flex gccmakedep ]; buildInputs = [ xproto libXau libXt libXext libXaw libXpm ]; diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 1f4876c11183..12684eab551a 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -3,14 +3,14 @@ let in stdenv.mkDerivation rec { - version = "3.3.16"; + version = "3.3.19"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "0pw930ri5a0f1s6mhsbjc58lsmpy535f5wv2vcp8mzdx1rk3l091"; + sha256 = "1qg4lqnn5x0xsmkq41mjj301mfh76r8ys1rkzhinxlq30jld3155"; }; buildInputs = [ diff --git a/pkgs/servers/samba/3.x.nix b/pkgs/servers/samba/3.x.nix index 4d9fc46dcf7f..1f432c189880 100644 --- a/pkgs/servers/samba/3.x.nix +++ b/pkgs/servers/samba/3.x.nix @@ -87,10 +87,11 @@ stdenv.mkDerivation rec { '' # */ + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf"; - meta = { + meta = with stdenv.lib; { homepage = https://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl3; knownVulnerabilities = [ "Numerous CVEs and no patches from upstream for 3.x since 2014." ]; diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index c32dcf475c5c..4be2c10b2e4e 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, pkgconfig -, bison, openssl, readline +{ stdenv, fetchurl, pkgconfig, file +, bison, openssl, readline, bzip2 }: let - version = "11.29.7"; + version = "11.31.11"; in stdenv.mkDerivation rec { name = "monetdb-${version}"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "19f9zfg94k8hr9qc7jp1iwl8av08mibzgmid0gbqplyhf6x1j0r7"; + sha256 = "0x504jdxnqpxln6b69dqagzm2zknf11lykckmydzi6vapfc5msd3"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bison openssl readline ]; + postPatch = '' + sed -i "s,/usr/bin/file,${file}/bin/file," configure + ''; + + nativeBuildInputs = [ pkgconfig file ]; + buildInputs = [ bison openssl readline bzip2 ]; meta = with stdenv.lib; { description = "An open source database system"; diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 15f82a90208c..36f5200d43bc 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -69,9 +69,14 @@ self = stdenv.mkDerivation rec { mysqlVersion = "5.5"; }; - meta = { + meta = with stdenv.lib; { homepage = https://www.mysql.com/; description = "The world's most popular open source database"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + # See https://downloads.mysql.com/docs/licenses/mysqld-5.5-gpl-en.pdf + license = with licenses; [ + artistic1 bsd0 bsd2 bsd3 bsdOriginal + gpl2 lgpl2 lgpl21 mit publicDomain licenses.zlib + ]; }; }; in self diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index b5912dd9ab94..51fca3997591 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -75,9 +75,13 @@ self = stdenv.mkDerivation rec { mysqlVersion = "5.7"; }; - meta = { + meta = with stdenv.lib; { homepage = https://www.mysql.com/; description = "The world's most popular open source database"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = with licenses; [ + artistic1 bsd0 bsd2 bsd3 bsdOriginal + gpl2 lgpl2 lgpl21 mit publicDomain licenses.zlib + ]; }; }; in self diff --git a/pkgs/servers/sql/postgresql/pgtap/default.nix b/pkgs/servers/sql/postgresql/pgtap/default.nix index 2f37d3a85d3e..6386049be395 100644 --- a/pkgs/servers/sql/postgresql/pgtap/default.nix +++ b/pkgs/servers/sql/postgresql/pgtap/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ willibutz ]; homepage = https://pgtap.org; inherit (postgresql.meta) platforms; + license = licenses.mit; }; } diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index eda1f060df27..0daf7533a604 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 = [ ]; + license = licenses.gpl2; }; } diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index 536e96354d92..17ec49d16131 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 = [ ]; + license = licenses.gpl2; }; } diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c53bd9121728..b53a5a235333 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2470,6 +2470,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xf86videovboxvideo = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + name = "xf86-video-vboxvideo-1.0.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2; + sha256 = "195z1js3i51qgxvhfw4bxb4dw3jcrrx2ynpm2y3475dypjzs7dkz"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xf86videovesa = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-vesa-2.4.0"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index a832302abdc5..1775d697d810 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -164,6 +164,7 @@ mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index ebdc73aec30a..535fb061de9b 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -34,8 +34,9 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = { + meta = with stdenv.lib; { description = "IRC transport module for XMPP"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index aeed7484f82e..b1c4d93f687e 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -32,8 +32,9 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = { + meta = with stdenv.lib; { description = "Email transport module for XMPP"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } |