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

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

This commit is contained in:
Joachim Schiele 2013-08-09 13:37:23 +00:00
parent cd188cbc0f 4be1055c40
commit 0a0713eb27
80 changed files with 1210 additions and 5480 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/amarok/default.nix
View File

@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "amarok";
version = "2.6.0";
version = "2.7.1";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
sha256 = "1h6jzl0jnn8g05pz4mw01kz20wjjxwwz6iki7lvgj70qi3jq04m9";
sha256 = "12dvqnx6jniykbi6sz94xxlnxzafjsaxlf0mppk9w5wn61jwc3cy";
};
QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";

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

@ -1,23 +1,43 @@
{ stdenv, fetchurl, lightdm, pkgconfig, gtk3, intltool }:
{ stdenv, fetchurl, lightdm, pkgconfig, intltool
, hicolor_icon_theme, makeWrapper
, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported
}:
stdenv.mkDerivation {
name = "lightdm-gtk-greeter";
#ToDo: bad icons with gtk2;
# avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from
#ToDo: Failed to open sessions directory: Error opening directory '${lightdm}/share/lightdm/remote-sessions': No such file or directory
let
ver_branch = "1.6";
version = "1.5.1"; # 1.5.2 and 1.6.0 result into infinite cycling of X in restarts
in
stdenv.mkDerivation rec {
name = "lightdm-gtk-greeter-${version}";
src = fetchurl {
url = "https://launchpad.net/lightdm-gtk-greeter/1.6/1.5.1/+download/lightdm-gtk-greeter-1.5.1.tar.gz";
sha256 = "ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621";
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
sha256 = "08fnsbnay5jhd7ps8n91i6c227zq6xizpyn34qhqzykrga8pxkpc";
};
buildInputs = [ pkgconfig gtk3 lightdm intltool ];
patches =
[ ./lightdm-gtk-greeter.patch
];
patches = [ ./lightdm-gtk-greeter.patch ];
patchFlags = "-p0";
buildInputs = [ pkgconfig lightdm intltool ]
++ (if useGTK2 then [ gtk2 makeWrapper ] else [ gtk3 ]);
configureFlags = stdenv.lib.optional useGTK2 "--with-gtk2";
postInstall = ''
substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
--replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
'' + stdenv.lib.optionalString useGTK2 ''
wrapProgram "$out/sbin/lightdm-gtk-greeter" \
--prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share"
'';
meta = {
homepage = http://launchpad.net/lightdm-gtk-greeter;
platforms = stdenv.lib.platforms.linux;
};
}

34
pkgs/applications/display-managers/lightdm/default.nix
View File

@ -1,25 +1,31 @@
{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2, intltool, x11, libxklavier, libgcrypt, makeWrapper }:
{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
, intltool, x11, libxklavier, libgcrypt, dbus/*for tests*/ }:
stdenv.mkDerivation {
name = "lightdm-1.5.1";
let
ver_branch = "1.8";
version = "1.7.0";
in
stdenv.mkDerivation rec {
name = "lightdm-${version}";
src = fetchurl {
url = https://launchpad.net/lightdm/1.6/1.5.1/+download/lightdm-1.5.1.tar.xz;
sha256 = "645db2d763cc514d6aecb1838f4a9c33c3dcf0c94567a7ef36c6b23d8aa56c86";
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
sha256 = "0nwwjgc9xvwili6714ag88wsrf0lr5hv1i6z9f0xvin4ym18cbs5";
};
buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt makeWrapper ];
configureFlags = [ "--enable-liblightdm-gobject" ];
patches =
[ ./lightdm.patch
];
patches = [ ./lightdm.patch ];
patchFlags = "-p0";
buildInputs = [
pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt
] ++ stdenv.lib.optional doCheck dbus.daemon;
configureFlags = [ "--enable-liblightdm-gobject" "--localstatedir=/var" ];
doCheck = false; # some tests fail, don't know why
meta = {
homepage = http://launchpad.net/lightdm;
platforms = stdenv.lib.platforms.linux;
};
}
}

17
pkgs/applications/misc/dunst/default.nix
View File

