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

Merge remote-tracking branch 'origin/master' into stdenv-updates.

Browse Source
This commit is contained in:
Peter Simons
2013-10-19 13:55:06 +02:00
parent 6be8ad3392 92613863fe
commit ee0a88ba01
26 changed files with 552 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/doc/manual/userconfiguration.xml
-80
View File
@@ -1,80 +0,0 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Configuration in home directory</title>
<!--===============================================================-->
<section>
<title>Compiz Fusion</title>
<para>
Compiz Fusion is just a set of plugins for Compiz. Your best interest is to have
them found both by Compiz and by Compiz Configuration Settings (also in Compiz Fusion
distribution). By default they look in Compiz installation path and in home directory.
You do not need to track /nix/store manually - everything is already in
/run/current-system/sw/share.
<orderedlist>
<listitem><para><filename>$HOME/.compiz/plugins</filename>
should contain plugins you want to load. All the installed
plugins are available in
<filename>/run/current-system/sw/share/compiz-plugins/compiz/</filename>,
so you can use symlinks to this directory.
</para></listitem>
<listitem><para><filename>$HOME/.compiz/metadata</filename>
should contain metadata (definition of configuration options) for plugins
you want to load. All the installed metadata is available in
<filename>/run/current-system/sw/share/compiz/</filename>,
so you can use symlinks to this directory.
</para></listitem>
<listitem><para>
Probably a way to load <literal>GConf</literal> configuration backend by default
should be found, but if you run <literal>Compiz</literal> with
<literal>GConf</literal> configuration (default for <literal>X server</literal> job
for now), you have to link
<filename>/run/current-system/sw/share/compizconfig/backends/</filename>
into <filename>$HOME/.compizconfig/backends</filename> directory.
</para></listitem>
</orderedlist>
To summarize the above, these are the commands you have to execute
<command>ln -s /run/current-system/sw/share/compiz/ $HOME/.compiz/metadata</command>
<command>ln -s /run/current-system/sw/share/compiz-plugins/compiz/ $HOME/.compiz/plugins</command>
<command>ln -s /run/current-system/sw/share/compizconfig/backends/ $HOME/.compizconfig/backends</command>
Now you can launch <literal>ccsm</literal> and configure everything. You should select
GConf as a backend in the preferences menu of <literal>ccsm</literal>
</para>
</section>
<section>
<title>Pidgin-LaTeX</title>
<para>
To have pidgin-latex plugin working after installation, you need the following:
<orderedlist>
<listitem><para>
Symlink <filename>/run/current-system/sw/share/pidgin-latex/pidgin-latex.so</filename>
to <filename>$HOME/.purple/plugins/pidgin-latex.so</filename>
</para></listitem>
<listitem><para>
Enable smileys. If you do not want to, you can create
<filename>$HOME/.purple/smileys/empty/theme</filename> with the following contents:
<programlisting>
Name=Empty
Description=No predefined smileys
Author=Nobody
</programlisting>
Enabling this theme will enable smileys, but define none.
</para></listitem>
<listitem><para>
Enable the plugin.
</para></listitem>
</orderedlist>
</para>
</section>
</chapter>
nixos/modules/services/x11/xserver.nix
+11 -1
View File
@@ -229,6 +229,14 @@ in
'';
};
s3tcSupport = mkOption {
default = false;
description = ''
Make S2TC via libtxc_dxtn available to OpenGL drivers. Using
this library may require a patent license depending on your location.
'';
};
startOpenSSHAgent = mkOption {
default = true;
description = ''
@@ -410,7 +418,9 @@ in
optionals (elem "nvidia" driverNames) [ "nouveau" "nvidiafb" ];
environment.variables.LD_LIBRARY_PATH =
[ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ];
[ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ]
++ pkgs.lib.optional cfg.s3tcSupport "${pkgs.libtxc_dxtn}/lib"
++ pkgs.lib.optional (cfg.s3tcSupport && cfg.driSupport32Bit) "${pkgs_i686.libtxc_dxtn}/lib";
environment.etc =
(optionals cfg.exportConfiguration
pkgs/applications/ike/default.nix
+39
View File
@@ -0,0 +1,39 @@
{ stdenv, fetchurl, cmake, openssl, libedit, flex, bison, qt4, makeWrapper, gcc }:
# NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp";
# launch with "iked -f /etc/iked.conf"
stdenv.mkDerivation rec {
name = "ike-2.2.1";
src = fetchurl {
url = "https://www.shrew.net/download/ike/${name}-release.tgz";
sha256 = "0fhyr2psd93b0zf7yfb72q3nqnh65mymgq5jpjcsj9jv5kfr6l8y";
};
buildInputs = [ cmake openssl libedit flex bison qt4 makeWrapper ];
configurePhase = ''
mkdir -p $out/{bin,sbin,lib}
cmake -DQTGUI=YES -DETCDIR=$out/etc -DLIBDIR=$out/lib -DSBINDIR=$out/sbin -DBINDIR=$out/bin -DMANDIR=$out/man -DNATT=YES -DCMAKE_INSTALL_PREFIX:BOOL=$out
'';
buildPhase = ''
make
'';
installPhase = ''
make install
for file in "$out"/bin/* "$out"/sbin/*; do
wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.gcc}/lib:${libedit}/lib:${qt4}/lib"
done
'';
meta = with stdenv.lib; {
homepage = https://www.shrew.net/software;
description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems";
platforms = platforms.unix;
maintainers = [ maintainers.iElectric ];
license = "sleepycat";
};
}
pkgs/development/libraries/haskell/active/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "active";
version = "0.1.0.7";
sha256 = "18pcw98ni8fiy0yd7wmrqvpaf2wgav70rsikqfl571zjmdmzdw7p";
version = "0.1.0.8";
sha256 = "1q2zrx1i5j04c9bss7c19nm6lqasmwxyfzkh49my7yaik95k7bw9";
buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
testDepends = [
newtype QuickCheck semigroupoids semigroups vectorSpace
pkgs/development/libraries/haskell/amqp/default.nix
+11 -4
View File
@@ -1,12 +1,19 @@
{ cabal, binary, dataBinaryIeee754, network, text, xml }:
{ cabal, binary, clock, dataBinaryIeee754, hspec, hspecExpectations
, network, split, text, xml
}:
cabal.mkDerivation (self: {
pname = "amqp";
version = "0.6.0";
sha256 = "0rfczmhf46sc3pxxb5gwv4ggsxkqkvdi4kkqdnrdpdhs7p41im2n";
version = "0.7.0";
sha256 = "09zazmbdw8nphbjkmixn2dpwdgkjqjfbn6jv522ykvrcnsn35kc4";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary dataBinaryIeee754 network text xml ];
buildDepends = [
binary clock dataBinaryIeee754 network split text xml
];
testDepends = [
binary dataBinaryIeee754 hspec hspecExpectations network split text
];
meta = {
homepage = "https://github.com/hreinhardt/amqp";
description = "Client library for AMQP servers (currently only RabbitMQ)";
pkgs/development/libraries/haskell/clock/default.nix
+13
View File
@@ -0,0 +1,13 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "clock";
version = "0.4.0.1";
sha256 = "1bn6dalank30l680iifyam0mg9izxbyscgq0vmr1aw5brba5kv6j";
meta = {
homepage = "http://corsis.github.com/clock/";
description = "High-resolution clock functions: monotonic, realtime, cputime";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})
pkgs/development/libraries/haskell/comonad-transformers/default.nix
+2
View File
@@ -5,10 +5,12 @@ cabal.mkDerivation (self: {
version = "4.0";
sha256 = "13zzp6r6s6c80skniphwvzxhpazbyal5854m53139kgcw560rv6z";
buildDepends = [ comonad ];
noHaddock = true;
meta = {
homepage = "http://github.com/ekmett/comonad-transformers/";
description = "This package has been merged into comonad 4.0";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})
pkgs/development/libraries/haskell/data-pprint/default.nix
+6 -1
View File
@@ -1,10 +1,15 @@
{ cabal, deepseq, mtl, parallel, time }:
{ cabal, deepseq, mtl, parallel, time, fetchurl }:
cabal.mkDerivation (self: {
pname = "data-pprint";
version = "0.2.2";
sha256 = "0cr69qv2j8fmmlir8rzlafcxk1cg3lg1z0zrwkz0lb7idm25fy36";
buildDepends = [ deepseq mtl parallel time ];
patches = [ (fetchurl { url = "https://github.com/divipp/ActiveHs-misc/pull/3.patch";
sha256 = "0wxvc7cbv4qpjl5zxy41863qpzda2ma75pmnnqx29qyh3rxp7biw";
})
];
patchFlags = "-p2";
meta = {
description = "Prettyprint and compare Data values";
license = self.stdenv.lib.licenses.bsd3;
pkgs/development/libraries/haskell/errors/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "errors";
version = "1.4.2";
sha256 = "1csry8bbz7r4gc7x3lf1ih10rvnig2i91nfij227p9744yndl2xw";
version = "1.4.3";
sha256 = "02xvfh0kfca7z5vhnkmqg5gw5i5ad5bc3jf8flxj75ry7wqggfmm";
buildDepends = [ either safe transformers ];
jailbreak = true;
meta = {
pkgs/development/libraries/haskell/hakyll/default.nix
+2 -5
View File
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "hakyll";
version = "4.4.1.0";
sha256 = "17bns61l5d0h8qyhbz5gnc4j9yjjajk57whp0j4gfshaq0s2aif9";
version = "4.4.1.2";
sha256 = "0rbl0gl5ds63mv8cbcwb8aj0vic9padqs3zrdxr2ny70md1v9m9y";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -25,9 +25,6 @@ cabal.mkDerivation (self: {
snapCore snapServer systemFilepath tagsoup testFramework
testFrameworkHunit testFrameworkQuickcheck2 text time
];
patchPhase = ''
sed -i -e 's|cryptohash.*,|cryptohash,|' -e 's|tagsoup.*,|tagsoup,|' hakyll.cabal
'';
doCheck = false;
meta = {
homepage = "http://jaspervdj.be/hakyll";
pkgs/development/libraries/haskell/http-types/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "http-types";
version = "0.8.1";
sha256 = "07hxxlhgnwsvjr2dzqbswwwkjxwsc0pk6shpkvzgclrsyn3xrg7p";
version = "0.8.2";
sha256 = "1536wpmicmq90qvnvcvq1dzk2vfhj7ls6hz4pqp0ll9aksk3msr1";
buildDepends = [ blazeBuilder caseInsensitive text ];
testDepends = [ blazeBuilder hspec QuickCheck text ];
meta = {
pkgs/development/libraries/haskell/monoid-extras/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "monoid-extras";
version = "0.3.2.2";
sha256 = "1fy0fk2mzan6n5chc11x303hz3iq3kpx6ma6c8xsi8va1b9ikpda";
version = "0.3.2.3";
sha256 = "1q7aw4adg082rszkc3skdvidcn86n06xvr3x8qarpjb285znsmc4";
buildDepends = [ groupoids groups semigroupoids semigroups ];
jailbreak = true;
meta = {
pkgs/development/libraries/haskell/optparse-applicative/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "optparse-applicative";
version = "0.6.0";
sha256 = "07wzsgwym0g6qd39jvgp6ndpqdn2w0c4sn9mcz19rqlb2am24ip8";
version = "0.7.0.2";
sha256 = "1pq620236x8fch9nkq4g4vganbzksnwj8z1bb80c2mwvf6sbg5ci";
buildDepends = [ transformers ];
testDepends = [
HUnit testFramework testFrameworkHunit testFrameworkThPrime
pkgs/development/libraries/haskell/snap/snap.nix
+2 -3
View File
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "snap";
version = "0.13.0.3";
sha256 = "0gwcrsmcx5823w53nfi92gg2hkjnyxd3mp97qijp5p8y83mhh0l0";
version = "0.13.0.4";
sha256 = "1cbc42x7p87fmazm0dqc519rdaiiiwmkri8y1n4hgvr70kfi6569";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -20,7 +20,6 @@ cabal.mkDerivation (self: {
unorderedContainers vector vectorAlgorithms xmlhtml
];
jailbreak = true;
patchPhase = "sed -i -e 's|lens .*|lens|' snap.cabal";
meta = {
homepage = "http://snapframework.com/";
description = "Top-level package for the Snap Web Framework";
pkgs/development/libraries/haskell/unix-time/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "unix-time";
version = "0.2.0";
sha256 = "1gmchi6crbd3lpnw1j0zaaj7y0gib8dbqd8ip2s5p3f50qqlsxj8";
version = "0.2.1";
sha256 = "15kg1rxbw86p5jzig9ac7lsizmlvqkxikq7h8jfi04rri39a9jiy";
testDepends = [ doctest hspec QuickCheck time ];
meta = {
description = "Unix time parser/formatter and utilities";
pkgs/development/libraries/haskell/zip-archive/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "zip-archive";
version = "0.1.3.4";
sha256 = "0hvndr3gb7fiv4qjwjvic5mg7wq7h7nw3c3v5xq8fnlr1l943vyb";
version = "0.1.4";
sha256 = "0ipk8gwa2k8iqg2gg4lbawr8l9sjwhy2p7b8qxazpq0i88dyy3lb";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary digest filepath mtl time utf8String zlib ];
pkgs/development/libraries/libtxc_dxtn/default.nix
+5 -6
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf, automake, libtool, mesa }:
{ stdenv, fetchurl, autoreconfHook, mesa }:
let version = "1.0.1"; in
@@ -6,15 +6,14 @@ stdenv.mkDerivation rec {
name = "libtxc_dxtn-${version}";
src = fetchurl {
url = "http://cgit.freedesktop.org/~mareko/${name}.tar.gz";
sha256 = "0g6lymik9cs7nbzigwzaf49fnhhfsvjanhg92wykw7rfq9zvkhvv";
url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2";
sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5";
};
buildInputs = [ autoconf automake libtool mesa ];
preConfigure = "autoreconf -vfi";
buildInputs = [ autoreconfHook mesa ];
meta = {
homepage = http://dri.freedesktop.org/wiki/S3TC;
repositories.git = git://people.freedesktop.org/~mareko/libtxc_dxtn;
};
}
pkgs/development/libraries/libxtc_dxtn/default.nix
-12
View File
@@ -1,12 +0,0 @@
{ stdenv, fetchurl, mesa }:
stdenv.mkDerivation rec {
name = "libtxc_dxtn-1.0.1";
src = fetchurl {
url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2";
sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5";
};
NIX_CFLAGS_COMPILE = "-I ${mesa}/include";
}
pkgs/development/web/nodejs/default.nix
+2 -2
View File
@@ -6,7 +6,7 @@ let
ln -sv /usr/sbin/dtrace $out/bin
'';
version = "0.10.12";
version = "0.10.21";
# !!! Should we also do shared libuv?
deps = {
@@ -27,7 +27,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
sha256 = "1dlnjjr135h2xcxifb06g33yi2bc5zpvc06985x5cjj56g1sffbk";
sha256 = "038l4j0ilrsmc6m2z2qprqs82z7p4940scb8597hcmhp5kr5n4kw";
};
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);
pkgs/os-specific/linux/i7z/default.nix
+4 -8
View File
@@ -1,19 +1,15 @@
{ stdenv, fetchurl, qt4, ncurses}:
stdenv.mkDerivation rec {
name = "i7z-0.27.1";
name = "i7z-0.27.2";
src = fetchurl {
url = "http://i7z.googlecode.com/files/${name}.tar.gz";
sha256 = "0n3pry1qmpq4basnny3gddls2zlwz0813ixnas87092rvlgjhbc6";
sha256 = "1wa7ix6m75wl3k2n88sz0x8cckvlzqklja2gvzqfw5rcfdjjvxx7";
};
buildInputs = [qt4 ncurses];
patchPhase = ''
substituteInPlace Makefile --replace "/usr/sbin" "$out/sbin"
'';
buildPhase = ''
make
cd GUI
@@ -24,15 +20,15 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
pwd
ensureDir $out/sbin
make install
make install prefix=$out
install -Dm755 GUI/i7z_GUI $out/sbin/i7z-gui
'';
meta = {
description = "A better i7 (and now i3, i5) reporting tool for Linux";
homepage = http://code.google.com/p/i7z;
repositories.git = https://github.com/ajaiantilal/i7z.git;
license = "GPLv2";
maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
};
pkgs/os-specific/linux/kernel/linux-3.12.nix
+1 -1
View File
@@ -4,7 +4,7 @@ import ./generic.nix (args // rec {
version = "3.12-rc3";
src = fetchurl {
url = "https://www.kernel.org/pub/linux/kernel/v3.0/testing/linux-${version}.tar.gz";
url = "https://www.kernel.org/pub/linux/kernel/v3.0/testing/linux-${version}.tar.xz";
sha256 = "1rayb0f4n81yp9ghcws0v36dpqyl9ks3naf37p2qy7jvrwagmj28";
};
pkgs/tools/system/sleuthkit/default.nix
+16 -40
View File
@@ -1,48 +1,24 @@
x@{builderDefsPackage
, libewf, afflib, openssl, zlib
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
{ stdenv, fetchurl, libewf, afflib, openssl, zlib }:
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="sleuthkit";
version="3.2.2";
name="${baseName}-${version}";
url="mirror://sourceforge/project/${baseName}/${baseName}/${version}/${name}.tar.gz";
hash="02hik5xvbgh1dpisvc3wlhhq1aprnlsk0spbw6h5khpbq9wqnmgj";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
stdenv.mkDerivation rec {
name = "sleuthkit-3.2.2";
src = fetchurl {
url = "mirror://sourceforge/sleuthkit/${name}.tar.gz";
sha256 = "02hik5xvbgh1dpisvc3wlhhq1aprnlsk0spbw6h5khpbq9wqnmgj";
};
inherit (sourceInfo) name version;
inherit buildInputs;
enableParallelBuilding = true;
buildInputs = [ libewf afflib openssl zlib ];
# Hack to fix the RPATH.
preFixup = "rm -rf */.libs";
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
meta = {
description = "A forensic/data recovery tool";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = stdenv.lib.platforms.linux;
license = "IBM Public License";
};
passthru = {
updateInfo = {
downloadPage = "http://sourceforge.net/projects/sleuthkit/files/sleuthkit";
};
};
}) x
}
pkgs/top-level/all-packages.nix
+2 -2
View File
@@ -5131,8 +5131,6 @@ let
libxslt = callPackage ../development/libraries/libxslt { };
libxtc_dxtn = callPackage ../development/libraries/libxtc_dxtn { };
libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii {
inherit fetchurl stdenv;
});
@@ -8064,6 +8062,8 @@ let
ii = callPackage ../applications/networking/irc/ii { };
ike = callPackage ../applications/ike { };
ikiwiki = callPackage ../applications/misc/ikiwiki {
inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber
HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext
pkgs/top-level/haskell-packages.nix
+2
View File
@@ -719,6 +719,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
clientsession = callPackage ../development/libraries/haskell/clientsession {};
clock = callPackage ../development/libraries/haskell/clock {};
cmdargs = callPackage ../development/libraries/haskell/cmdargs {};
cmdlib = callPackage ../development/libraries/haskell/cmdlib {};
pkgs/top-level/node-packages-generated.nix
+419 -174
View File
File diff suppressed because it is too large Load Diff
pkgs/top-level/node-packages.json
+1
View File
@@ -106,4 +106,5 @@
, "plist-native"
, "x509"
, "owl-deepcopy"
, "meat"
]