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

Merge branch 'master' of github.com:NixOS/nixpkgs

Browse Source
This commit is contained in:
Cillian de Róiste 2013-03-16 16:33:43 +01:00
commit 1f000ba427
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/browsers/elinks/default.nix
View File

@ -1,5 +1,8 @@
{ stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl { stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl
, spidermonkey, guile, gpm }: , spidermonkey, gpm
, enableGuile ? true, guile ? null }:
assert enableGuile -> guile != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "elinks-0.12pre5"; name = "elinks-0.12pre5";
@ -11,14 +14,15 @@ stdenv.mkDerivation rec {
patches = [ ./gc-init.patch ]; patches = [ ./gc-init.patch ];
buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm ]; buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ]
++ stdenv.lib.optional enableGuile guile;
configureFlags = configureFlags =
'' ''
--enable-finger --enable-html-highlight --with-guile --enable-finger --enable-html-highlight
--with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent
--enable-nntp --with-openssl=${openssl} --enable-nntp --with-openssl=${openssl}
''; '' + stdenv.lib.optionalString enableGuile " --with-guile";
crossAttrs = { crossAttrs = {
propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ]; propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ];

4
pkgs/os-specific/linux/kernel/linux-3.9.nix
View File

@ -251,7 +251,7 @@ in
import ./generic.nix ( import ./generic.nix (
rec { rec {
version = "3.9-rc1"; version = "3.9-rc2";
modDirVersion = "3.9.0-rc1"; modDirVersion = "3.9.0-rc1";
testing = true; testing = true;
@ -261,7 +261,7 @@ import ./generic.nix (
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "1bm4fdk1v3dlhcqrzwzrf6fscvq7p7493f5ld5lbspaw8vb08690"; sha256 = "1aan14n6sw43qk9kpmdrpcakb1398kj2djqca8cvijc8g76973in";
}; };
config = configWithPlatform stdenv.platform; config = configWithPlatform stdenv.platform;

6
pkgs/tools/system/storebrowse/default.nix
View File

@ -3,12 +3,12 @@
assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64); assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "storebrowse-20130316003957"; name = "storebrowse-20130316140138";
src = fetchurl { src = fetchurl {
url = "http://viric.name/cgi-bin/storebrowse/tarball/storebrowse-16700f4ad9e88.tar.gz?uuid=16700f4ad9e88"; url = "http://viric.name/cgi-bin/storebrowse/tarball/storebrowse-881990147c.tar.gz?uuid=881990147c";
name = "${name}.tar.gz"; name = "${name}.tar.gz";
sha256 = "1wwzdraszja8sapa666akm8fkg53aj8ka5yn2hkq6dmbim5wjnaq"; sha256 = "183b6gz7xv88c94i9mgmjslsdn75v5vsbchl19kjv7mbrxfx5mvl";
}; };
srcGoSqlite = fetchhg { srcGoSqlite = fetchhg {