diff options
Diffstat (limited to 'pkgs/servers')
22 files changed, 144 insertions, 247 deletions
diff --git a/pkgs/servers/consul/Gemfile b/pkgs/servers/consul/Gemfile deleted file mode 100644 index 0e782af6b000..000000000000 --- a/pkgs/servers/consul/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -# A sample Gemfile -source "https://rubygems.org" - -gem "uglifier" -gem "sass" diff --git a/pkgs/servers/consul/Gemfile.lock b/pkgs/servers/consul/Gemfile.lock deleted file mode 100644 index 60a565f66951..000000000000 --- a/pkgs/servers/consul/Gemfile.lock +++ /dev/null @@ -1,25 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - execjs (2.7.0) - ffi (1.9.23) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - sass (3.5.6) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - uglifier (4.1.10) - execjs (>= 0.3.0, < 3) - -PLATFORMS - ruby - -DEPENDENCIES - sass - uglifier - -BUNDLED WITH - 1.14.6 diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 5cf192791000..d1dcd78667f0 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -1,22 +1,27 @@ -{ stdenv, buildGoPackage, consul-ui, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "consul-${version}"; - version = "0.9.3"; + version = "1.3.0"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul"; + # Note: Currently only release tags are supported, because they have the Consul UI + # vendored. See + # https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834 + # If you want to use a non-release commit as `src`, you probably want to improve + # this derivation so that it can build the UI's JavaScript from source. + # See https://github.com/NixOS/nixpkgs/pull/49082 for something like that. + # Or, if you want to patch something that doesn't touch the UI, you may want + # to apply your changes as patches on top of a release commit. src = fetchFromGitHub { owner = "hashicorp"; repo = "consul"; inherit rev; - sha256 = "1176frp7kimpycsmz9wrbizf46jgxr8jq7hz5w4q1x90lswvrxv3"; + sha256 = "1zv84snvrjm74w3v3rr27linsbxj00m73xd047sb78a4766xs2h0"; }; - # 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=") ''; @@ -26,6 +31,6 @@ buildGoPackage rec { homepage = https://www.consul.io/; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; - maintainers = with maintainers; [ pradeepchhetri ]; + maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 ]; }; } diff --git a/pkgs/servers/consul/gemset.nix b/pkgs/servers/consul/gemset.nix deleted file mode 100644 index 2a5425ccf5f5..000000000000 --- a/pkgs/servers/consul/gemset.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - execjs = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1"; - type = "gem"; - }; - version = "2.7.0"; - }; - ffi = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; - type = "gem"; - }; - version = "1.9.23"; - }; - rb-fsevent = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; - type = "gem"; - }; - version = "0.10.3"; - }; - rb-inotify = { - dependencies = ["ffi"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; - type = "gem"; - }; - version = "0.9.10"; - }; - sass = { - dependencies = ["sass-listen"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; - type = "gem"; - }; - version = "3.5.6"; - }; - sass-listen = { - dependencies = ["rb-fsevent" "rb-inotify"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; - type = "gem"; - }; - version = "4.0.0"; - }; - uglifier = { - dependencies = ["execjs"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dycp9c5xiricla6sgvg0vf22i3axs5k1v1607dvl7nv1xkkaczi"; - type = "gem"; - }; - version = "4.1.10"; - }; -} \ No newline at end of file diff --git a/pkgs/servers/consul/ui-no-bundle-exec.patch b/pkgs/servers/consul/ui-no-bundle-exec.patch deleted file mode 100644 index 5707b871049b..000000000000 --- a/pkgs/servers/consul/ui-no-bundle-exec.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/ui/scripts/dist.sh b/ui/scripts/dist.sh -index 0ad6e28e..db340da0 100755 ---- a/ui/scripts/dist.sh -+++ b/ui/scripts/dist.sh -@@ -15,10 +15,9 @@ DEPLOY="../pkg/web_ui" - rm -rf $DEPLOY - mkdir -p $DEPLOY - --bundle check >/dev/null 2>&1 || bundle install --bundle exec sass styles/base.scss static/base.css -+sass styles/base.scss static/base.css - --bundle exec ruby scripts/compile.rb -+ruby scripts/compile.rb - - # Copy into deploy - shopt -s dotglob diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix deleted file mode 100644 index da9b518bad73..000000000000 --- a/pkgs/servers/consul/ui.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, consul, ruby, bundlerEnv, zip, nodejs }: - -let - # `sass` et al - gems = bundlerEnv { - name = "consul-ui-deps"; - gemdir = ./.; - }; -in - -stdenv.mkDerivation { - name = "consul-ui-${consul.version}"; - - src = consul.src; - - buildInputs = [ ruby gems zip nodejs ]; - - patches = [ ./ui-no-bundle-exec.patch ]; - - postPatch = "patchShebangs ./ui/scripts/dist.sh"; - - buildPhase = '' - # Build ui static files - cd ui - make dist - ''; - - installPhase = '' - # Install ui static files - mkdir -p $out - mv ../pkg/web_ui/* $out - ''; - - meta = with stdenv.lib; { - homepage = https://www.consul.io/; - description = "A tool for service discovery, monitoring and configuration"; - maintainers = with maintainers; [ cstrahan wkennington ]; - license = licenses.mpl20 ; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index b760b080ab78..ceefa542e6a4 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -12,11 +12,11 @@ inherit (stdenv.lib) optional concatStringsSep; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "68a0137e0e15061ee7dec53a2e424aa3266611720db3843853c6e7774a414f40"; + sha256 = "8f3deba4695784a666cde317bc6af80ecf42ce1047b01f4b9c582fdc021c7492"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 73cc01281493..01232bd94704 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.81.2"; + version = "0.81.5"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -867,7 +867,7 @@ "sensor.bme680" = ps: with ps; [ ]; "sensor.bmw_connected_drive" = ps: with ps; [ ]; "sensor.bom" = ps: with ps; [ ]; - "sensor.broadlink" = ps: with ps; [ ]; + "sensor.broadlink" = ps: with ps; [ broadlink ]; "sensor.buienradar" = ps: with ps; [ ]; "sensor.canary" = ps: with ps; [ ]; "sensor.cert_expiry" = ps: with ps; [ ]; @@ -1166,7 +1166,7 @@ "switch.arduino" = ps: with ps; [ ]; "switch.arest" = ps: with ps; [ ]; "switch.bbb_gpio" = ps: with ps; [ ]; - "switch.broadlink" = ps: with ps; [ ]; + "switch.broadlink" = ps: with ps; [ broadlink ]; "switch.command_line" = ps: with ps; [ ]; "switch.deconz" = ps: with ps; [ ]; "switch.deluge" = ps: with ps; [ deluge-client ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 932995513af6..427f35e2fbcd 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -79,7 +79,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.81.2"; + hassVersion = "0.81.5"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -94,7 +94,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0qg3kh99bqhsraa8jpqqrvaxz9l1gsbh3aazg3v0d6q6ng42y2bq"; + sha256 = "1fgf9hrv7q7g8s561sir951vd27a459mh3k685xzfnhkh4si47g4"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 4af2a4ec9220..89d77649d971 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20181026.1"; + version = "20181026.4"; src = fetchPypi { inherit pname version; - sha256 = "ea5e7fb769df2f096e2993c23d1aa3dc8652e0f0aa09a89863af22e095b80aa8"; + sha256 = "b0610206eee06042847d89a581ecfcd71255b0e1ecff77e302237e8aa175b00d"; }; propagatedBuildInputs = [ user-agents ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index dab58d2edd6b..e0c666b002a9 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,4 +1,6 @@ -{ stdenv, python2Packages, fetchurl, fetchFromGitHub }: +{ lib, stdenv, python2Packages, fetchurl, fetchFromGitHub +, enableSystemd ? true +}: let matrix-angular-sdk = python2Packages.buildPythonPackage rec { name = "matrix-angular-sdk-${version}"; @@ -26,13 +28,13 @@ let }; in python2Packages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.33.6"; + version = "0.33.8"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "0c1dr09f1msv6xvpmdlncx7yyj6qxnpihd93lqckd115fds12g5h"; + sha256 = "122ba09xkc1x35qaajcynkjikg342259rgy81m8abz0l8mcg4mkm"; }; patches = [ @@ -40,16 +42,41 @@ in python2Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python2Packages; [ - blist canonicaljson daemonize dateutil frozendict pillow pyasn1 - pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests - signedjson systemd twisted ujson unpaddedbase64 pyyaml prometheus_client - matrix-angular-sdk bleach netaddr jinja2 psycopg2 - psutil msgpack-python lxml matrix-synapse-ldap3 - phonenumbers jsonschema affinity bcrypt sortedcontainers treq - ]; + bcrypt + bleach + canonicaljson + daemonize + dateutil + frozendict + jinja2 + jsonschema + lxml + matrix-angular-sdk + matrix-synapse-ldap3 + msgpack-python + netaddr + phonenumbers + pillow + prometheus_client + psutil + psycopg2 + pyasn1 + pydenticon + pymacaroons-pynacl + pynacl + pyopenssl + pysaml2 + pyyaml + requests + signedjson + sortedcontainers + treq + twisted + unpaddedbase64 + ] ++ lib.optional enableSystemd systemd; - # Checks fail because of Tox. - doCheck = false; + doCheck = true; + checkPhase = "python -m twisted.trial test"; buildInputs = with python2Packages; [ mock setuptoolsTrial diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index b562df681a06..4e783f3a507e 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.8.5395"; - vsnHash = "10d48da0d"; - sha256 = "0lpsh87kcrqwi2qqkj1ccb86hif535yb45hhc41c0ixsfxbqk5cw"; + version = "1.13.9.5456"; + vsnHash = "ecd600442"; + sha256 = "6d1125d4e6eaa94a84f8c600230b867c2d0764644adbc959a96433b8fc210b61"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index 1d8d97f4bde5..90e27b2907e5 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "Radicale"; - version = "2.1.10"; + version = "2.1.11"; # No tests in PyPI tarball src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = version; - sha256 = "0ik9gvljxhmykkzzcv9kmkp4qjwgdrl9f7hp6300flx5kmqlcjb1"; + sha256 = "1k32iy55lnyyp1r75clarhwdqvw6w8mxb5v0l5aysga07fg2mix4"; }; # We only want functional tests diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 0326784b2ac8..04e85212f3cd 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { name = "solr-${version}"; - version = "4.10.3"; + version = "7.5.0"; src = fetchurl { url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz"; - sha256 = "1dp269jka4q62qhv47j91wsrsnbxfn23lsx6qcycbijrlyh28w5c"; + sha256 = "1g6f58j2pzb73phj4hfri9mj7vmql72by7w3xrbq1pbnqgzxmhpa"; }; - phases = [ "unpackPhase" "installPhase" ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/lib - cp dist/${name}.war $out/lib/solr.war - cp -r example/lib/ext $out/lib/ext + mkdir -p $out $out/bin + + cp -r bin/solr bin/post $out/bin/ + cp -r contrib $out/ + cp -r dist $out/ + cp -r example $out/ + cp -r server $out/ + + wrapProgram $out/bin/solr --set JAVA_HOME "${jre}" + wrapProgram $out/bin/post --set JAVA_HOME "${jre}" ''; meta = with stdenv.lib; { @@ -22,7 +29,7 @@ stdenv.mkDerivation rec { description = "Open source enterprise search platform from the Apache Lucene project"; license = licenses.asl20; platforms = platforms.all; - maintainers = [ maintainers.rickynils maintainers.domenkozar ]; + maintainers = [ maintainers.rickynils maintainers.domenkozar maintainers.aanderse ]; }; } diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index b81b4340d767..f8bf08b55b7d 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -89,11 +89,11 @@ let }; meta = with lib; { - homepage = https://www.postgresql.org; + homepage = https://www.postgresql.org; description = "A powerful, open source object-relational database system"; - license = licenses.postgresql; - maintainers = [ maintainers.ocharles ]; - platforms = platforms.unix; + license = licenses.postgresql; + maintainers = with maintainers; [ ocharles thoughtpolice ]; + platforms = platforms.unix; }; }); diff --git a/pkgs/servers/sql/postgresql/pg_hll/default.nix b/pkgs/servers/sql/postgresql/pg_hll/default.nix index 6c453f6a40c3..f91a8b1bf252 100644 --- a/pkgs/servers/sql/postgresql/pg_hll/default.nix +++ b/pkgs/servers/sql/postgresql/pg_hll/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "pg_hll-${version}"; - version = "2.10.2-${builtins.substring 0 7 src.rev}"; + version = "2.12"; buildInputs = [ postgresql ]; src = fetchFromGitHub { owner = "citusdata"; repo = "postgresql-hll"; - rev = "9af41684d479a3097bab87d04936702c9e6baf5c"; - sha256 = "044x9v9kjhxb0idqb9f5i7c3yygxxsqliswl4kspqy9f9qcblckl"; + rev = "refs/tags/v${version}"; + sha256 = "1jdc9gjqc3dkjxv855q1p594j0awhrrymrcqnl5vw5vx2ny3bpgn"; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix index a50605bd0409..14f71b1e2b3b 100644 --- a/pkgs/servers/sql/postgresql/pg_repack/default.nix +++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix @@ -1,35 +1,35 @@ { stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: stdenv.mkDerivation rec { - name = "pg_repack-${version}"; - version = "1.4.4"; + name = "pg_repack-${version}"; + version = "1.4.4"; - buildInputs = [ postgresql openssl zlib readline ]; + buildInputs = [ postgresql openssl zlib readline ]; - src = fetchFromGitHub { - owner = "reorg"; - repo = "pg_repack"; - rev = "refs/tags/ver_${version}"; - sha256 = "0ynsmsxfkcp82ccpz2nrgg8wiil8yxqigvw6425lx8v80h5lszbw"; - }; + src = fetchFromGitHub { + owner = "reorg"; + repo = "pg_repack"; + rev = "refs/tags/ver_${version}"; + sha256 = "0ynsmsxfkcp82ccpz2nrgg8wiil8yxqigvw6425lx8v80h5lszbw"; + }; - installPhase = '' - install -D bin/pg_repack -t $out/bin/ - install -D lib/pg_repack.so -t $out/lib/ - install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/extension - ''; + installPhase = '' + install -D bin/pg_repack -t $out/bin/ + install -D lib/pg_repack.so -t $out/lib/ + install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/extension + ''; - meta = with stdenv.lib; { - description = "Reorganize tables in PostgreSQL databases with minimal locks"; - longDescription = '' - pg_repack is a PostgreSQL extension which lets you remove bloat from tables and indexes, and optionally restore - the physical order of clustered indexes. Unlike CLUSTER and VACUUM FULL it works online, without holding an - exclusive lock on the processed tables during processing. pg_repack is efficient to boot, - with performance comparable to using CLUSTER directly. - ''; - license = licenses.bsd3; - maintainers = with maintainers; [ danbst ]; - inherit (postgresql.meta) platforms; - inherit (src.meta) homepage; - }; + meta = with stdenv.lib; { + description = "Reorganize tables in PostgreSQL databases with minimal locks"; + longDescription = '' + pg_repack is a PostgreSQL extension which lets you remove bloat from tables and indexes, and optionally restore + the physical order of clustered indexes. Unlike CLUSTER and VACUUM FULL it works online, without holding an + exclusive lock on the processed tables during processing. pg_repack is efficient to boot, + with performance comparable to using CLUSTER directly. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ danbst ]; + inherit (postgresql.meta) platforms; + inherit (src.meta) homepage; + }; } diff --git a/pkgs/servers/sql/postgresql/pgjwt/default.nix b/pkgs/servers/sql/postgresql/pgjwt/default.nix index 3e01d9bfe2ca..ab7ba8943a7b 100644 --- a/pkgs/servers/sql/postgresql/pgjwt/default.nix +++ b/pkgs/servers/sql/postgresql/pgjwt/default.nix @@ -1,19 +1,23 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, postgresql }: + stdenv.mkDerivation rec { - name = "pgjwt-${version}"; + name = "pgjwt-${version}"; version = "unstable-2017-04-24"; + src = fetchFromGitHub { - owner = "michelp"; - repo = "pgjwt"; - rev = "546a2911027b716586e241be7fd4c6f1785237cd"; + owner = "michelp"; + repo = "pgjwt"; + rev = "546a2911027b716586e241be7fd4c6f1785237cd"; sha256 = "1riz0xvwb6y02j0fljbr9hcbqb2jqs4njlivmavy9ysbcrrv1vrf"; }; - dontBuild = true; + + buildPhase = ":"; installPhase = '' mkdir -p $out/bin # current postgresql extension mechanism in nixos requires bin directory mkdir -p $out/share/extension cp pg*sql *.control $out/share/extension ''; + meta = with stdenv.lib; { description = "PostgreSQL implementation of JSON Web Tokens"; longDescription = '' diff --git a/pkgs/servers/sql/postgresql/plv8/default.nix b/pkgs/servers/sql/postgresql/plv8/default.nix index 009f65b9d81c..dae3b2fd1af1 100644 --- a/pkgs/servers/sql/postgresql/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/plv8/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "plv8-${version}"; - version = "2.1.0"; + version = "2.3.8"; nativeBuildInputs = [ perl ]; buildInputs = [ v8 postgresql ]; @@ -11,16 +11,20 @@ stdenv.mkDerivation rec { owner = "plv8"; repo = "plv8"; rev = "v${version}"; - sha256 = "1sfpxz0zcbinn6822j12lkwgrw9kfacrs83ic968rm489rl9w241"; + sha256 = "0hrmn1zzzdf52zwldg6axv57p0f3b279l9s8lbpijcv60fqrzx16"; }; + makeFlags = [ "--makefile=Makefile.shared" ]; + preConfigure = '' - substituteInPlace Makefile --replace '-lv8_libplatform' '-lv8_libplatform -lv8_libbase' + patchShebangs ./generate_upgrade.sh ''; + buildPhase = "make -f Makefile.shared all"; + installPhase = '' mkdir -p $out/bin - install -D plv8.so -t $out/lib + install -D plv8*.so -t $out/lib install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/extension ''; diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix index fab515035ce6..3c53054ba7de 100644 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, postgresql }: +{ stdenv, fetchFromGitHub, cmake, postgresql, openssl }: # # To enable on NixOS: # config.services.postgresql = { @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "0.11.0"; + version = "1.0.0"; nativeBuildInputs = [ cmake ]; - buildInputs = [ postgresql ]; + buildInputs = [ postgresql openssl ]; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "06xysf45r0c2sjfl6vgdbrm7pn7nxx2n0k29bm88q0ipyyp9fr0v"; + sha256 = "1359jc0dw8q3f0iipqfadzs8lvri9qa5w59ziz00x1d09ppw2q40"; }; # Fix the install phase which tries to install into the pgsql extension dir, @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = https://www.timescale.com/; maintainers = with maintainers; [ volth ]; platforms = platforms.linux; - license = licenses.postgresql; + license = licenses.asl20; }; } diff --git a/pkgs/servers/sql/postgresql/topn/default.nix b/pkgs/servers/sql/postgresql/topn/default.nix index 6886c80cf50d..dae30aadabd0 100644 --- a/pkgs/servers/sql/postgresql/topn/default.nix +++ b/pkgs/servers/sql/postgresql/topn/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "pg_topn-${version}"; - version = "2.0.2"; + version = "2.2.0"; nativeBuildInputs = [ protobufc ]; buildInputs = [ postgresql ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "postgresql-topn"; rev = "refs/tags/v${version}"; - sha256 = "00hc3hgnqv9xaalizbcvprb7s55sydj2qgk3rhgrdlwg2g025h62"; + sha256 = "1i5fn517mdvzfhlcj7fh4z0iniynanshcn7kzhsq19sgci0g31fr"; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix index 5140ae1a228f..b43a9c51be0c 100644 --- a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix +++ b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "tsearch-extras-${version}"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { - owner = "zulip"; - repo = "tsearch_extras"; - rev = version; - sha256 = "0i3i99lw80jwd4xflgdqabxmn1dnm1gm7dzf1mqv2drllxcy3yix"; + owner = "zulip"; + repo = "tsearch_extras"; + rev = "84e78f00931c4ef261d98197d6b5d94fc141f742"; # no release tag? + sha256 = "18j0saqblg3jhrz38splk173xjwdf32c67ymm18m8n5y94h8d2ba"; }; nativenativeBuildInputs = [ pkgconfig ]; |