public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit staging+systemd into closure-size

Browse Source 
Many non-conflict problems weren't (fully) resolved in this commit yet.
This commit is contained in:
Vladimír Čunát
2015-10-03 13:33:13 +02:00
parent d6dd3b8bd1 33373d939a
commit 5227fb1dd5
6304 changed files with 708456 additions and 130039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/servers/sql/mariadb/default.nix
View File

@@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "mariadb-${version}";
version = "10.0.17";
version = "10.0.21";
src = fetchurl {
url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz";
sha256 = "04ckq67qgkghh7yzrbzwidk7wn7yjml15gzj2c5p1hs2k7lr9lww";
sha256 = "0i9mzbn35f4lj4y1lqzgbavh5xyx18zfn0ks0nqzvppabkhk56jb";
};
buildInputs = [ cmake ncurses openssl zlib pcre libxml2 boost judy bison libevent ]
@@ -49,11 +49,13 @@ stdenv.mkDerivation rec {
"-DWITH_PARTITION_STORAGE_ENGINE=1"
"-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1"
"-DWITHOUT_FEDERATED_STORAGE_ENGINE=1"
] ++ stdenv.lib.optional stdenv.isDarwin "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1";
] ++ stdenv.lib.optionals stdenv.isDarwin [
"-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1"
"-DWITHOUT_TOKUDB=1"
];
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
enableParallelBuilding = true;
# fails to find lex_token.h sometimes
enableParallelBuilding = false;
outputs = [ "out" "lib" ];
setOutputFlags = false;
@@ -105,6 +107,9 @@ stdenv.mkDerivation rec {
# Make sure to propagate lib for compatability
mkdir -p $out/nix-support
echo "$lib" > $out/nix-support/propagated-native-build-inputs
# Don't install static libraries.
rm $lib/lib/libmysqlclient.a $lib/lib/libmysqld.a
'';
passthru.mysqlVersion = "5.6";
@@ -113,7 +118,7 @@ stdenv.mkDerivation rec {
description = "An enhanced, drop-in replacement for MySQL";
homepage = https://mariadb.org/;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ shlevy thoughtpolice wkennington ];
maintainers = with stdenv.lib.maintainers; [ thoughtpolice wkennington ];
platforms = stdenv.lib.platforms.all;
};
}

4
pkgs/servers/sql/monetdb/default.nix
View File

@@ -4,7 +4,7 @@ let inherit (composableDerivation) edf; in
composableDerivation.composableDerivation {} {
name = "monetdb-may-2009";
name = "monetdb-2009-05-01";
src = fetchurl {
url = http://monetdb.cwi.nl/downloads/sources/May2009-SP1/MonetDB-May2009-SuperBall-SP1.tar.bz2;
@@ -34,7 +34,7 @@ composableDerivation.composableDerivation {} {
'';
meta = {
description = "MonetDB is a open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval";
description = "A open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval";
homepage = http://monetdb.cwi.nl/;
license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
};

44
pkgs/servers/sql/mysql/5.5.17-cygwin.patch Normal file
View File

@@ -0,0 +1,44 @@
--- mysql-5.5.17/cmake/install_macros.cmake 2011-10-12 07:10:24.000000000 -0500
+++ mysql-5.5.17/cmake/install_macros.cmake 2011-11-07 23:19:35.772837800 -0600
@@ -230,7 +230,13 @@ FUNCTION(MYSQL_INSTALL_TARGETS)
IF(ARG_COMPONENT)
SET(COMP COMPONENT ${ARG_COMPONENT})
ENDIF()
- INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP})
+ IF(${ARG_DESTINATION} STREQUAL "${INSTALL_LIBDIR}")
+ INSTALL(TARGETS ${TARGETS} LIBRARY DESTINATION ${ARG_DESTINATION}
+ RUNTIME DESTINATION bin
+ ARCHIVE DESTINATION ${ARG_DESTINATION} ${COMP})
+ ELSE()
+ INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP})
+ ENDIF()
SET(INSTALL_LOCATION ${ARG_DESTINATION} )
INSTALL_DEBUG_SYMBOLS("${TARGETS}")
SET(INSTALL_LOCATION)
--- mysql-5.5.17/libmysql/CMakeLists.txt 2011-10-12 07:10:24.000000000 -0500
+++ mysql-5.5.17/libmysql/CMakeLists.txt 2011-11-08 03:19:31.379219300 -0600
@@ -214,6 +214,7 @@ IF(NOT DISABLE_SHARED)
SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1)
SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+ IF(NOT CYGWIN)
# Install links to libmysqlclient.so (client_r)
GET_VERSIONED_LIBNAME(
"${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r"
@@ -231,5 +232,6 @@ IF(NOT DISABLE_SHARED)
linkname)
INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)
ENDFOREACH()
+ ENDIF(NOT CYGWIN)
ENDIF()
ENDIF()
--- mysql-5.5.17/strings/dtoa.c 2011-10-12 07:10:25.000000000 -0500
+++ mysql-5.5.17/strings/dtoa.c 2011-11-07 20:38:05.064690100 -0600
@@ -36,6 +36,7 @@
***************************************************************/
+#define __STRICT_ANSI__
#include <my_base.h> /* for EOVERFLOW on Windows */
#include <my_global.h>
#include <m_string.h> /* for memcpy and NOT_FIXED_DEC */

