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

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III 2015-06-18 23:33:44 -07:00
commit 91e87c5f58
6 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
View File

@ -8,14 +8,14 @@
let let
ver_branch = "2.0"; ver_branch = "2.0";
version = "2.0.0"; version = "2.0.1";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lightdm-gtk-greeter-${version}"; name = "lightdm-gtk-greeter-${version}";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
sha256 = "1134q8qd7gr34jkivqxckdnwbpa8pl7dhjpdi9fci0pcs4hh22jc"; sha256 = "031iv7zrpv27zsvahvfyrm75zdrh7591db56q89k8cjiiy600r1j";
}; };
buildInputs = [ pkgconfig lightdm intltool makeWrapper ] buildInputs = [ pkgconfig lightdm intltool makeWrapper ]

4
pkgs/development/libraries/rabbitmq-c/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rabbitmq-c-${version}"; name = "rabbitmq-c-${version}";
version = "0.6.0"; version = "0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alanxz"; owner = "alanxz";
repo = "rabbitmq-c"; repo = "rabbitmq-c";
rev = "v${version}"; rev = "v${version}";
sha256 = "00264mvwwcibd36w9a3s3cv2x7pvz88al64q2maaw1kbd9mg1ky5"; sha256 = "1nfb82lbccr46wr4a2fsrkvpvdvmnyx8kn275hvdfz7mxpkd5qy6";
}; };
buildInputs = [ cmake openssl popt xmlto ]; buildInputs = [ cmake openssl popt xmlto ];

4
pkgs/development/libraries/tdb/default.nix
View File

@ -3,11 +3,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tdb-1.3.4"; name = "tdb-1.3.6";
src = fetchurl { src = fetchurl {
url = "mirror://samba/tdb/${name}.tar.gz"; url = "mirror://samba/tdb/${name}.tar.gz";
sha256 = "0a8pa4ar7dxkbsgv1447av2rn35a1m6l1v2s9hgz3ccwni9wv1gm"; sha256 = "19arbbicw469q6a9m8yyaigrxzrxkb1jnajlvq1v7n2qgqjdvmw5";
}; };
buildInputs = [ buildInputs = [

4
pkgs/development/libraries/tevent/default.nix
View File

@ -3,11 +3,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tevent-0.9.24"; name = "tevent-0.9.25";
src = fetchurl { src = fetchurl {
url = "mirror://samba/tevent/${name}.tar.gz"; url = "mirror://samba/tevent/${name}.tar.gz";
sha256 = "0l1zjx2z6nhvn6gwbcvzn8w0cca53j717fwi10s7a5v1jb04rfad"; sha256 = "0sf694bdp2l6s48gmr8hxlcpdmjbwhr9ph1faqxmkcqibbav1ppy";
}; };
buildInputs = [ buildInputs = [

13
pkgs/tools/misc/ttylog/default.nix
View File

@ -1,11 +1,14 @@
{ stdenv, fetchurl, cmake }: { stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ttylog-0.25"; name = "ttylog-${version}";
version = "0.26";
src = fetchurl { src = fetchFromGitHub {
url = "mirror://sourceforge/ttylog/${name}.tar.gz"; owner = "rocasa";
sha256 = "0546mj5gcxi7idvfw82p8qw27lk7wsk6j4b6zw7nb6z2wi517l40"; repo = "ttylog";
rev = version;
sha256 = "1xvqch1dwpl2d89n9cjcxhqbpvm50fspj5yn883wbii6dpg62p84";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

8
pkgs/tools/security/opensc/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "opensc-${version}"; name = "opensc-${version}";
version = "0.14.0"; version = "0.15.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OpenSC"; owner = "OpenSC";
repo = "OpenSC"; repo = "OpenSC";
rev = version; rev = version;
sha256 = "02q3rndcfd7lga1ph0xcl556rgigzpp9bpwqyn42rfbx8lll7gzv"; sha256 = "16y3ryx606nry2li05hm88bllrragdj3sfl3yh7pf71777n4lsk4";
}; };
postPatch = '' postPatch = ''
@ -37,6 +37,10 @@ stdenv.mkDerivation rec {
"--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so" "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so"
]; ];
installFlags = [
"sysconfdir=\${out}/etc"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Set of libraries and utilities to access smart cards"; description = "Set of libraries and utilities to access smart cards";
homepage = https://github.com/OpenSC/OpenSC/wiki; homepage = https://github.com/OpenSC/OpenSC/wiki;