@ -1,15 +1,18 @@
{ stdenv, fetchurl, coreutils , unzip, which, pkgconfig , dbus
{ stdenv, fetchgit, coreutils , unzip, which, pkgconfig , dbus
, freetype, xdg_utils , libXext, glib, pango , cairo, libX11, libnotify
, libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl, gdk_pixbuf
}:
stdenv.mkDerivation rec {
version = "1.0.0";
name = "dunst-${version}";
rev = "6a3a855b48a3db64821d1cf8a91c5ee2815a2b2d";
name = "dunst-${rev}";
src = fetchurl {
url = "https://github.com/knopwob/dunst/archive/v${version}.zip";
sha256 = "1x6k6jrf219v8hmhqhnnfjycldvsnp7ag8a2y8adp5rhfmgyn671";
# 1.0.0 release doesn't include 100% CPU fix
# https://github.com/knopwob/dunst/issues/98
src = fetchgit {
inherit rev;
url = "https://github.com/knopwob/dunst.git";
sha256 = "0m7yki16d72xm9n2m2fjszd8phqpn5b95q894cz75pmd0sv1j6bj";
};
patchPhase = ''
@ -23,7 +26,7 @@ stdenv.mkDerivation rec {
libXScrnSaver xproto libXinerama perl];
buildPhase = ''
export VERSION=${version};
export VERSION=${rev};
export PREFIX=$out;
make dunst;
'';

17
pkgs/applications/misc/pgadmin/default.nix
View File

@ -1,18 +1,25 @@
{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl }:
stdenv.mkDerivation rec {
name = "pgadmin3-1.10.0";
name = "pgadmin3-${version}";
version = "1.16.1";
src = fetchurl {
url = "http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org/pgadmin3/release/v1.10.0/src/pgadmin3-1.10.0.tar.gz";
sha256 = "1ndi951da3jw5800fjdgkbvl8n6k71x7x16ghihi1l88bilf2a16";
url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz";
sha256 = "13n2nyjnbmjbz9n0xp6627n3pavkqfp4n45l1mnqxhjdq8yj9fnl";
};
buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ];
meta = {
preConfigure = ''
substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell"
'';
meta = with stdenv.lib; {
description = "PostgreSQL administration GUI tool";
homepage = http://www.pgadmin.org;
license = "GPL2";
license = licenses.gpl2;
maintainers = [ maintainers.iElectric ];
platforms = platforms.unix;
};
}

3
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -135,6 +135,9 @@ in stdenv.mkDerivation rec {
sed -i -e 's|/usr/bin/gcc|gcc|' third_party/WebKit/Source/core/core.gypi
'' + optionalString useOpenSSL ''
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
'' + optionalString (versionOlder sourceInfo.version "29.0.0.0") ''
sed -i -e '/struct SECItemArray/,/^};/d' \
net/third_party/nss/ssl/bodge/secitem_array.c
'';
gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {

18
pkgs/applications/networking/browsers/chromium/sources.nix
View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
dev = {
version = "30.0.1573.2";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1573.2.tar.xz";
sha256 = "1pbph4jz0svaawk06zajq73x0xm73f9kdiflhad2709f4y23gzjz";
version = "30.0.1581.2";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1581.2.tar.xz";
sha256 = "16l0gprinxbhdsx67yaq6qwy45018v6vww0hnyji4wdzd5drkf9r";
};
beta = {
version = "29.0.1547.32";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.32.tar.xz";
sha256 = "14p5s1xn15mdrlf87hv4y9kczw5r8s461a56kkdzb5xzyq25ph8w";
version = "29.0.1547.41";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.41.tar.xz";
sha256 = "0xb2y7n3qyakg08606zdaw6wf60ypx9p61g56sqhxamgd5byfsg1";
};
stable = {
version = "28.0.1500.71";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.71.tar.xz";
sha256 = "1w8hkbb17bwq9myhj7fig27pn50qlwdfrqs04xjvam4ah3w6qb0r";
version = "28.0.1500.95";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.95.tar.xz";
sha256 = "0d6pj57nyx7wfgxws98f6ly749flcyv7zg5sc3w16ggdxf5qhf1w";
};
}

6
pkgs/applications/networking/browsers/firefox/default.nix
View File

@ -19,9 +19,9 @@ assert useSystemCairo -> cairo != null;
let optional = stdenv.lib.optional;
in rec {
firefoxVersion = "22.0";
firefoxVersion = "23.0";
xulVersion = "22.0"; # this attribute is used by other packages
xulVersion = "23.0"; # this attribute is used by other packages
src = fetchurl {
@ -31,7 +31,7 @@ in rec {
# Fall back to this url for versions not available at releases.mozilla.org.
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha1 = "db2d5b028b6ea95b5f006b46e153f50f7a52bf80";
sha1 = "31936d2ddb727640c96a3ae697bf145c42a2a20e";
};
commonConfigureFlags =

8
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
View File

@ -44,9 +44,9 @@ let
throw "no x86_64 debugging version available"
else rec {
# -> http://labs.adobe.com/downloads/flashplayer10.html
version = "11.2.202.273";
version = "11.2.202.297";
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
sha256 = "0c15nszgg7zsv00n2qxha5zf8hmyf8i6byvhalnh5x46mr0rkbv9";
sha256 = "0jfigq56p6zp61pmc4jl12p8gv2jhfmim18j1b30iikw3iv26lh8";
}
else if stdenv.system == "i686-linux" then
if debug then {
@ -55,9 +55,9 @@ let
url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
} else rec {
version = "11.2.202.273";
version = "11.2.202.297";
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
sha256 = "1gb14xv7gbq57qg1hxmrnryaw6xgmkg54ql5hr7q6szplj65wvmd";
sha256 = "0mpj25b2ar7gccqmw5lffdzlr3yyfalphpgwnl18s05wy1fx484y";
}
else throw "Flash Player is not supported on this platform";

8
pkgs/applications/science/math/R/default.nix
View File

@ -36,9 +36,15 @@ stdenv.mkDerivation rec {
--with-system-pcre
--with-system-xz
--with-ICU
R_SHELL="${stdenv.shell}"
AR=$(type -p ar)
AWK=$(type -p gawk)
CC=$(type -p gcc)
CXX=$(type -p g++)
FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran"
JAVA_HOME="${jdk}"
LDFLAGS="-L${gfortran.gcc}/lib"
RANLIB=$(type -p ranlib)
R_SHELL="${stdenv.shell}"
)
echo "TCLLIBPATH=${tk}/lib" >>etc/Renviron.in
'';

4
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -89,9 +89,5 @@ rec {
svn2git_kde = callPackage ./svn2git-kde { };
gitSubtree = import ./git-subtree {
inherit stdenv fetchurl git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt;
};
darcsToGit = callPackage ./darcs-to-git { };
}

10
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
View File

@ -1,7 +1,7 @@
{ cabal, aeson, async, blazeBuilder, bloomfilter, bup
, caseInsensitive, clientsession, cryptoApi, curl, dataDefault
, dataenc, DAV, dbus, dlist, dns, editDistance
, extensibleExceptions, filepath, git, gnupg1, gnutls, hamlet
, extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet
, hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, HUnit
, IfElse, json, lsof, MissingH, MonadCatchIOTransformers
, monadControl, mtl, network, networkInfo, networkMulticast
@ -14,15 +14,15 @@
cabal.mkDerivation (self: {
pname = "git-annex";
version = "4.20130723";
sha256 = "1fc8kz4n2g4x9fzvdx4bz4d8gkbajdnqphldcglwl23g97vyrn6i";
version = "4.20130802";
sha256 = "12dvmz88sbcvhyf7aldhpkrf4aqs0x39hky0hikmfd9zcqs6vbih";
isLibrary = false;
isExecutable = true;
buildDepends = [
aeson async blazeBuilder bloomfilter caseInsensitive clientsession
cryptoApi dataDefault dataenc DAV dbus dlist dns editDistance
extensibleExceptions filepath gnutls hamlet hinotify hS3 hslogger
HTTP httpConduit httpTypes HUnit IfElse json MissingH
extensibleExceptions feed filepath gnutls hamlet hinotify hS3
hslogger HTTP httpConduit httpTypes HUnit IfElse json MissingH
MonadCatchIOTransformers monadControl mtl network networkInfo
networkMulticast networkProtocolXmpp QuickCheck random regexTdfa
SafeSemaphore SHA stm text time transformers unixCompat utf8String

27
pkgs/applications/version-management/git-and-tools/git-subtree/default.nix
View File

@ -1,27 +0,0 @@
{ stdenv, fetchurl, git, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt }:
stdenv.mkDerivation {
name = "git-subtree-0.4-2-g2793ee6";
src = fetchurl {
url = "http://github.com/apenwarr/git-subtree/tarball/2793ee6ba6da57d97e9c313741041f7eb2e88974";
sha256 = "33fdba315cf8846f45dff7622c1099c386db960c7b43d5d8fbb382fd4d1acff6";
name = "git-subtree-0.4-2-g2793ee6.tar.gz";
};
buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ];
configurePhase = "export prefix=$out";
buildPhase = "true";
installPhase = "make install prefix=$out gitdir=$out/bin";
meta= {
description = "experimental alternative to the git-submodule command";
homepage = http://github.com/apenwarr/git-subtree;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.gnu;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

11
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -10,7 +10,7 @@
let
version = "1.8.3.2";
version = "1.8.3.4";
svn = subversionClient.override { perlBindings = true; };
@ -21,7 +21,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
sha256 = "0mfylhcdrh8prxkbs0gc877rmra2ks48bchg4hhaf2vpw9hpdf63";
sha256 = "1nfr4hgqs3b6k9wanqcix0wlw71q61h5irxiavlspd4jvzrcv8nz";
};
patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
@ -50,6 +50,13 @@ stdenv.mkDerivation {
chmod +x $1
}
# Install git-subtree.
pushd contrib/subtree
make
make install install-doc
popd
rm -rf contrib/subtree
# Install contrib stuff.
mkdir -p $out/share/git
mv contrib $out/share/git/

4
pkgs/applications/version-management/subversion/default.nix
View File

@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
stdenv.mkDerivation rec {
version = "1.7.10";
version = "1.7.11";
name = "subversion-${version}";
src = fetchurl {
url = "mirror://apache/subversion//${name}.tar.bz2";
sha1 = "a4f3de0a13b034b0eab4d35512c6c91a4abcf4f5";
sha1 = "d82e187803043b74c072cd5a861ac02e4a027684";
};
buildInputs = [ zlib apr aprutil sqlite ]

4
pkgs/build-support/kernel/modules-closure.nix
View File

@ -4,12 +4,12 @@
# Also generate an appropriate modules.dep.
{ stdenv, kernel, nukeReferences, rootModules
, module_init_tools, allowMissing ? false }:
, kmod, allowMissing ? false }:
stdenv.mkDerivation {
name = kernel.name + "-shrunk";
builder = ./modules-closure.sh;
buildInputs = [nukeReferences];
inherit kernel rootModules module_init_tools allowMissing;
inherit kernel rootModules kmod allowMissing;
allowedReferences = ["out"];
}

12
pkgs/build-support/kernel/modules-closure.sh
View File

@ -2,24 +2,20 @@ source $stdenv/setup
set -o pipefail
PATH=$module_init_tools/sbin:$PATH
PATH=$kmod/sbin:$PATH
version=$(cd $kernel/lib/modules && ls -d *)
echo "kernel version is $version"
export MODULE_DIR=$(readlink -f $kernel/lib/modules/)
# Determine the dependencies of each root module.
closure=
for module in $rootModules; do
echo "root module: $module"
deps=$(modprobe --config /dev/null --set-version "$version" --show-depends "$module" \
deps=$(modprobe --config no-config -d $kernel --set-version "$version" --show-depends "$module" \
| sed 's/^insmod //') \
|| if test -z "$allowMissing"; then exit 1; fi
#for i in $deps; do echo $i; done
if [[ "$deps" != builtin* ]]
then
if [[ "$deps" != builtin* ]]; then
closure="$closure $deps"
fi
done
@ -41,4 +37,4 @@ for module in $closure; do
echo $target >> $out/insmod-list
done
MODULE_DIR=$out/lib/modules/ depmod -a $version
depmod -b $out -a $version

12
pkgs/build-support/vm/default.nix
View File

@ -1,5 +1,5 @@
{ pkgs
, kernel ? pkgs.linux_3_9
, kernel ? pkgs.linux_3_10
, img ? "bzImage"
, rootModules ?
[ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" ]
@ -91,8 +91,8 @@ rec {
esac
done
echo "loading kernel modules..."
for i in $(cat ${modulesClosure}/insmod-list); do
echo "loading module $(basename $i .ko)"
insmod $i
done
@ -114,14 +114,14 @@ rec {
echo "mounting Nix store..."
mkdir -p /fs/nix/store
mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache
mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=loose
mkdir -p /fs/tmp
mount -t tmpfs -o "mode=755" none /fs/tmp
echo "mounting host's temporary directory..."
mkdir -p /fs/tmp/xchg
mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache
mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=loose
mkdir -p /fs/proc
mount -t proc none /fs/proc
@ -133,7 +133,7 @@ rec {
ln -sf /proc/mounts /fs/etc/mtab
echo "127.0.0.1 localhost" > /fs/etc/hosts
echo "Now running: $command"
echo "starting stage 2 ($command)"
test -n "$command"
set +e
@ -195,7 +195,7 @@ rec {
-drive file=$diskImage,if=virtio,cache=writeback,werror=report \
-kernel ${kernel}/${img} \
-initrd ${initrd}/initrd \
-append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk" \
-append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \
$QEMU_OPTS
'';

4
pkgs/data/documentation/man-pages/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "man-pages-3.50";
name = "man-pages-3.53";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
sha256 = "04fn7zzi75y79rkg57nkync3hf14m8708iw33s03f0x8ays6fajz";
sha256 = "0kzkjfrw65f7bv6laz3jism4yqajmfh3vdq2jb5d6gyp4n14sxnl";
};
preBuild =

15
pkgs/development/libraries/haskell/MissingH/default.nix
View File

@ -1,16 +1,19 @@
{ cabal, filepath, hslogger, HUnit, mtl, network, parsec, random
, regexCompat, time
{ cabal, filepath, hslogger, HUnit, mtl, network, parsec
, QuickCheck, random, regexCompat, testpack, time
}:
cabal.mkDerivation (self: {
pname = "MissingH";
version = "1.2.0.0";
sha256 = "0bqg1j2pvm0ixrbnsxrr5kgibhbp191irhcavqlwfwgaxhrpqnm1";
isLibrary = true;
isExecutable = true;
version = "1.2.0.1";
sha256 = "0hxyf82g2rz36ks6n136p6brgs0r9cnxfkh4xgl6iw11wbq2rb5m";
buildDepends = [
filepath hslogger HUnit mtl network parsec random regexCompat time
];
testDepends = [
filepath hslogger HUnit mtl network parsec QuickCheck random
regexCompat testpack time
];
doCheck = false;
meta = {
homepage = "http://software.complete.org/missingh";
description = "Large utility library";

4
pkgs/development/libraries/haskell/MonadRandom/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "MonadRandom";
version = "0.1.10";
sha256 = "0acx8vm43pd3wn5gp4rx9h24y08fcdy4bpack1sd0pxx2wmhi5qs";
version = "0.1.11";
sha256 = "107f3ch84riagxa9x6yk4gxq2vq5dsk63rd0780g1fdplnf1sky3";
buildDepends = [ mtl random transformers ];
meta = {
description = "Random-number generation monad";

4
pkgs/development/libraries/haskell/fast-logger/default.nix
View File

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "fast-logger";
version = "0.3.2";
sha256 = "0bx8yjg7bf18i7j7fnhidnms5a3v6hiwqqvr249fk03c86v20rla";
version = "0.3.3";
sha256 = "0ya9dn9j2nddpclj00w6jgmiq2xx500sws056fa2s4bdsl8vn5rh";
buildDepends = [ blazeBuilder dateCache filepath text unixTime ];
testDepends = [ hspec ];
meta = {

5
pkgs/development/libraries/haskell/feed/default.nix
View File

@ -2,10 +2,11 @@
cabal.mkDerivation (self: {
pname = "feed";
version = "0.3.9";
sha256 = "0waqy8ssmbfpqy21svvbnm0igrjxbgd2i093hbl5chim6yraapv2";
version = "0.3.9.1";
sha256 = "1c7dj9w9qj8408qql1kfq8m28fwvfd7bpgkj32lmk5x9qm5iz04k";
buildDepends = [ utf8String xml ];
meta = {
homepage = "https://github.com/sof/feed";
description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

4
pkgs/development/libraries/haskell/generic-deriving/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "generic-deriving";
version = "1.5.0";
sha256 = "1m3hckwpzmarlvm2xq22za3386ady6p89kg7nd8cnjkifnnbz20r";
version = "1.6.1";
sha256 = "0c3b3xkjdfp14w48gfk3f6aqz4cgk6i3bl5mci23mbb3f33jcx1j";
meta = {
description = "Generic programming library for generalised deriving";
license = self.stdenv.lib.licenses.bsd3;

3
pkgs/development/libraries/haskell/lens/default.nix
View File

@ -26,6 +26,9 @@ cabal.mkDerivation (self: {
transformers unorderedContainers vector
];
doCheck = false;
patchPhase = ''
sed -i -e 's|generic-deriving.*,|generic-deriving,|' lens.cabal
'';
meta = {
homepage = "http://github.com/ekmett/lens/";
description = "Lenses, Folds and Traversals";

6
pkgs/development/libraries/haskell/numeric-prelude/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "numeric-prelude";
version = "0.4.0.1";
sha256 = "1j361gj7cw31x31vnjhxmy7a62ldvyyqfm7irhff7sf5gv4kr5wh";
version = "0.4.0.3";
sha256 = "0lgjnkvbz14cqsm5fjafl8g5mkclcdvpwa3kpz9radmg2x09rsnl";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
meta = {
homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude";
description = "An experimental alternative hierarchy of numeric type classes";
license = "GPL";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};

4
pkgs/development/libraries/haskell/profunctor-extras/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "profunctor-extras";
version = "3.3.1";
sha256 = "0z3lip0mjw0xyf516shdrnkkp9h53wglz6sjjqagpjj2viyqkprb";
version = "3.3.3.1";
sha256 = "16naa6ksgwy6fh8vwflcc9s0rpamn886as8qhjqrkpjlc8s83h7g";
buildDepends = [
comonad profunctors semigroupoidExtras semigroupoids tagged
transformers

4
pkgs/development/libraries/haskell/reactive-banana/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "reactive-banana";
version = "0.7.1.2";
sha256 = "1x4ln3dr937va0ii7lr86d6wsrh2qd1sxany4y9dkpcrsvb3db0l";
version = "0.7.1.3";
sha256 = "117y1sk97kpiq0cippq0ydl2zqb99q49y2m2m6pgg2nh6gz6a3zb";
buildDepends = [ hashable transformers unorderedContainers vault ];
testDepends = [
hashable HUnit testFramework testFrameworkHunit transformers

4
pkgs/development/libraries/haskell/shakespeare/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare";
version = "1.0.5";
sha256 = "1dc1yg35pxh45fv20fvnlpas0svqi18h6bdalpjaqjb164s114vf";
version = "1.0.5.1";
sha256 = "1qsg23jqv6lzwqk42yapqydx3fn6crkrzim8wr7ds55z6iblxbq6";
buildDepends = [ parsec systemFileio systemFilepath text time ];
testDepends = [
hspec parsec systemFileio systemFilepath text time

14
pkgs/development/libraries/haskell/stm-conduit/default.nix
View File

@ -1,13 +1,15 @@
{ cabal, conduit, HUnit, QuickCheck, resourcet, stm, stmChans
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
, transformers
{ cabal, async, conduit, HUnit, monadControl, QuickCheck, resourcet
, stm, stmChans, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, transformers
}:
cabal.mkDerivation (self: {
pname = "stm-conduit";
version = "2.1.0";
sha256 = "0rxnw7kpxvhwmpbn2v9ps0b2hw9321817nyywjjq3x8fadg8w99l";
buildDepends = [ conduit resourcet stm stmChans transformers ];
version = "2.1.1";
sha256 = "06frli37jz9xag249q1gmvnpnsaic1xa304d8d8bjz08980dbmpr";
buildDepends = [
async conduit monadControl resourcet stm stmChans transformers
];
testDepends = [
conduit HUnit QuickCheck stm stmChans testFramework
testFrameworkHunit testFrameworkQuickcheck2 transformers

4
pkgs/development/libraries/haskell/stylish-haskell/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "stylish-haskell";
version = "0.5.6.1";
sha256 = "0fxncnl9bvb7qjha3r06qli9qlzfljism6k688hrr9y6l06jdc2c";
version = "0.5.7.0";
sha256 = "12ka5lyp28fy8gablhymxdldl792ycr8d51lsknhldb54pmklf73";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/unix-process-conduit/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "unix-process-conduit";
version = "0.2.1.2";
sha256 = "1gg1ynqd8hka5ynpmpsj8qw0lqsyg7l1m1py05iw3bd3cldwflx1";
version = "0.2.2";
sha256 = "15n6n925avv51kr2avwkp8sq8mfl287i0445vl9iy6hyxjjgpgr6";
buildDepends = [ conduit filepath stm time transformers ];
testDepends = [ conduit hspec transformers ];
meta = {

4
pkgs/development/libraries/haskell/unix-time/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "unix-time";
version = "0.1.10";
sha256 = "0z8i02j295fi0y512bwhxfk2dr2s4i0xlgi80pnq680zdrahgwlf";
version = "0.2.0";
sha256 = "1gmchi6crbd3lpnw1j0zaaj7y0gib8dbqd8ip2s5p3f50qqlsxj8";
testDepends = [ doctest hspec QuickCheck time ];
meta = {
description = "Unix time parser/formatter and utilities";

59
pkgs/development/libraries/nss/default.nix
View File

@ -1,68 +1,58 @@
{ stdenv, fetchurl, fetchgit, nspr, perl, zlib, sqlite
{ stdenv, fetchurl, nspr, perl, zlib, sqlite
, includeTools ? false
}:
let
nssPEM = fetchgit {
url = "git://git.fedorahosted.org/git/nss-pem.git";
rev = "07a683505d4a0a1113c4085c1ce117425d0afd80";
sha256 = "e4a9396d90e50e8b3cceff45f312eda9aaf356423f4eddd354a0e1afbbfd4cf8";
nssPEM = fetchurl {
url = http://dev.gentoo.org/~anarchy/patches/nss-3.15-pem-support-20130617.patch.xz;
sha256 = "1k1m8lsgqwxx251943hks1dd13hz1adpqqb0hxwn011by5vmi201";
};
secLoadPatch = fetchurl {
name = "security_load.patch";
urls = [
# "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.6-1/85_security_load.patch"
# "http://anonscm.debian.org/gitweb/?p=pkg-mozilla/nss.git;a=blob_plain;f=debian/patches/85_security_load.patch;hb=HEAD"
"http://www.parsix.org/export/7797/pkg/security/raul/main/nss/trunk/debian/patches/85_security_load.patch"
];
sha256 = "8a8d0ae4ebbd7c389973fa5d26d8bc5f473046c6cb1d8283cb9a3c1f4c565c47";
urls = http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.1-1/85_security_load.patch;
sha256 = "041c6v4cxwsy14qr5m9qs0gkv3w24g632cwpz27kacxpa886r1ds";
};
in stdenv.mkDerivation rec {
name = "nss-${version}";
version = "3.14.3";
version = "3.15.1";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_3_RTM/src/${name}.tar.gz";
sha1 = "94d8781d1fa29cfbd37453dda3e9488709b82c4c";
url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_1_RTM/src/${name}.tar.gz";
sha1 = "1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0";
};
buildInputs = [ nspr perl zlib sqlite ];
postUnpack = ''
cp -rdv "${nssPEM}/mozilla/security/nss/lib/ckfw/pem" \
"$sourceRoot/mozilla/security/nss/lib/ckfw/"
chmod -R u+w "$sourceRoot/mozilla/security/nss/lib/ckfw/pem"
prePatch = ''
xz -d < ${nssPEM} | patch -p1
'';
patches = [
./nss-3.14.1-gentoo-fixups-r1.patch
secLoadPatch
./nix_secload_fixup.patch
./sync-up-with-upstream-softokn-changes.patch
];
patches =
[ ./nss-3.15-gentoo-fixups.patch
secLoadPatch
./nix_secload_fixup.patch
];
postPatch = ''
sed -i -e 's/^DIRS.*$/& pem/' mozilla/security/nss/lib/ckfw/manifest.mn
# Fix up the patch from Gentoo
# Fix up the patch from Gentoo.
sed -i \
-e "/^PREFIX =/s|= /usr|= $out|" \
-e '/@libdir@/s|gentoo/nss|lib|' \
-e '/ln -sf/d' \
mozilla/security/nss/config/Makefile
nss/config/Makefile
# Note for spacing/tab nazis: The TAB characters are intentional!
cat >> mozilla/security/nss/config/Makefile <<INSTALL_TARGET
cat >> nss/config/Makefile <<INSTALL_TARGET
install:
mkdir -p \$(DIST)/lib/pkgconfig
cp nss.pc \$(DIST)/lib/pkgconfig
INSTALL_TARGET
'';
preConfigure = "cd mozilla/security/nss";
preConfigure = "cd nss";
makeFlags = [
"NSPR_INCLUDE_DIR=${nspr}/include/nspr"
@ -74,8 +64,6 @@ in stdenv.mkDerivation rec {
"NSS_USE_SYSTEM_SQLITE=1"
] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1";
buildFlags = [ "build_coreconf" "build_dbm" "all" ];
postInstall = ''
rm -rf $out/private
mv $out/public $out/include
@ -83,6 +71,8 @@ in stdenv.mkDerivation rec {
rmdir $out/*.OBJ
cp -av config/nss-config $out/bin/nss-config
ln -s lib $out/lib64
'';
postFixup = ''
@ -94,4 +84,9 @@ in stdenv.mkDerivation rec {
'' + stdenv.lib.optionalString (!includeTools) ''
find $out/bin -type f \( -name nss-config -o -delete \)
'';
meta = {
homepage = https://developer.mozilla.org/en-US/docs/NSS;
description = "A set of libraries for development of security-enabled client and server applications";
};
}

40
pkgs/development/libraries/nss/nix_secload_fixup.patch
View File

@ -1,18 +1,7 @@
diff --git a/mozilla/security/coreconf/config.mk b/mozilla/security/coreconf/config.mk
index 72557c6..bdcbf88 100644
--- a/mozilla/security/coreconf/config.mk
+++ b/mozilla/security/coreconf/config.mk
@@ -207,3 +207,5 @@ endif
DEFINES += -DUSE_UTIL_DIRECTLY
USE_UTIL_DIRECTLY = 1
+# nix specific stuff:
+DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
diff --git a/mozilla/security/nss/cmd/shlibsign/shlibsign.c b/mozilla/security/nss/cmd/shlibsign/shlibsign.c
index 5ce626e..e1e8039 100644
--- a/mozilla/security/nss/cmd/shlibsign/shlibsign.c
+++ b/mozilla/security/nss/cmd/shlibsign/shlibsign.c
@@ -770,7 +770,7 @@ int main(int argc, char **argv)
diff -ru -x '*~' nss-3.15.1-orig/nss/cmd/shlibsign/shlibsign.c nss-3.15.1/nss/cmd/shlibsign/shlibsign.c
--- nss-3.15.1-orig/nss/cmd/shlibsign/shlibsign.c 2013-08-07 16:03:40.013256377 +0200
+++ nss-3.15.1/nss/cmd/shlibsign/shlibsign.c 2013-08-07 16:04:21.128410153 +0200
@@ -853,7 +853,7 @@
assert(libname != NULL);
lib = PR_LoadLibrary(libname);
if (!lib)
@ -21,11 +10,20 @@ index 5ce626e..e1e8039 100644
assert(lib != NULL);
PR_FreeLibraryName(libname);
diff --git a/mozilla/security/nss/lib/util/secload.c b/mozilla/security/nss/lib/util/secload.c
index 7d6fc22..0b7759b 100644
--- a/mozilla/security/nss/lib/util/secload.c
+++ b/mozilla/security/nss/lib/util/secload.c
@@ -105,9 +105,9 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name)
diff -ru -x '*~' nss-3.15.1-orig/nss/coreconf/config.mk nss-3.15.1/nss/coreconf/config.mk
--- nss-3.15.1-orig/nss/coreconf/config.mk 2013-06-27 19:58:08.000000000 +0200
+++ nss-3.15.1/nss/coreconf/config.mk 2013-08-07 16:11:27.364608802 +0200
@@ -181,3 +181,6 @@
# Build with NO_NSPR_10_SUPPORT to avoid using obsolete NSPR features
DEFINES += -DNO_NSPR_10_SUPPORT
+
+# Nix specific stuff.
+DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
diff -ru -x '*~' nss-3.15.1-orig/nss/lib/util/secload.c nss-3.15.1/nss/lib/util/secload.c
--- nss-3.15.1-orig/nss/lib/util/secload.c 2013-08-07 16:03:40.014256381 +0200
+++ nss-3.15.1/nss/lib/util/secload.c 2013-08-07 16:05:02.453563064 +0200
@@ -70,9 +70,9 @@
/* Remove the trailing filename from referencePath and add the new one */
c = strrchr(referencePath, PR_GetDirectorySeparator());
if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0]
@ -38,7 +36,7 @@ index 7d6fc22..0b7759b 100644
}
if (c) {
size_t referencePathSize = 1 + c - referencePath;
@@ -125,8 +125,7 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name)
@@ -90,8 +90,7 @@
(strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) {
memcpy(fullName + referencePathSize -4, "lib", 3);
}

59
pkgs/development/libraries/nss/nss-3.14.1-gentoo-fixups-r1.patch → pkgs/development/libraries/nss/nss-3.15-gentoo-fixups.patch
View File

@ -1,9 +1,8 @@
diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/Makefile
--- a/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600
+++ b/mozilla/security/nss/config/Makefile 2012-12-15 07:27:20.650148987 -0600
--- a/nss/config/Makefile
+++ b/nss/config/Makefile
@@ -0,0 +1,40 @@
+CORE_DEPTH = ../..
+DEPTH = ../..
+CORE_DEPTH = ..
+DEPTH = ..
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
@ -19,14 +18,14 @@ diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/M
+ mkdir -p $(DIST)/lib/pkgconfig
+ sed -e "s,@prefix@,$(PREFIX)," \
+ -e "s,@exec_prefix@,\$${prefix}," \
+ -e "s,@libdir@,\$${prefix}/gentoo/nss," \
+ -e "s,@libdir@,\$${prefix}/lib64," \
+ -e "s,@includedir@,\$${prefix}/include/nss," \
+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
+ nss.pc.in > nss.pc
+ chmod 0644 nss.pc
+ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
+ ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig
+
+ # Create the nss-config script
+ mkdir -p $(DIST)/bin
@ -36,15 +35,14 @@ diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/M
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
+ nss-config.in > nss-config
+ chmod 0755 nss-config
+ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin
+ ln -sf ../../../config/nss-config $(DIST)/bin
+
+libs:
+
+dummy: all export libs
+
diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/config/nss-config.in
--- a/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600
+++ b/mozilla/security/nss/config/nss-config.in 2012-12-15 07:27:20.651148959 -0600
--- a/nss/config/nss-config.in
+++ b/nss/config/nss-config.in
@@ -0,0 +1,145 @@
+#!/bin/sh
+
@ -191,9 +189,8 @@ diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/con
+ echo $libdirs
+fi
+
diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/nss.pc.in
--- a/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600
+++ b/mozilla/security/nss/config/nss.pc.in 2012-12-15 07:27:20.651148959 -0600
--- a/nss/config/nss.pc.in
+++ b/nss/config/nss.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
@ -207,37 +204,35 @@ diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/
+Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
+Cflags: -I${includedir}
+
diff -urN a/mozilla/security/nss/Makefile b/mozilla/security/nss/Makefile
--- a/mozilla/security/nss/Makefile 2012-11-13 19:14:07.000000000 -0600
+++ b/mozilla/security/nss/Makefile 2012-12-15 07:27:57.235162137 -0600
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -44,7 +44,7 @@
# (7) Execute "local" rules. (OPTIONAL). #
#######################################################################
-nss_build_all: build_coreconf build_nspr build_dbm all
+nss_build_all: build_coreconf build_dbm all
-nss_build_all: build_nspr all
+nss_build_all: all
nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
nss_clean_all: clobber_nspr clobber
@@ -106,12 +106,6 @@
@@ -103,12 +103,6 @@
--with-dist-prefix='$(NSPR_PREFIX)' \
--with-dist-includedir='$(NSPR_PREFIX)/include'
-build_nspr: $(NSPR_CONFIG_STATUS)
- $(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)
- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
-
-clobber_nspr: $(NSPR_CONFIG_STATUS)
- $(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) clobber
- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
-
build_dbm:
ifdef NSS_DISABLE_DBM
@echo "skipping the build of DBM"
diff -urN a/mozilla/security/nss/manifest.mn b/mozilla/security/nss/manifest.mn
--- a/mozilla/security/nss/manifest.mn 2012-03-20 09:46:49.000000000 -0500
+++ b/mozilla/security/nss/manifest.mn 2012-12-15 07:27:20.652148933 -0600
@@ -10,6 +10,6 @@
build_docs:
$(MAKE) -C $(CORE_DEPTH)/doc
--- a/nss/manifest.mn
+++ b/nss/manifest.mn
@@ -10,4 +10,4 @@
RELEASE = nss
-DIRS = lib cmd
+DIRS = lib cmd config
-DIRS = coreconf lib cmd
+DIRS = coreconf lib cmd config

406
pkgs/development/libraries/nss/sync-up-with-upstream-softokn-changes.patch
View File

@ -1,406 +0,0 @@
From d6dbecfea317a468be12423595e584f43d84d8ec Mon Sep 17 00:00:00 2001
From: Elio Maldonado <emaldona@redhat.com>
Date: Sat, 9 Feb 2013 17:11:00 -0500
Subject: [PATCH] Sync up with upstream softokn changes
- Disable RSA OEP case in FormatBlock, RSA_OAEP support is experimental and in a state of flux
- Numerous change upstream due to the work for TLS/DTLS 'Lucky 13' vulnerability CVE-2013-0169
- It now compiles with the NSS_3_14_3_BETA1 source
---
mozilla/security/nss/lib/ckfw/pem/rsawrapr.c | 338 +++++++-------------------
1 files changed, 82 insertions(+), 256 deletions(-)
diff --git a/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c b/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
index 5ac4f39..3780d30 100644
--- a/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
+++ b/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
@@ -46,6 +46,7 @@
#include "sechash.h"
#include "base.h"
+#include "lowkeyi.h"
#include "secerr.h"
#define RSA_BLOCK_MIN_PAD_LEN 8
@@ -54,9 +55,8 @@
#define RSA_BLOCK_PRIVATE_PAD_OCTET 0xff
#define RSA_BLOCK_AFTER_PAD_OCTET 0x00
-#define OAEP_SALT_LEN 8
-#define OAEP_PAD_LEN 8
-#define OAEP_PAD_OCTET 0x00
+/* Needed for RSA-PSS functions */
+static const unsigned char eightZeros[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
#define FLAT_BUFSIZE 512 /* bytes to hold flattened SHA1Context. */
@@ -78,127 +78,39 @@ pem_PublicModulusLen(NSSLOWKEYPublicKey *pubk)
return 0;
}
-static SHA1Context *SHA1_CloneContext(SHA1Context * original)
-{
- SHA1Context *clone = NULL;
- unsigned char *pBuf;
- int sha1ContextSize = SHA1_FlattenSize(original);
- SECStatus frv;
- unsigned char buf[FLAT_BUFSIZE];
-
- PORT_Assert(sizeof buf >= sha1ContextSize);
- if (sizeof buf >= sha1ContextSize) {
- pBuf = buf;
- } else {
- pBuf = nss_ZAlloc(NULL, sha1ContextSize);
- if (!pBuf)
- goto done;
- }
-
- frv = SHA1_Flatten(original, pBuf);
- if (frv == SECSuccess) {
- clone = SHA1_Resurrect(pBuf, NULL);
- memset(pBuf, 0, sha1ContextSize);
- }
- done:
- if (pBuf != buf)
- nss_ZFreeIf(pBuf);
- return clone;
+/* Constant time comparison of a single byte.
+ * Returns 1 iff a == b, otherwise returns 0.
+ * Note: For ranges of bytes, use constantTimeCompare.
+ */
+static unsigned char constantTimeEQ8(unsigned char a, unsigned char b) {
+ unsigned char c = ~(a - b | b - a);
+ c >>= 7;
+ return c;
}
-/*
- * Modify data by XORing it with a special hash of salt.
+/* Constant time comparison of a range of bytes.
+ * Returns 1 iff len bytes of a are identical to len bytes of b, otherwise
+ * returns 0.
*/
-static SECStatus
-oaep_xor_with_h1(unsigned char *data, unsigned int datalen,
- unsigned char *salt, unsigned int saltlen)
-{
- SHA1Context *sha1cx;
- unsigned char *dp, *dataend;
- unsigned char end_octet;
-
- sha1cx = SHA1_NewContext();
- if (sha1cx == NULL) {
- return SECFailure;
- }
-
- /*
- * Get a hash of salt started; we will use it several times,
- * adding in a different end octet (x00, x01, x02, ...).
- */
- SHA1_Begin(sha1cx);
- SHA1_Update(sha1cx, salt, saltlen);
- end_octet = 0;
-
- dp = data;
- dataend = data + datalen;
-
- while (dp < dataend) {
- SHA1Context *sha1cx_h1;
- unsigned int sha1len, sha1off;
- unsigned char sha1[SHA1_LENGTH];
-
- /*
- * Create hash of (salt || end_octet)
- */
- sha1cx_h1 = SHA1_CloneContext(sha1cx);
- SHA1_Update(sha1cx_h1, &end_octet, 1);
- SHA1_End(sha1cx_h1, sha1, &sha1len, sizeof(sha1));
- SHA1_DestroyContext(sha1cx_h1, PR_TRUE);
- PORT_Assert(sha1len == SHA1_LENGTH);
-
- /*
- * XOR that hash with the data.
- * When we have fewer than SHA1_LENGTH octets of data
- * left to xor, use just the low-order ones of the hash.
- */
- sha1off = 0;
- if ((dataend - dp) < SHA1_LENGTH)
- sha1off = SHA1_LENGTH - (dataend - dp);
- while (sha1off < SHA1_LENGTH)
- *dp++ ^= sha1[sha1off++];
-
- /*
- * Bump for next hash chunk.
- */
- end_octet++;
- }
-
- SHA1_DestroyContext(sha1cx, PR_TRUE);
- return SECSuccess;
+static unsigned char constantTimeCompare(const unsigned char *a,
+ const unsigned char *b,
+ unsigned int len) {
+ unsigned char tmp = 0;
+ unsigned int i;
+ for (i = 0; i < len; ++i, ++a, ++b)
+ tmp |= *a ^ *b;
+ return constantTimeEQ8(0x00, tmp);
}
-/*
- * Modify salt by XORing it with a special hash of data.
+/* Constant time conditional.
+ * Returns a if c is 1, or b if c is 0. The result is undefined if c is
+ * not 0 or 1.
*/
-static SECStatus
-oaep_xor_with_h2(unsigned char *salt, unsigned int saltlen,
- unsigned char *data, unsigned int datalen)
+static unsigned int constantTimeCondition(unsigned int c,
+ unsigned int a,
+ unsigned int b)
{
- unsigned char sha1[SHA1_LENGTH];
- unsigned char *psalt, *psha1, *saltend;
- SECStatus rv;
-
- /*
- * Create a hash of data.
- */
- rv = SHA1_HashBuf(sha1, data, datalen);
- if (rv != SECSuccess) {
- return rv;
- }
-
- /*
- * XOR the low-order octets of that hash with salt.
- */
- PORT_Assert(saltlen <= SHA1_LENGTH);
- saltend = salt + saltlen;
- psalt = salt;
- psha1 = sha1 + SHA1_LENGTH - saltlen;
- while (psalt < saltend) {
- *psalt++ ^= *psha1++;
- }
-
- return SECSuccess;
+ return (~(c - 1) & a) | ((c - 1) & b);
}
/*
@@ -212,7 +124,7 @@ static unsigned char *rsa_FormatOneBlock(unsigned modulusLen,
unsigned char *block;
unsigned char *bp;
int padLen;
- int i;
+ int i, j;
SECStatus rv;
block = (unsigned char *) nss_ZAlloc(NULL, modulusLen);
@@ -260,124 +172,58 @@ static unsigned char *rsa_FormatOneBlock(unsigned modulusLen,
*/
case RSA_BlockPublic:
- /*
- * 0x00 || BT || Pad || 0x00 || ActualData
- * 1 1 padLen 1 data->len
- * Pad is all non-zero random bytes.
- */
- padLen = modulusLen - data->len - 3;
- PORT_Assert(padLen >= RSA_BLOCK_MIN_PAD_LEN);
- if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
- nss_ZFreeIf(block);
- return NULL;
- }
- for (i = 0; i < padLen; i++) {
- /* Pad with non-zero random data. */
- do {
- rv = RNG_GenerateGlobalRandomBytes(bp + i, 1);
- } while (rv == SECSuccess
- && bp[i] == RSA_BLOCK_AFTER_PAD_OCTET);
- if (rv != SECSuccess) {
- nss_ZFreeIf(block);
- return NULL;
- }
- }
- bp += padLen;
- *bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
- nsslibc_memcpy(bp, data->data, data->len);
-
- break;
-
- /*
- * Blocks intended for public-key operation, using
- * Optimal Asymmetric Encryption Padding (OAEP).
- */
- case RSA_BlockOAEP:
- /*
- * 0x00 || BT || Modified2(Salt) || Modified1(PaddedData)
- * 1 1 OAEP_SALT_LEN OAEP_PAD_LEN + data->len [+ N]
- *
- * where:
- * PaddedData is "Pad1 || ActualData [|| Pad2]"
- * Salt is random data.
- * Pad1 is all zeros.
- * Pad2, if present, is random data.
- * (The "modified" fields are all the same length as the original
- * unmodified values; they are just xor'd with other values.)
- *
- * Modified1 is an XOR of PaddedData with a special octet
- * string constructed of iterated hashing of Salt (see below).
- * Modified2 is an XOR of Salt with the low-order octets of
- * the hash of Modified1 (see farther below ;-).
- *
- * Whew!
- */
-
-
- /*
- * Salt
- */
- rv = RNG_GenerateGlobalRandomBytes(bp, OAEP_SALT_LEN);
- if (rv != SECSuccess) {
- nss_ZFreeIf(block);
- return NULL;
- }
- bp += OAEP_SALT_LEN;
-
- /*
- * Pad1
- */
- nsslibc_memset(bp, OAEP_PAD_OCTET, OAEP_PAD_LEN);
- bp += OAEP_PAD_LEN;
-
- /*
- * Data
- */
- nsslibc_memcpy(bp, data->data, data->len);
- bp += data->len;
-
- /*
- * Pad2
- */
- if (bp < (block + modulusLen)) {
- rv = RNG_GenerateGlobalRandomBytes(bp,
- block - bp + modulusLen);
- if (rv != SECSuccess) {
- nss_ZFreeIf(block);
- return NULL;
- }
- }
-
- /*
- * Now we have the following:
- * 0x00 || BT || Salt || PaddedData
- * (From this point on, "Pad1 || Data [|| Pad2]" is treated
- * as the one entity PaddedData.)
- *
- * We need to turn PaddedData into Modified1.
- */
- if (oaep_xor_with_h1(block + 2 + OAEP_SALT_LEN,
- modulusLen - 2 - OAEP_SALT_LEN,
- block + 2, OAEP_SALT_LEN) != SECSuccess) {
- nss_ZFreeIf(block);
- return NULL;
- }
-
- /*
- * Now we have:
- * 0x00 || BT || Salt || Modified1(PaddedData)
- *
- * The remaining task is to turn Salt into Modified2.
- */
- if (oaep_xor_with_h2(block + 2, OAEP_SALT_LEN,
- block + 2 + OAEP_SALT_LEN,
- modulusLen - 2 - OAEP_SALT_LEN) !=
- SECSuccess) {
- nss_ZFreeIf(block);
- return NULL;
- }
-
- break;
+ /*
+ * 0x00 || BT || Pad || 0x00 || ActualData
+ * 1 1 padLen 1 data->len
+ * Pad is all non-zero random bytes.
+ *
+ * Build the block left to right.
+ * Fill the entire block from Pad to the end with random bytes.
+ * Use the bytes after Pad as a supply of extra random bytes from
+ * which to find replacements for the zero bytes in Pad.
+ * If we need more than that, refill the bytes after Pad with
+ * new random bytes as necessary.
+ */
+ padLen = modulusLen - (data->len + 3);
+ PORT_Assert (padLen >= RSA_BLOCK_MIN_PAD_LEN);
+ if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
+ nss_ZFreeIf (block);
+ return NULL;
+ }
+ j = modulusLen - 2;
+ rv = RNG_GenerateGlobalRandomBytes(bp, j);
+ if (rv == SECSuccess) {
+ for (i = 0; i < padLen; ) {
+ unsigned char repl;
+ /* Pad with non-zero random data. */
+ if (bp[i] != RSA_BLOCK_AFTER_PAD_OCTET) {
+ ++i;
+ continue;
+ }
+ if (j <= padLen) {
+ rv = RNG_GenerateGlobalRandomBytes(bp + padLen,
+ modulusLen - (2 + padLen));
+ if (rv != SECSuccess)
+ break;
+ j = modulusLen - 2;
+ }
+ do {
+ repl = bp[--j];
+ } while (repl == RSA_BLOCK_AFTER_PAD_OCTET && j > padLen);
+ if (repl != RSA_BLOCK_AFTER_PAD_OCTET) {
+ bp[i++] = repl;
+ }
+ }
+ }
+ if (rv != SECSuccess) {
+ /*sftk_fatalError = PR_TRUE;*/
+ nss_ZFreeIf (block);
+ return NULL;
+ }
+ bp += padLen;
+ *bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
+ nsslibc_memcpy(bp, data->data, data->len);
+ break;
default:
PORT_Assert(0);
@@ -427,26 +273,6 @@ rsa_FormatBlock(SECItem * result, unsigned modulusLen,
break;
- case RSA_BlockOAEP:
- /*
- * 0x00 || BT || M1(Salt) || M2(Pad1||ActualData[||Pad2])
- *
- * The "2" below is the first octet + the second octet.
- * (The other fields do not contain the clear values, but are
- * the same length as the clear values.)
- */
- PORT_Assert(data->len <= (modulusLen - (2 + OAEP_SALT_LEN
- + OAEP_PAD_LEN)));
-
- result->data = rsa_FormatOneBlock(modulusLen, blockType, data);
- if (result->data == NULL) {
- result->len = 0;
- return SECFailure;
- }
- result->len = modulusLen;
-
- break;
-
case RSA_BlockRaw:
/*
* Pad || ActualData
--
1.7.1

35
pkgs/development/mobile/androidenv/androidsdk.nix
View File

@ -1,9 +1,9 @@
{ stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper
, platformTools, buildTools, support, platforms, sysimages, addons
, zlib_32bit
, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit
, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa
, freetype, fontconfig, gtk, atk
, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit
, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib
, freetype, fontconfig, glib, gtk, atk, file, jdk
}:
{platformVersions, abiVersions, useGoogleAPIs}:
@ -56,19 +56,30 @@ stdenv.mkDerivation {
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i
done
# The emulators need additional libraries, which are not in the RPATH => let's wrap them
# The android script has a hardcoded reference to /bin/ls that must be patched
sed -i -e "s|/bin/ls|ls|" android
# The android script used SWT and wants to dynamically load some GTK+ stuff.
# The following wrapper ensures that they can be found:
wrapProgram `pwd`/android \
--prefix PATH : ${jdk}/bin \
--prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib
# The emulators need additional libraries, which are dynamically loaded => let's wrap them
for i in emulator emulator-arm emulator-mips emulator-x86
do
wrapProgram `pwd`/$i \
--prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib
--prefix PATH : ${file}/bin \
--suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib
done
${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
for i in emulator64-arm emulator64-mips emulator64-x86
do
wrapProgram `pwd`/$i \
--prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib
--prefix PATH : ${file}/bin \
--suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib:${alsaLib}/lib
done
''}
''}
@ -172,11 +183,7 @@ stdenv.mkDerivation {
do
if [ ! -d $i ] && [ -x $i ]
then
( echo '#! ${stdenv.shell} -e'
echo "cd $out/libexec/android-sdk-*/tools"
echo "exec ./$(basename $i) \"\$@\"" ) > $out/bin/$(basename $i)
chmod +x $out/bin/$(basename $i)
ln -sf $i $out/bin/$(basename $i)
fi
done
@ -184,11 +191,7 @@ stdenv.mkDerivation {
do
if [ ! -d $i ] && [ -x $i ]
then
( echo '#! ${stdenv.shell} -e'
echo "cd $out/libexec/android-sdk-*/platform-tools"
echo "exec ./$(basename $i) \"\$@\"") > $out/bin/$(basename $i)
chmod +x $out/bin/$(basename $i)
ln -sf $i $out/bin/$(basename $i)
fi
done
'';

7
pkgs/development/mobile/androidenv/build-app.nix
View File

@ -1,5 +1,5 @@
{ stdenv, androidsdk, jdk, ant }:
{ name, src, platformVersions ? [ "8" ], abiVersions ? [ "armeabi-v7a" ], useGoogleAPIs ? false
{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? ""
, release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null
}:
@ -11,7 +11,8 @@ let
else throw "Platform: ${stdenv.system} is not supported!";
androidsdkComposition = androidsdk {
inherit platformVersions abiVersions useGoogleAPIs;
inherit platformVersions useGoogleAPIs;
abiVersions = [];
};
in
stdenv.mkDerivation {
@ -34,7 +35,7 @@ stdenv.mkDerivation {
''}
export ANDROID_SDK_HOME=`pwd` # Key files cannot be stored in the user's home directory. This overrides it.
ant ${if release then "release" else "debug"}
ant ${antFlags} ${if release then "release" else "debug"}
'';
installPhase = ''

11
pkgs/development/mobile/androidenv/default.nix
View File

@ -36,8 +36,8 @@ rec {
androidsdk = import ./androidsdk.nix {
inherit (pkgs) stdenv fetchurl unzip makeWrapper;
inherit (pkgs) freetype fontconfig gtk atk mesa;
inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp;
inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib jdk;
inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst;
inherit platformTools buildTools support platforms sysimages addons;
@ -49,6 +49,7 @@ rec {
libXdmcp_32bit = pkgs_i686.xorg.libXdmcp;
libXext_32bit = pkgs_i686.xorg.libXext;
mesa_32bit = pkgs_i686.mesa;
alsaLib_32bit = pkgs_i686.alsaLib;
};
androidsdk_4_1 = androidsdk {
@ -57,6 +58,12 @@ rec {
useGoogleAPIs = true;
};
androidsdk_4_2 = androidsdk {
platformVersions = [ "17" ];
abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true;
};
buildApp = import ./build-app.nix {
inherit (pkgs) stdenv jdk ant;
inherit androidsdk;

44
pkgs/development/mobile/androidenv/emulate-app.nix
View File

@ -1,5 +1,10 @@
{stdenv, androidsdk}:
{name, app, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false, enableGPU ? false, package, activity}:
{ name, app ? null
, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false
, enableGPU ? false, extraAVDFiles ? []
, package ? null, activity ? null}:
assert app != null -> package != null && activity != null;
let
androidsdkComposition = androidsdk {
@ -28,7 +33,7 @@ stdenv.mkDerivation {
# We have to look for a free TCP port
echo "Looking for a free TCP port in range 5554-5584"
echo "Looking for a free TCP port in range 5554-5584" >&2
for i in $(seq 5554 2 5584)
do
@ -41,56 +46,61 @@ stdenv.mkDerivation {
if [ -z "$port" ]
then
echo "Unfortunately, the emulator port space is exhausted!"
echo "Unfortunately, the emulator port space is exhausted!" >&2
exit 1
else
echo "We have a free TCP port: $port"
echo "We have a free TCP port: $port" >&2
fi
export ANDROID_SERIAL="emulator-$port"
# Create a virtual android device
${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion}
yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS
# Enable GPU acceleration
${stdenv.lib.optionalString enableGPU ''
# Enable GPU acceleration
echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini
''}
${stdenv.lib.concatMapStrings (extraAVDFile: ''
ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd
'') extraAVDFiles}
# Launch the emulator
${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port &
${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS &
# Wait until the device has completely booted
echo "Waiting until the emulator has booted the device and the package manager is ready..."
echo "Waiting until the emulator has booted the device and the package manager is ready..." >&2
${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port wait-for-device
echo "Device state has been reached"
echo "Device state has been reached" >&2
while [ -z "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ]
do
sleep 5
done
echo "dev.bootcomplete property is 1"
echo "dev.bootcomplete property is 1" >&2
#while [ -z "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ]
#do
#sleep 5
#done
#echo "sys.boot_completed property is 1"
#echo "sys.boot_completed property is 1" >&2
echo "ready"
echo "ready" >&2
# Install the App through the debugger
${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk
${stdenv.lib.optionalString (app != null) ''
# Install the App through the debugger
${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk
# Start the application
${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity}
# Start the application
${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity}
''}
EOF
chmod +x $out/bin/run-test-emulator
'';
}

3
pkgs/development/mobile/titaniumenv/build-app.nix
View File

@ -1,5 +1,5 @@
{stdenv, androidsdk, titaniumsdk, xcodewrapper}:
{ appId, name, appName ? null, src, target, androidPlatformVersions ? [ "8" ]
{ appId, name, appName ? null, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ]
, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
, iosKeyFile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosDistribute ? false
}:
@ -10,6 +10,7 @@ assert (release && target == "iphone") -> iosKeyFile != null && iosCertificateNa
let
androidsdkComposition = androidsdk {
platformVersions = androidPlatformVersions;
abiVersions = androidAbiVersions;
useGoogleAPIs = true;
};

8
pkgs/development/mobile/xcodeenv/simulate-app.nix
View File

@ -1,5 +1,9 @@
{stdenv, xcodewrapper}:
{name, appName ? null, app, device ? "iPhone", baseDir ? ""}:
{ name, appName ? null, app
, device ? "iPhone", baseDir ? ""
, sdkRoot ? "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"
, sdkVersion ? "6.1"
}:
let
_appName = if appName == null then name else appName;
@ -12,7 +16,7 @@ stdenv.mkDerivation {
#! ${stdenv.shell} -e
cd "${app}/${baseDir}/${_appName}.app"
"$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}'
"$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}' -currentSDKRoot '${sdkRoot}/iPhoneSimulator${sdkVersion}.sdk'
EOF
chmod +x $out/bin/run-test-simulator
'';

2
pkgs/development/python-modules/blivet/default.nix
View File

@ -18,7 +18,7 @@ in buildPythonPackage rec {
src = fetchurl {
url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/"
+ "${name}.tar.bz2";
sha256 = "0b28q539657mqif0mn5dfqcpqv7gbyszg83gf2fv6z7q6206rnx5";
sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci";
};
postPatch = ''

9
pkgs/development/tools/analysis/splint/default.nix
View File

@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
meta = with stdenv.lib; {
homepage = http://splint.org/;
description = "Splint, an annotation-assisted lightweight static analyzer for C";
description = "Annotation-assisted lightweight static analyzer for C";
longDescription = ''
Splint is a tool for statically checking C programs for security
@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
checking than can be done by any standard lint.
'';
license = "GPLv2+";
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}
}

34
pkgs/development/tools/misc/cl-launch/default.nix Normal file
View File

@ -0,0 +1,34 @@
{stdenv, fetchurl}:
let
s = # Generated upstream information
rec {
baseName="cl-launch";
version="3.21.1";
name="${baseName}-${version}";
hash="1241lyn2a3ry06ii9zlns0cj462bi7rih41vlbbmra1chj4c21ij";
url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-3.21.1.tar.gz";
sha256="1241lyn2a3ry06ii9zlns0cj462bi7rih41vlbbmra1chj4c21ij";
};
buildInputs = [
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
preConfigure = ''
export makeFlags="$makeFlags PREFIX='$out'"
mkdir -p "$out/bin"
'';
meta = {
inherit (s) version;
description = ''Common Lisp launcher script'';
license = stdenv.lib.licenses.llgpl21 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

2
pkgs/development/tools/misc/cl-launch/default.upstream Normal file
View File

@ -0,0 +1,2 @@
url http://common-lisp.net/project/xcvb/cl-launch/
version_link '.-[0-9].*[0-9][.]tar[.].*'

9
pkgs/development/tools/misc/strace/default.nix
View File

@ -1,18 +1,19 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
name = "strace-4.7";
name = "strace-4.8";
src = fetchurl {
url = "mirror://sourceforge/strace/${name}.tar.xz";
sha256 = "158iwk0pl2mfw93m1843xb7a2zb8p6lh0qim07rca6f1ff4dk764";
sha256 = "1y6pw4aj4rw5470lqks1ml0n8jh5xbhwr5c3gb00bj570wgjk4pl";
};
nativeBuildInputs = [ perl ];
meta = {
meta = with stdenv.lib; {
homepage = http://strace.sourceforge.net/;
description = "A system call tracer for Linux";
license = "bsd";
license = licenses.bsd3;
platforms = platforms.linux;
};
}

0
pkgs/development/tools/parsing/bison/default.nix → pkgs/development/tools/parsing/bison/2.x.nix
View File

40
pkgs/development/tools/parsing/bison/3.x.nix Normal file
View File

@ -0,0 +1,40 @@
{ stdenv, fetchurl, m4, perl }:
stdenv.mkDerivation rec {
name = "bison-3.0";
src = fetchurl {
url = "mirror://gnu/bison/${name}.tar.xz";
sha256 = "1j14fqgi9wzqgsy4fhkcdrv4hv6rrvhvn84axs520w9b022mbb79";
};
nativeBuildInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl;
propagatedBuildInputs = [ m4 ];
doCheck = true;
meta = {
homepage = "http://www.gnu.org/software/bison/";
description = "GNU Bison, a Yacc-compatible parser generator";
license = "GPLv3+";
longDescription = ''
Bison is a general-purpose parser generator that converts an
annotated context-free grammar into an LALR(1) or GLR parser for
that grammar. Once you are proficient with Bison, you can use
it to develop a wide range of language parsers, from those used
in simple desk calculators to complex programming languages.
Bison is upward compatible with Yacc: all properly-written Yacc
grammars ought to work with Bison with no change. Anyone
familiar with Yacc should be able to use Bison with little
trouble. You need to be fluent in C or C++ programming in order
to use Bison.
'';
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
platforms = stdenv.lib.platforms.unix;
};
passthru = { glrSupport = true; };
}

6
pkgs/lib/licenses.nix
View File

@ -148,6 +148,12 @@
url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html;
};
llgpl21 = {
shortName = "LLGPLv2.1";
fullName = "Lisp LGPL; GNU Lesser General Public License version 2.1 with Franz Inc. preamble for clarification of LGPL terms in context of Lisp";
url = http://opensource.franz.com/preamble.html;
};
lgpl3 = {
shortName = "LGPLv3";
fullName = "GNU Lesser General Public License version 3 only";

36
pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix
View File

@ -1,36 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "iwlwifi-4965-ucode-228.57.1.21";
src = fetchurl {
url = "wireless.kernel.org/en/users/Drivers/iwlegacy?action=AttachFile&do=get&target=${name}.tgz";
name = "${name}.tgz";
sha256 = "1rry0kpzszxk60h5gb94advzi009010xb332iyvfpaiwbj6aiyas";
};
buildPhase = "true";
installPhase = ''
mkdir -p "$out"
chmod -x *
cp * "$out"
# The driver expects the `-1' in the file name.
cd "$out"
ln -s iwlwifi-4965.ucode iwlwifi-4965-1.ucode
'';
meta = {
description = "Firmware for the Intel 4965ABG wireless card";
longDescription = ''
This package provides version 2 of the Intel wireless card
firmware, for Linux up to 2.6.26. It contains the
`iwlwifi-4965-1.ucode' file, which is loaded by the `iw4965'
driver found in recent kernels.
'';
homepage = http://intellinuxwireless.org/;
};
}

12
pkgs/os-specific/linux/kernel/builder.sh
View File

@ -1,7 +1,7 @@
source $stdenv/setup
makeFlags="ARCH=$arch SHELL=/bin/sh $makeFlags"
makeFlags="ARCH=$arch SHELL=/bin/sh KBUILD_BUILD_VERSION=1-NixOS $makeFlags"
if [ -n "$crossConfig" ]; then
makeFlags="$makeFlags CROSS_COMPILE=$crossConfig-"
fi
@ -10,19 +10,20 @@ postPatch() {
# Makefiles are full of /bin/pwd, /bin/false, /bin/bash, etc.
# Patch these away, assuming the tools are in $PATH.
for mf in $(find -name Makefile); do
echo "stripping FHS paths in \`$mf'..."
sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g'
echo "stripping FHS paths in \`$mf'..."
sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g'
done
}
configurePhase() {
if test -n "$preConfigure"; then
eval "$preConfigure";
eval "$preConfigure"
fi
export INSTALL_PATH=$out
export INSTALL_MOD_PATH=$out
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
# Set our own localversion, if specified.
rm -f localversion*
@ -30,7 +31,6 @@ configurePhase() {
echo "$localVersion" > localversion-nix
fi
# Patch kconfig to print "###" after every question so that
# generate-config.pl can answer them.
sed -e '/fflush(stdout);/i\printf("###");' -i scripts/kconfig/conf.c
@ -112,7 +112,7 @@ installPhase() {
if test "$dontStrip" = "1"; then
# copy any debugging info that can be found
cp --parents -rv `find -name \*.debug -o -name debug.a` \
cp --parents -rv `find -name \*.debug -o -name debug.a` \
"$out/lib/modules/$version/build"
fi

13
pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch
View File

@ -1,13 +0,0 @@
--- /tmp/linux-2.6.32.14/fs/cifs/transport.c 2011-03-27 20:37:20.000000000 +0200
+++ linux-2.6.32.14/fs/cifs/transport.c 2011-04-01 11:07:17.700305670 +0200
@@ -182,8 +182,8 @@
after the retries we will kill the socket and
reconnect which may clear the network problem.
*/
- if ((i >= 14) || (!server->noblocksnd && (i > 2))) {
- cERROR(1, "sends on sock %p stuck for 15 seconds",
+ if ((i >= 119) || (!server->noblocksnd && (i > 2))) {
+ cERROR(1, "sends on sock %p stuck for 119 seconds",
ssocket);
rc = -EAGAIN;
break;

306
pkgs/os-specific/linux/kernel/common-config.nix Normal file
View File

@ -0,0 +1,306 @@
{ stdenv, version, kernelPlatform, extraConfig }:
with stdenv.lib;
''
# Power management and debugging.
DEBUG_KERNEL y
PM_ADVANCED_DEBUG y
PM_RUNTIME y
TIMER_STATS y
${optionalString (versionOlder version "3.10") ''
USB_SUSPEND y
''}
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT? n
DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
DETECT_HUNG_TASK y
# Support drivers that need external firmware.
STANDALONE n
# Make /proc/config.gz available.
IKCONFIG_PROC y
# Optimize with -O2, not -Os.
CC_OPTIMIZE_FOR_SIZE n
# Enable the kernel's built-in memory tester.
MEMTEST y
# Include the CFQ I/O scheduler in the kernel, rather than as a
# module, so that the initrd gets a good I/O scheduler.
IOSCHED_CFQ y
BLK_CGROUP y # required by CFQ
# Enable NUMA.
NUMA? y
# Disable some expensive (?) features.
FTRACE n
KPROBES n
PM_TRACE_RTC n
# Enable various subsystems.
ACCESSIBILITY y # Accessibility support
AUXDISPLAY y # Auxiliary Display support
DONGLE y # Serial dongle support
HIPPI y
MTD_COMPLEX_MAPPINGS y # needed for many devices
${optionalString (versionOlder version "3.2") ''
NET_POCKET y # enable pocket and portable adapters
''}
SCSI_LOWLEVEL y # enable lots of SCSI devices
SCSI_LOWLEVEL_PCMCIA y
SPI y # needed for many devices
SPI_MASTER y
WAN y
# Networking options.
IP_PNP n
IPV6_PRIVACY y
NETFILTER_ADVANCED y
IP_VS_PROTO_TCP y
IP_VS_PROTO_UDP y
IP_VS_PROTO_ESP y
IP_VS_PROTO_AH y
IP_DCCP_CCID3 n # experimental
CLS_U32_PERF y
CLS_U32_MARK y
# Wireless networking.
CFG80211_WEXT y # Without it, ipw2200 drivers don't build
IPW2100_MONITOR y # support promiscuous mode
IPW2200_MONITOR y # support promiscuous mode
HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
HOSTAP_FIRMWARE_NVRAM y
ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
ATH9K_AHB y # Ditto, AHB bus
${optionalString (versionAtLeast version "3.2") ''
B43_PHY_HT y
''}
BCMA_HOST_PCI y
# Some settings to make sure that fbcondecor works - in particular,
# disable tileblitting and the drivers that need it.
# Enable various FB devices.
FB y
FB_EFI y
FB_NVIDIA_I2C y # Enable DDC Support
FB_RIVA_I2C y
FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
FB_ATY_GX y # Mach64 GX support
FB_SAVAGE_I2C y
FB_SAVAGE_ACCEL y
FB_SIS_300 y
FB_SIS_315 y
FB_3DFX_ACCEL y
FB_GEODE y
# Video configuration.
# Enable KMS for devices whose X.org driver supports it.
DRM_I915_KMS y
${optionalString (versionOlder version "3.9") ''
DRM_RADEON_KMS y
''}
# Hybrid graphics support
VGA_SWITCHEROO y
# Sound.
SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
SND_HDA_INPUT_BEEP y # Support digital beep via input layer
SND_USB_CAIAQ_INPUT y
PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
# USB serial devices.
USB_SERIAL_GENERIC y # USB Generic Serial Driver
USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
USB_SERIAL_KEYSPAN_USA28 y
USB_SERIAL_KEYSPAN_USA28X y
USB_SERIAL_KEYSPAN_USA28XA y
USB_SERIAL_KEYSPAN_USA28XB y
USB_SERIAL_KEYSPAN_USA19 y
USB_SERIAL_KEYSPAN_USA18X y
USB_SERIAL_KEYSPAN_USA19W y
USB_SERIAL_KEYSPAN_USA19QW y
USB_SERIAL_KEYSPAN_USA19QI y
USB_SERIAL_KEYSPAN_USA49W y
USB_SERIAL_KEYSPAN_USA49WLC y
# Filesystem options - in particular, enable extended attributes and
# ACLs for all filesystems that support them.
EXT2_FS_XATTR y
EXT2_FS_POSIX_ACL y
EXT2_FS_SECURITY y # Ext2 Security Labels
EXT2_FS_XIP y # Ext2 execute in place support
EXT4_FS_POSIX_ACL y
EXT4_FS_SECURITY y
REISERFS_FS_XATTR y
REISERFS_FS_POSIX_ACL y
REISERFS_FS_SECURITY y
JFS_POSIX_ACL y
JFS_SECURITY y
XFS_QUOTA y
XFS_POSIX_ACL y
XFS_RT y # XFS Realtime subvolume support
OCFS2_DEBUG_MASKLOG n
BTRFS_FS_POSIX_ACL y
UBIFS_FS_XATTR? y
UBIFS_FS_ADVANCED_COMPR y
NFSD_V2_ACL y
NFSD_V3 y
NFSD_V3_ACL y
NFSD_V4 y
NFS_FSCACHE y
CIFS_XATTR y
CIFS_POSIX y
CIFS_FSCACHE y
# Security related features.
STRICT_DEVMEM y # Filter access to /dev/mem
SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
DEVKMEM n # Disable /dev/kmem
CC_STACKPROTECTOR y # Detect buffer overflows on the stack
# Misc. options.
8139TOO_8129 y
8139TOO_PIO n # PIO is slower
AIC79XX_DEBUG_ENABLE n
AIC7XXX_DEBUG_ENABLE n
AIC94XX_DEBUG n
${optionalString (versionAtLeast version "3.3") ''
AUDIT_LOGINUID_IMMUTABLE y
''}
B43_PCMCIA y
BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
BLK_DEV_IDEACPI y # IDE ACPI support
BLK_DEV_INTEGRITY y
BSD_PROCESS_ACCT_V3 y
BT_HCIUART_BCSP y
BT_HCIUART_H4 y # UART (H4) protocol support
BT_HCIUART_LL y
BT_RFCOMM_TTY? y # RFCOMM TTY support
CRASH_DUMP n
${optionalString (versionOlder version "3.1") ''
DMAR? n # experimental
''}
DVB_DYNAMIC_MINORS? y # we use udev
${optionalString (versionAtLeast version "3.3") ''
EFI_STUB y # EFI bootloader in the bzImage itself
''}
FHANDLE y # used by systemd
FUSION y # Fusion MPT device support
IDE_GD_ATAPI y # ATAPI floppy support
IRDA_ULTRA y # Ultra (connectionless) protocol
JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
LOGO n # not needed
MEDIA_ATTACH y
MEGARAID_NEWGEN y
MICROCODE_AMD y
MODVERSIONS y
MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
MTRR_SANITIZER y
NET_FC y # Fibre Channel driver support
PPP_MULTILINK y # PPP multilink support
REGULATOR y # Voltage and Current Regulator Support
${optionalString (versionAtLeast version "3.6") ''
RC_DEVICES? y # Enable IR devices
''}
SCSI_LOGGING y # SCSI logging facility
SERIAL_8250 y # 8250/16550 and compatible serial support
SLIP_COMPRESSED y # CSLIP compressed headers
SLIP_SMART y
THERMAL_HWMON y # Hardware monitoring support
USB_DEBUG n
USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
X86_CHECK_BIOS_CORRUPTION y
X86_MCE y
# Linux containers.
RT_GROUP_SCHED? y
CGROUP_DEVICE? y
${if versionAtLeast version "3.6" then ''
MEMCG y
MEMCG_SWAP y
'' else ''
CGROUP_MEM_RES_CTLR y
CGROUP_MEM_RES_CTLR_SWAP y
''}
DEVPTS_MULTIPLE_INSTANCES y
# Enable staging drivers. These are somewhat experimental, but
# they generally don't hurt.
STAGING y
# PROC_EVENTS requires that the netlink connector is not built
# as a module. This is required by libcgroup's cgrulesengd.
CONNECTOR y
PROC_EVENTS y
# Tracing.
FTRACE y
FUNCTION_TRACER y
FTRACE_SYSCALLS y
SCHED_TRACER y
# Devtmpfs support.
DEVTMPFS y
# Easier debugging of NFS issues.
${optionalString (versionAtLeast version "3.4") ''
SUNRPC_DEBUG y
''}
# Virtualisation.
PARAVIRT y
${if versionAtLeast version "3.10" then ''
HYPERVISOR_GUEST y
'' else ''
PARAVIRT_GUEST y
''}
KVM_GUEST y
${optionalString (versionOlder version "3.7") ''
KVM_CLOCK y
''}
XEN y
XEN_DOM0? y
KSM y
${optionalString (!stdenv.is64bit) ''
HIGHMEM64G? y # We need 64 GB (PAE) support for Xen guest support.
''}
# Media support.
${optionalString (versionAtLeast version "3.6") ''
MEDIA_DIGITAL_TV_SUPPORT y
MEDIA_CAMERA_SUPPORT y
MEDIA_RC_SUPPORT y
''}
${optionalString (versionAtLeast version "3.7") ''
MEDIA_USB_SUPPORT y
''}
# Our initrd init uses shebang scripts, so can't be modular.
${optionalString (versionAtLeast version "3.10") ''
BINFMT_SCRIPT y
''}
# Enable the 9P cache to speed up NixOS VM tests.
9P_FSCACHE y
9P_FS_POSIX_ACL y
${kernelPlatform.kernelExtraConfig or ""}
${extraConfig}
''

23
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, mktemp, module_init_tools
{ stdenv, fetchurl, perl, mktemp, module_init_tools, bc
, # The kernel source tarball.
src
@ -6,15 +6,12 @@
, # The kernel version.
version
, # Overrides to the kernel config.
extraConfig ? ""
, # The version number used for the module directory
modDirVersion ? version
, # The kernel configuration.
config
, # The kernel configuration when cross building.
configCross ? {}
, # An attribute set whose attributes express the availability of
# certain features in this kernel. E.g. `{iwlwifi = true;}'
# indicates a kernel that provides Intel wireless support. Used in
@ -40,7 +37,6 @@
# we force building the target asked: bzImage/zImage/uImage/...
postBuild ? "make $makeFlags $kernelTarget; make $makeFlags -C scripts unifdef"
, extraNativeBuildInputs ? []
, ...
}:
@ -59,6 +55,12 @@ let
map ({extraConfig ? "", ...}: extraConfig) kernelPatches;
in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches);
configWithPlatform = kernelPlatform:
import ./common-config.nix { inherit stdenv version kernelPlatform extraConfig; };
config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform;
in
stdenv.mkDerivation {
@ -69,7 +71,7 @@ stdenv.mkDerivation {
passthru = {
inherit version modDirVersion kernelPatches;
# Combine the `features' attribute sets of all the kernel patches.
features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches;
features = lib.fold (x: y: (x.features or {}) // y) features kernelPatches;
};
builder = ./builder.sh;
@ -85,7 +87,7 @@ stdenv.mkDerivation {
# For UML and non-PC, just ignore all options that don't apply (We are lazy).
ignoreConfigErrors = stdenv.platform.name != "pc";
nativeBuildInputs = [ perl mktemp ] ++ extraNativeBuildInputs;
nativeBuildInputs = [ perl mktemp bc ];
buildInputs = lib.optional (stdenv.platform.uboot != null)
(ubootChooser stdenv.platform.uboot);
@ -133,7 +135,6 @@ stdenv.mkDerivation {
" (with patches: "
+ lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
+ ")");
inherit version;
license = "GPLv2";
homepage = http://www.kernel.org/;
maintainers = [

2714
pkgs/os-specific/linux/kernel/guruplug-defconfig.patch
View File

File diff suppressed because it is too large Load Diff

15
pkgs/os-specific/linux/kernel/guruplug-mach-type.patch
View File

@ -1,15 +0,0 @@
The GuruPlug's u-boot is configured with the wrong `arch_number', so
change Linux so that it matches u-boot's expectations. See
<http://www.plugcomputer.org/plugwiki/index.php/Compiling_Linux_Kernel_for_the_Plug_Computer>.
--- linux-2.6.35.3/arch/arm/tools/mach-types 2010-08-20 20:55:55.000000000 +0200
+++ linux-2.6.35.3/arch/arm/tools/mach-types 2010-09-13 22:49:41.000000000 +0200
@@ -2643,7 +2643,7 @@ rfp43 MACH_RFP43 RFP43 2655
sk86r0301 MACH_SK86R0301 SK86R0301 2656
ctpxa MACH_CTPXA CTPXA 2657
epb_arm9_a MACH_EPB_ARM9_A EPB_ARM9_A 2658
-guruplug MACH_GURUPLUG GURUPLUG 2659
+guruplug MACH_GURUPLUG GURUPLUG 2601
spear310 MACH_SPEAR310 SPEAR310 2660
spear320 MACH_SPEAR320 SPEAR320 2661
robotx MACH_ROBOTX ROBOTX 2662

258
pkgs/os-specific/linux/kernel/linux-3.0.nix
View File

@ -1,252 +1,12 @@
args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:
{ stdenv, fetchurl, ... } @ args:
let
configWithPlatform = kernelPlatform :
''
# Power management and debugging for powertop.
DEBUG_KERNEL y
PM_ADVANCED_DEBUG y
PM_RUNTIME y
TIMER_STATS y
USB_SUSPEND y
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT n
DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
import ./generic.nix (args // rec {
version = "3.0.88";
# Support drivers that need external firmware.
STANDALONE n
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1icfkbn9a5cpwiax1xklvpqyjcvqij3dwib009fipp53z4pn5bz4";
};
# Make /proc/config.gz available.
IKCONFIG_PROC y
# Optimize with -O2, not -Os.
CC_OPTIMIZE_FOR_SIZE n
# Enable the kernel's built-in memory tester.
MEMTEST y
# Include the CFQ I/O scheduler in the kernel, rather than as a
# module, so that the initrd gets a good I/O scheduler.
IOSCHED_CFQ y
BLK_CGROUP y # required by CFQ
# Disable some expensive (?) features.
FTRACE n
KPROBES n
NUMA? n
PM_TRACE_RTC n
# Enable various subsystems.
ACCESSIBILITY y # Accessibility support
AUXDISPLAY y # Auxiliary Display support
DONGLE y # Serial dongle support
HIPPI y
MTD_COMPLEX_MAPPINGS y # needed for many devices
NET_POCKET y # enable pocket and portable adapters
SCSI_LOWLEVEL y # enable lots of SCSI devices
SCSI_LOWLEVEL_PCMCIA y
SPI y # needed for many devices
SPI_MASTER y
WAN y
# Networking options.
IP_PNP n
IPV6_PRIVACY y
NETFILTER_ADVANCED y
IP_VS_PROTO_TCP y
IP_VS_PROTO_UDP y
IP_VS_PROTO_ESP y
IP_VS_PROTO_AH y
IP_DCCP_CCID3 n # experimental
CLS_U32_PERF y
CLS_U32_MARK y
# Wireless networking.
IPW2100_MONITOR y # support promiscuous mode
IPW2200_MONITOR y # support promiscuous mode
HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
HOSTAP_FIRMWARE_NVRAM y
ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
ATH9K_AHB y # Ditto, AHB bus
# Some settings to make sure that fbcondecor works - in particular,
# disable tileblitting and the drivers that need it.
# Enable various FB devices.
FB y
FB_EFI y
FB_NVIDIA_I2C y # Enable DDC Support
FB_RIVA_I2C y
FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
FB_ATY_GX y # Mach64 GX support
FB_SAVAGE_I2C y
FB_SAVAGE_ACCEL y
FB_SIS_300 y
FB_SIS_315 y
FB_3DFX_ACCEL y
FB_GEODE y
# Video configuration
# Enable KMS for devices whose X.org driver supports it.
DRM_I915_KMS y
DRM_RADEON_KMS y
# Hybrid graphics support
VGA_SWITCHEROO y
# Sound.
SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
SND_HDA_INPUT_BEEP y # Support digital beep via input layer
SND_USB_CAIAQ_INPUT y
PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
# USB serial devices.
USB_SERIAL_GENERIC y # USB Generic Serial Driver
USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
USB_SERIAL_KEYSPAN_USA28 y
USB_SERIAL_KEYSPAN_USA28X y
USB_SERIAL_KEYSPAN_USA28XA y
USB_SERIAL_KEYSPAN_USA28XB y
USB_SERIAL_KEYSPAN_USA19 y
USB_SERIAL_KEYSPAN_USA18X y
USB_SERIAL_KEYSPAN_USA19W y
USB_SERIAL_KEYSPAN_USA19QW y
USB_SERIAL_KEYSPAN_USA19QI y
USB_SERIAL_KEYSPAN_USA49W y
USB_SERIAL_KEYSPAN_USA49WLC y
# Filesystem options - in particular, enable extended attributes and
# ACLs for all filesystems that support them.
EXT2_FS_XATTR y # Ext2 extended attributes
EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
EXT2_FS_SECURITY y # Ext2 Security Labels
EXT2_FS_XIP y # Ext2 execute in place support
EXT4_FS_POSIX_ACL y
EXT4_FS_SECURITY y
REISERFS_FS_XATTR y
REISERFS_FS_POSIX_ACL y
REISERFS_FS_SECURITY y
JFS_POSIX_ACL y
JFS_SECURITY y
XFS_QUOTA y
XFS_POSIX_ACL y
XFS_RT y # XFS Realtime subvolume support
OCFS2_DEBUG_MASKLOG n
BTRFS_FS_POSIX_ACL y
UBIFS_FS_XATTR y
UBIFS_FS_ADVANCED_COMPR y
NFSD_V2_ACL y
NFSD_V3 y
NFSD_V3_ACL y
NFSD_V4 y
CIFS_XATTR y
CIFS_POSIX y
# Security related features.
STRICT_DEVMEM y # Filter access to /dev/mem
SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
# Misc. options.
8139TOO_8129 y
8139TOO_PIO n # PIO is slower
AIC79XX_DEBUG_ENABLE n
AIC7XXX_DEBUG_ENABLE n
AIC94XX_DEBUG n
B43_PCMCIA y
BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
BLK_DEV_IDEACPI y # IDE ACPI support
BLK_DEV_INTEGRITY y
BSD_PROCESS_ACCT_V3 y
BT_HCIUART_BCSP y
BT_HCIUART_H4 y # UART (H4) protocol support
BT_HCIUART_LL y
BT_L2CAP y
BT_SCO y # audio support
BT_RFCOMM m
BT_RFCOMM_TTY y # RFCOMM TTY support
CRASH_DUMP n
DMAR? n # experimental
DVB_DYNAMIC_MINORS y # we use udev
FHANDLE y # used by systemd
FUSION y # Fusion MPT device support
IDE_GD_ATAPI y # ATAPI floppy support
IRDA_ULTRA y # Ultra (connectionless) protocol
JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
LOGO n # not needed
MEDIA_ATTACH y
MEGARAID_NEWGEN y
MICROCODE_AMD y
MODVERSIONS y
MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
MTRR_SANITIZER y
NET_FC y # Fibre Channel driver support
PPP_MULTILINK y # PPP multilink support
REGULATOR y # Voltage and Current Regulator Support
SCSI_LOGGING y # SCSI logging facility
SERIAL_8250 y # 8250/16550 and compatible serial support
SLIP_COMPRESSED y # CSLIP compressed headers
SLIP_SMART y
THERMAL_HWMON y # Hardware monitoring support
USB_DEBUG n
USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
X86_CHECK_BIOS_CORRUPTION y
X86_MCE y
# Linux Containers
RT_GROUP_SCHED? y
CGROUP_DEVICE? y
CGROUP_MEM_RES_CTLR? y
CGROUP_MEM_RES_CTLR_SWAP? y
DEVPTS_MULTIPLE_INSTANCES? y
# Enable staging drivers. These are somewhat experimental, but
# they generally don't hurt.
STAGING y
# PROC_EVENTS requires that the netlink connector is not built
# as a module. This is required by libcgroup's cgrulesengd.
CONNECTOR y
PROC_EVENTS y
# Devtmpfs support.
DEVTMPFS y
${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
${extraConfig}
'';
in
import ./generic.nix (
rec {
version = "3.0.80";
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
'';
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0f3md117bh8n5izkhjd2jp096jqmwz6wpxn7rf8x2x9cz4jz0cqx";
};
config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform;
features.iwlwifi = true;
}
// removeAttrs args ["extraConfig"]
)
features.iwlwifi = true;
})

297
pkgs/os-specific/linux/kernel/linux-3.10.nix
View File

@ -1,287 +1,16 @@
args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools, bc
, ... }:
{ stdenv, fetchurl, ... } @ args:
let
configWithPlatform = kernelPlatform :
''
# Power management and debugging for powertop.
DEBUG_KERNEL y
PM_ADVANCED_DEBUG y
PM_RUNTIME y
TIMER_STATS y
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT? n
DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
import ./generic.nix (args // rec {
version = "3.10.5";
# Support drivers that need external firmware.
STANDALONE n
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0p1nmk5mikvqi2b6wzlbb0fnrv30p5qazgnqlxgifsf4pmh1x279";
};
# Make /proc/config.gz available.
IKCONFIG_PROC y
# Optimize with -O2, not -Os.
CC_OPTIMIZE_FOR_SIZE n
# Enable the kernel's built-in memory tester.
MEMTEST y
# Include the CFQ I/O scheduler in the kernel, rather than as a
# module, so that the initrd gets a good I/O scheduler.
IOSCHED_CFQ y
BLK_CGROUP y # required by CFQ
# Enable NUMA.
NUMA? y
# Disable some expensive (?) features.
FTRACE n
KPROBES n
PM_TRACE_RTC n
# Enable various subsystems.
ACCESSIBILITY y # Accessibility support
AUXDISPLAY y # Auxiliary Display support
DONGLE y # Serial dongle support
HIPPI? y
MTD_COMPLEX_MAPPINGS y # needed for many devices
SCSI_LOWLEVEL y # enable lots of SCSI devices
SCSI_LOWLEVEL_PCMCIA y
SPI y # needed for many devices
SPI_MASTER y
WAN y
# Networking options.
IP_PNP n
IPV6_PRIVACY y
NETFILTER_ADVANCED y
IP_VS_PROTO_TCP y
IP_VS_PROTO_UDP y
IP_VS_PROTO_ESP y
IP_VS_PROTO_AH y
IP_DCCP_CCID3 n # experimental
CLS_U32_PERF y
CLS_U32_MARK y
# Wireless networking.
IPW2100_MONITOR y # support promiscuous mode
IPW2200_MONITOR? y # support promiscuous mode
HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
HOSTAP_FIRMWARE_NVRAM y
ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
ATH9K_AHB y # Ditto, AHB bus
B43_PHY_HT y
BCMA_HOST_PCI y
CFG80211_WEXT y # Without it, ipw2200 drivers don't build
# Some settings to make sure that fbcondecor works - in particular,
# disable tileblitting and the drivers that need it.
# Enable various FB devices.
FB y
FB_EFI y
FB_NVIDIA_I2C y # Enable DDC Support
FB_RIVA_I2C y
FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
FB_ATY_GX y # Mach64 GX support
FB_SAVAGE_I2C y
FB_SAVAGE_ACCEL y
FB_SIS_300 y
FB_SIS_315 y
FB_3DFX_ACCEL y
FB_GEODE y
# Video configuration
# Enable KMS for devices whose X.org driver supports it.
DRM_I915_KMS y
DRM_RADEON_KMS? y
# Hybrid graphics support
VGA_SWITCHEROO y
# Sound.
SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
SND_HDA_INPUT_BEEP y # Support digital beep via input layer
SND_USB_CAIAQ_INPUT y
PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
# USB serial devices.
USB_SERIAL_GENERIC y # USB Generic Serial Driver
USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
USB_SERIAL_KEYSPAN_USA28 y
USB_SERIAL_KEYSPAN_USA28X y
USB_SERIAL_KEYSPAN_USA28XA y
USB_SERIAL_KEYSPAN_USA28XB y
USB_SERIAL_KEYSPAN_USA19 y
USB_SERIAL_KEYSPAN_USA18X y
USB_SERIAL_KEYSPAN_USA19W y
USB_SERIAL_KEYSPAN_USA19QW y
USB_SERIAL_KEYSPAN_USA19QI y
USB_SERIAL_KEYSPAN_USA49W y
USB_SERIAL_KEYSPAN_USA49WLC y
# Filesystem options - in particular, enable extended attributes and
# ACLs for all filesystems that support them.
EXT2_FS_XATTR y # Ext2 extended attributes
EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
EXT2_FS_SECURITY y # Ext2 Security Labels
EXT2_FS_XIP y # Ext2 execute in place support
EXT4_FS_POSIX_ACL y
EXT4_FS_SECURITY y
REISERFS_FS_XATTR y
REISERFS_FS_POSIX_ACL y
REISERFS_FS_SECURITY y
JFS_POSIX_ACL y
JFS_SECURITY y
XFS_QUOTA y
XFS_POSIX_ACL y
XFS_RT y # XFS Realtime subvolume support
OCFS2_DEBUG_MASKLOG n
BTRFS_FS_POSIX_ACL y
UBIFS_FS_XATTR? y
UBIFS_FS_ADVANCED_COMPR y
NFSD_V2_ACL y
NFSD_V3 y
NFSD_V3_ACL y
NFSD_V4 y
NFS_FSCACHE y
CIFS_XATTR y
CIFS_POSIX y
CIFS_FSCACHE y
# Security related features.
STRICT_DEVMEM y # Filter access to /dev/mem
SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
# Misc. options.
8139TOO_8129 y
8139TOO_PIO n # PIO is slower
AIC79XX_DEBUG_ENABLE n
AIC7XXX_DEBUG_ENABLE n
AIC94XX_DEBUG n
AUDIT_LOGINUID_IMMUTABLE y
B43_PCMCIA y
BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
BLK_DEV_IDEACPI y # IDE ACPI support
BLK_DEV_INTEGRITY y
BSD_PROCESS_ACCT_V3 y
BT_HCIUART_BCSP y
BT_HCIUART_H4 y # UART (H4) protocol support
BT_HCIUART_LL y
BT_RFCOMM m
BT_RFCOMM_TTY y # RFCOMM TTY support
CRASH_DUMP n
DMAR? n # experimental
DVB_DYNAMIC_MINORS? y # we use udev
EFI_STUB y # EFI bootloader in the bzImage itself
FHANDLE y # used by systemd
FUSION y # Fusion MPT device support
IDE_GD_ATAPI y # ATAPI floppy support
IRDA_ULTRA y # Ultra (connectionless) protocol
JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
LOGO n # not needed
MEDIA_ATTACH? y
MEGARAID_NEWGEN y
MICROCODE_AMD y
MODVERSIONS y
MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
MTRR_SANITIZER y
NET_FC y # Fibre Channel driver support
PPP_MULTILINK y # PPP multilink support
REGULATOR y # Voltage and Current Regulator Support
RC_DEVICES y # Enable IR devices
SCSI_LOGGING y # SCSI logging facility
SERIAL_8250 y # 8250/16550 and compatible serial support
SLIP_COMPRESSED y # CSLIP compressed headers
SLIP_SMART y
THERMAL_HWMON y # Hardware monitoring support
USB_DEBUG n
USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
X86_CHECK_BIOS_CORRUPTION y
X86_MCE y
# Linux Containers
RT_GROUP_SCHED? y
CGROUP_DEVICE? y
MEMCG? y
MEMCG_SWAP? y
DEVPTS_MULTIPLE_INSTANCES? y
# Enable staging drivers. These are somewhat experimental, but
# they generally don't hurt.
STAGING y
# PROC_EVENTS requires that the netlink connector is not built
# as a module. This is required by libcgroup's cgrulesengd.
CONNECTOR y
PROC_EVENTS y
# Tracing
FTRACE y
FUNCTION_TRACER y
FTRACE_SYSCALLS y
SCHED_TRACER y
# Devtmpfs support.
DEVTMPFS y
# Media support
MEDIA_CAMERA_SUPPORT? y
MEDIA_RC_SUPPORT? y
MEDIA_USB_SUPPORT y
# Easier debug of NFS issues
SUNRPC_DEBUG y
# Our initrd init uses shebang scripts, so can't be modular
BINFMT_SCRIPT y
# Enable the 9P cache to speed up NixOS VM tests.
9P_FSCACHE y
9P_FS_POSIX_ACL y
${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
${extraConfig}
'';
in
import ./generic.nix (
rec {
version = "3.10.4";
testing = false;
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
'';
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "1f0ynk37bhkllx2ahzp587yr8cvn809v2ad0sn7z92yv48vl4nly";
};
config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform;
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
extraNativeBuildInputs = [bc];
}
// removeAttrs args ["extraConfig"]
)
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
})

269
pkgs/os-specific/linux/kernel/linux-3.2.nix
View File

@ -1,263 +1,12 @@
args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:
{ stdenv, fetchurl, ... } @ args:
let
configWithPlatform = kernelPlatform :
''
# Power management and debugging for powertop.
DEBUG_KERNEL y
PM_ADVANCED_DEBUG y
PM_RUNTIME y
TIMER_STATS y
USB_SUSPEND y
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT n
DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
import ./generic.nix (args // rec {
version = "3.2.49";
# Support drivers that need external firmware.
STANDALONE n
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "06xiwcgk6hbcp6g1dpmxb95dzx94s29vzmh1pz4lsglcj1yfrkry";
};
# Make /proc/config.gz available.
IKCONFIG_PROC y
# Optimize with -O2, not -Os.
CC_OPTIMIZE_FOR_SIZE n
# Enable the kernel's built-in memory tester.
MEMTEST y
# Include the CFQ I/O scheduler in the kernel, rather than as a
# module, so that the initrd gets a good I/O scheduler.
IOSCHED_CFQ y
BLK_CGROUP y # required by CFQ
# Enable NUMA.
NUMA? y
# Disable some expensive (?) features.
FTRACE n
KPROBES n
PM_TRACE_RTC n
# Enable various subsystems.
ACCESSIBILITY y # Accessibility support
AUXDISPLAY y # Auxiliary Display support
DONGLE y # Serial dongle support
HIPPI? y
MTD_COMPLEX_MAPPINGS y # needed for many devices
SCSI_LOWLEVEL y # enable lots of SCSI devices
SCSI_LOWLEVEL_PCMCIA y
SPI y # needed for many devices
SPI_MASTER y
WAN y
# Networking options.
IP_PNP n
IPV6_PRIVACY y
NETFILTER_ADVANCED y
IP_VS_PROTO_TCP y
IP_VS_PROTO_UDP y
IP_VS_PROTO_ESP y
IP_VS_PROTO_AH y
IP_DCCP_CCID3 n # experimental
CLS_U32_PERF y
CLS_U32_MARK y
# Wireless networking.
IPW2100_MONITOR y # support promiscuous mode
IPW2200_MONITOR y # support promiscuous mode
HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
HOSTAP_FIRMWARE_NVRAM y
ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
ATH9K_AHB y # Ditto, AHB bus
# Some settings to make sure that fbcondecor works - in particular,
# disable tileblitting and the drivers that need it.
# Enable various FB devices.
FB y
FB_EFI y
FB_NVIDIA_I2C y # Enable DDC Support
FB_RIVA_I2C y
FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
FB_ATY_GX y # Mach64 GX support
FB_SAVAGE_I2C y
FB_SAVAGE_ACCEL y
FB_SIS_300 y
FB_SIS_315 y
FB_3DFX_ACCEL y
FB_GEODE y
# Video configuration
# Enable KMS for devices whose X.org driver supports it.
DRM_I915_KMS y
DRM_RADEON_KMS y
# Hybrid graphics support
VGA_SWITCHEROO y
# Sound.
SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
SND_HDA_INPUT_BEEP y # Support digital beep via input layer
SND_USB_CAIAQ_INPUT y
PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
# USB serial devices.
USB_SERIAL_GENERIC y # USB Generic Serial Driver
USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
USB_SERIAL_KEYSPAN_USA28 y
USB_SERIAL_KEYSPAN_USA28X y
USB_SERIAL_KEYSPAN_USA28XA y
USB_SERIAL_KEYSPAN_USA28XB y
USB_SERIAL_KEYSPAN_USA19 y
USB_SERIAL_KEYSPAN_USA18X y
USB_SERIAL_KEYSPAN_USA19W y
USB_SERIAL_KEYSPAN_USA19QW y
USB_SERIAL_KEYSPAN_USA19QI y
USB_SERIAL_KEYSPAN_USA49W y
USB_SERIAL_KEYSPAN_USA49WLC y
# Filesystem options - in particular, enable extended attributes and
# ACLs for all filesystems that support them.
EXT2_FS_XATTR y # Ext2 extended attributes
EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
EXT2_FS_SECURITY y # Ext2 Security Labels
EXT2_FS_XIP y # Ext2 execute in place support
EXT4_FS_POSIX_ACL y
EXT4_FS_SECURITY y
REISERFS_FS_XATTR y
REISERFS_FS_POSIX_ACL y
REISERFS_FS_SECURITY y
JFS_POSIX_ACL y
JFS_SECURITY y
XFS_QUOTA y
XFS_POSIX_ACL y
XFS_RT y # XFS Realtime subvolume support
OCFS2_DEBUG_MASKLOG n
BTRFS_FS_POSIX_ACL y
UBIFS_FS_XATTR y
UBIFS_FS_ADVANCED_COMPR y
NFSD_V2_ACL y
NFSD_V3 y
NFSD_V3_ACL y
NFSD_V4 y
NFS_FSCACHE y
CIFS_XATTR y
CIFS_POSIX y
CIFS_FSCACHE y
# Security related features.
STRICT_DEVMEM y # Filter access to /dev/mem
SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
# Misc. options.
8139TOO_8129 y
8139TOO_PIO n # PIO is slower
AIC79XX_DEBUG_ENABLE n
AIC7XXX_DEBUG_ENABLE n
AIC94XX_DEBUG n
B43_PCMCIA y
BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
BLK_DEV_IDEACPI y # IDE ACPI support
BLK_DEV_INTEGRITY y
BSD_PROCESS_ACCT_V3 y
BT_HCIUART_BCSP y
BT_HCIUART_H4 y # UART (H4) protocol support
BT_HCIUART_LL y
BT_L2CAP y
BT_SCO y # audio support
BT_RFCOMM m
BT_RFCOMM_TTY y # RFCOMM TTY support
CRASH_DUMP n
DMAR? n # experimental
DVB_DYNAMIC_MINORS y # we use udev
FHANDLE y # used by systemd
FUSION y # Fusion MPT device support
IDE_GD_ATAPI y # ATAPI floppy support
IRDA_ULTRA y # Ultra (connectionless) protocol
JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
LOGO n # not needed
MEDIA_ATTACH y
MEGARAID_NEWGEN y
MICROCODE_AMD y
MODVERSIONS y
MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
MTRR_SANITIZER y
NET_FC y # Fibre Channel driver support
PPP_MULTILINK y # PPP multilink support
REGULATOR y # Voltage and Current Regulator Support
SCSI_LOGGING y # SCSI logging facility
SERIAL_8250 y # 8250/16550 and compatible serial support
SLIP_COMPRESSED y # CSLIP compressed headers
SLIP_SMART y
THERMAL_HWMON y # Hardware monitoring support
USB_DEBUG n
USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
X86_CHECK_BIOS_CORRUPTION y
X86_MCE y
# Linux Containers
RT_GROUP_SCHED? y
CGROUP_DEVICE? y
CGROUP_MEM_RES_CTLR? y
CGROUP_MEM_RES_CTLR_SWAP? y
DEVPTS_MULTIPLE_INSTANCES? y
# Enable staging drivers. These are somewhat experimental, but
# they generally don't hurt.
STAGING y
# PROC_EVENTS requires that the netlink connector is not built
# as a module. This is required by libcgroup's cgrulesengd.
CONNECTOR y
PROC_EVENTS y
# Tracing
FTRACE y
FUNCTION_TRACER y
FTRACE_SYSCALLS y
SCHED_TRACER y
# Devtmpfs support.
DEVTMPFS y
${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
${extraConfig}
'';
in
import ./generic.nix (
rec {
version = "3.2.49";
modDirVersion = version;
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
'';
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "06xiwcgk6hbcp6g1dpmxb95dzx94s29vzmh1pz4lsglcj1yfrkry";
};
config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform;
features.iwlwifi = true;
}
// removeAttrs args ["extraConfig"]
)
features.iwlwifi = true;
})

280
pkgs/os-specific/linux/kernel/linux-3.4.nix
View File

@ -1,271 +1,15 @@
args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:
{ stdenv, fetchurl, ... } @ args:
let
configWithPlatform = kernelPlatform :
''
# Power management and debugging for powertop.
DEBUG_KERNEL y
PM_ADVANCED_DEBUG y
PM_RUNTIME y
TIMER_STATS y
USB_SUSPEND y
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT? n
DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
import ./generic.nix (args // rec {
version = "3.4.56";
# Support drivers that need external firmware.
STANDALONE n
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1br23nmfrd8r13ad5n79qlndl8s0db89hjp8zrhdz8nzf9jabsjp";
};
# Make /proc/config.gz available.
IKCONFIG_PROC y
# Optimize with -O2, not -Os.
CC_OPTIMIZE_FOR_SIZE n
# Enable the kernel's built-in memory tester.
MEMTEST y
# Include the CFQ I/O scheduler in the kernel, rather than as a
# module, so that the initrd gets a good I/O scheduler.
IOSCHED_CFQ y
BLK_CGROUP y # required by CFQ
# Enable NUMA.
NUMA? y
# Disable some expensive (?) features.
FTRACE n
KPROBES n
PM_TRACE_RTC n
# Enable various subsystems.
ACCESSIBILITY y # Accessibility support
AUXDISPLAY y # Auxiliary Display support
DONGLE y # Serial dongle support
HIPPI? y
MTD_COMPLEX_MAPPINGS y # needed for many devices
SCSI_LOWLEVEL y # enable lots of SCSI devices
SCSI_LOWLEVEL_PCMCIA y
SPI y # needed for many devices
SPI_MASTER y
WAN y
# Networking options.
IP_PNP n
IPV6_PRIVACY y
NETFILTER_ADVANCED y
IP_VS_PROTO_TCP y
IP_VS_PROTO_UDP y
IP_VS_PROTO_ESP y
IP_VS_PROTO_AH y
IP_DCCP_CCID3 n # experimental
CLS_U32_PERF y
CLS_U32_MARK y
# Wireless networking.
IPW2100_MONITOR y # support promiscuous mode
IPW2200_MONITOR y # support promiscuous mode
HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
HOSTAP_FIRMWARE_NVRAM y
ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
ATH9K_AHB y # Ditto, AHB bus
B43_PHY_HT y
BCMA_HOST_PCI y
# Some settings to make sure that fbcondecor works - in particular,
# disable tileblitting and the drivers that need it.
# Enable various FB devices.
FB y
FB_EFI y
FB_NVIDIA_I2C y # Enable DDC Support
FB_RIVA_I2C y
FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
FB_ATY_GX y # Mach64 GX support
FB_SAVAGE_I2C y
FB_SAVAGE_ACCEL y
FB_SIS_300 y
FB_SIS_315 y
FB_3DFX_ACCEL y
FB_GEODE y
# Video configuration
# Enable KMS for devices whose X.org driver supports it.
DRM_I915_KMS y
DRM_RADEON_KMS y
# Hybrid graphics support
VGA_SWITCHEROO y
# Sound.
SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
SND_HDA_INPUT_BEEP y # Support digital beep via input layer
SND_USB_CAIAQ_INPUT y
PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
# USB serial devices.
USB_SERIAL_GENERIC y # USB Generic Serial Driver
USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
USB_SERIAL_KEYSPAN_USA28 y
USB_SERIAL_KEYSPAN_USA28X y
USB_SERIAL_KEYSPAN_USA28XA y
USB_SERIAL_KEYSPAN_USA28XB y
USB_SERIAL_KEYSPAN_USA19 y
USB_SERIAL_KEYSPAN_USA18X y
USB_SERIAL_KEYSPAN_USA19W y
USB_SERIAL_KEYSPAN_USA19QW y
USB_SERIAL_KEYSPAN_USA19QI y
USB_SERIAL_KEYSPAN_USA49W y
USB_SERIAL_KEYSPAN_USA49WLC y
# Filesystem options - in particular, enable extended attributes and
# ACLs for all filesystems that support them.
EXT2_FS_XATTR y # Ext2 extended attributes
EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
EXT2_FS_SECURITY y # Ext2 Security Labels
EXT2_FS_XIP y # Ext2 execute in place support
EXT4_FS_POSIX_ACL y
EXT4_FS_SECURITY y
REISERFS_FS_XATTR y
REISERFS_FS_POSIX_ACL y
REISERFS_FS_SECURITY y
JFS_POSIX_ACL y
JFS_SECURITY y
XFS_QUOTA y
XFS_POSIX_ACL y
XFS_RT y # XFS Realtime subvolume support
OCFS2_DEBUG_MASKLOG n
BTRFS_FS_POSIX_ACL y
UBIFS_FS_XATTR y
UBIFS_FS_ADVANCED_COMPR y
NFSD_V2_ACL y
NFSD_V3 y
NFSD_V3_ACL y
NFSD_V4 y
NFS_FSCACHE y
CIFS_XATTR y
CIFS_POSIX y
CIFS_FSCACHE y
# Security related features.
STRICT_DEVMEM y # Filter access to /dev/mem
SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
# Misc. options.
8139TOO_8129 y
8139TOO_PIO n # PIO is slower
AIC79XX_DEBUG_ENABLE n
AIC7XXX_DEBUG_ENABLE n
AIC94XX_DEBUG n
AUDIT_LOGINUID_IMMUTABLE y
B43_PCMCIA y
BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
BLK_DEV_IDEACPI y # IDE ACPI support
BLK_DEV_INTEGRITY y
BSD_PROCESS_ACCT_V3 y
BT_HCIUART_BCSP y
BT_HCIUART_H4 y # UART (H4) protocol support
BT_HCIUART_LL y
BT_RFCOMM m
BT_RFCOMM_TTY y # RFCOMM TTY support
CRASH_DUMP n
DMAR? n # experimental
DVB_DYNAMIC_MINORS y # we use udev
EFI_STUB y # EFI bootloader in the bzImage itself
FHANDLE y # used by systemd
FUSION y # Fusion MPT device support
IDE_GD_ATAPI y # ATAPI floppy support
IRDA_ULTRA y # Ultra (connectionless) protocol
JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
LOGO n # not needed
MEDIA_ATTACH y
MEGARAID_NEWGEN y
MICROCODE_AMD y
MODVERSIONS y
MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
MTRR_SANITIZER y
NET_FC y # Fibre Channel driver support
PPP_MULTILINK y # PPP multilink support
REGULATOR y # Voltage and Current Regulator Support
SCSI_LOGGING y # SCSI logging facility
SERIAL_8250 y # 8250/16550 and compatible serial support
SLIP_COMPRESSED y # CSLIP compressed headers
SLIP_SMART y
THERMAL_HWMON y # Hardware monitoring support
USB_DEBUG n
USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
X86_CHECK_BIOS_CORRUPTION y
X86_MCE y
# Linux Containers
RT_GROUP_SCHED? y
CGROUP_DEVICE? y
CGROUP_MEM_RES_CTLR? y
CGROUP_MEM_RES_CTLR_SWAP? y
DEVPTS_MULTIPLE_INSTANCES? y
# Enable staging drivers. These are somewhat experimental, but
# they generally don't hurt.
STAGING y
# PROC_EVENTS requires that the netlink connector is not built
# as a module. This is required by libcgroup's cgrulesengd.
CONNECTOR y
PROC_EVENTS y
# Tracing
FTRACE y
FUNCTION_TRACER y
FTRACE_SYSCALLS y
SCHED_TRACER y
# Devtmpfs support.
DEVTMPFS y
# Easier debug of NFS issues
SUNRPC_DEBUG y
${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
${extraConfig}
'';
in
import ./generic.nix (
rec {
version = "3.4.55";
testing = false;
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
'';
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "1sbb6qa2nb1zwihkdn51q5ac3kn7hrssabn5whx8965hga7yw1dx";
};
config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform;
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.netfilterRPFilter = true;
}
// removeAttrs args ["extraConfig"]
)
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.netfilterRPFilter = true;
})

283
pkgs/os-specific/linux/kernel/linux-3.8.nix
View File

@ -1,283 +0,0 @@
args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:
let
configWithPlatform = kernelPlatform :
''
# Power management and debugging for powertop.
DEBUG_KERNEL y
PM_ADVANCED_DEBUG y
PM_RUNTIME y
TIMER_STATS y
USB_SUSPEND y
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT? n
DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
# Support drivers that need external firmware.
STANDALONE n
# Make /proc/config.gz available.
IKCONFIG_PROC y
# Optimize with -O2, not -Os.
CC_OPTIMIZE_FOR_SIZE n
# Enable the kernel's built-in memory tester.
MEMTEST y
# Include the CFQ I/O scheduler in the kernel, rather than as a
# module, so that the initrd gets a good I/O scheduler.
IOSCHED_CFQ y
BLK_CGROUP y # required by CFQ
# Enable NUMA.
NUMA? y
# Disable some expensive (?) features.
FTRACE n
KPROBES n
PM_TRACE_RTC n
# Enable various subsystems.
ACCESSIBILITY y # Accessibility support
AUXDISPLAY y # Auxiliary Display support
DONGLE y # Serial dongle support
HIPPI? y
MTD_COMPLEX_MAPPINGS y # needed for many devices
SCSI_LOWLEVEL y # enable lots of SCSI devices
SCSI_LOWLEVEL_PCMCIA y
SPI y # needed for many devices
SPI_MASTER y
WAN y
# Networking options.
IP_PNP n
IPV6_PRIVACY y
NETFILTER_ADVANCED y
IP_VS_PROTO_TCP y
IP_VS_PROTO_UDP y
IP_VS_PROTO_ESP y
IP_VS_PROTO_AH y
IP_DCCP_CCID3 n # experimental
CLS_U32_PERF y
CLS_U32_MARK y
# Wireless networking.
IPW2100_MONITOR y # support promiscuous mode
IPW2200_MONITOR? y # support promiscuous mode
HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
HOSTAP_FIRMWARE_NVRAM y
ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
ATH9K_AHB y # Ditto, AHB bus
B43_PHY_HT y
BCMA_HOST_PCI y
CFG80211_WEXT y # Without it, ipw2200 drivers don't build
# Some settings to make sure that fbcondecor works - in particular,
# disable tileblitting and the drivers that need it.
# Enable various FB devices.
FB y
FB_EFI y
FB_NVIDIA_I2C y # Enable DDC Support
FB_RIVA_I2C y
FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
FB_ATY_GX y # Mach64 GX support
FB_SAVAGE_I2C y
FB_SAVAGE_ACCEL y
FB_SIS_300 y
FB_SIS_315 y
FB_3DFX_ACCEL y
FB_GEODE y
# Video configuration
# Enable KMS for devices whose X.org driver supports it.
DRM_I915_KMS y
DRM_RADEON_KMS y
# Hybrid graphics support
VGA_SWITCHEROO y
# Sound.
SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
SND_HDA_INPUT_BEEP y # Support digital beep via input layer
SND_USB_CAIAQ_INPUT y
PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
# USB serial devices.
USB_SERIAL_GENERIC y # USB Generic Serial Driver
USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
USB_SERIAL_KEYSPAN_USA28 y
USB_SERIAL_KEYSPAN_USA28X y
USB_SERIAL_KEYSPAN_USA28XA y
USB_SERIAL_KEYSPAN_USA28XB y
USB_SERIAL_KEYSPAN_USA19 y
USB_SERIAL_KEYSPAN_USA18X y
USB_SERIAL_KEYSPAN_USA19W y
USB_SERIAL_KEYSPAN_USA19QW y
USB_SERIAL_KEYSPAN_USA19QI y
USB_SERIAL_KEYSPAN_USA49W y
USB_SERIAL_KEYSPAN_USA49WLC y
# Filesystem options - in particular, enable extended attributes and
# ACLs for all filesystems that support them.
EXT2_FS_XATTR y # Ext2 extended attributes
EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
EXT2_FS_SECURITY y # Ext2 Security Labels
EXT2_FS_XIP y # Ext2 execute in place support
EXT4_FS_POSIX_ACL y
EXT4_FS_SECURITY y
REISERFS_FS_XATTR y
REISERFS_FS_POSIX_ACL y
REISERFS_FS_SECURITY y
JFS_POSIX_ACL y
JFS_SECURITY y
XFS_QUOTA y
XFS_POSIX_ACL y
XFS_RT y # XFS Realtime subvolume support
OCFS2_DEBUG_MASKLOG n
BTRFS_FS_POSIX_ACL y
UBIFS_FS_XATTR? y
UBIFS_FS_ADVANCED_COMPR y
NFSD_V2_ACL y
NFSD_V3 y
NFSD_V3_ACL y
NFSD_V4 y
NFS_FSCACHE y
CIFS_XATTR y
CIFS_POSIX y
CIFS_FSCACHE y
# Security related features.
STRICT_DEVMEM y # Filter access to /dev/mem
SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
# Misc. options.
8139TOO_8129 y
8139TOO_PIO n # PIO is slower
AIC79XX_DEBUG_ENABLE n
AIC7XXX_DEBUG_ENABLE n
AIC94XX_DEBUG n
AUDIT_LOGINUID_IMMUTABLE y
B43_PCMCIA y
BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
BLK_DEV_IDEACPI y # IDE ACPI support
BLK_DEV_INTEGRITY y
BSD_PROCESS_ACCT_V3 y
BT_HCIUART_BCSP y
BT_HCIUART_H4 y # UART (H4) protocol support
BT_HCIUART_LL y
BT_RFCOMM m
BT_RFCOMM_TTY y # RFCOMM TTY support
CRASH_DUMP n
DMAR? n # experimental
DVB_DYNAMIC_MINORS? y # we use udev
EFI_STUB y # EFI bootloader in the bzImage itself
FHANDLE y # used by systemd
FUSION y # Fusion MPT device support
IDE_GD_ATAPI y # ATAPI floppy support
IRDA_ULTRA y # Ultra (connectionless) protocol
JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
LOGO n # not needed
MEDIA_ATTACH? y
MEGARAID_NEWGEN y
MICROCODE_AMD y
MODVERSIONS y
MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
MTRR_SANITIZER y
NET_FC y # Fibre Channel driver support
PPP_MULTILINK y # PPP multilink support
REGULATOR y # Voltage and Current Regulator Support
RC_DEVICES y # Enable IR devices
SCSI_LOGGING y # SCSI logging facility
SERIAL_8250 y # 8250/16550 and compatible serial support
SLIP_COMPRESSED y # CSLIP compressed headers
SLIP_SMART y
THERMAL_HWMON y # Hardware monitoring support
USB_DEBUG n
USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
X86_CHECK_BIOS_CORRUPTION y
X86_MCE y
XEN_DOM0 y
# Linux Containers
RT_GROUP_SCHED? y
CGROUP_DEVICE? y
MEMCG? y
MEMCG_SWAP? y
DEVPTS_MULTIPLE_INSTANCES? y
# Enable staging drivers. These are somewhat experimental, but
# they generally don't hurt.
STAGING y
# PROC_EVENTS requires that the netlink connector is not built
# as a module. This is required by libcgroup's cgrulesengd.
CONNECTOR y
PROC_EVENTS y
# Tracing
FTRACE y
FUNCTION_TRACER y
FTRACE_SYSCALLS y
SCHED_TRACER y
# Devtmpfs support.
DEVTMPFS y
# Media support
MEDIA_SUPPORT y
MEDIA_DIGITAL_TV_SUPPORT y
MEDIA_CAMERA_SUPPORT? y
MEDIA_RC_SUPPORT? y
MEDIA_USB_SUPPORT y
# Easier debug of NFS issues
SUNRPC_DEBUG y
${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
${extraConfig}
'';
in
import ./generic.nix (
rec {
version = "3.8.13";
testing = false;
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
'';
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0pznsj89020fjl8dhcyf7r5bh95b27727gs0ri9has4i2z63blbw";
};
config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform;
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
}
// removeAttrs args ["extraConfig"]
)

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

@ -1,286 +1,16 @@
args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools, bc
, ... }:
{ stdenv, fetchurl, ... } @ args:
let
configWithPlatform = kernelPlatform :
''
# Power management and debugging for powertop.
DEBUG_KERNEL y
PM_ADVANCED_DEBUG y
PM_RUNTIME y
TIMER_STATS y
USB_SUSPEND y
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT? n
DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
import ./generic.nix (args // rec {
version = "3.9.11";
# Support drivers that need external firmware.
STANDALONE n
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0d5j7kg1ifzwipicbi4g26plzbzn1rlvgj1hs4zip6sxj8ifbffl";
};
# Make /proc/config.gz available.
IKCONFIG_PROC y
# Optimize with -O2, not -Os.
CC_OPTIMIZE_FOR_SIZE n
# Enable the kernel's built-in memory tester.
MEMTEST y
# Include the CFQ I/O scheduler in the kernel, rather than as a
# module, so that the initrd gets a good I/O scheduler.
IOSCHED_CFQ y
BLK_CGROUP y # required by CFQ
# Enable NUMA.
NUMA? y
# Disable some expensive (?) features.
FTRACE n
KPROBES n
PM_TRACE_RTC n
# Enable various subsystems.
ACCESSIBILITY y # Accessibility support
AUXDISPLAY y # Auxiliary Display support
DONGLE y # Serial dongle support
HIPPI? y
MTD_COMPLEX_MAPPINGS y # needed for many devices
SCSI_LOWLEVEL y # enable lots of SCSI devices
SCSI_LOWLEVEL_PCMCIA y
SPI y # needed for many devices
SPI_MASTER y
WAN y
# Networking options.
IP_PNP n
IPV6_PRIVACY y
NETFILTER_ADVANCED y
IP_VS_PROTO_TCP y
IP_VS_PROTO_UDP y
IP_VS_PROTO_ESP y
IP_VS_PROTO_AH y
IP_DCCP_CCID3 n # experimental
CLS_U32_PERF y
CLS_U32_MARK y
# Wireless networking.
IPW2100_MONITOR y # support promiscuous mode
IPW2200_MONITOR? y # support promiscuous mode
HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
HOSTAP_FIRMWARE_NVRAM y
ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
ATH9K_AHB y # Ditto, AHB bus
B43_PHY_HT y
BCMA_HOST_PCI y
CFG80211_WEXT y # Without it, ipw2200 drivers don't build
# Some settings to make sure that fbcondecor works - in particular,
# disable tileblitting and the drivers that need it.
# Enable various FB devices.
FB y
FB_EFI y
FB_NVIDIA_I2C y # Enable DDC Support
FB_RIVA_I2C y
FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
FB_ATY_GX y # Mach64 GX support
FB_SAVAGE_I2C y
FB_SAVAGE_ACCEL y
FB_SIS_300 y
FB_SIS_315 y
FB_3DFX_ACCEL y
FB_GEODE y
# Video configuration
# Enable KMS for devices whose X.org driver supports it.
DRM_I915_KMS y
DRM_RADEON_KMS? y
# Hybrid graphics support
VGA_SWITCHEROO y
# Sound.
SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
SND_HDA_INPUT_BEEP y # Support digital beep via input layer
SND_USB_CAIAQ_INPUT y
PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
# USB serial devices.
USB_SERIAL_GENERIC y # USB Generic Serial Driver
USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
USB_SERIAL_KEYSPAN_USA28 y
USB_SERIAL_KEYSPAN_USA28X y
USB_SERIAL_KEYSPAN_USA28XA y
USB_SERIAL_KEYSPAN_USA28XB y
USB_SERIAL_KEYSPAN_USA19 y
USB_SERIAL_KEYSPAN_USA18X y
USB_SERIAL_KEYSPAN_USA19W y
USB_SERIAL_KEYSPAN_USA19QW y
USB_SERIAL_KEYSPAN_USA19QI y
USB_SERIAL_KEYSPAN_USA49W y
USB_SERIAL_KEYSPAN_USA49WLC y
# Filesystem options - in particular, enable extended attributes and
# ACLs for all filesystems that support them.
EXT2_FS_XATTR y # Ext2 extended attributes
EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
EXT2_FS_SECURITY y # Ext2 Security Labels
EXT2_FS_XIP y # Ext2 execute in place support
EXT4_FS_POSIX_ACL y
EXT4_FS_SECURITY y
REISERFS_FS_XATTR y
REISERFS_FS_POSIX_ACL y
REISERFS_FS_SECURITY y
JFS_POSIX_ACL y
JFS_SECURITY y
XFS_QUOTA y
XFS_POSIX_ACL y
XFS_RT y # XFS Realtime subvolume support
OCFS2_DEBUG_MASKLOG n
BTRFS_FS_POSIX_ACL y
UBIFS_FS_XATTR? y
UBIFS_FS_ADVANCED_COMPR y
NFSD_V2_ACL y
NFSD_V3 y
NFSD_V3_ACL y
NFSD_V4 y
NFS_FSCACHE y
CIFS_XATTR y
CIFS_POSIX y
CIFS_FSCACHE y
# Security related features.
STRICT_DEVMEM y # Filter access to /dev/mem
SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
# Misc. options.
8139TOO_8129 y
8139TOO_PIO n # PIO is slower
AIC79XX_DEBUG_ENABLE n
AIC7XXX_DEBUG_ENABLE n
AIC94XX_DEBUG n
AUDIT_LOGINUID_IMMUTABLE y
B43_PCMCIA y
BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
BLK_DEV_IDEACPI y # IDE ACPI support
BLK_DEV_INTEGRITY y
BSD_PROCESS_ACCT_V3 y
BT_HCIUART_BCSP y
BT_HCIUART_H4 y # UART (H4) protocol support
BT_HCIUART_LL y
BT_RFCOMM m
BT_RFCOMM_TTY y # RFCOMM TTY support
CRASH_DUMP n
DMAR? n # experimental
DVB_DYNAMIC_MINORS? y # we use udev
EFI_STUB y # EFI bootloader in the bzImage itself
FHANDLE y # used by systemd
FUSION y # Fusion MPT device support
IDE_GD_ATAPI y # ATAPI floppy support
IRDA_ULTRA y # Ultra (connectionless) protocol
JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
LOGO n # not needed
MEDIA_ATTACH? y
MEGARAID_NEWGEN y
MICROCODE_AMD y
MODVERSIONS y
MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
MTRR_SANITIZER y
NET_FC y # Fibre Channel driver support
PPP_MULTILINK y # PPP multilink support
REGULATOR y # Voltage and Current Regulator Support
RC_DEVICES y # Enable IR devices
SCSI_LOGGING y # SCSI logging facility
SERIAL_8250 y # 8250/16550 and compatible serial support
SLIP_COMPRESSED y # CSLIP compressed headers
SLIP_SMART y
THERMAL_HWMON y # Hardware monitoring support
USB_DEBUG n
USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
X86_CHECK_BIOS_CORRUPTION y
X86_MCE y
XEN_DOM0 y
# Linux Containers
RT_GROUP_SCHED? y
CGROUP_DEVICE? y
MEMCG? y
MEMCG_SWAP? y
DEVPTS_MULTIPLE_INSTANCES? y
# Enable staging drivers. These are somewhat experimental, but
# they generally don't hurt.
STAGING y
# PROC_EVENTS requires that the netlink connector is not built
# as a module. This is required by libcgroup's cgrulesengd.
CONNECTOR y
PROC_EVENTS y
# Tracing
FTRACE y
FUNCTION_TRACER y
FTRACE_SYSCALLS y
SCHED_TRACER y
# Devtmpfs support.
DEVTMPFS y
# Media support
MEDIA_CAMERA_SUPPORT? y
MEDIA_RC_SUPPORT? y
MEDIA_USB_SUPPORT y
# Easier debug of NFS issues
SUNRPC_DEBUG y
# Enable the 9P cache to speed up NixOS VM tests.
9P_FSCACHE y
9P_FS_POSIX_ACL y
${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
${extraConfig}
'';
in
import ./generic.nix (
rec {
version = "3.9.10";
testing = false;
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
'';
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "1c187jmdkz6nqfgf4sz9f4da6wzbn2mf99qcjr56nz8sr2zmk2wv";
};
config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform;
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
extraNativeBuildInputs = [bc];
}
// removeAttrs args ["extraConfig"]
)
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
})

51
pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
View File

@ -1,44 +1,17 @@
args @ {
stdenv, fetchurl, extraConfig ? "" , perl, mktemp, module_init_tools, ...
}:
{ stdenv, fetchurl, ... } @ args:
let
configWithPlatform = kernelPlatform :
''
${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
${extraConfig}
'';
let rev = "91a3be5b2b"; in
rev = "91a3be5b2b";
in
import ./generic.nix (args // rec {
version = "3.6.y-${rev}";
import ./generic.nix (
src = fetchurl {
url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}";
name = "linux-raspberrypi-${version}.tar.gz";
sha256 = "04370b1da7610622372940decdc13ddbba2a58c9da3c3bd3e7df930a399f140d";
};
rec {
version = "3.6.y-${rev}";
testing = false;
features.iwlwifi = true;
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
'';
src = fetchurl {
url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}";
name = "linux-raspberrypi-${version}.tar.gz";
sha256 = "04370b1da7610622372940decdc13ddbba2a58c9da3c3bd3e7df930a399f140d";
};
config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform;
features.iwlwifi = true;
#features.efiBootStub = true;
#features.needsCifsUtils = true;
#features.canDisableNetfilterConntrackHelpers = true;
#features.netfilterRPFilter = true;
extraMeta.platforms = [];
}
// removeAttrs args ["extraConfig"]
)
extraMeta.platforms = [];
})

47
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -110,29 +110,6 @@ rec {
features.aufs3 = true;
};
# not officially released yet, but 3.x seems to work fine
aufs3_7 = rec {
name = "aufs3.7";
version = "3.x.20121210";
utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
patch = makeAufs3StandalonePatch {
inherit version;
rev = "8d24d728c7eb54dd624bccd8e87afa826670142c";
sha256 = "02dcb46e02b2a6b90c1601b5747614276074488c9308625c3a52ab74cad997a5";
};
features.aufsBase = true;
features.aufs3 = true;
};
# Increase the timeout on CIFS requests from 15 to 120 seconds to
# make CIFS more resilient to high load on the CIFS server.
cifs_timeout_2_6_38 =
{ name = "cifs-timeout";
patch = ./cifs-timeout-2.6.38.patch;
features.cifsTimeout = true;
};
no_xsave =
{ name = "no-xsave";
patch = ./no-xsave.patch;
@ -156,26 +133,10 @@ rec {
grsecurity_2_9_1_3_2_48 =
{ name = "grsecurity-2.9.1-3.2.48";
patch =
(fetchurl {
url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.48-201307212241.patch;
sha256 = "1llgrcd7ynxx60dn05bcbysd6a1091wwxkck4d15gvp71s9r6scm";
});
patch = fetchurl {
url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.48-201307212241.patch;
sha256 = "1llgrcd7ynxx60dn05bcbysd6a1091wwxkck4d15gvp71s9r6scm";
};
};
guruplug_defconfig =
{ # Default configuration for the GuruPlug. From
# <http://www.openplug.org/plugwiki/images/c/c6/Guruplug-patchset-2.6.33.2.tar.bz2>.
name = "guruplug-defconfig";
patch = ./guruplug-defconfig.patch;
};
guruplug_arch_number =
{ # Hack to match the `arch_number' of the U-Boot that ships with the
# GuruPlug. This is only needed when using this specific U-Boot
# binary. See
# <http://www.plugcomputer.org/plugwiki/index.php/Compiling_Linux_Kernel_for_the_Plug_Computer>.
name = "guruplug-arch-number";
patch = ./guruplug-mach-type.patch;
};
}

5
pkgs/os-specific/linux/upower/default.nix
View File

@ -6,11 +6,11 @@
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "upower-0.9.19";
name = "upower-0.9.21";
src = fetchurl {
url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
sha256 = "053yahks5c7nwdxwx8q6nqp3mxbqldmc844mzyvc3ws9635zmisl";
sha256 = "1qmjvfdsm6fnmwmdz0mb8nc8i5fnvzz98j37w0ia7482f058xhhk";
};
buildInputs =
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
[ "--enable-systemd"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-systemdutildir=$(out)/lib/systemd/system-sleep"
"--with-udevrulesdir=$(out)/lib/udev/rules.d"
];
preConfigure =

19
pkgs/tools/X11/hsetroot/default.nix Normal file
View File

@ -0,0 +1,19 @@
{stdenv, fetchurl, imlib2, libX11, libXext }:
stdenv.mkDerivation {
name = "hsetroot-1.0.2";
# The primary download site seems to no longer exist; use Gentoo's mirror for now.
src = fetchurl {
url = "http://mirror.datapipe.net/gentoo/distfiles/hsetroot-1.0.2.tar.gz";
sha256 = "d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7";
};
buildInputs = [ imlib2 libX11 libXext ];
meta = {
description = "hsetroot allows you to compose wallpapers ('root pixmaps') for X";
homepage = http://thegraveyard.org/hsetroot.html;
license = "GPLv2+";
};
}

13
pkgs/tools/X11/xrestop/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ stdenv, fetchurl, xlibs, pkgconfig, ncurses }:
stdenv.mkDerivation rec {
name = "xrestop-${version}";
version = "0.4";
src = fetchurl {
url = mirror://gentoo/distfiles/xrestop-0.4.tar.gz;
sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7";
};
buildInputs = [ pkgconfig xlibs.libX11 xlibs.libXres xlibs.libXext ncurses ];
}

4
pkgs/tools/filesystems/nixpart/default.nix
View File

@ -9,11 +9,11 @@ let
};
in buildPythonPackage rec {
name = "nixpart-${version}";
version = "0.4.0";
version = "0.4.1";
src = fetchurl {
url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz";
sha256 = "1kgiyqh7gndr0zs3qgi6r0dpy5p71d32c2k9kbd8pjf2xyyb6fk6";
sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp";
};
propagatedBuildInputs = [ (blivet.override blivetOverrides) ];

32
pkgs/tools/misc/grc/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation rec {
version = "1.4";
name = "grc_${version}";
src = fetchurl {
url = "http://korpus.juls.savba.sk/~garabik/software/grc/${name}.tar.gz";
sha256 = "1l7lskxfjk32kkv4aaqw5qcxvh972nab3x2jzy67m1aa0zpcbzdv";
};
installPhase = ''
sed -i s%/usr%% install.sh
sed -i "s% /usr/bin/python%${python}/bin/python%" grc
sed -i "s% /usr/bin/python%${python}/bin/python%" grc
./install.sh "$out"
'';
meta = with stdenv.lib; {
description = "Yet another colouriser for beautifying your logfiles or output of commands.";
homepage = http://korpus.juls.savba.sk/~garabik/software/grc.html;
license = licenses.gpl2;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
longDescription = ''
Generic Colouriser is yet another colouriser (written in Python) for
beautifying your logfiles or output of commands.
'';
};
}

2
pkgs/tools/networking/iodine/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib ];
patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/sbin/ifconfig,; s,/sbin/route,${nettools}/sbin/route," src/tun.c'';
patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/bin/ifconfig,; s,/sbin/route,${nettools}/bin/route," src/tun.c'';
installFlags = "prefix=\${out}";

16
pkgs/tools/networking/wicd/default.nix
View File

@ -33,14 +33,14 @@ stdenv.mkDerivation rec {
substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})" in/scripts=wicd.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in
sed -i "2iexport PATH=${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin\$\{PATH:+:\}\$PATH" in/scripts=wicd.in
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in
sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in
sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in
sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in
rm po/ast.po
'';

48
pkgs/tools/security/pass/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ stdenv, fetchurl, getopt }:
stdenv.mkDerivation rec {
version = "1.4.2";
name = "password-store-${version}";
src = fetchurl {
url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
sha256 = "00m3q6dihrhw8cxsrham3bdqg5841an8ch4s3a4k5fynlcb802m1";
};
meta = with stdenv.lib; {
description = "Stores, retrieves, generates, and synchronizes passwords securely.";
homepage = http://zx2c4.com/projects/password-store/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
longDescription = ''
pass is a very simple password store that keeps passwords inside gpg2
encrypted files inside a simple directory tree residing at
~/.password-store. The pass utility provides a series of commands for
manipulating the password store, allowing the user to add, remove, edit,
synchronize, generate, and manipulate passwords.
'';
};
propagatedBuildInputs = [ getopt ];
installPhase = ''
# link zsh and fish completions
sed -ie '22s/^#//' Makefile
sed -ie '25s/^#//' Makefile
sed -i 's/find /find -L /' contrib/pass.zsh-completion
mkdir -p "$out/share/zsh/site-functions"
mkdir -p "$out/share/fish/completions"
# use gnused
sed -i 's/sed -i ""/sed -i /' Makefile
SYSCONFDIR="$out/etc" PREFIX="$out" make install
'' + stdenv.lib.optionalString stdenv.isDarwin ''
# use nix-supplied getopt
sed -ie '34c GETOPT="${getopt}/bin/getopt"' \
"$out/lib/password-store.platform.sh"
'';
}

53
pkgs/top-level/all-packages.nix
View File

@ -348,10 +348,9 @@ let
makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
makeModulesClosure = {kernel, rootModules, allowMissing ? false}:
makeModulesClosure = { kernel, rootModules, allowMissing ? false }:
import ../build-support/kernel/modules-closure.nix {
inherit stdenv module_init_tools kernel nukeReferences
rootModules allowMissing;
inherit stdenv kmod kernel nukeReferences rootModules allowMissing;
};
pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;
@ -448,8 +447,12 @@ let
apg = callPackage ../tools/security/apg { };
grc = callPackage ../tools/misc/grc { };
otool = callPackage ../os-specific/darwin/otool { };
pass = callPackage ../tools/security/pass { };
setfile = callPackage ../os-specific/darwin/setfile { };
install_name_tool = callPackage ../os-specific/darwin/install_name_tool { };
@ -3319,7 +3322,9 @@ let
cross = assert crossSystem != null; crossSystem;
}));
bison = callPackage ../development/tools/parsing/bison { };
bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { };
bison3 = lowPrio (callPackage ../development/tools/parsing/bison/3.x.nix { });
bison = bison2;
buildbot = callPackage ../development/tools/build-managers/buildbot {
inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate;
@ -3360,6 +3365,8 @@ let
chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; };
"cl-launch" = callPackage ../development/tools/misc/cl-launch {};
complexity = callPackage ../development/tools/misc/complexity { };
ctags = callPackage ../development/tools/misc/ctags { };
@ -4251,7 +4258,9 @@ let
cairomm = callPackage ../development/libraries/cairomm { };
pango = callPackage ../development/libraries/pango { };
pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { };
pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix {
cairo = cairo_1_12_2;
};
pangox_compat = callPackage ../development/libraries/pangox-compat { };
@ -6313,8 +6322,6 @@ let
iwlwifi3945ucode = callPackage ../os-specific/linux/firmware/iwlwifi-3945-ucode { };
iwlwifi4965ucodeV1 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode { };
iwlwifi4965ucodeV2 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix { };
iwlwifi5000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-5000-ucode { };
@ -6370,7 +6377,7 @@ let
kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
kernelPatches =
[ kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_0
@ -6378,11 +6385,10 @@ let
};
linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
kernelPatches =
[ kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_2
kernelPatches.cifs_timeout_2_6_38
];
};
@ -6405,7 +6411,7 @@ let
});
linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
kernelPatches =
[ kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_4
@ -6424,19 +6430,7 @@ let
});
linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
};
linux_3_8 = makeOverridable (import ../os-specific/linux/kernel/linux-3.8.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
] ++ lib.optionals (platform.kernelArch == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
};
linux_3_9 = makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) {
@ -6510,11 +6504,7 @@ let
iwlwifi = callPackage ../os-specific/linux/iwlwifi { };
iwlwifi4965ucode =
if builtins.compareVersions self.kernel.version "2.6.27" == 0
|| builtins.compareVersions self.kernel.version "2.6.27" == 1
then iwlwifi4965ucodeV2
else iwlwifi4965ucodeV1;
iwlwifi4965ucode = iwlwifi4965ucodeV2;
atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { };
@ -6586,7 +6576,6 @@ let
linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4);
linuxPackages_3_4_apparmor = linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor;
linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi);
linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8);
linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9);
linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
# Update this when adding a new version!
@ -8797,6 +8786,8 @@ let
xpra = callPackage ../tools/X11/xpra { };
xrestop = callPackage ../tools/X11/xrestop { };
xscreensaver = callPackage ../misc/screensavers/xscreensaver {
inherit (gnome) libglade;
};
@ -9160,6 +9151,8 @@ let
gnome = recurseIntoAttrs gnome2;
hsetroot = callPackage ../tools/X11/hsetroot { };
kde4 = recurseIntoAttrs pkgs.kde410;
kde48 = kdePackagesFor (pkgs.kde48 // {

4
pkgs/top-level/haskell-packages.nix
View File

@ -1390,7 +1390,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
misfortune = callPackage ../development/libraries/haskell/misfortune {};
MissingH = callPackage ../development/libraries/haskell/MissingH {};
MissingH = callPackage ../development/libraries/haskell/MissingH {
testpack = null;
};
mmap = callPackage ../development/libraries/haskell/mmap {};

444
pkgs/top-level/node-packages-generated.nix
View File

@ -47,24 +47,24 @@
{
name = "amdefine";
spec = "*";
version = "0.0.5";
version = "0.0.8";
topLevel = true;
dependencies = [
];
patchLatest = false;
sha1 = "86b6e9470f8cde955ef7daa3cf5d544ba81aa3db";
tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.5.tgz";
sha1 = "34dc8c981e6acb3be1853bef8f0ec94a39d55ba0";
tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.8.tgz";
}
{
name = "amdefine";
spec = ">=0.0.4";
version = "0.0.5";
version = "0.0.8";
topLevel = false;
dependencies = [
];
patchLatest = false;
sha1 = "86b6e9470f8cde955ef7daa3cf5d544ba81aa3db";
tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.5.tgz";
sha1 = "34dc8c981e6acb3be1853bef8f0ec94a39d55ba0";
tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.8.tgz";
}
{
name = "ansi";
@ -447,7 +447,7 @@
{
name = "browserchannel";
spec = "*";
version = "1.0.4";
version = "1.0.5";
topLevel = true;
dependencies = [
{ name = "hat"; spec = "*"; }
@ -455,8 +455,8 @@
{ name = "request"; spec = "~2"; }
];
patchLatest = false;
sha1 = "077c1d59d7872d84932172d373c5f8f45698e975";
tarball = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.4.tgz";
sha1 = "e36bc8536cf5a16873087867622cb5028ba33957";
tarball = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.5.tgz";
}
{
name = "bson";
@ -471,14 +471,14 @@
}
{
name = "bson";
spec = "0.1.9";
version = "0.1.9";
spec = "0.2.2";
version = "0.2.2";
topLevel = false;
dependencies = [
];
patchLatest = false;
sha1 = "7528f81ed770e6d630ca8c2ccdf5394a4096db14";
tarball = "http://registry.npmjs.org/bson/-/bson-0.1.9.tgz";
sha1 = "3dbf984acb9d33a6878b46e6fb7afbd611856a60";
tarball = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz";
}
{
name = "buffer-crc32";
@ -653,14 +653,14 @@
{
name = "cli";
spec = "0.4.x";
version = "0.4.4";
version = "0.4.5";
topLevel = false;
dependencies = [
{ name = "glob"; spec = ">= 3.1.4"; }
];
patchLatest = false;
sha1 = "13ceb30872e7c9addc383e5519fb2949ab61ba43";
tarball = "http://registry.npmjs.org/cli/-/cli-0.4.4.tgz";
sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61";
tarball = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz";
}
{
name = "cliff";
@ -1109,14 +1109,26 @@
{
name = "couch-login";
spec = "~0.1.15";
version = "0.1.17";
version = "0.1.18";
topLevel = false;
dependencies = [
{ name = "request"; spec = "2 >=2.14"; }
{ name = "request"; spec = "2 >=2.25.0"; }
];
patchLatest = false;
sha1 = "ab3ac31dd56e1061ea5f7faa838c7bda32a2b2ed";
tarball = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.17.tgz";
sha1 = "a69fa40dd43d1f98d97e560f18187a578a116056";
tarball = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.18.tgz";
}
{
name = "couch-login";
spec = "~0.1.18";
version = "0.1.18";
topLevel = false;
dependencies = [
{ name = "request"; spec = "2 >=2.25.0"; }
];
patchLatest = false;
sha1 = "a69fa40dd43d1f98d97e560f18187a578a116056";
tarball = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.18.tgz";
}
{
name = "cryptiles";
@ -1232,6 +1244,17 @@
sha1 = "056692c86670977f115de82917918b8e8b9a10f0";
tarball = "http://registry.npmjs.org/debug/-/debug-0.7.2.tgz";
}
{
name = "debug";
spec = "0.7.0";
version = "0.7.0";
topLevel = false;
dependencies = [
];
patchLatest = false;
sha1 = "f5be05ec0434c992d79940e50b2695cfb2e01b08";
tarball = "http://registry.npmjs.org/debug/-/debug-0.7.0.tgz";
}
{
name = "debug";
spec = "~0.7.0";
@ -1757,20 +1780,6 @@
sha1 = "c1ad6c6ab837a89fa2d47bb439727ca968235684";
tarball = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.2.tgz";
}
{
name = "form-data";
spec = "0.0.8";
version = "0.0.8";
topLevel = false;
dependencies = [
{ name = "combined-stream"; spec = "~0.0.4"; }
{ name = "mime"; spec = "~1.2.2"; }
{ name = "async"; spec = "~0.2.7"; }
];
patchLatest = false;
sha1 = "0890cd1005c5ccecc0b9d24a88052c92442d0db5";
tarball = "http://registry.npmjs.org/form-data/-/form-data-0.0.8.tgz";
}
{
name = "form-data";
spec = "~0.0.3";
@ -2019,7 +2028,7 @@
}
{
name = "glob";
spec = "~3.2.3";
spec = "~3.2.6";
version = "3.2.6";
topLevel = false;
dependencies = [
@ -2161,21 +2170,6 @@
sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2";
tarball = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz";
}
{
name = "hawk";
spec = "~0.13.0";
version = "0.13.1";
topLevel = false;
dependencies = [
{ name = "hoek"; spec = "0.8.x"; }
{ name = "boom"; spec = "0.4.x"; }
{ name = "cryptiles"; spec = "0.2.x"; }
{ name = "sntp"; spec = "0.2.x"; }
];
patchLatest = false;
sha1 = "3617958821f58311e4d7f6de291fca662b412ef4";
tarball = "http://registry.npmjs.org/hawk/-/hawk-0.13.1.tgz";
}
{
name = "hawk";
spec = "~1.0.0";
@ -2214,17 +2208,6 @@
sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a";
tarball = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz";
}
{
name = "hoek";
spec = "0.8.x";
version = "0.8.5";
topLevel = false;
dependencies = [
];
patchLatest = false;
sha1 = "1e9fd770ef7ebe0274adfcb5b0806a025a5e4e9f";
tarball = "http://registry.npmjs.org/hoek/-/hoek-0.8.5.tgz";
}
{
name = "hoek";
spec = "0.9.x";
@ -2313,20 +2296,6 @@
sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582";
tarball = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz";
}
{
name = "http-signature";
spec = "~0.9.11";
version = "0.9.11";
topLevel = false;
dependencies = [
{ name = "assert-plus"; spec = "0.1.2"; }
{ name = "asn1"; spec = "0.1.11"; }
{ name = "ctype"; spec = "0.5.2"; }
];
patchLatest = false;
sha1 = "9e882714572315e6790a5d0a7955efff1f19e653";
tarball = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz";
}
{
name = "i";
spec = "0.3.x";
@ -2462,8 +2431,8 @@
}
{
name = "init-package-json";
spec = "0.0.10";
version = "0.0.10";
spec = "0.0.11";
version = "0.0.11";
topLevel = false;
dependencies = [
{ name = "promzard"; spec = "~0.2.0"; }
@ -2472,22 +2441,34 @@
{ name = "semver"; spec = "2.x"; }
];
patchLatest = false;
sha1 = "7baf10535227e0878105a04e44b78f132475da6a";
tarball = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.10.tgz";
sha1 = "71914631d091bb1f73a4bddbe6d7985e929859ce";
tarball = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.11.tgz";
}
{
name = "ironhorse";
spec = "*";
version = "0.0.5";
version = "0.0.6";
topLevel = true;
dependencies = [
{ name = "winston"; spec = "*"; }
{ name = "nconf"; spec = "*"; }
{ name = "fs-walk"; spec = "*"; }
{ name = "async"; spec = "*"; }
{ name = "express"; spec = "*"; }
{ name = "jade"; spec = "*"; }
{ name = "passport"; spec = "*"; }
{ name = "passport-http"; spec = "*"; }
{ name = "libyaml"; spec = "*"; }
{ name = "mongoose"; spec = "*"; }
{ name = "gridfs-stream"; spec = "*"; }
{ name = "temp"; spec = "*"; }
{ name = "kue"; spec = "*"; }
{ name = "redis"; spec = "*"; }
{ name = "hiredis"; spec = "*"; }
];
patchLatest = false;
sha1 = "d7b15b73e7da814b272e580243cc2239e7b021e6";
tarball = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.5.tgz";
sha1 = "de774f72022630a258158acdcb590e1542a09b58";
tarball = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.6.tgz";
}
{
name = "is-promise";
@ -2588,7 +2569,7 @@
{
name = "jshint";
spec = "*";
version = "2.1.7";
version = "2.1.9";
topLevel = true;
dependencies = [
{ name = "shelljs"; spec = "0.1.x"; }
@ -2598,8 +2579,8 @@
{ name = "console-browserify"; spec = "0.1.x"; }
];
patchLatest = false;
sha1 = "11f4214333a0cd2df88057b88c4d751d0c0658a0";
tarball = "http://registry.npmjs.org/jshint/-/jshint-2.1.7.tgz";
sha1 = "65cdbb2302cbf27e45db0066669b5d5e74f66465";
tarball = "http://registry.npmjs.org/jshint/-/jshint-2.1.9.tgz";
}
{
name = "json-schema";
@ -2623,17 +2604,6 @@
sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3";
tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz";
}
{
name = "json-stringify-safe";
spec = "~4.0.0";
version = "4.0.0";
topLevel = false;
dependencies = [
];
patchLatest = false;
sha1 = "77c271aaea54302e68efeaccb56abbf06a9b1a54";
tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-4.0.0.tgz";
}
{
name = "json-stringify-safe";
spec = "~5.0.0";
@ -2642,7 +2612,7 @@
dependencies = [
];
patchLatest = false;
sha1 = "156515f55e62ed4cd912ec13bfc79d5013dfd1e7";
sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e";
tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
}
{
@ -2706,7 +2676,7 @@
{
name = "knox";
spec = "*";
version = "0.8.5";
version = "0.8.6";
topLevel = true;
dependencies = [
{ name = "mime"; spec = "*"; }
@ -2715,8 +2685,8 @@
{ name = "stream-counter"; spec = "~0.1.0"; }
];
patchLatest = false;
sha1 = "86f227fcd22db2b7699106b9b6e5ce29fcbf78de";
tarball = "http://registry.npmjs.org/knox/-/knox-0.8.5.tgz";
sha1 = "244e7c643c4c9ea2eb37e215dd02b07c8e138e3a";
tarball = "http://registry.npmjs.org/knox/-/knox-0.8.6.tgz";
}
{
name = "kue";
@ -3204,35 +3174,36 @@
}
{
name = "mongodb";
spec = "1.3.11";
version = "1.3.11";
spec = "1.3.15";
version = "1.3.15";
topLevel = false;
dependencies = [
{ name = "bson"; spec = "0.1.9"; }
{ name = "bson"; spec = "0.2.2"; }
{ name = "kerberos"; spec = "0.0.3"; }
];
patchLatest = false;
sha1 = "dba6f669dd30612b3d07fc13e2181b9d2b105da2";
tarball = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.11.tgz";
sha1 = "d612597344b6a1b6d07375698fd7ee06cbaea009";
tarball = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.15.tgz";
}
{
name = "mongoose";
spec = "*";
version = "3.6.15";
version = "3.7.0";
topLevel = true;
dependencies = [
{ name = "hooks"; spec = "0.2.1"; }
{ name = "mongodb"; spec = "1.3.11"; }
{ name = "mongodb"; spec = "1.3.15"; }
{ name = "ms"; spec = "0.1.0"; }
{ name = "sliced"; spec = "0.0.3"; }
{ name = "sliced"; spec = "0.0.5"; }
{ name = "muri"; spec = "0.3.1"; }
{ name = "mpromise"; spec = "0.2.1"; }
{ name = "mpromise"; spec = "0.3.0"; }
{ name = "mpath"; spec = "0.1.1"; }
{ name = "regexp-clone"; spec = "0.0.1"; }
{ name = "mquery"; spec = "0.2.4"; }
];
patchLatest = false;
sha1 = "272f1575da3b48ec31467abdf15baa61854ba5f1";
tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.15.tgz";
sha1 = "ffad3ac81293bffe5b02f886592685675c7a0d99";
tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.7.0.tgz";
}
{
name = "mongoose";
@ -3310,6 +3281,32 @@
sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8";
tarball = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz";
}
{
name = "mpromise";
spec = "0.3.0";
version = "0.3.0";
topLevel = false;
dependencies = [
{ name = "sliced"; spec = "0.0.5"; }
];
patchLatest = false;
sha1 = "cb864c2f642eb2192765087e3692e1dc152afe4b";
tarball = "http://registry.npmjs.org/mpromise/-/mpromise-0.3.0.tgz";
}
{
name = "mquery";
spec = "0.2.4";
version = "0.2.4";
topLevel = false;
dependencies = [
{ name = "sliced"; spec = "0.0.5"; }
{ name = "debug"; spec = "0.7.0"; }
{ name = "regexp-clone"; spec = "0.0.1"; }
];
patchLatest = false;
sha1 = "5d6e7f7f5129aa334e7e754d3f6a93cf304b7778";
tarball = "http://registry.npmjs.org/mquery/-/mquery-0.2.4.tgz";
}
{
name = "ms";
spec = "0.1.0";
@ -3492,7 +3489,7 @@
{
name = "node-gyp";
spec = "*";
version = "0.10.6";
version = "0.10.9";
topLevel = true;
dependencies = [
{ name = "glob"; spec = "3"; }
@ -3505,18 +3502,18 @@
{ name = "osenv"; spec = "0"; }
{ name = "request"; spec = "2"; }
{ name = "rimraf"; spec = "2"; }
{ name = "semver"; spec = "~2.0.7"; }
{ name = "semver"; spec = "~2.1"; }
{ name = "tar"; spec = "0"; }
{ name = "which"; spec = "1"; }
];
patchLatest = false;
sha1 = "2b81f9c1b9cd3cc8fd56fe776744814e394d3427";
tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.6.tgz";
sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f";
tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz";
}
{
name = "node-gyp";
spec = "~0.10.6";
version = "0.10.6";
spec = "~0.10.9";
version = "0.10.9";
topLevel = false;
dependencies = [
{ name = "glob"; spec = "3"; }
@ -3529,13 +3526,13 @@
{ name = "osenv"; spec = "0"; }
{ name = "request"; spec = "2"; }
{ name = "rimraf"; spec = "2"; }
{ name = "semver"; spec = "~2.0.7"; }
{ name = "semver"; spec = "~2.1"; }
{ name = "tar"; spec = "0"; }
{ name = "which"; spec = "1"; }
];
patchLatest = false;
sha1 = "2b81f9c1b9cd3cc8fd56fe776744814e394d3427";
tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.6.tgz";
sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f";
tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz";
}
{
name = "node-uptime";
@ -3634,13 +3631,13 @@
{
name = "nodemon";
spec = "*";
version = "0.7.8";
version = "0.7.10";
topLevel = true;
dependencies = [
];
patchLatest = false;
sha1 = "c0667a000f208dbf6a4dad08a5186595a9889590";
tarball = "http://registry.npmjs.org/nodemon/-/nodemon-0.7.8.tgz";
sha1 = "695a01b9458b115b03bbe01696d361bd50b4fb9b";
tarball = "http://registry.npmjs.org/nodemon/-/nodemon-0.7.10.tgz";
}
{
name = "nodeunit";
@ -3718,10 +3715,10 @@
{
name = "npm";
spec = "*";
version = "1.3.6";
version = "1.3.7";
topLevel = true;
dependencies = [
{ name = "semver"; spec = "~2.0.8"; }
{ name = "semver"; spec = "~2.1.0"; }
{ name = "ini"; spec = "~1.1.0"; }
{ name = "slide"; spec = "~1.1.4"; }
{ name = "abbrev"; spec = "~1.0.4"; }
@ -3729,7 +3726,7 @@
{ name = "minimatch"; spec = "~0.2.12"; }
{ name = "nopt"; spec = "~2.1.2"; }
{ name = "rimraf"; spec = "~2.2.0"; }
{ name = "request"; spec = "~2.21.0"; }
{ name = "request"; spec = "~2.25.0"; }
{ name = "which"; spec = "1"; }
{ name = "tar"; spec = "~0.1.18"; }
{ name = "fstream"; spec = "~0.1.23"; }
@ -3737,18 +3734,18 @@
{ name = "mkdirp"; spec = "~0.3.3"; }
{ name = "read"; spec = "~1.0.4"; }
{ name = "lru-cache"; spec = "~2.3.0"; }
{ name = "node-gyp"; spec = "~0.10.6"; }
{ name = "node-gyp"; spec = "~0.10.9"; }
{ name = "fstream-npm"; spec = "~0.1.3"; }
{ name = "uid-number"; spec = "0"; }
{ name = "archy"; spec = "0"; }
{ name = "chownr"; spec = "0"; }
{ name = "npmlog"; spec = "0.0.4"; }
{ name = "ansi"; spec = "~0.1.2"; }
{ name = "npm-registry-client"; spec = "~0.2.27"; }
{ name = "npm-registry-client"; spec = "~0.2.28"; }
{ name = "read-package-json"; spec = "~1.1.0"; }
{ name = "read-installed"; spec = "~0.2.2"; }
{ name = "glob"; spec = "~3.2.3"; }
{ name = "init-package-json"; spec = "0.0.10"; }
{ name = "glob"; spec = "~3.2.6"; }
{ name = "init-package-json"; spec = "0.0.11"; }
{ name = "osenv"; spec = "0"; }
{ name = "lockfile"; spec = "~0.4.0"; }
{ name = "retry"; spec = "~0.6.0"; }
@ -3763,8 +3760,8 @@
{ name = "npm-user-validate"; spec = "0.0.3"; }
];
patchLatest = false;
sha1 = "7c317871955f8427529c78e9b1ec21239dcd222a";
tarball = "http://registry.npmjs.org/npm/-/npm-1.3.6.tgz";
sha1 = "689bb2093521369ce80ec229fcbbefc32c4bc668";
tarball = "http://registry.npmjs.org/npm/-/npm-1.3.7.tgz";
}
{
name = "npm-registry-client";
@ -3789,24 +3786,24 @@
}
{
name = "npm-registry-client";
spec = "~0.2.27";
version = "0.2.27";
spec = "~0.2.28";
version = "0.2.28";
topLevel = false;
dependencies = [
{ name = "request"; spec = "2 >=2.20.0"; }
{ name = "request"; spec = "2 >=2.25.0"; }
{ name = "graceful-fs"; spec = "~2.0.0"; }
{ name = "semver"; spec = "~2.0.5"; }
{ name = "semver"; spec = "~2.1.0"; }
{ name = "slide"; spec = "~1.1.3"; }
{ name = "chownr"; spec = "0"; }
{ name = "mkdirp"; spec = "~0.3.3"; }
{ name = "rimraf"; spec = "~2"; }
{ name = "retry"; spec = "0.6.0"; }
{ name = "couch-login"; spec = "~0.1.15"; }
{ name = "couch-login"; spec = "~0.1.18"; }
{ name = "npmlog"; spec = ""; }
];
patchLatest = false;
sha1 = "8f338189d32769267886a07ad7b7fd2267446adf";
tarball = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz";
sha1 = "959141fc0180d7b1ad089e87015a8a2142a8bffc";
tarball = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.28.tgz";
}
{
name = "npm-user-validate";
@ -4543,24 +4540,24 @@
{
name = "readable-stream";
spec = "1.0";
version = "1.0.2";
version = "1.0.15";
topLevel = false;
dependencies = [
];
patchLatest = false;
sha1 = "213ce36864fc1f0d4e98e03b9eb92c64042299d4";
tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz";
sha1 = "a2c160237235951da985a1572d0a3af585e4be95";
tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.15.tgz";
}
{
name = "readable-stream";
spec = "~1.0.2";
version = "1.0.2";
version = "1.0.15";
topLevel = false;
dependencies = [
];
patchLatest = false;
sha1 = "213ce36864fc1f0d4e98e03b9eb92c64042299d4";
tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz";
sha1 = "a2c160237235951da985a1572d0a3af585e4be95";
tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.15.tgz";
}
{
name = "readdirp";
@ -4646,7 +4643,7 @@
{
name = "request";
spec = "2";
version = "2.25.0";
version = "2.26.0";
topLevel = false;
dependencies = [
{ name = "qs"; spec = "~0.6.0"; }
@ -4663,36 +4660,13 @@
{ name = "form-data"; spec = "~0.1.0"; }
];
patchLatest = false;
sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
}
{
name = "request";
spec = "2 >=2.14";
version = "2.25.0";
topLevel = false;
dependencies = [
{ name = "qs"; spec = "~0.6.0"; }
{ name = "json-stringify-safe"; spec = "~5.0.0"; }
{ name = "forever-agent"; spec = "~0.5.0"; }
{ name = "tunnel-agent"; spec = "~0.3.0"; }
{ name = "http-signature"; spec = "~0.10.0"; }
{ name = "hawk"; spec = "~1.0.0"; }
{ name = "aws-sign"; spec = "~0.3.0"; }
{ name = "oauth-sign"; spec = "~0.3.0"; }
{ name = "cookie-jar"; spec = "~0.3.0"; }
{ name = "node-uuid"; spec = "~1.4.0"; }
{ name = "mime"; spec = "~1.2.9"; }
{ name = "form-data"; spec = "~0.1.0"; }
];
patchLatest = false;
sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212";
tarball = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
}
{
name = "request";
spec = "2 >=2.20.0";
version = "2.25.0";
version = "2.26.0";
topLevel = false;
dependencies = [
{ name = "qs"; spec = "~0.6.0"; }
@ -4709,8 +4683,31 @@
{ name = "form-data"; spec = "~0.1.0"; }
];
patchLatest = false;
sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212";
tarball = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
}
{
name = "request";
spec = "2 >=2.25.0";
version = "2.26.0";
topLevel = false;
dependencies = [
{ name = "qs"; spec = "~0.6.0"; }
{ name = "json-stringify-safe"; spec = "~5.0.0"; }
{ name = "forever-agent"; spec = "~0.5.0"; }
{ name = "tunnel-agent"; spec = "~0.3.0"; }
{ name = "http-signature"; spec = "~0.10.0"; }
{ name = "hawk"; spec = "~1.0.0"; }
{ name = "aws-sign"; spec = "~0.3.0"; }
{ name = "oauth-sign"; spec = "~0.3.0"; }
{ name = "cookie-jar"; spec = "~0.3.0"; }
{ name = "node-uuid"; spec = "~1.4.0"; }
{ name = "mime"; spec = "~1.2.9"; }
{ name = "form-data"; spec = "~0.1.0"; }
];
patchLatest = false;
sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212";
tarball = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
}
{
name = "request";
@ -4748,6 +4745,29 @@
{
name = "request";
spec = "~2";
version = "2.26.0";
topLevel = false;
dependencies = [
{ name = "qs"; spec = "~0.6.0"; }
{ name = "json-stringify-safe"; spec = "~5.0.0"; }
{ name = "forever-agent"; spec = "~0.5.0"; }
{ name = "tunnel-agent"; spec = "~0.3.0"; }
{ name = "http-signature"; spec = "~0.10.0"; }
{ name = "hawk"; spec = "~1.0.0"; }
{ name = "aws-sign"; spec = "~0.3.0"; }
{ name = "oauth-sign"; spec = "~0.3.0"; }
{ name = "cookie-jar"; spec = "~0.3.0"; }
{ name = "node-uuid"; spec = "~1.4.0"; }
{ name = "mime"; spec = "~1.2.9"; }
{ name = "form-data"; spec = "~0.1.0"; }
];
patchLatest = false;
sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212";
tarball = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
}
{
name = "request";
spec = "~2.25.0";
version = "2.25.0";
topLevel = false;
dependencies = [
@ -4768,29 +4788,6 @@
sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
}
{
name = "request";
spec = "~2.21.0";
version = "2.21.0";
topLevel = false;
dependencies = [
{ name = "qs"; spec = "~0.6.0"; }
{ name = "json-stringify-safe"; spec = "~4.0.0"; }
{ name = "forever-agent"; spec = "~0.5.0"; }
{ name = "tunnel-agent"; spec = "~0.3.0"; }
{ name = "http-signature"; spec = "~0.9.11"; }
{ name = "hawk"; spec = "~0.13.0"; }
{ name = "aws-sign"; spec = "~0.3.0"; }
{ name = "oauth-sign"; spec = "~0.3.0"; }
{ name = "cookie-jar"; spec = "~0.3.0"; }
{ name = "node-uuid"; spec = "~1.4.0"; }
{ name = "mime"; spec = "~1.2.9"; }
{ name = "form-data"; spec = "0.0.8"; }
];
patchLatest = false;
sha1 = "5728ab9c45e5a87c99daccd530298b6673a868d7";
tarball = "http://registry.npmjs.org/request/-/request-2.21.0.tgz";
}
{
name = "restify";
spec = "2.4.1";
@ -4979,7 +4976,7 @@
dependencies = [
];
patchLatest = false;
sha1 = "64d135ad53ae000fef91190177620442bd996e03";
sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
}
{
@ -5012,7 +5009,7 @@
dependencies = [
];
patchLatest = false;
sha1 = "64d135ad53ae000fef91190177620442bd996e03";
sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
}
{
@ -5023,7 +5020,7 @@
dependencies = [
];
patchLatest = false;
sha1 = "64d135ad53ae000fef91190177620442bd996e03";
sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
}
{
@ -5034,7 +5031,7 @@
dependencies = [
];
patchLatest = false;
sha1 = "64d135ad53ae000fef91190177620442bd996e03";
sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
}
{
@ -5050,25 +5047,25 @@
}
{
name = "semver";
spec = "~2.0.7";
version = "2.0.11";
spec = "~2.1";
version = "2.1.0";
topLevel = false;
dependencies = [
];
patchLatest = false;
sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
}
{
name = "semver";
spec = "~2.0.8";
version = "2.0.11";
spec = "~2.1.0";
version = "2.1.0";
topLevel = false;
dependencies = [
];
patchLatest = false;
sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
}
{
name = "send";
@ -5175,15 +5172,15 @@
{
name = "simplesmtp";
spec = ">= 0.1.22";
version = "0.3.5";
version = "0.3.6";
topLevel = false;
dependencies = [
{ name = "rai"; spec = "~0.1"; }
{ name = "xoauth2"; spec = "~0.1"; }
];
patchLatest = false;
sha1 = "3f8d43e7885c926037ab3aa5026b563543a67e5b";
tarball = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.5.tgz";
sha1 = "a6921eb3d38f31f2abd442d0d612ec2d8a1ed08d";
tarball = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.6.tgz";
}
{
name = "sliced";
@ -5207,6 +5204,17 @@
sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee";
tarball = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz";
}
{
name = "sliced";
spec = "0.0.5";
version = "0.0.5";
topLevel = false;
dependencies = [
];
patchLatest = false;
sha1 = "5edc044ca4eb6f7816d50ba2fc63e25d8fe4707f";
tarball = "http://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz";
}
{
name = "slide";
spec = "*";
@ -5427,7 +5435,7 @@
{
name = "stylus";
spec = "*";
version = "0.35.1";
version = "0.36.1";
topLevel = true;
dependencies = [
{ name = "cssom"; spec = "0.2.x"; }
@ -5436,8 +5444,8 @@
{ name = "sax"; spec = "0.5.x"; }
];
patchLatest = false;
sha1 = "ed4f4cf378c2f883b04633f01e5c76ffe976084f";
tarball = "http://registry.npmjs.org/stylus/-/stylus-0.35.1.tgz";
sha1 = "64e493933eb5f7347e941b37046f5ba533d3d262";
tarball = "http://registry.npmjs.org/stylus/-/stylus-0.36.1.tgz";
}
{
name = "stylus";
@ -5621,13 +5629,13 @@
{
name = "timezone";
spec = "*";
version = "0.0.22";
version = "0.0.23";
topLevel = true;
dependencies = [
];
patchLatest = false;
sha1 = "933c3d1950224957a349183e124147dd99e182f5";
tarball = "http://registry.npmjs.org/timezone/-/timezone-0.0.22.tgz";
sha1 = "5e89359e0c01c92b495c725e81ecce6ddbdb9bac";
tarball = "http://registry.npmjs.org/timezone/-/timezone-0.0.23.tgz";
}
{
name = "tinycolor";

21
pkgs/top-level/perl-packages.nix
View File

@ -6040,11 +6040,16 @@ rec {
};
};
StatisticsDescriptive = buildPerlPackage rec {
name = "Statistics-Descriptive-3.0202";
StatisticsDescriptive = buildPerlPackage {
name = "Statistics-Descriptive-3.0605";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Statistics/${name}.tar.gz";
sha256 = "0y8l3dkhfc2gqwfigrg363ac7pxcyshdna66afpdvs8r1gd53a1i";
url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0605.tar.gz;
sha256 = "8e7dae184444e27ee959e33b3ae161cc83115d11da189ed5003b004450e04b48";
};
meta = {
homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/;
description = "Module of basic descriptive statistical functions";
license = "perl";
};
};
@ -7395,6 +7400,14 @@ rec {
buildInputs = [ pkgs.icu ];
};
UnixGetrusage = buildPerlPackage {
name = "Unix-Getrusage-0.03";
src = fetchurl {
url = mirror://cpan/authors/id/T/TA/TAFFY/Unix-Getrusage-0.03.tar.gz;
sha256 = "76cde1cee2453260b85abbddc27cdc9875f01d2457e176e03dcabf05fb444d12";
};
};
URI = buildPerlPackage {
name = "URI-1.60";
src = fetchurl {

13
pkgs/top-level/platforms.nix
View File

@ -10,19 +10,6 @@ rec {
# Currently ignored - it should be set according to 'system' once it is
# not ignored. This is for stdenv-updates.
kernelArch = "i386";
kernelExtraConfig =
''
# Virtualisation (KVM, Xen...).
HYPERVISOR_GUEST? y #3.10 version of the paravirt options
PARAVIRT_GUEST? y #Doesn't exist in 3.10
KVM_CLOCK? y #Part of KVM_GUEST since linux 3.7
KVM_GUEST? y #Doesn't exist in 3.10
XEN? y #Doesn't exist in 3.10
KSM y
# We need 64 GB (PAE) support for Xen guest support.
HIGHMEM64G? y
'';
};
pc_simplekernel = pc // {

18
pkgs/top-level/python-packages.nix
View File

@ -68,6 +68,10 @@ pythonPackages = modules // rec {
nixpart = callPackage ../tools/filesystems/nixpart { };
# This is used for NixOps to make sure we won't break it with the next major
# version of nixpart.
nixpart0 = nixpart;
pil = import ../development/python-modules/pil {
inherit (pkgs) fetchurl stdenv libjpeg zlib freetype;
inherit python buildPythonPackage;
@ -3267,14 +3271,14 @@ pythonPackages = modules // rec {
};
paramiko = buildPythonPackage rec {
name = "paramiko-1.10.1";
name = "paramiko-1.11.0";
src = fetchurl {
url = https://pypi.python.org/packages/source/p/paramiko/paramiko-1.10.1.tar.gz;
sha256 = "1g5sbzfxdhps61z3vm30wa87m5xq1j9ar3qvgr5bz63l7nxhvb2z";
url = "http://pypi.python.org/packages/source/p/paramiko/${name}.tar.gz";
md5 = "a2c55dc04904bd08d984533703177084";
};
buildInputs = [ pycrypto ];
propagatedBuildInputs = [ pycrypto ];
meta = {
homepage = "http://www.lag.net/paramiko/";
@ -4908,11 +4912,11 @@ pythonPackages = modules // rec {
supervisor = buildPythonPackage rec {
name = "supervisor-3.0b2";
name = "supervisor-3.0";
src = fetchurl {
url = https://pypi.python.org/packages/source/s/supervisor/supervisor-3.0b2.tar.gz;
md5 = "e2557853239ee69955f993091b0eddc4";
url = "https://pypi.python.org/packages/source/s/supervisor/${name}.tar.gz";
md5 = "94ff3cf09618c36889425a8e002cd51a";
};
buildInputs = [ mock ];