diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/mail/postfix/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/jdbc/default.nix | 8 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/pg_cron/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/sqlite/jdbc/default.nix | 19 | ||||
-rw-r--r-- | pkgs/servers/unifi/default.nix | 8 | ||||
-rw-r--r-- | pkgs/servers/varnish/default.nix | 13 |
6 files changed, 27 insertions, 27 deletions
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index d88b9f8b0dbc..796d5696ebfa 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl , coreutils, findutils, gnugrep, gawk, icu, pcre +, withLDAP ? true, openldap , withPgSQL ? false, postgresql , withMySQL ? false, mysql , withSQLite ? false, sqlite -, withLDAP ? false, openldap }: let diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix index 62ebf6b44533..c67d72705482 100644 --- a/pkgs/servers/sql/postgresql/jdbc/default.nix +++ b/pkgs/servers/sql/postgresql/jdbc/default.nix @@ -2,25 +2,25 @@ stdenv.mkDerivation rec { name = "postgresql-jdbc-${version}"; - version = "42.2.2"; + version = "42.2.5"; src = fetchMavenArtifact { artifactId = "postgresql"; groupId = "org.postgresql"; - sha256 = "0w7sfi1gmzqhyhr4iq9znv8hff41xwwqcblkyd9ph0m34r0555hr"; + sha256 = "1p0cbb7ka41xxipzjy81hmcndkqynav22xyipkg7qdqrqvw4dykz"; inherit version; }; phases = [ "installPhase" ]; installPhase = '' - install -D $src/share/java/*_postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar + install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar ''; meta = with stdenv.lib; { homepage = https://jdbc.postgresql.org/; description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; - license = licenses.bsd3; + license = licenses.bsd2; platforms = platforms.unix; }; } diff --git a/pkgs/servers/sql/postgresql/pg_cron/default.nix b/pkgs/servers/sql/postgresql/pg_cron/default.nix index c5a7a40546ef..959c2c382524 100644 --- a/pkgs/servers/sql/postgresql/pg_cron/default.nix +++ b/pkgs/servers/sql/postgresql/pg_cron/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "pg_cron-${version}"; - version = "1.0.2"; + version = "1.1.2"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "pg_cron"; rev = "refs/tags/v${version}"; - sha256 = "0z743bbal9j0pvqskznfj0zvjsqvdl7p90d4fdrl0sc0crc3nvyx"; + sha256 = "0n74dx1wkg9qxvjhnx03028465ap3p97v2kzqww833dws1wqk5m1"; }; installPhase = '' diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/pkgs/servers/sql/sqlite/jdbc/default.nix index 5b0425c410fc..4e40d8761526 100644 --- a/pkgs/servers/sql/sqlite/jdbc/default.nix +++ b/pkgs/servers/sql/sqlite/jdbc/default.nix @@ -1,25 +1,28 @@ -{ lib, stdenv, fetchurl }: +{ stdenv, fetchMavenArtifact }: stdenv.mkDerivation rec { - version = "3.20.0"; pname = "sqlite-jdbc"; name = "${pname}-${version}"; + version = "3.25.2"; - src = fetchurl { - url = "https://bitbucket.org/xerial/${pname}/downloads/${name}.jar"; - sha256 = "0wxfxnq2ghiwy2mwz3rljgmy1lciafhrw80lprvqz6iw8l51qfql"; + src = fetchMavenArtifact { + groupId = "org.xerial"; + artifactId = "sqlite-jdbc"; + inherit version; + sha256 = "1xk5fi2wzq3jspvbdm5hvs78501i14jy3v7x6fjnh5fnpqdacpd4"; }; phases = [ "installPhase" ]; installPhase = '' - install -D "${src}" "$out/share/java/${name}.jar" + install -m444 -D ${src}/share/java/*${name}.jar "$out/share/java/${name}.jar" ''; - meta = with lib; { + meta = with stdenv.lib; { homepage = "https://github.com/xerial/sqlite-jdbc"; - description = "SQLite JDBC Driver"; + description = "Library for accessing and creating SQLite database files in Java"; license = licenses.asl20; + platforms = platforms.linux; maintainers = with maintainers; [ jraygauthier ]; }; } diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index ae7dd9805776..fd1787d4c99d 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -49,13 +49,9 @@ in rec { }; unifiStable = generic { - version = "5.8.30"; - sha256 = "051cx1y51xmhvd3s8zbmknrcjdi46mj4yf1rlnngzr77rj77sqvi"; - }; - - unifiTesting = generic { version = "5.9.29"; - suffix = "-04b5d20997"; sha256 = "0djdjh7lwaa5nvhvz2yh6dn07iad5nq4jpab7rc909sljl6wvwvx"; }; + + unifiTesting = unifiStable; } diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 4d8841fad318..7517560a521c 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -2,7 +2,7 @@ , python2, makeWrapper }: let - common = { version, sha256 }: + common = { version, sha256, extraBuildInputs ? [] }: stdenv.mkDerivation rec { name = "varnish-${version}"; @@ -15,7 +15,7 @@ let buildInputs = [ pcre libxslt groff ncurses readline python2 libedit python2.pkgs.docutils makeWrapper - ]; + ] ++ extraBuildInputs; buildFlags = "localstatedir=/var/spool"; @@ -39,15 +39,16 @@ let in { varnish4 = common { - version = "4.1.9"; - sha256 = "11zwyasz2fn9qxc87r175wb5ba7388sd79mlygjmqn3yv2m89n12"; + version = "4.1.10"; + sha256 = "08kwx0il6cqxsx3897042plh1yxjaanbaqjbspfl0xgvyvxk6j1n"; }; varnish5 = common { version = "5.2.1"; sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq"; }; varnish6 = common { - version = "6.0.1"; - sha256 = "1f7k751r31sgfvr1ns6s3h48c5x06kkps1p6zd40wvylm56qxwj7"; + version = "6.1.0"; + sha256 = "0zg2aqkg7a4zsjpxj0s7mphxv5f9xy279hjwln30h901k18r46qn"; + extraBuildInputs = [ python2.pkgs.sphinx ]; }; } |