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

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Aycan iRiCAN 2014-06-27 20:55:22 +03:00
parent 0acf2f98b7 34de04149e
commit 3377abee50
35 changed files with 455 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/licenses.nix
View File

@ -88,6 +88,8 @@
url = http://www.eclipse.org/legal/epl-v10.html;
};
free = "free";
gpl2 = {
shortName = "GPLv2";
fullName = "GNU General Public License version 2";

4
nixos/lib/test-driver/log2html.xsl
View File

@ -9,8 +9,8 @@
<xsl:template match="logfile">
<html>
<head>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
<script type="text/javascript" src="treebits.js" />
<link rel="stylesheet" href="logfile.css" type="text/css" />
<title>Log File</title>

1
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -56,6 +56,7 @@ let
authKeysFiles = let
mkAuthKeyFile = u: {
target = "ssh/authorized_keys.d/${u.name}";
mode = "0444";
source = pkgs.writeText "${u.name}-authorized_keys" ''
${concatStringsSep "\n" u.openssh.authorizedKeys.keys}
${concatMapStrings (f: readFile f + "\n") u.openssh.authorizedKeys.keyFiles}

48
nixos/tests/openssh.nix
View File

@ -1,4 +1,21 @@
import ./make-test.nix ({ pkgs, ... }: {
import ./make-test.nix ({ pkgs, ... }:
let
snakeOilPrivateKey = pkgs.writeText "privkey.snakeoil" ''
-----BEGIN EC PRIVATE KEY-----
MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49
AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN
r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA==
-----END EC PRIVATE KEY-----
'';
snakeOilPublicKey = pkgs.lib.concatStrings [
"ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA"
"yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa"
"9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil"
];
in {
nodes = {
@ -9,6 +26,9 @@ import ./make-test.nix ({ pkgs, ... }: {
services.openssh.enable = true;
security.pam.services.sshd.limits =
[ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ];
users.extraUsers.root.openssh.authorizedKeys.keys = [
snakeOilPublicKey
];
};
client =
@ -23,15 +43,25 @@ import ./make-test.nix ({ pkgs, ... }: {
$server->waitForUnit("sshd");
$server->succeed("mkdir -m 700 /root/.ssh");
$server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
subtest "manual-authkey", sub {
$server->succeed("mkdir -m 700 /root/.ssh");
$server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
$client->succeed("mkdir -m 700 /root/.ssh");
$client->copyFileFromHost("key", "/root/.ssh/id_dsa");
$client->succeed("chmod 600 /root/.ssh/id_dsa");
$client->succeed("mkdir -m 700 /root/.ssh");
$client->copyFileFromHost("key", "/root/.ssh/id_dsa");
$client->succeed("chmod 600 /root/.ssh/id_dsa");
$client->waitForUnit("network.target");
$client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2");
$client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024");
$client->waitForUnit("network.target");
$client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2");
$client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024");
};
subtest "configured-authkey", sub {
$client->succeed("cat ${snakeOilPrivateKey} > privkey.snakeoil");
$client->succeed("chmod 600 privkey.snakeoil");
$client->succeed("ssh -o UserKnownHostsFile=/dev/null" .
" -o StrictHostKeyChecking=no -i privkey.snakeoil" .
" server true");
};
'';
})

25
pkgs/applications/audio/transcode/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenv, fetchurl, flac, lame, zlib, libjpeg, libvorbis, libtheora, libxml2
, lzo, libdvdread, pkgconfig, x264, libmpeg2, xvidcore }:
stdenv.mkDerivation rec {
name = "transcode-1.1.7";
src = fetchurl {
url = "https://bitbucket.org/france/transcode-tcforge/downloads/${name}.tar.bz2";
sha256 = "1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92";
};
buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo
libdvdread pkgconfig x264 libmpeg2 xvidcore ];
configureFlags = "--disable-ffmpeg --disable-libavcodec --disable-libavformat
--enable-lzo --enable-ogg --enable-vorbis --enable-theora --enable-libxml2
--enable-x264 --enable-libmpeg2 --enable-xvid";
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Suite of command line utilities for transcoding video and audio codecs, and for converting beween different container formats";
homepage = http://www.transcoding.org/;
license = licenses.lgpl2Plus;
platforms = platforms.linux;
};
}

46
pkgs/applications/science/logic/twelf/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ stdenv, fetchurl, pkgconfig, smlnj, rsync }:
stdenv.mkDerivation rec {
name = "twelf-${version}";
version = "1.7.1";
src = fetchurl {
url = "http://twelf.plparty.org/releases/twelf-src-${version}.tar.gz";
sha256 = "0fi1kbs9hrdrm1x4k13angpjasxlyd1gc3ys8ah54i75qbcd9c4i";
};
buildInputs = [ pkgconfig smlnj rsync ];
buildPhase = ''
export SMLNJ_HOME=${smlnj}
make smlnj
'';
installPhase = ''
ensureDir $out/bin
rsync -av bin/* $out/bin/
ensureDir $out/share/emacs/site-lisp/twelf/
rsync -av emacs/ $out/share/emacs/site-lisp/twelf/
ensureDir $out/share/twelf/examples
rsync -av examples/ $out/share/twelf/examples/
ensureDir $out/share/twelf/vim
rsync -av vim/ $out/share/twelf/vim/
'';
meta = {
description = "Twelf logic proof assistant";
longDescription = ''
Twelf is a language used to specify, implement, and prove properties of
deductive systems such as programming languages and logics. Large
research projects using Twelf include the TALT typed assembly language,
a foundational proof-carrying-code system, and a type safety proof for
Standard ML.
'';
homepage = http://twelf.org/wiki/Main_Page;
license = "MIT";
maintainers = with stdenv.lib.maintainers; [ jwiegley ];
platforms = stdenv.lib.platforms.unix;
};
}

2
pkgs/build-support/upstream-updater/update-walker-service-specific.sh
View File

@ -5,7 +5,7 @@ SF_redirect () {
}
SF_version_dir () {
version_link 'http://sourceforge.net/.+/[0-9.]+/$'
version_link 'http://sourceforge.net/.+/'"$1"'[0-9.]+/$'
}
GH_latest () {

43
pkgs/development/compilers/smlnj/bootstrap.nix Normal file
View File

@ -0,0 +1,43 @@
{ stdenv, fetchurl, cpio, rsync, makeWrapper }:
stdenv.mkDerivation rec {
name = "smlnj-bootstrap-${version}";
version = "110.76";
src = fetchurl {
url = "http://smlnj.cs.uchicago.edu/dist/working/${version}/smlnj-x86-${version}.pkg";
sha256 = "0n3kdlqffqw97piya7i4lddrhjml2dp1q9hfq2jrd2hbzln8vdjf";
};
buildInputs = [ cpio rsync makeWrapper ];
unpackPhase = ''
/usr/bin/xar -xf $src
cd smlnj.pkg
'';
buildPhase = ''
cat Payload | gunzip -dc | cpio -i
'';
installPhase = ''
ensureDir $out/bin
rsync -av bin/ $out/bin/
ensureDir $out/lib
rsync -av lib/ $out/lib/
'';
postInstall = ''
wrapProgram "$out/bin/sml" --set "SMLNJ_HOME" "$out"
'';
meta = {
description = "Compiler for the Standard ML '97 programming language";
homepage = http://www.smlnj.org;
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.darwin;
maintainers = [ stdenv.lib.maintainers.jwiegley ];
};
}

4
pkgs/development/interpreters/php/5.4.nix
View File

@ -9,7 +9,7 @@ in
composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
version = "5.4.29";
version = "5.4.30";
name = "php-${version}";
@ -243,7 +243,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
src = fetchurl {
url = "http://www.php.net/distributions/php-${version}.tar.bz2";
sha256 = "19z2n6h1fvj30n6hl2mwhw2f4i1vwhbj3j7abq3gc16gcfh3rkk2";
sha256 = "1rkc977b4k0y6qg5nf8729g5zpica31h1isyds6khmrdwi23df1j";
};
meta = {

1
pkgs/development/libraries/haskell/ghc-mod/default.nix
View File

@ -21,6 +21,7 @@ cabal.mkDerivation (self: {
configureFlags = "--datasubdir=${self.pname}-${self.version}";
postInstall = ''
cd $out/share/$pname-$version
sed -i -e 's/"-b" "\\n" "-l"/"-l" "-b" "\\"\\\\n\\""/' ghc-process.el
make
rm Makefile
cd ..

18
pkgs/development/libraries/haskell/monadloc-pp/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ cabal, filepath, haskellSrcExts, monadloc, syb }:
cabal.mkDerivation (self: {
pname = "monadloc-pp";
version = "0.3";
sha256 = "0jr9ngcj3l6kd5cscll5kr3a4bp52sdjgrdxd1j5a21jyc3gdyvn";
isLibrary = false;
isExecutable = true;
buildDepends = [ filepath haskellSrcExts monadloc syb ];
jailbreak = true;
meta = {
homepage = "http://github.com/pepeiborra/monadloc";
description = "A preprocessor for generating monadic call traces";
license = self.stdenv.lib.licenses.publicDomain;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.tomberek ];
};
})

28
pkgs/development/libraries/libatomic_ops/default.nix Normal file
View File

@ -0,0 +1,28 @@
{stdenv, fetchurl}:
let
s = # Generated upstream information
rec {
baseName="libatomic_ops";
version="7.4.2";
name="${baseName}-${version}";
hash="1pdm0h1y7bgkczr8byg20r6bq15m5072cqm5pny4f9crc9gn3yh4";
url="http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-7.4.2.tar.gz";
sha256="1pdm0h1y7bgkczr8byg20r6bq15m5072cqm5pny4f9crc9gn3yh4";
};
buildInputs = [
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
meta = {
inherit (s) version;
description = ''A library for semi-portable access to hardware-provided atomic memory update operations'';
license = stdenv.lib.licenses.gpl2Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

1
pkgs/development/libraries/libatomic_ops/default.upstream Normal file
View File

@ -0,0 +1 @@
url https://github.com/ivmai/libatomic_ops/wiki/Download

30
pkgs/development/libraries/libe-book/0.0.nix Normal file
View File

@ -0,0 +1,30 @@
{stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu, cppunit
, libwpd}:
let
s = # Generated upstream information
rec {
baseName="libe-book";
version="0.0.3";
name="${baseName}-${version}";
hash="06xhg319wbqrkj8914npasv5lr7k2904mmy7wa78063mkh31365i";
url="mirror://sourceforge/project/libebook/libe-book-0.0.3/libe-book-0.0.3.tar.xz";
sha256="06xhg319wbqrkj8914npasv5lr7k2904mmy7wa78063mkh31365i";
};
buildInputs = [
gperf pkgconfig librevenge libxml2 boost icu cppunit libwpd
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
meta = {
inherit (s) version;
description = ''Library for import of reflowable e-book formats'';
license = stdenv.lib.licenses.lgpl21Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/development/libraries/libe-book/0.0.upstream Normal file
View File

@ -0,0 +1,4 @@
url http://sourceforge.net/projects/libebook/files/
SF_version_dir libe-book-0.0.
version_link '[.]tar.xz/download$'
SF_redirect

29
pkgs/development/libraries/libe-book/default.nix Normal file
View File

@ -0,0 +1,29 @@
{stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu, cppunit}:
let
s = # Generated upstream information
rec {
baseName="libe-book";
version="0.1.1";
name="${baseName}-${version}";
hash="0awv96q92qgxk22w2vrf4vg90cab5qfsrkbhgz252722mrkd5p4a";
url="mirror://sourceforge/project/libebook/libe-book-0.1.1/libe-book-0.1.1.tar.xz";
sha256="0awv96q92qgxk22w2vrf4vg90cab5qfsrkbhgz252722mrkd5p4a";
};
buildInputs = [
gperf pkgconfig librevenge libxml2 boost icu cppunit
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
meta = {
inherit (s) version;
description = ''Library for import of reflowable e-book formats'';
license = stdenv.lib.licenses.lgpl21Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/development/libraries/libe-book/default.upstream Normal file
View File

@ -0,0 +1,4 @@
url http://sourceforge.net/projects/libebook/files/
SF_version_dir libe-book-
version_link '[.]tar.xz/download$'
SF_redirect

29
pkgs/development/libraries/libmwaw/0.2.nix Normal file
View File

@ -0,0 +1,29 @@
{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}:
let
s = # Generated upstream information
rec {
baseName="libmwaw";
version="0.2.1";
name="${baseName}-${version}";
hash="1fil1ll84pq0k3g6rcc2xfg1yrigkljp4ay5p2wpwd9qlmfvvvqn";
url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.2.1/libmwaw-0.2.1.tar.xz";
sha256="1fil1ll84pq0k3g6rcc2xfg1yrigkljp4ay5p2wpwd9qlmfvvvqn";
};
buildInputs = [
boost pkgconfig cppunit zlib libwpg libwpd librevenge
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
meta = {
inherit (s) version;
description = ''Import library for some old mac text documents'';
license = stdenv.lib.licenses.mpl20 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/development/libraries/libmwaw/0.2.upstream Normal file
View File

@ -0,0 +1,4 @@
url http://sourceforge.net/projects/libmwaw/files/libmwaw/
SF_version_dir libmwaw-0.2.
version_link '[.]tar.xz/download$'
SF_redirect

29
pkgs/development/libraries/libmwaw/default.nix Normal file
View File

@ -0,0 +1,29 @@
{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}:
let
s = # Generated upstream information
rec {
baseName="libmwaw";
version="0.3.1";
name="${baseName}-${version}";
hash="0fa6nf4pxl853xnh2kdjw1nk3w6i39diixiampml7g9qygbd0vqb";
url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.1/libmwaw-0.3.1.tar.xz";
sha256="0fa6nf4pxl853xnh2kdjw1nk3w6i39diixiampml7g9qygbd0vqb";
};
buildInputs = [
boost pkgconfig cppunit zlib libwpg libwpd librevenge
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
meta = {
inherit (s) version;
description = ''Import library for some old mac text documents'';
license = stdenv.lib.licenses.mpl20 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/development/libraries/libmwaw/default.upstream Normal file
View File

@ -0,0 +1,4 @@
url http://sourceforge.net/projects/libmwaw/files/libmwaw/
SF_version_dir libmwaw-
version_link '[.]tar.xz/download$'
SF_redirect

29
pkgs/development/libraries/libodfgen/default.nix Normal file
View File

@ -0,0 +1,29 @@
{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}:
let
s = # Generated upstream information
rec {
baseName="libodfgen";
version="0.1.1";
name="${baseName}-${version}";
hash="1p335m2l19c7glsss30rrm5dxfcyajk9fvj7rsclgn0kmb4y48cm";
url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.1/libodfgen-0.1.1.tar.xz";
sha256="1p335m2l19c7glsss30rrm5dxfcyajk9fvj7rsclgn0kmb4y48cm";
};
buildInputs = [
boost pkgconfig cppunit zlib libwpg libwpd librevenge
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
meta = {
inherit (s) version;
description = ''A base library for generating ODF documents'';
license = stdenv.lib.licenses.mpl20 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/development/libraries/libodfgen/default.upstream Normal file
View File

@ -0,0 +1,4 @@
url http://sourceforge.net/projects/libwpd/files/libodfgen/
SF_version_dir libodfgen-
version_link '[.]tar.xz/download$'
SF_redirect

29
pkgs/development/libraries/librevenge/default.nix Normal file
View File

@ -0,0 +1,29 @@
{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib}:
let
s = # Generated upstream information
rec {
baseName="librevenge";
version="0.0.1";
name="${baseName}-${version}";
hash="0zgfxvbqf11pypyc0vmcan73x197f7ia1ywin9qqy9hvvmrjgchc";
url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.1/librevenge-0.0.1.tar.xz";
sha256="0zgfxvbqf11pypyc0vmcan73x197f7ia1ywin9qqy9hvvmrjgchc";
};
buildInputs = [
boost pkgconfig cppunit zlib
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
meta = {
inherit (s) version;
description = ''A base library for writing document import filters'';
license = stdenv.lib.licenses.mpl20 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/development/libraries/librevenge/default.upstream Normal file
View File

@ -0,0 +1,4 @@
url http://sourceforge.net/projects/libwpd/files/librevenge/
SF_version_dir librevenge-
version_link '[.]tar.xz/download$'
SF_redirect

10
pkgs/development/tools/misc/arcanist/default.nix
View File

@ -3,18 +3,18 @@
let
libphutil = fetchgit {
url = "git://github.com/facebook/libphutil.git";
rev = "0027e97cd6cbafcbdc626b4ac6cf315b9508a14f";
sha256 = "4781a4e3e1cb72da24e97f89a9b879803be8e1cf6baa2a4517801dfb893eec26";
rev = "8d1b522333caf4984180ac830be8635437bacedb";
sha256 = "e83da381cd8845b64a1cd3244d17736fb736aeabce37efd19754447f47cd4fe1";
};
arcanist = fetchgit {
url = "git://github.com/facebook/arcanist.git";
rev = "680ec3670cd9d9195debf3e9b674b1b232156e61";
sha256 = "a70cde586960676c0d69f4d98e6936633e0d79c37c6f6cc5b0213146a6b18c83";
rev = "0971c728fea89ac45a67e06cdb89349ad8040c60";
sha256 = "33e595b81dcbef181d3c71072ecf1c22db3f86f49dbb5276c671caefe83c8594";
};
in
stdenv.mkDerivation rec {
name = "arcanist-${version}";
version = "20140617";
version = "20140627";
src = [ arcanist libphutil ];
buildInputs = [ php makeWrapper flex ];

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

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.10.44";
version = "3.10.45";
extraMeta.branch = "3.10";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "06brvvxkgx4im4jzyl08y8hifgqb8ndxlhdkczwlqx3cgs6769c0";
sha256 = "0bsmqszc86d33g6qpwgrdckgrd1x37087br3vsc5151s2p22rk1f";
};
features.iwlwifi = true;

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

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.14.8";
version = "3.14.9";
extraMeta.branch = "3.14";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0l2k7c8i3vzcs8mwdy3h1yzlqli6vr56wbn6bxp4nyvxkwxlhs5d";
sha256 = "0rm68hzkxzzh6a1nw6fsxbg43d4b88957ail7b9ga589cagf3p94";
};
features.iwlwifi = true;

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

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.15.1";
version = "3.15.2";
extraMeta.branch = "3.15";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0bmzag945bb9v20xc2f6i4syx456prai3qj5cxhm8cb76wby4s8b";
sha256 = "09nq8q84xn6lwzdnn36pzfiqhn1lapi60yxn4hifb7v9ymhc5sv6";
};
features.iwlwifi = true;

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

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.4.94";
version = "3.4.95";
extraMeta.branch = "3.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0kc1s38zij39z8mrk9x29wizhbn4i7c7gyd796s1ib4826p3k48k";
sha256 = "1rv2jsfc2m12nk293v12rvvqnicyh73pwp6bcb28jdqdhm95k6l6";
};
kernelPatches = args.kernelPatches ++

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

@ -60,17 +60,17 @@ rec {
};
grsecurity_stable = grsecPatch
{ kversion = "3.14.8";
revision = "201406222110";
{ kversion = "3.14.9";
revision = "201406262057";
branch = "stable";
sha256 = "0jar710hqpjkp4g3ldrbcpgc170v9qp8ykajq5fi8mxx4j54gjwa";
sha256 = "0rrcmlaz69028fwl45xnif1dc9wnl7lnrry1280mdg764wrc6g0n";
};
grsecurity_unstable = grsecPatch
{ kversion = "3.15.1";
revision = "201406222112";
{ kversion = "3.15.2";
revision = "201406262058";
branch = "test";
sha256 = "04sbpmzgfgn7hjiln9baynpgr7k67lm0b5wn2z8i2jsjigfmv0r4";
sha256 = "02r9xasg1hiw3bynwh50r9cqjzwffmhsyg4gmiyzs58izivl1hvd";
};
grsec_fix_path =

4
pkgs/tools/graphics/povray/default.nix
View File

@ -4,8 +4,8 @@ stdenv.mkDerivation {
name = "povray-3.6";
src = fetchurl {
url = http://www.povray.org/redirect/www.povray.org/ftp/pub/povray/Official/Unix/povray-3.6.tar.bz2;
sha256 = "0wvsfgkybx28mj2p76nnsq9rdq50192g5qb7d0xk81s8skn7z2jf";
url = http://www.povray.org/ftp/pub/povray/Old-Versions/Official-3.62/Unix/povray-3.6.tar.bz2;
sha256 = "4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73";
};
# the installPhase wants to put files into $HOME. I let it put the files

4
pkgs/tools/networking/network-manager-applet/default.nix
View File

@ -2,7 +2,7 @@
, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring
, mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
, makeWrapper, networkmanager_openvpn, networkmanager_vpnc
, networkmanager_openconnect, networkmanager_pptp, udev, hicolor_icon_theme }:
, networkmanager_openconnect, networkmanager_pptp, udev, hicolor_icon_theme, dconf }:
let
pn = "network-manager-applet";
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
preFixup = ''
wrapProgram "$out/bin/nm-applet" \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
--set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
--prefix PATH ":" "${gnome3.gconf}/bin"

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

@ -1605,7 +1605,7 @@ let
networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { };
networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { };
networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { dconf = gnome3.dconf; };
newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { };
@ -3303,6 +3303,7 @@ let
sdcc = callPackage ../development/compilers/sdcc { };
smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { };
smlnj = callPackage_i686 ../development/compilers/smlnj { };
stalin = callPackage ../development/compilers/stalin { };
@ -4964,6 +4965,8 @@ let
libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { };
libatomic_ops = callPackage ../development/libraries/libatomic_ops {};
libav = libav_10;
libav_all = callPackage ../development/libraries/libav { };
inherit (libav_all) libav_0_8 libav_9 libav_10;
@ -5096,6 +5099,9 @@ let
liblscp = callPackage ../development/libraries/liblscp { };
libe-book = callPackage ../development/libraries/libe-book {};
libe-book_00 = callPackage ../development/libraries/libe-book/0.0.nix {};
libev = builderDefsPackage ../development/libraries/libev { };
libevent14 = callPackage ../development/libraries/libevent/1.4.nix { };
@ -5194,6 +5200,8 @@ let
libresample = callPackage ../development/libraries/libresample {};
librevenge = callPackage ../development/libraries/librevenge {};
librevisa = callPackage ../development/libraries/librevisa { };
libsamplerate = callPackage ../development/libraries/libsamplerate {
@ -5302,6 +5310,9 @@ let
libmusicbrainz = libmusicbrainz3;
libmwaw = callPackage ../development/libraries/libmwaw { };
libmwaw_02 = callPackage ../development/libraries/libmwaw/0.2.nix { };
libmx = callPackage ../development/libraries/libmx { };
libnet = callPackage ../development/libraries/libnet { };
@ -5318,6 +5329,8 @@ let
libnxml = callPackage ../development/libraries/libnxml { };
libodfgen = callPackage ../development/libraries/libodfgen { };
libofa = callPackage ../development/libraries/libofa { };
libofx = callPackage ../development/libraries/libofx { };
@ -9637,6 +9650,8 @@ let
toxic = callPackage ../applications/networking/instant-messengers/toxic { };
transcode = callPackage ../applications/audio/transcode { };
transmission = callPackage ../applications/networking/p2p/transmission { };
transmission_gtk = transmission.override { enableGTK3 = true; };
@ -10731,6 +10746,12 @@ let
tptp = callPackage ../applications/science/logic/tptp {};
twelf = callPackage ../applications/science/logic/twelf {
smlnj = if stdenv.isDarwin
then smlnjBootstrap
else smlnj;
};
verifast = callPackage ../applications/science/logic/verifast {};
why3 = callPackage ../applications/science/logic/why3 {};

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

@ -1472,6 +1472,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
monadloc = callPackage ../development/libraries/haskell/monadloc {};
monadlocPp = callPackage ../development/libraries/haskell/monadloc-pp {};
monadLoops = callPackage ../development/libraries/haskell/monad-loops {};
monadLogger = callPackage ../development/libraries/haskell/monad-logger {};