alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
_1126 2014-07-02 11:45:59 +02:00
parent d2356fc75c cb41fecaa1
commit 9759372476
3 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nixos/tests/mumble.nix
View file

@ -30,21 +30,21 @@ in
$client1->execute("mumble mumble://client1\@server/test &");
$client2->execute("mumble mumble://client2\@server/test &");
$client1->waitForWindow(qr/Mumble/);
$client2->waitForWindow(qr/Mumble/);
$server->sleep(3); # Wait some more for the Mumble UI
# cancel client audio configuration
$client1->waitForWindow(qr/Audio Tuning Wizard/);
$client2->waitForWindow(qr/Audio Tuning Wizard/);
$client1->sendKeys("esc");
$client2->sendKeys("esc");
$server->sleep(1);
# cancel client cert configuration
$client1->waitForWindow(qr/Certificate Management/);
$client2->waitForWindow(qr/Certificate Management/);
$client1->sendKeys("esc");
$client2->sendKeys("esc");
$server->sleep(1);
# accept server certificate
$client1->waitForWindow(qr/^Mumble$/);
$client2->waitForWindow(qr/^Mumble$/);
$client1->sendChars("y");
$client2->sendChars("y");

25
pkgs/development/libraries/sqlcipher/default.nix Normal file
View file

@ -0,0 +1,25 @@
{ stdenv, fetchurl, openssl, tcl, readline ? null, ncurses ? null }:
assert readline != null -> ncurses != null;
stdenv.mkDerivation {
name = "sqlcipher-3.1.0";
src = fetchurl {
url = "https://github.com/sqlcipher/sqlcipher/archive/v3.1.0.tar.gz";
sha256 = "1h54hsl7g6ra955aaqid5wxm93fklx2pxz8abcdwf9md3bpfcn18";
};
buildInputs = [ readline ncurses openssl tcl ];
configureFlags = "--enable-threadsafe --disable-tcl";
CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_HAS_CODEC";
LDFLAGS = if readline != null then "-lncurses" else "";
meta = {
homepage = http://sqlcipher.net/;
description = "Full Database Encryption for SQLite";
platforms = stdenv.lib.platforms.unix;
};
}

5
pkgs/top-level/all-packages.nix
View file

@ -6147,6 +6147,11 @@ let
inherit readline ncurses;
});
sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher {
readline = null;
ncurses = null;
});
stfl = callPackage ../development/libraries/stfl {
stdenv = if stdenv.isDarwin
then overrideGCC stdenv gccApple