22
pkgs/servers/sql/mysql/5.5.17-export-symbols.patch Normal file
View File

@@ -0,0 +1,22 @@
--- mysql-5.5.17/libmysql/CMakeLists.txt 2011-10-12 07:10:24.000000000 -0500
+++ mysql-5.5.17/libmysql/CMakeLists.txt 2011-11-08 03:19:31.379219300 -0600
@@ -25,6 +25,11 @@ INCLUDE_DIRECTORIES(
ADD_DEFINITIONS(${SSL_DEFINES})
SET(CLIENT_API_FUNCTIONS
+dynstr_free
+dynstr_append_mem
+dynstr_append_os_quoted
+dynstr_realloc
+init_dynamic_string
get_tty_password
handle_options
load_defaults
@@ -131,6 +136,7 @@ mysql_server_end
mysql_set_character_set
mysql_get_character_set_info
mysql_stmt_next_result
+strfill
CACHE INTERNAL "Functions exported by client API"

11
pkgs/servers/sql/mysql/5.5.x.nix
View File

@@ -4,13 +4,18 @@
stdenv.mkDerivation rec {
name = "mysql-${version}";
version = "5.5.42";
version = "5.5.45";
src = fetchurl {
url = "http://mysql.mirrors.pair.com/Downloads/MySQL-5.5/${name}.tar.gz";
sha256 = "0jn7py2wsq78rwi7vfihxs6z3h5hr338b9g46fl3z2g4ddki4yw8";
url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
sha256 = "0clkr3r44j8nsgmjzv6r09pb0vjangn5hpyjxgg5ynr674ygskkl";
};
patches = if stdenv.isCygwin then [
./5.5.17-cygwin.patch
./5.5.17-export-symbols.patch
] else null;
preConfigure = stdenv.lib.optional stdenv.isDarwin ''
ln -s /bin/ps $TMPDIR/ps
export PATH=$PATH:$TMPDIR

30
pkgs/servers/sql/postgresql/8.4.x.nix
View File

@@ -1,30 +0,0 @@
{ stdenv, fetchurl, zlib, ncurses, readline, openssl }:
let version = "8.4.22"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw";
};
buildInputs = [ zlib ncurses readline openssl ];
LC_ALL = "C";
configureFlags = [ "--with-openssl" ];
patches = [ ./less-is-more.patch ];
passthru = { inherit readline; };
meta = {
homepage = http://www.postgresql.org/;
description = "A powerful, open source object-relational database system";
license = stdenv.lib.licenses.postgresql;
maintainers = [ stdenv.lib.maintainers.ocharles ];
hydraPlatforms = stdenv.lib.platforms.linux;
};
}

33
pkgs/servers/sql/postgresql/9.0.x.nix
View File

@@ -1,33 +0,0 @@
{ stdenv, fetchurl, zlib, readline, openssl }:
let version = "9.0.19"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "1h45jdbzdcvprdsi9gija81s3ny46h3faf9f007gza4vm6y15bak";
};
buildInputs = [ zlib readline openssl ];
LC_ALL = "C";
configureFlags = [ "--with-openssl" ];
patches = [ ./less-is-more.patch ];
passthru = {
inherit readline;
psqlSchema = "9.0";
};
meta = {
homepage = http://www.postgresql.org/;
description = "A powerful, open source object-relational database system";
license = stdenv.lib.licenses.postgresql;
maintainers = [ stdenv.lib.maintainers.ocharles ];
hydraPlatforms = stdenv.lib.platforms.linux;
};
}

