Author: simons
Date: Fri Aug 6 10:13:03 2010
New Revision: 22990
URL: https://svn.nixos.org/websvn/nix/?rev=22990&sc=1
Log:
Merging updates from trunk:
* Update Coq to version 8.2pl2 (patch by roconnor)
* Add libssh2
* Add optional scp support to curl
* Update to SQLite 3.7.0.1, which fixes a corruption bug when the
database is also accessed using SQLite 3.6.23.
* pam_krb5: added version 2.3.11-1.
* pam_ccreds: to locally authenticate using an enterprise identity when
the network is unavailable.
* heimdal: add sqlite support and install server executables to
$out/sbin
* added older version of sqlite for use in DBD-SQLite perl package,
which fails with newest one
Added:
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/libssh2/
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/libssh2/default.nix
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/sqlite/3.6.x.nix
- copied, changed from r22969,
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/sqlite/default.nix
nixpkgs/branches/parallel-building-merger/pkgs/os-specific/linux/pam_ccreds/
nixpkgs/branches/parallel-building-merger/pkgs/os-specific/linux/pam_ccreds/default.nix
nixpkgs/branches/parallel-building-merger/pkgs/os-specific/linux/pam_krb5/
nixpkgs/branches/parallel-building-merger/pkgs/os-specific/linux/pam_krb5/default.nix
Modified:
nixpkgs/branches/parallel-building-merger/pkgs/applications/science/logic/coq/default.nix
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/kerberos/heimdal.nix
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/sqlite/default.nix
nixpkgs/branches/parallel-building-merger/pkgs/tools/networking/curl/default.nix
nixpkgs/branches/parallel-building-merger/pkgs/tools/package-management/nix/sqlite.nix
nixpkgs/branches/parallel-building-merger/pkgs/top-level/all-packages.nix
nixpkgs/branches/parallel-building-merger/pkgs/top-level/perl-packages.nix
Modified:
nixpkgs/branches/parallel-building-merger/pkgs/applications/science/logic/coq/default.nix
==============================================================================
---
nixpkgs/branches/parallel-building-merger/pkgs/applications/science/logic/coq/default.nix
Fri Aug 6 08:54:27 2010 (r22989)
+++
nixpkgs/branches/parallel-building-merger/pkgs/applications/science/logic/coq/default.nix
Fri Aug 6 10:13:03 2010 (r22990)
@@ -4,19 +4,15 @@
{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}:
let
-
- pname = "coq";
- version = "8.2pl1";
- name = "${pname}-${version}";
-
+ version = "8.2pl2";
in
stdenv.mkDerivation {
- inherit name;
+ name = "coq-${version}";
src = fetchurl {
- url = "http://coq.inria.fr/V${version}/files/${name}.tar.gz";;
- sha256 =
"7c15acfd369111e51d937cce632d22fc77a6718a5ac9f2dd2dcbdfab4256ae0c";
+ url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz";;
+ sha256 = "0dh2vv3bvz8694dd12kjdkdaq19l1vslvygzif11igshc5bw4rhf";
};
buildInputs = [ ocaml camlp5 ncurses lablgtk ];
Modified:
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/kerberos/heimdal.nix
==============================================================================
---
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/kerberos/heimdal.nix
Fri Aug 6 08:54:27 2010 (r22989)
+++
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/kerberos/heimdal.nix
Fri Aug 6 10:13:03 2010 (r22990)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl }:
+{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} :
stdenv.mkDerivation rec {
name = "heimdal-1.3.3";
@@ -14,7 +14,16 @@
patches = [ ./no-md2.patch ];
## ugly, X should be made an option
- configureFlags = "--with-openldap=${openldap} --without-x";
-
- propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl ];
+ configureFlags = [
+ "--with-openldap=${openldap}"
+ "--with-sqlite3=${sqlite}"
+ "--without-x"
+ ];
+ # dont succeed with --libexec=$out/sbin, so
+ postInstall = ''
+ mv $out/libexec/* $out/sbin/
+ rmdir $out/libexec
+ '';
+
+ propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl sqlite];
}
Added:
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/libssh2/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/libssh2/default.nix
Fri Aug 6 10:13:03 2010 (r22990)
@@ -0,0 +1,19 @@
+{stdenv, fetchurlBoot, openssl, zlib}:
+
+stdenv.mkDerivation rec {
+ name = "libssh2-1.2.6";
+
+ src = fetchurlBoot {
+ url = "${meta.homepage}/download/${name}.tar.gz";
+ sha256 = "00f6hw972v7jd0rrdr6kx5cn7pa1spyx8xgc7vhjydksgsig3f8b";
+ };
+
+ buildInputs = [ openssl zlib ];
+
+ meta = {
+ description = "A client-side C library implementing the SSH2 protocol";
+ homepage = http://www.libssh2.org;
+ platforms = stdenv.lib.platforms.all;
+ maintainers = [ stdenv.lib.maintainers.urkud ];
+ };
+}
Copied and modified:
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/sqlite/3.6.x.nix
(from r22969,
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/sqlite/default.nix)
==============================================================================
---
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/sqlite/default.nix
Thu Aug 5 18:37:30 2010 (r22969, copy source)
+++
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/sqlite/3.6.x.nix
Fri Aug 6 10:13:03 2010 (r22990)
@@ -3,15 +3,14 @@
assert readline != null -> ncurses != null;
stdenv.mkDerivation {
- name = "sqlite-3.7.0";
+ name = "sqlite-3.6.23";
src = fetchurl {
- url = "http://www.sqlite.org/sqlite-amalgamation-3.7.0.tar.gz";;
- sha256 = "13krs46f6fx83hd13i1a6ndbqs12wv4nhgi2dg3aas58r40p7a3w";
+ url = "http://www.sqlite.org/sqlite-amalgamation-3.6.23.tar.gz";;
+ sha256 =
"a5de9ec9273acabc6cb18235df802549c476410b09d58a206e02862b4dc303ae";
};
- buildInputs = [ readline ncurses ];
-
+ buildInputs = [readline ncurses];
configureFlags = "--enable-threadsafe";
NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1";
Modified:
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/sqlite/default.nix
==============================================================================
---
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/sqlite/default.nix
Fri Aug 6 08:54:27 2010 (r22989)
+++
nixpkgs/branches/parallel-building-merger/pkgs/development/libraries/sqlite/default.nix
Fri Aug 6 10:13:03 2010 (r22990)
@@ -3,11 +3,11 @@
assert readline != null -> ncurses != null;
stdenv.mkDerivation {
- name = "sqlite-3.7.0";
+ name = "sqlite-3.7.0.1";
src = fetchurl {
- url = "http://www.sqlite.org/sqlite-amalgamation-3.7.0.tar.gz";;
- sha256 = "13krs46f6fx83hd13i1a6ndbqs12wv4nhgi2dg3aas58r40p7a3w";
+ url = "http://www.sqlite.org/sqlite-amalgamation-3.7.0.1.tar.gz";;
+ sha256 = "0nx506wmp32l6sh2p82bd2fscak1b402fp86cxl3r9pfs1yvychj";
};
buildInputs = [ readline ncurses ];
Added:
nixpkgs/branches/parallel-building-merger/pkgs/os-specific/linux/pam_ccreds/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/parallel-building-merger/pkgs/os-specific/linux/pam_ccreds/default.nix
Fri Aug 6 10:13:03 2010 (r22990)
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, pam, openssl, db}:
+
+stdenv.mkDerivation {
+ name = "pam_ccreds-10";
+
+ src = fetchurl {
+ url = "http://www.padl.com/download/pam_ccreds.tgz";;
+ sha256 = "1h7zyg1b1h69civyvrj95w22dg0y7lgw3hq4gqkdcg35w1y76fhz";
+ };
+ patchPhase = ''
+ sed 's/-o root -g root//' -i Makefile.in
+ '';
+
+ buildInputs = [pam openssl db];
+ meta = {
+ homepage = "http://www.padl.com/OSS/pam_ccreds.html";;
+ description = "The pam_ccreds module provides the means for Linux
workstations to locally authenticate using an enterprise identity when the
network is unavailable.";
+ };
+}
Added:
nixpkgs/branches/parallel-building-merger/pkgs/os-specific/linux/pam_krb5/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/parallel-building-merger/pkgs/os-specific/linux/pam_krb5/default.nix
Fri Aug 6 10:13:03 2010 (r22990)
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, pam, kerberos}:
+
+stdenv.mkDerivation {
+ name = "pam_krb5-2.3.11-1";
+
+ src = fetchurl {
+ url =
https://fedorahosted.org/releases/p/a/pam_krb5/pam_krb5-2.3.11-1.tar.gz;
+ sha256 = "1x6wgjzkfkx0h9a7wdgx0jwrdm15npbs79i510lk1n3fyx9lk4mq";
+# url = http://archives.eyrie.org/software/kerberos/pam-krb5-4.2.tar.gz;
+# sha256 = "0a0zyd4ddln8yf827qxbfqi1pryxnj0fykfz8lx6nxn2f9pqj1gv";
+ };
+
+ buildInputs = [pam kerberos];
+ meta = {
+# homepage = "http://www.eyrie.org/~eagle/software/pam-krb5";;
+ homepage = "https://fedorahosted.org/pam_krb5/";;
+ description = "The pam_krb5 module allows PAM-aware applications to
authenticate users by performing an AS exchange with a Kerberos KDC. It can
optionally convert Kerberos 5 credentials to Kerberos IV credentials and/or use
them to set up AFS tokens for a user's session.";
+ };
+}
Modified:
nixpkgs/branches/parallel-building-merger/pkgs/tools/networking/curl/default.nix
==============================================================================
---
nixpkgs/branches/parallel-building-merger/pkgs/tools/networking/curl/default.nix
Fri Aug 6 08:54:27 2010 (r22989)
+++
nixpkgs/branches/parallel-building-merger/pkgs/tools/networking/curl/default.nix
Fri Aug 6 10:13:03 2010 (r22990)
@@ -1,6 +1,7 @@
{ stdenv, fetchurl
-, zlibSupport ? false, zlib ? null
-, sslSupport ? false, openssl ? null
+, zlibSupport ? false, zlib
+, sslSupport ? false, openssl
+, scpSupport ? false, libssh2
, linkStatic ? false
}:
@@ -24,6 +25,7 @@
configureFlags = ''
${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"}
+ ${if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2"}
${if linkStatic then "--enable-static --disable-shared" else ""}
'';
Modified:
nixpkgs/branches/parallel-building-merger/pkgs/tools/package-management/nix/sqlite.nix
==============================================================================
---
nixpkgs/branches/parallel-building-merger/pkgs/tools/package-management/nix/sqlite.nix
Fri Aug 6 08:54:27 2010 (r22989)
+++
nixpkgs/branches/parallel-building-merger/pkgs/tools/package-management/nix/sqlite.nix
Fri Aug 6 10:13:03 2010 (r22990)
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "nix-0.16pre22378";
+ name = "nix-0.16pre22953";
src = fetchurl {
- url = "http://hydra.nixos.org/build/467032/download/4/${name}.tar.bz2";;
- sha256 =
"1bd3645da0bc03b70e4b0d687c6c0868bb1522b01b6acf4af858556f8f21ee57";
+ url = "http://hydra.nixos.org/build/527157/download/4/${name}.tar.bz2";;
+ sha256 =
"7fe185f49bda5281274b203467d206a6a76a762f742a93adeca71ba63470f71e";
};
buildInputs = [ perl curl openssl ];
Modified:
nixpkgs/branches/parallel-building-merger/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/parallel-building-merger/pkgs/top-level/all-packages.nix
Fri Aug 6 08:54:27 2010 (r22989)
+++ nixpkgs/branches/parallel-building-merger/pkgs/top-level/all-packages.nix
Fri Aug 6 10:13:03 2010 (r22990)
@@ -488,11 +488,12 @@
cron = callPackage ../tools/system/cron { # see also fcron
};
- curl = makeOverridable (import ../tools/networking/curl) {
+ curl = makeOverridable (import ../tools/networking/curl) rec {
fetchurl = fetchurlBoot;
- inherit stdenv zlib openssl;
+ inherit stdenv zlib openssl libssh2;
zlibSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic));
- sslSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic));
+ sslSupport = zlibSupport;
+ scpSupport = zlibSupport;
};
curlftpfs = callPackage ../tools/filesystems/curlftpfs { };
@@ -3377,6 +3378,8 @@
libssh = callPackage ../development/libraries/libssh { };
+ libssh2 = callPackage ../development/libraries/libssh2 { };
+
libstartup_notification = callPackage
../development/libraries/startup-notification { };
libtasn1 = callPackage ../development/libraries/libtasn1 { };
@@ -3734,6 +3737,11 @@
ncurses = null;
};
+ sqlite36 = callPackage ../development/libraries/sqlite/3.6.x.nix {
+ readline = null;
+ ncurses = null;
+ };
+
sqliteInteractive = appendToName "interactive" (sqlite.override {
inherit readline ncurses;
});
@@ -4724,6 +4732,10 @@
# pam_bioapi ( see
http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader )
+ pam_ccreds = callPackage ../os-specific/linux/pam_ccreds {
+ db = db4;
+ };
+
pam_console = callPackage ../os-specific/linux/pam_console {
libtool = libtool_1_5;
flex = if stdenv.system == "i686-linux" then flex else flex2533;
@@ -4731,6 +4743,8 @@
pam_devperm = callPackage ../os-specific/linux/pam_devperm { };
+ pam_krb5 = callPackage ../os-specific/linux/pam_krb5 { };
+
pam_ldap = callPackage ../os-specific/linux/pam_ldap { };
pam_login = callPackage ../os-specific/linux/pam_login { };
Modified:
nixpkgs/branches/parallel-building-merger/pkgs/top-level/perl-packages.nix
==============================================================================
--- nixpkgs/branches/parallel-building-merger/pkgs/top-level/perl-packages.nix
Fri Aug 6 08:54:27 2010 (r22989)
+++ nixpkgs/branches/parallel-building-merger/pkgs/top-level/perl-packages.nix
Fri Aug 6 10:13:03 2010 (r22990)
@@ -904,7 +904,7 @@
DBDSQLite = import ../development/perl-modules/DBD-SQLite {
inherit fetchurl buildPerlPackage DBI;
- inherit (pkgs) sqlite;
+ sqlite = pkgs.sqlite36;
};
DBDmysql = import ../development/perl-modules/DBD-mysql {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