41
pkgs/servers/sql/postgresql/9.1.x.nix
View File

@@ -1,41 +0,0 @@
{ stdenv, fetchurl, zlib, readline, openssl }:
let version = "9.1.15"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "0pyyw0cy91z9wkqf8qzkwsy8cyjps0s94c9czz6mzhyd2npxxmk7";
};
buildInputs = [ zlib readline openssl ];
enableParallelBuilding = true;
LC_ALL = "C";
configureFlags = [ "--with-openssl" ];
patches = [ ./less-is-more.patch ];
postInstall =
''
mkdir -p $out/share/man
cp -rvd doc/src/sgml/man1 $out/share/man
'';
passthru = {
inherit readline;
psqlSchema = "9.1";
};
meta = {
homepage = http://www.postgresql.org/;
description = "A powerful, open source object-relational database system";
license = stdenv.lib.licenses.postgresql;
maintainers = [ stdenv.lib.maintainers.ocharles ];
hydraPlatforms = stdenv.lib.platforms.linux;
};
}

39
pkgs/servers/sql/postgresql/9.2.x.nix
View File

@@ -1,39 +0,0 @@
{ stdenv, fetchurl, zlib, readline, openssl }:
let version = "9.2.10"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "1bbkinqzb3c8i0vfzcy2g7djrq0kxz63jgvzda9p0vylxazmnm1m";
};
buildInputs = [ zlib readline openssl ];
enableParallelBuilding = true;
makeFlags = [ "world" ];
configureFlags = [ "--with-openssl" ];
patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ];
installTargets = [ "install-world" ];
LC_ALL = "C";
passthru = {
inherit readline;
psqlSchema = "9.2";
};
meta = {
homepage = http://www.postgresql.org/;
description = "A powerful, open source object-relational database system";
license = stdenv.lib.licenses.postgresql;
maintainers = [ stdenv.lib.maintainers.ocharles ];
hydraPlatforms = stdenv.lib.platforms.linux;
};
}

43
pkgs/servers/sql/postgresql/9.3.x.nix
View File

@@ -1,43 +0,0 @@
{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl}:
with stdenv.lib;
let version = "9.3.6"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "056ass7nnfyv7blv02anv795kgpz77gipdpxggd835cdwrhwns13";
};
buildInputs = [ zlib readline openssl ]
++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
enableParallelBuilding = true;
makeFlags = [ "world" ];
configureFlags = [ "--with-openssl" ]
++ optional (!stdenv.isDarwin) "--with-ossp-uuid";
patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ];
installTargets = [ "install-world" ];
LC_ALL = "C";
passthru = {
inherit readline;
psqlSchema = "9.3";
};
meta = {
homepage = http://www.postgresql.org/;
description = "A powerful, open source object-relational database system";
license = stdenv.lib.licenses.postgresql;
maintainers = [ stdenv.lib.maintainers.ocharles ];
hydraPlatforms = stdenv.lib.platforms.linux;
};
}

43
pkgs/servers/sql/postgresql/9.4.x.nix
View File

@@ -1,43 +0,0 @@
{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl }:
with stdenv.lib;
let version = "9.4.1"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "19n3i14bhmw8dacd2kl3n1wzj362qv3fjmal5vsvi580h9ybgp99";
};
buildInputs = [ zlib readline openssl ]
++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
enableParallelBuilding = true;
makeFlags = [ "world" ];
configureFlags = [ "--with-openssl" ]
++ optional (!stdenv.isDarwin) "--with-ossp-uuid";
patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ];
installTargets = [ "install-world" ];
LC_ALL = "C";
passthru = {
inherit readline;
psqlSchema = "9.4";
};
meta = {
homepage = http://www.postgresql.org/ ;
description = "A powerful, open source object-relational database system";
license = stdenv.lib.licenses.postgresql;
maintainers = with stdenv.lib.maintainers; [ aristid ocharles ];
hydraPlatforms = stdenv.lib.platforms.linux;
};
}

91
pkgs/servers/sql/postgresql/default.nix Normal file
View File

@@ -0,0 +1,91 @@
{ lib, stdenv, fetchurl, zlib, readline, libossp_uuid, openssl }:
let
common = { version, sha256, psqlSchema } @ args: stdenv.mkDerivation (rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
inherit sha256;
};
outputs = [ "out" "doc" ];
buildInputs =
[ zlib readline openssl ]
++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ];
enableParallelBuilding = true;
makeFlags = [ "world" ];
configureFlags =
[ "--with-openssl" ]
++ lib.optional (stdenv.isDarwin) "--with-uuid=e2fs"
++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid";
patches =
[ (if lib.versionAtLeast version "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch)
./less-is-more.patch
];
installTargets = [ "install-world" ];
LC_ALL = "C";
postInstall =
''
# Prevent a retained dependency on gcc-wrapper.
substituteInPlace $out/lib/pgxs/src/Makefile.global --replace ${stdenv.cc}/bin/ld ld
'';
disallowedReferences = [ stdenv.cc ];
passthru = {
inherit readline psqlSchema;
};
meta = with lib; {
homepage = http://www.postgresql.org/;
description = "A powerful, open source object-relational database system";
license = licenses.postgresql;
maintainers = [ maintainers.ocharles ];
platforms = platforms.unix;
hydraPlatforms = platforms.linux;
};
});
in {
postgresql90 = common {
version = "9.0.22";
psqlSchema = "9.0";
sha256 = "19gq6axjhvlr5zlrzwnll1fbrvai4xh0nb1jki6gmmschl6v5m4l";
};
postgresql91 = common {
version = "9.1.18";
psqlSchema = "9.1";
sha256 = "1a44hmcvfaa8j169ladsibmvjakw6maaxqkzz1ab8139cqkda9i7";
};
postgresql92 = common {
version = "9.2.13";
psqlSchema = "9.2";
sha256 = "0i3avdr8mnvn6ldkx0hc4jmclhisb2338hzs0j2m03wck8hddjsx";
};
postgresql93 = common {
version = "9.3.9";
psqlSchema = "9.3";
sha256 = "0j85j69rf54cwz5yhrhk4ca22b82990j5sqb8cr1fl9843nd0fzp";
};
postgresql94 = common {
version = "9.4.4";
psqlSchema = "9.4";
sha256 = "04q07g209y99xzjh88y52qpvz225rxwifv8nzp3bxzfni2bdk3jk";
};
}

4
pkgs/servers/sql/postgresql/jdbc/default.nix
View File

@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
cp jars/*.jar $out/share/java
'';
meta = {
meta = with stdenv.lib; {
homepage = http://jdbc.postgresql.org/;
description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database";
license = "bsd";
license = licenses.bsd3;
};
}

4
pkgs/servers/sql/postgresql/psqlodbc/default.nix
View File

@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
configureFlags = "--with-iodbc=${libiodbc}";
meta = {
meta = with stdenv.lib; {
homepage = http://psqlodbc.projects.postgresql.org/;
description = "ODBC driver for PostgreSQL";
license = "LGPL";
license = licenses.lgpl2;
};
}