alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

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

Browse source
This commit is contained in:
Sander van der Burg 2013-08-12 14:57:24 +02:00
parent 5a0c7f3077 7fc87a865e
commit d77bbbae82
79 changed files with 866 additions and 508 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/stdenv.xml
View file

@ -6,7 +6,7 @@
<para>The standard build environment in the Nix Packages collection
provides a environment for building Unix packages that does a lot of
provides an environment for building Unix packages that does a lot of
common build tasks automatically. In fact, for Unix packages that use
the standard <literal>./configure; make; make install</literal> build
interface, you don’t need to write a build script at all; the standard

6
maintainers/docs/cross.txt
View file

@ -41,7 +41,7 @@ NB:
Keep in mind that many programs are not very well suited for cross
compilation. Either they are not intended to run on other platforms,
because the code is highly platform specific, or the configuration proces
because the code is highly platform specific, or the configuration process
is not written with cross compilation in mind.
Nix will not solve these problems for you!
@ -290,7 +290,7 @@ this compiler and verified to be working on a HP Jornada 820 running Linux
are "patch", "make" and "wget".
If we want to build C++ programs it gets a lot more difficult. GCC has a
three step compilation proces. In the first step a simple compiler, called
three step compilation process. In the first step a simple compiler, called
xgcc, that can compile only C programs is built. With that compiler it
compiles itself two more times: one time to build a full compiler, and another
time to build a full compiler once again with the freshly built compiler from
@ -318,7 +318,7 @@ with compilation flags. This is still work in progress for Nix.
---
After succesfully completing the whole toolchain you can start building
After successfully completing the whole toolchain you can start building
packages with the newly built tools. To make everything build correctly
you will need a stdenv for your target platform. Setting up this platform
will take some effort. Right now there is a very experimental setup for

53
pkgs/applications/misc/vifm/default.nix
View file

@ -1,48 +1,31 @@
x@{builderDefsPackage
, ncurses
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
{ pkgs, fetchurl, stdenv, ncurses, utillinux, file, libX11 }:
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="vifm";
version="0.6.3";
name="${baseName}-${version}";
url="mirror://sourceforge/project/${baseName}/${baseName}/${name}.tar.bz2";
hash="1v5kiifjk7iyqrzjd94wn6a5dz4j3krl06pbp1ps9g3zdq2w2skv";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
let
name = "vifm-${version}";
version = "0.7.5";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url="mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2";
sha256 ="1r1d92zrff94rfx011dw2qsgdwd2ksqlz15la74d6h7sfcsnyd01";
};
inherit (sourceInfo) name version;
inherit buildInputs;
#phaseNames = ["doConfigure" "doMakeInstall"];
buildInputs = [ utillinux ncurses file libX11 ];
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
meta = {
description = "A vi-like file manager";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.gpl2;
maintainers = with pkgs.lib.maintainers; [ raskin garbas ];
platforms = pkgs.lib.platforms.linux;
license = pkgs.lib.licenses.gpl2;
};
passthru = {
updateInfo = {
downloadPage = "http://vifm.sf.net";
};
};
}) x
}

7
pkgs/applications/networking/browsers/midori/default.nix
View file

@ -12,6 +12,7 @@ let
gtksourceview pkgconfig which gettext makeWrapper
file libidn sqlite docutils libnotify libsoup vala
kbproto xproto scrnsaverproto libXScrnSaver dbus_glib
glib_networking
];
in
rec {
@ -34,7 +35,11 @@ rec {
shebangsHere = (doPatchShebangs ".");
shebangsInstalled = (doPatchShebangs "$out/bin");
wrapWK = (makeManyWrappers "$out/bin/*" "--set WEBKIT_IGNORE_SSL_ERRORS 1");
wrapWK = (makeManyWrappers "$out/bin/*"
''
--set WEBKIT_IGNORE_SSL_ERRORS 1 \
--prefix GIO_EXTRA_MODULES : "${args.glib_networking}/lib/gio/modules"
'');
name = "midori-${version}.${release}";
meta = {

8
pkgs/applications/version-management/git-and-tools/qgit/default.nix
View file

@ -1,18 +1,18 @@
{stdenv, fetchurl, qt, libXext, libX11}:
stdenv.mkDerivation rec {
name = "qgit-2.3";
name = "qgit-2.5";
meta =
{
license = "GPLv2";
homepage = "http://digilander.libero.it/mcostalba/";
homepage = "http://libre.tibirna.org/projects/qgit/wiki/QGit";
description = "Graphical front-end to Git";
inherit (qt.meta) platforms;
};
src = fetchurl
{
url = "mirror://sourceforge/qgit/${name}.tar.bz2";
sha256 = "a5fdd7e27fea376790eed787e22f4863eb9d2fe0217fd98b9fdbcf47a45bdc64";
url = "http://libre.tibirna.org/attachments/download/9/${name}.tar.gz";
sha256 = "25f1ca2860d840d87b9919d34fc3a1b05d4163671ed87d29c3e4a8a09e0b2499";
};
buildInputs = [qt libXext libX11];
configurePhase = "qmake PREFIX=$out";

12
pkgs/applications/virtualization/virtualbox/default.nix
View file

@ -11,7 +11,7 @@ with stdenv.lib;
let
version = "4.2.14"; # changes ./guest-additions as well
version = "4.2.16"; # changes ./guest-additions as well
forEachModule = action: ''
for mod in \
@ -31,11 +31,13 @@ let
'';
# See https://github.com/NixOS/nixpkgs/issues/672 for details
extpackRevision = "86644";
extpackRevision = "86992";
extensionPack = requireFile rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
# Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
sha256 = "5813cae72790de4893cadb839ffbd148290a44ec6913d901d84c9b3740ab1b1e";
# IMPORTANT: Hash must be base16 encoded because it's used as an input to
# VBoxExtPackHelperApp!
# Tip: nix-hash --type sha256 --to-base16 "hash from nix-prefetch-url"
sha256 = "8f88b1ebe69b770103e9151bebf6681c5e049eb5fac45ae8d52c43440aa0fa0d";
message = ''
In order to use the extension pack, you need to comply with the VirtualBox Personal Use
and Evaluation License (PUEL) by downloading the related binaries from:
@ -54,7 +56,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
sha256 = "038k65cdvr80da5nfan5r3rjrnxqab2fbf2pr2jq8g1gc4cxrxpq";
sha256 = "0nnl8qh8j4sk5zn78hrp6ccidmk332p7qg6pv5a0a4irs0b8j3zz";
};
buildInputs =

2
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View file

@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "9f08f13bbd818fb3ef9916658542ad0999c35e11afc1f6e8ff0b944405486e8a";
sha256 = "1id0rb2sdnn34rvjl2v3hp3z9g9c4s4f4kl1lx0myjlqv8i0fayg";
};
KERN_DIR = "${kernelDev}/lib/modules/*/build";

2
pkgs/build-support/fetchmtn/builder.sh
View file

@ -24,7 +24,7 @@ for source in $dbs; do
echo "selector $selector does not match any revision";
fi
else
echo "pulling branch $branch wasn't succesfull";
echo "pulling branch $branch wasn't successful";
fi;
if test -n "$done"; then
break;

55
pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch
View file

@ -1,46 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79945c4..a244d0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,10 +32,6 @@ set(generator_SRC
type.cpp
)
diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in
--- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in 2013-06-28 17:14:50.000000000 +0000
+++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in 2013-07-30 21:26:33.000000000 +0000
@@ -80,8 +80,7 @@
set(SMOKE_API_BIN "@SMOKE_API_BIN@")
-# force RPATH so that the binary is usable from within the build tree
-set (CMAKE_SKIP_BUILD_RPATH FALSE)
-set (CMAKE_SKIP_RPATH FALSE)
-
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
find_library(SMOKE_BASE_LIBRARY smokebase
- PATHS "@SMOKE_LIBRARY_PREFIX@"
- NO_DEFAULT_PATH)
+ PATHS "@SMOKE_LIBRARY_PREFIX@")
add_executable(smokegen ${generator_SRC})
diff --git a/cmake/SmokeConfig.cmake.in b/cmake/SmokeConfig.cmake.in
index 947315c..de8d66c 100644
--- a/cmake/SmokeConfig.cmake.in
+++ b/cmake/SmokeConfig.cmake.in
@@ -44,21 +44,19 @@ macro (find_smoke_component name)
set (SMOKE_${uppercase}_FOUND FALSE CACHE INTERNAL "")
find_path(SMOKE_${uppercase}_INCLUDE_DIR
- ${lowercase}_smoke.h
- PATH ${SMOKE_INCLUDE_DIR}
- NO_DEFAULT_PATH
+ ${lowercase}_smoke.h
+ HINTS ${SMOKE_INCLUDE_DIR}
+ PATH_SUFFIXES smoke
)
if(WIN32)
# DLLs are in the bin directory.
find_library(SMOKE_${uppercase}_LIBRARY
smoke${lowercase}
- PATHS "@CMAKE_INSTALL_PREFIX@/bin"
- NO_DEFAULT_PATH)
+ PATHS "@CMAKE_INSTALL_PREFIX@/bin")
else(WIN32)
find_library(SMOKE_${uppercase}_LIBRARY
smoke${lowercase}
- PATHS "@SMOKE_LIBRARY_PREFIX@"
- NO_DEFAULT_PATH)
+ PATHS "@SMOKE_LIBRARY_PREFIX@")
endif(WIN32)
if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_LIBRARY)
if (NOT SMOKE_BASE_LIBRARY)
if (Smoke_FIND_REQUIRED)

4
pkgs/development/compilers/elm/elm-server.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "elm-server";
version = "0.8";
sha256 = "0mnxayfg54f5mr27sd1zw3xrdijppgvrz2yzzmhp07qc1jiyfald";
version = "0.9";
sha256 = "1mk2ligv8has1ssmpild2dq23ld84cdayr6bm3ycg11jab0hrbsx";
isLibrary = false;
isExecutable = true;
buildDepends = [

13
pkgs/development/compilers/elm/elm.nix
View file

@ -1,17 +1,16 @@
{ cabal, blazeHtml, blazeMarkup, cmdargs, deepseq, filepath, hjsmin
, indents, json, mtl, pandoc, parsec, shakespeare, text
, transformers
{ cabal, binary, blazeHtml, blazeMarkup, cmdargs, filepath, hjsmin
, indents, mtl, pandoc, parsec, transformers, unionFind, uniplate
}:
cabal.mkDerivation (self: {
pname = "Elm";
version = "0.8.0.3";
sha256 = "0zai8glmkiqramivgz405zh385cz166gpry2yl29g37dxpwxffzb";
version = "0.9.0.1";
sha256 = "0p6sqfrf11xpgj7y81hsjbvsyyyfvc4nzcg6gmfwyqkg3qc3yg6v";
isLibrary = true;
isExecutable = true;
buildDepends = [
blazeHtml blazeMarkup cmdargs deepseq filepath hjsmin indents json
mtl pandoc parsec shakespeare text transformers
binary blazeHtml blazeMarkup cmdargs filepath hjsmin indents mtl
pandoc parsec transformers unionFind uniplate
];
meta = {
homepage = "http://elm-lang.org";

18
pkgs/development/compilers/ghc/head.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.7";
version = "7.7.20130811";
name = "ghc-${version}";
src = fetchurl {
url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
sha256 = "1f4grj1lw25vb5drn4sn8fc1as3hwhk8dl659spi5fnbrs5k4wgb";
url = "http://darcs.haskell.org/ghcBuilder/uploads/tn23/${name}-src.tar.bz2";
sha256 = "1jkks2nq9189vxim9lfiwmf3wrnxi834brv9kn9n31225f34qdyr";
};
buildInputs = [ ghc perl gmp ncurses ];
@ -19,24 +19,16 @@ stdenv.mkDerivation rec {
DYNAMIC_BY_DEFAULT = NO
'';
# The tarball errorneously contains an executable that doesn't work in
# Nix. Deleting it will cause the program to be re-built locally.
postUnpack = ''
rm -v $sourceRoot/libraries/integer-gmp/cbits/mkGmpDerivedConstants
'';
preConfigure = ''
echo "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'';
configureFlags=[
"--with-gcc=${stdenv.gcc}/bin/gcc"
];
configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc";
# required, because otherwise all symbols from HSffi.o are stripped, and
# that in turn causes GHCi to abort
stripDebugFlags=["-S" "--keep-file-symbols"];
stripDebugFlags = [ "-S" "--keep-file-symbols" ];
meta = {
homepage = "http://haskell.org/ghc";

5
pkgs/development/compilers/ghc/with-packages.nix
View file

@ -76,6 +76,11 @@ stdenv.mkDerivation rec {
ln -s $f $out/share/emacs/site-lisp/
echo -n .
done
for f in "$currentPath/share/ghci/"*; do
mkdir -p $out/share/ghci
ln -s $f $out/share/ghci/
echo -n .
done
for f in "$currentPkgDir/"*.conf; do
ln -s $f $linkedPkgDir
echo -n .

20
pkgs/development/compilers/orc/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "orc-0.4.17";
src = fetchurl {
url = "http://code.entropywave.com/download/orc/${name}.tar.gz";
sha256 = "1s6psp8phrd1jmxz9j01cksh3q5xrm1bd3z7zqxg5zsrijjcrisg";
};
meta = {
description = "The Oil Runtime Compiler";
homepage = "http://code.entropywave.com/orc/";
# The source code implementing the Marsenne Twister algorithm is licensed
# under the 3-clause BSD license. The rest is 2-clause BSD license.
license = stdenv.lib.licenses.bsd3;
platform = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.iyzsong ];
};
}

4
pkgs/development/interpreters/racket/default.nix
View file

@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
pname = "racket";
version = "5.3.5";
version = "5.3.6";
name = "${pname}-${version}";
src = fetchurl {
url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz";
sha256 = "0xrd25d2iskkih08ydcjqnasg84r7g32apvdw7qzlp4xs1xynjwk";
sha256 = "12pvgidaym1rwyyi69bd2gfmfwi1y0lf8xgih7a8r20z4g0zzq3z";
};
# Various racket executables do run-time searches for these.

4
pkgs/development/libraries/haskell/bindings-posix/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "bindings-posix";
version = "1.2.3";
sha256 = "0nj18lfpn8hmlaa7cmvdkjnk8fi2f6ysjbigkx7zbrpqnvbi63ba";
version = "1.2.6";
sha256 = "1yza3qbf0f5gfpg79pb6xfpw37zg191nmxa4r6h9x4xb5na0rzff";
buildDepends = [ bindingsDSL ];
meta = {
description = "Low level bindings to posix";

6
pkgs/development/libraries/haskell/c2hs/default.nix
View file

@ -2,13 +2,13 @@
cabal.mkDerivation (self: {
pname = "c2hs";
version = "0.16.4";
sha256 = "0m8mzc19cgaqsi1skqimk22770xddxx0j024mgp76hl8vqc5rcgi";
version = "0.16.5";
sha256 = "19h4zppn7ry7p3f7qw1kgsrf6h2bjnknycfrj3ibxys82qpv8m8y";
isLibrary = false;
isExecutable = true;
buildDepends = [ filepath languageC ];
meta = {
homepage = "http://www.cse.unsw.edu.au/~chak/haskell/c2hs/";
homepage = "https://github.com/haskell/c2hs";
description = "C->Haskell FFI tool that gives some cross-language type safety";
license = self.stdenv.lib.licenses.gpl2;
platforms = self.ghc.meta.platforms;

20
pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ cabal, byteable, cryptoCipherTypes, HUnit, mtl, QuickCheck
, securemem, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2
}:
cabal.mkDerivation (self: {
pname = "crypto-cipher-tests";
version = "0.0.1";
sha256 = "1g5rxx07s23pr0vam0bjlp3qwxzqa3m6x6gbv88fhkmbqwxiq2fh";
buildDepends = [
byteable cryptoCipherTypes HUnit mtl QuickCheck securemem
testFramework testFrameworkHunit testFrameworkQuickcheck2
];
meta = {
homepage = "http://github.com/vincenthz/hs-crypto-cipher";
description = "Generic cryptography cipher tests";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

21
pkgs/development/libraries/haskell/crypto-cipher-types/default.nix Normal file
View file

@ -0,0 +1,21 @@
{ cabal, byteable, HUnit, mtl, QuickCheck, securemem, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2
}:
cabal.mkDerivation (self: {
pname = "crypto-cipher-types";
version = "0.0.1";
sha256 = "0brwb6awni3jm152vi68saz6gla7kgwf2pfjalzqsi8qjpjbzgpj";
buildDepends = [ byteable securemem ];
testDepends = [
byteable HUnit mtl QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2
];
doCheck = false;
meta = {
homepage = "http://github.com/vincenthz/hs-crypto-cipher";
description = "Generic cryptography cipher types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/diagrams/cairo.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-cairo";
version = "0.6";
sha256 = "0fxqwkv2cpgpkr80q828rm91ybn7j0dwj1p5ysc3648w28jvhkil";
version = "0.7";
sha256 = "14ghcrzzpqdnvmpvykhf4r74sb9jgp69094mkwydslzmi8dsgdiy";
buildDepends = [
cairo cmdargs colour diagramsCore diagramsLib filepath mtl split
time

4
pkgs/development/libraries/haskell/diagrams/contrib.nix
View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-contrib";
version = "0.6.1";
sha256 = "0z92sfgqpfk401lzkvnsg3ij05795qc61c4lx12glbmdpfhilcpi";
version = "0.7";
sha256 = "0dcj4rjvpgf0lmxgv50f8cpi6adkbfnsa4z4ay8khawhnn4af5ac";
buildDepends = [
arithmoi circlePacking colour dataDefault diagramsCore diagramsLib
forceLayout lens MonadRandom mtl split vectorSpace

4
pkgs/development/libraries/haskell/diagrams/core.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-core";
version = "0.6.0.2";
sha256 = "1g4b1zabgfdpaf7y3804r3w04ll4sqqrf71rm9389dg17ghc1q85";
version = "0.7";
sha256 = "00ba31imq91w6lzy8blgxawr06igrjfrg4adrqy650wip8jafqwq";
buildDepends = [
dualTree MemoTrie monoidExtras newtype semigroups vectorSpace
vectorSpacePoints

4
pkgs/development/libraries/haskell/diagrams/diagrams.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "diagrams";
version = "0.6";
sha256 = "1i62jbixjzw82y622ymp6lrp4kzgn7iv55arivvh0y46bbmybqvh";
version = "0.7";
sha256 = "08ibmxzykb9v8y7ars9jz2qyss8ln8i6j87sm31bq5g9kvpy287c";
buildDepends = [
diagramsContrib diagramsCore diagramsLib diagramsSvg
];

13
pkgs/development/libraries/haskell/diagrams/lib.nix
View file

@ -1,14 +1,15 @@
{ cabal, active, colour, dataDefault, diagramsCore, monoidExtras
, newtype, NumInstances, semigroups, vectorSpace
{ cabal, active, colour, dataDefaultClass, diagramsCore, fingertree
, intervals, monoidExtras, newtype, NumInstances, semigroups
, vectorSpace
}:
cabal.mkDerivation (self: {
pname = "diagrams-lib";
version = "0.6.0.3";
sha256 = "0rc3m2v1bxlm5rz1pi1w4k37sbgmr9qv54rllsqan1kicafjaqw1";
version = "0.7";
sha256 = "02zb9j2qb5f26azscv1m4iivp1ixdhx6rcjns5smka1hdgyzld1j";
buildDepends = [
active colour dataDefault diagramsCore monoidExtras newtype
NumInstances semigroups vectorSpace
active colour dataDefaultClass diagramsCore fingertree intervals
monoidExtras newtype NumInstances semigroups vectorSpace
];
meta = {
homepage = "http://projects.haskell.org/diagrams";

4
pkgs/development/libraries/haskell/diagrams/svg.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-svg";
version = "0.6.0.1";
sha256 = "0x4yjm1wdhicknls1y3fhdg89m8wcvfk2svabww9075w6ras79qk";
version = "0.7";
sha256 = "0vfykrx29dxii9mdjjkia5a42jfg4hbzgxzv5rp7zvf3fz9w8w1x";
buildDepends = [
blazeSvg cmdargs colour diagramsCore diagramsLib filepath
monoidExtras mtl split time vectorSpace

4
pkgs/development/libraries/haskell/ghc-heap-view/default.nix
View file

@ -5,6 +5,10 @@ cabal.mkDerivation (self: {
version = "0.5.1";
sha256 = "1qi7f3phj2j63x1wd2cvk36945cxd84s12zs03hlrn49wzx2pf1n";
buildDepends = [ binary transformers ];
postInstall = ''
ensureDir "$out/share/ghci"
ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
'';
meta = {
description = "Extract the heap representation of Haskell values and thunks";
license = self.stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/haskell/ghc-vis/default.nix
View file

@ -10,6 +10,10 @@ cabal.mkDerivation (self: {
cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
transformers xdot
];
postInstall = ''
ensureDir "$out/share/ghci"
ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
'';
meta = {
homepage = "http://felsin9.de/nnis/ghc-vis";
description = "Live visualization of data structures in GHCi";

4
pkgs/development/libraries/haskell/github/default.nix
View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "github";
version = "0.7.0";
sha256 = "0r803hpyyd0nfhlk5jn4ripzi2cpj708zp9g961g7wvvvi66013p";
version = "0.7.1";
sha256 = "0aipaamd7gn5f79f451v8ifjs5g8b40g9w4kvi1i62imsh0zhh90";
buildDepends = [
aeson attoparsec caseInsensitive conduit dataDefault failure HTTP
httpConduit httpTypes network text time unorderedContainers vector

4
pkgs/development/libraries/haskell/hakyll/default.nix
View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "hakyll";
version = "4.3.1.0";
sha256 = "1cx5pf0wf49cylbcgy1di218qk0fw8rgzqri9lx1v8jfl31zvsg5";
version = "4.3.3.0";
sha256 = "11zfz55a7dr5l7xzknphqninyrb2pw2qmrs7v7ajq2gvbl0lf37n";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/hastache/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hastache";
version = "0.5.0";
sha256 = "1c1pphw7qx5l5fdfqchihvp2yrwwb0ln8dfshkvd1giv8cjmbyn8";
version = "0.5.1";
sha256 = "05lm7mjzc1hamxcj8akq06081bhp907hrjdkhas3wzm6ran6rwn3";
buildDepends = [
blazeBuilder filepath ieee754 mtl syb text transformers utf8String
];

14
pkgs/development/libraries/haskell/intervals/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ cabal, numericExtras }:
cabal.mkDerivation (self: {
pname = "intervals";
version = "0.2.2";
sha256 = "059xmk373xz6nwk61iyhx4d7xd328jxb694qmq9plry3k77mdh5q";
buildDepends = [ numericExtras ];
meta = {
homepage = "http://github.com/ekmett/intervals";
description = "Interval Arithmetic";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

16
pkgs/development/libraries/haskell/language-c/0.3.2.1.nix
View file

@ -1,16 +0,0 @@
{ cabal, alex, filepath, happy, syb }:
cabal.mkDerivation (self: {
pname = "language-c";
version = "0.3.2.1";
sha256 = "1qk86p88p2jk1cbgl8p5g19ip3nh6z22ddj5jac58r5ny076iimx";
buildDepends = [ filepath syb ];
buildTools = [ alex happy ];
meta = {
homepage = "http://www.sivity.net/projects/language.c/";
description = "Analysis and generation of C code";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

0
pkgs/development/libraries/haskell/language-c/0.4.2.nix → pkgs/development/libraries/haskell/language-c/default.nix
View file

4
pkgs/development/libraries/haskell/monoid-extras/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "monoid-extras";
version = "0.2.2.3";
sha256 = "00yj7wdyznsis82fb7i07s0vz8vsn2mpqk7jkgl9xxa57gk1rsax";
version = "0.3.0.0";
sha256 = "1bb8yq2vja80177h3wfadkjkwvcrszx0nq6m5n10f4lh9spvr087";
buildDepends = [ semigroups ];
meta = {
description = "Various extra monoid-related definitions and utilities";

13
pkgs/development/libraries/haskell/numeric-extras/default.nix Normal file
View file

@ -0,0 +1,13 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "numeric-extras";
version = "0.0.3";
sha256 = "18jyjrk6iizz3sgkwgbh1rxf6zdf166bkgs7wia8b4z7f6261nzg";
meta = {
homepage = "http://github.com/ekmett/numeric-extras";
description = "Useful tools from the C standard library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/postgresql-simple/default.nix
View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "postgresql-simple";
version = "0.3.4.0";
sha256 = "1xqs5hpljsapgisr7q3yd8ir351196xrdrk51dsizvk4vcs85wgs";
version = "0.3.5.0";
sha256 = "09w9cdjn9jvmcwh63ydjl8p28xfhrhy448y211z3carx2zwryshi";
buildDepends = [
attoparsec blazeBuilder blazeTextual postgresqlLibpq text time
transformers vector

14
pkgs/development/libraries/haskell/securemem/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ cabal, byteable }:
cabal.mkDerivation (self: {
pname = "securemem";
version = "0.1.2";
sha256 = "1szb530jw7666cnrfa8988p2b5scl2bfafi8kgslf7xi5yv7grqh";
buildDepends = [ byteable ];
meta = {
homepage = "http://github.com/vincenthz/hs-securemem";
description = "abstraction to an auto scrubbing and const time eq, memory chunk";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/stm-conduit/default.nix
View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "stm-conduit";
version = "2.1.1";
sha256 = "06frli37jz9xag249q1gmvnpnsaic1xa304d8d8bjz08980dbmpr";
version = "2.1.2";
sha256 = "1jkjnp1sjb4sqs6zkmmlm0s1126fkh54jkhwxairdwaxx9yh9y9k";
buildDepends = [
async conduit monadControl resourcet stm stmChans transformers
];

4
pkgs/development/libraries/haskell/texmath/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "texmath";
version = "0.6.1.5";
sha256 = "15cxki04khq29m9h5wxzxgppc3r58ccp2hgsslp2g1f59x2wm348";
version = "0.6.3";
sha256 = "1ajza3p4rj318l03rffscqs6rbk635drmdciv7hhl4nljc4qmnpz";
isLibrary = true;
isExecutable = true;
buildDepends = [ parsec syb xml ];

1
pkgs/development/libraries/haskell/tls-extra/default.nix
View file

@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
certificate cipherAes cipherRc4 cryptohash cryptoPubkey
cryptoRandomApi mtl network pem text time tls vector
];
jailbreak = true;
meta = {
homepage = "http://github.com/vincenthz/hs-tls";
description = "TLS extra default values and helpers";

14
pkgs/development/libraries/haskell/union-find/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ cabal, transformers }:
cabal.mkDerivation (self: {
pname = "union-find";
version = "0.2";
sha256 = "1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6";
buildDepends = [ transformers ];
meta = {
homepage = "http://github.com/nominolo/union-find";
description = "Efficient union and equivalence testing of sets";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

20
pkgs/development/libraries/libtxc_dxtn/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl, autoconf, automake, libtool, mesa }:
let version = "1.0.1"; in
stdenv.mkDerivation rec {
name = "libtxc_dxtn-${version}";
src = fetchurl {
url = "http://cgit.freedesktop.org/~mareko/${name}.tar.gz";
sha256 = "0g6lymik9cs7nbzigwzaf49fnhhfsvjanhg92wykw7rfq9zvkhvv";
};
buildInputs = [ autoconf automake libtool mesa ];
preConfigure = "autoreconf -vfi";
meta = {
homepage = http://dri.freedesktop.org/wiki/S3TC;
};
}

20
pkgs/development/libraries/liburcu/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "0.7.7";
name = "liburcu-${version}";
src = fetchurl {
url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
sha256 = "1yxxnhrsy6sv6bmp7j96jjynnqns01zjgj94mk70jz54zvcagf4a";
};
meta = with stdenv.lib; {
description = "Userspace RCU (read-copy-update) library";
homepage = http://lttng.org/urcu;
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

19
pkgs/development/libraries/libvisual/default.nix Normal file
View file

@ -0,0 +1,19 @@
{ stdenv, fetchurl, pkgconfig, glib }:
stdenv.mkDerivation rec {
name = "libvisual-0.4.0";
src = fetchurl {
url = "mirror://sourceforge/libvisual/${name}.tar.gz";
sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b";
};
buildInputs = [ pkgconfig glib ];
meta = {
description = "An abstraction library for audio visualisations";
homepage = "http://sourceforge.net/projects/libvisual/";
license = stdenv.lib.licenses.lgpl21Plus;
platform = stdenv.lib.platforms.unix;
};
}

2
pkgs/development/libraries/libxml2/setup-hook.sh
View file

@ -11,7 +11,7 @@ addXMLCatalogs () {
if test -z "$libxmlHookDone"; then
libxmlHookDone=1
# Set http_proxy and ftp_proxy to a invalid host to prevent
# Set http_proxy and ftp_proxy to an invalid host to prevent
# xmllint and xsltproc from trying to download DTDs from the
# network even when --nonet is not given. That would be impure.
# (Note that .invalid is a reserved domain guaranteed not to

4
pkgs/development/tools/build-managers/leiningen/builder.sh
View file

@ -21,7 +21,3 @@ chmod -v 755 $out_bin
patchShebangs $out
wrapProgram $out_bin --prefix PATH ":" ${rlwrap}/bin
echo "Testing out \"lein version\"..."
$out_bin version
echo "Success."

14
pkgs/development/tools/build-managers/leiningen/default.nix
View file

@ -1,21 +1,21 @@
{stdenv, fetchurl, makeWrapper, openjdk, rlwrap, clojure }:
{ stdenv, fetchurl, makeWrapper, jdk, rlwrap, clojure }:
stdenv.mkDerivation rec {
pname = "leiningen";
version = "2.1.2";
version = "2.3.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
sha256 = "10s4xpwrhd8wz3h2vj8ay4rf2hw8vzswfkr8ckckk3fhjcn130dy";
sha256 = "18rk1rr9il5jc3103cnmii6hyc1j3k12d975sqrcqyg97h7f0jkb";
};
jarsrc = fetchurl {
url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar";
sha256 = "08jq21zpsgwsmsz7lpfxidj2s3mv8i23fjwyl9qc6dngskkx45sa";
sha256 = "04xmnw80f39qs2vfm5ic8bmhks1fvasiwg4snckg2zhfjkhzms05";
};
patches = ./lein_2.1.2.patch;
patches = ./lein_2.3.0.patch;
inherit rlwrap clojure;
@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper ];
propagatedBuildInputs = [ openjdk clojure ];
propagatedBuildInputs = [ jdk clojure ];
meta = {
homepage = https://github.com/technomancy/leiningen;
description = "Project automation for Clojure";
license = "EPL";
platforms = stdenv.lib.platforms.unix;
maintainer = with stdenv.lib.maintainers; [the-kenny];
maintainer = with stdenv.lib.maintainers; [ the-kenny ];
};
}

0
pkgs/development/tools/build-managers/leiningen/lein_2.1.2.patch → pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch
View file

6
pkgs/development/tools/haskell/cabal-ghci/default.nix
View file

@ -2,13 +2,13 @@
cabal.mkDerivation (self: {
pname = "cabal-ghci";
version = "0.2.1";
sha256 = "0za0bf59f4a3v5zvyy7h1xvxskrazdga4j1cs6psfv9fv80qig9r";
version = "0.3";
sha256 = "1x7fpvvmr2mq7l960wgsijhyrdaiq3lnnl3z6drklc5p73pms8w6";
isLibrary = true;
isExecutable = true;
buildDepends = [ Cabal filepath ];
meta = {
homepage = "http://code.atnnn.com/projects/cabal-ghci/wiki";
homepage = "http://github.com/atnnn/cabal-ghci";
description = "Set up ghci with options taken from a .cabal file";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

4
pkgs/development/tools/haskell/cabal2nix/default.nix
View file

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.52";
sha256 = "1w38qxwbwaq37c7vypydwjjhgrn9vbaqnnk7b2y0pm8n2fh78z1s";
version = "1.53";
sha256 = "1xhvxx5maj03rc6zd8bcqwzyn3b9yqxsbzgdh4d9ss4myn8x2zp3";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

21
pkgs/development/tools/misc/babeltrace/default.nix Normal file
View file

@ -0,0 +1,21 @@
{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt }:
stdenv.mkDerivation rec {
name = "babeltrace-1.1.1";
src = fetchurl {
url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2";
sha256 = "04jc1yd3aaq59fmpzswzc78cywpq7wzjfqdlsg7xc76ivb8cggfz";
};
buildInputs = [ pkgconfig glib libuuid popt ];
meta = with stdenv.lib; {
description = "Command-line tool and library to read and convert LTTng tracefiles";
homepage = http://www.efficios.com/babeltrace;
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

23
pkgs/development/tools/misc/lttng-tools/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, popt, libuuid, liburcu, lttngUst }:
stdenv.mkDerivation rec {
name = "lttng-tools-2.2.3";
src = fetchurl {
url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
sha256 = "1p16n42j34xkaj17zg2g12rzkfwpdv9ay1h4bkdq6038v320mljv";
};
buildInputs = [ popt libuuid liburcu lttngUst ];
patches = [ ./lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch ];
meta = with stdenv.lib; {
description = "Tracing tools (kernel + user space) for Linux";
homepage = http://lttng.org/;
license = licenses.lgpl21;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

53
pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch Normal file
View file

@ -0,0 +1,53 @@
From daba2e936571a236817022b760d91c48b730c30b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 9 Jul 2013 23:47:47 +0200
Subject: [PATCH] Change modprobe path from "/sbin/modprobe" to "modprobe"
(rely on PATH lookup)
---
src/bin/lttng-sessiond/modprobe.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
index 7e06dad..4075efe 100644
--- a/src/bin/lttng-sessiond/modprobe.c
+++ b/src/bin/lttng-sessiond/modprobe.c
@@ -90,7 +90,7 @@ void modprobe_remove_lttng_control(void)
for (i = ARRAY_SIZE(kern_modules_control) - 1; i >= 0; i--) {
ret = snprintf(modprobe, sizeof(modprobe),
- "/sbin/modprobe -r -q %s",
+ "modprobe -r -q %s",
kern_modules_control[i].name);
if (ret < 0) {
PERROR("snprintf modprobe -r");
@@ -125,7 +125,7 @@ void modprobe_remove_lttng_data(void)
for (i = ARRAY_SIZE(kern_modules_list) - 1; i >= 0; i--) {
ret = snprintf(modprobe, sizeof(modprobe),
- "/sbin/modprobe -r -q %s",
+ "modprobe -r -q %s",
kern_modules_list[i].name);
if (ret < 0) {
PERROR("snprintf modprobe -r");
@@ -169,7 +169,7 @@ int modprobe_lttng_control(void)
for (i = 0; i < ARRAY_SIZE(kern_modules_control); i++) {
ret = snprintf(modprobe, sizeof(modprobe),
- "/sbin/modprobe %s%s",
+ "modprobe %s%s",
kern_modules_control[i].required ? "" : "-q ",
kern_modules_control[i].name);
if (ret < 0) {
@@ -205,7 +205,7 @@ int modprobe_lttng_data(void)
for (i = 0; i < ARRAY_SIZE(kern_modules_list); i++) {
ret = snprintf(modprobe, sizeof(modprobe),
- "/sbin/modprobe %s%s",
+ "modprobe %s%s",
kern_modules_list[i].required ? "" : "-q ",
kern_modules_list[i].name);
if (ret < 0) {
--
1.8.2.3

32
pkgs/development/tools/misc/lttng-ust/default.nix Normal file
View file

@ -0,0 +1,32 @@
{ stdenv, fetchurl, liburcu }:
# NOTE:
# ./configure ...
# [...]
# LTTng-UST will be built with the following options:
#
# Java support (JNI): Disabled
# sdt.h integration: Disabled
# [...]
#
# Debian builds with std.h (systemtap).
stdenv.mkDerivation rec {
name = "lttng-ust-2.2.1";
src = fetchurl {
url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
sha256 = "0881ri3v96fjii24qnwgsypk4crri4qp6mc4zp7kwghz8gys9rla";
};
buildInputs = [ liburcu ];
meta = with stdenv.lib; {
description = "LTTng Userspace Tracer libraries";
homepage = http://lttng.org/;
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

23
pkgs/development/tools/misc/lttv/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk2, popt, babeltrace }:
stdenv.mkDerivation rec {
name = "lttv-1.5-beta1";
src = fetchurl {
url = "http://lttng.org/files/packages/${name}.tar.bz2";
sha256 = "0cz69q189wndwpvic0l6wvzl1nsfqadbrigaaxgzij72r7n89sfc";
};
buildInputs = [ pkgconfig glib gtk2 popt babeltrace ];
meta = with stdenv.lib; {
description = "Graphical trace viewer for LTTng trace files";
homepage = http://lttng.org/;
# liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1.
# The rest of the LTTV package is distributed under the GNU GPL v2.
license = with licenses; [ gpl2 lgpl21 ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

99
pkgs/games/steam/default.nix Normal file
View file

@ -0,0 +1,99 @@
{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc, glibc
, libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk
, gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib
, dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio
, libxcb, libXau, libXdmcp, flashplayer, libSM, libICE, libXext
, dbus_glib, libusb1, networkmanager
, SDL # World of Goo
, libvorbis # Osmos
, curl, mesa # Superbrothers: S&S EP
, patchelf }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let version = "1.0.0.39"; in
stdenv.mkDerivation rec {
name = "steam-${version}";
src = fetchurl {
url = "http://repo.steampowered.com/steam/archive/precise/steam-launcher_${version}_all.deb";
sha256 = "1z1cnlr2qw2ndnqsfwjck9617m2p0f3p9q9409vczj909h2a9wyk";
};
buildInputs = [ dpkg makeWrapper ];
phases = "installPhase";
installPhase = ''
mkdir -p $out
dpkg-deb -x $src $out
cp -r $out/usr/* $out/
rm -rf $out/usr
substituteInPlace "$out/bin/steam" --replace "/usr/bin/env bash" "/bin/sh"
substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/"
sed -i 's,STEAMPACKAGE=.*,STEAMPACKAGE=steam,' $out/bin/steam
sed -i '/STEAMSCRIPT/d' $out/bin/steam
mv $out/bin/steam $out/bin/.steam-wrapped
cat > $out/bin/steam << EOF
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib:${libSM}/lib:${libICE}/lib:${dbus_glib}/lib:${networkmanager}/lib:${libXext}/lib:${libusb1}/lib
STEAMBOOTSTRAP=~/.steam/steam/steam.sh
if [ -f \$STEAMBOOTSTRAP ]; then
PLATFORM32=ubuntu12_32
STEAMCONFIG=~/.steam
STEAMROOT=~/.local/share/Steam
STEAMDATA="\$STEAMROOT"
PIDFILE="\$STEAMCONFIG/steam.pid"
STEAMBIN32LINK="\$STEAMCONFIG/bin32"
STEAMBIN64LINK="\$STEAMCONFIG/bin64"
STEAMSDK32LINK="\$STEAMCONFIG/sdk32"
STEAMSDK64LINK="\$STEAMCONFIG/sdk64"
STEAMROOTLINK="\$STEAMCONFIG/root"
STEAMDATALINK="\$STEAMCONFIG/steam"
STEAMSTARTING="\$STEAMCONFIG/starting"
# Create symbolic links for the Steam API
if [ ! -e "\$STEAMCONFIG" ]; then
mkdir "\$STEAMCONFIG"
fi
if [ "\$STEAMROOT" != "\$STEAMROOTLINK" -a "\$STEAMROOT" != "\$STEAMDATALINK" ]; then
rm -f "\$STEAMBIN32LINK" && ln -s "\$STEAMROOT/\$PLATFORM32" "\$STEAMBIN32LINK"
rm -f "\$STEAMBIN64LINK" && ln -s "\$STEAMROOT/\$PLATFORM64" "\$STEAMBIN64LINK"
rm -f "\$STEAMSDK32LINK" && ln -s "\$STEAMROOT/linux32" "\$STEAMSDK32LINK"
rm -f "\$STEAMSDK64LINK" && ln -s "\$STEAMROOT/linux64" "\$STEAMSDK64LINK"
rm -f "\$STEAMROOTLINK" && ln -s "\$STEAMROOT" "\$STEAMROOTLINK"
if [ "\$STEAMDATALINK" ]; then
rm -f "\$STEAMDATALINK" && ln -s "\$STEAMDATA" "\$STEAMDATALINK"
fi
fi
# Temporary bandaid until everyone has the new libsteam_api.so
rm -f ~/.steampath && ln -s "\$STEAMCONFIG/bin32/steam" ~/.steampath
rm -f ~/.steampid && ln -s "\$PIDFILE" ~/.steampid
rm -f ~/.steam/bin && ln -s "\$STEAMBIN32LINK" ~/.steam/bin
export LD_LIBRARY_PATH="\$STEAMBIN32LINK:\$LD_LIBRARY_PATH:${mesa}/lib"
export SDL_VIDEO_X11_DGAMOUSE=0
cd "\$STEAMROOT"
FLASHLINK="\$STEAMCONFIG/bin32/plugins"
rm -f "\$FLASHLINK" && ln -s "${flashplayer}/lib/mozilla/plugins" "\$FLASHLINK"
LDSO="\$STEAMBIN32LINK/ld.so"
cp ${glibc}/lib/ld-linux.so.2 "\$LDSO"
chmod u+w "\$LDSO"
echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${glibc}/lib
exec "\$LDSO" "\$STEAMBIN32LINK/steam"
else
export PATH=${xz}/bin:\$PATH
exec $out/bin/.steam-wrapped
fi
EOF
chmod +x $out/bin/steam
'';
meta = {
description = "A digital distribution platform";
homepage = http://store.steampowered.com/;
license = "unfree";
};
}

3
pkgs/lib/maintainers.nix
View file

@ -24,9 +24,10 @@
goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
guibert = "David Guibert <david.guibert@gmail.com>";
iElectric = "Domen Kozar <domen@dev.si>";
lovek323 = "Jason O'Conal <jason@oconal.id.au>";
iyzsong = "Song Wenwu <iyzsong@gmail.com>";
jcumming = "Jack Cummings <jack@mudshark.org>";
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
lovek323 = "Jason O'Conal <jason@oconal.id.au>";
ludo = "Ludovic Courtès <ludo@gnu.org>";
marcweber = "Marc Weber <marco-oweber@gmx.de>";
mornfall = "Petr Ročkai <me@mornfall.net>";

11
pkgs/os-specific/linux/kernel/builder.sh
View file

@ -23,8 +23,6 @@ configurePhase() {
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*
if test -n "$localVersion"; then
@ -70,14 +68,9 @@ installPhase() {
cp vmlinux $out
if grep -q "CONFIG_MODULES=y" .config; then
# Install the modules in $out/lib/modules with matching paths
# in modules.dep (i.e., refererring to $out/lib/modules, not
# /lib/modules). The depmod_opts= is to prevent the kernel
# from passing `-b PATH' to depmod.
export MODULE_DIR=$out/lib/modules/
substituteInPlace Makefile --replace '-b $(INSTALL_MOD_PATH)' ''
# Install the modules in $out/lib/modules.
make modules_install \
DEPMOD=$module_init_tools/sbin/depmod depmod_opts= \
DEPMOD=$kmod/sbin/depmod \
$makeFlags "${makeFlagsArray[@]}" \
$installFlags "${installFlagsArray[@]}"

2
pkgs/os-specific/linux/kernel/common-config.nix
View file

@ -186,7 +186,7 @@ with stdenv.lib;
BT_HCIUART_H4 y # UART (H4) protocol support
BT_HCIUART_LL y
BT_RFCOMM_TTY? y # RFCOMM TTY support
CRASH_DUMP n
CRASH_DUMP? n
${optionalString (versionOlder version "3.1") ''
DMAR? n # experimental
''}

4
pkgs/os-specific/linux/kernel/generate-config.pl
View file

@ -54,8 +54,8 @@ sub runConfig {
if ($s eq "\n") {
print STDERR "GOT: $line" if $debug;
# Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR)").
if ($line =~ /^\s*>?\s*(\d+)\.\s+.*\(([A-Za-z0-9_]+)\)$/) {
# Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR) (NEW)").
if ($line =~ /^\s*>?\s*(\d+)\.\s+.*?\(([A-Za-z0-9_]+)\)(?:\s+\(NEW\))?\s*$/) {
$choices{$2} = $1;
}

4
pkgs/os-specific/linux/kernel/generic.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, mktemp, module_init_tools, bc
{ stdenv, fetchurl, perl, mktemp, kmod, bc
, # The kernel source tarball.
src
@ -78,7 +78,7 @@ stdenv.mkDerivation {
generateConfig = ./generate-config.pl;
inherit preConfigure src module_init_tools localVersion postInstall postBuild;
inherit preConfigure src kmod localVersion postInstall postBuild;
patches = map (p: p.patch) kernelPatches;

4
pkgs/os-specific/linux/kernel/linux-3.2.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.2.49";
version = "3.2.50";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "06xiwcgk6hbcp6g1dpmxb95dzx94s29vzmh1pz4lsglcj1yfrkry";
sha256 = "0yg936syhay9x0qxqxdqrgi6ijdqklhqdrd8zk7l4zvgxaayaj68";
};
features.iwlwifi = true;

19
pkgs/os-specific/linux/kernel/patches.nix
View file

@ -131,11 +131,22 @@ rec {
patch = ./mips-ext3-n32.patch;
};
grsecurity_2_9_1_3_2_48 =
{ name = "grsecurity-2.9.1-3.2.48";
grsecurity_2_9_1_3_2_50 =
{ name = "grsecurity-2.9.1-3.2.50";
patch = fetchurl {
url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.48-201307212241.patch;
sha256 = "1llgrcd7ynxx60dn05bcbysd6a1091wwxkck4d15gvp71s9r6scm";
url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.50-201308052151.patch;
sha256 = "178y68bx4h4r9gq1p4izbjah8vhjmb3yvr3sfjglz8blxxahgd6n";
};
};
# this patch will probably make it into 3.11 or 3.12
# it only touches 1 file (fs/btrfs/send.c) so it only affects people that use
# the btrfs send feature.
btrfs_send_backport =
{ name = "btrfs-send-check-parent-dir-when-doing-a-compare-send";
patch = fetchurl {
url = https://patchwork.kernel.org/patch/2839612/mbox;
sha256 = "0qv5mxpfrzj2dibac64n4b3d6pg7gzsafd11548bihwmsa3dlbhg";
};
};

8
pkgs/os-specific/linux/module-init-tools/aggregator.nix → pkgs/os-specific/linux/kmod/aggregator.nix
View file

@ -1,4 +1,4 @@
{stdenv, module_init_tools, modules, buildEnv}:
{ stdenv, kmod, modules, buildEnv }:
buildEnv {
name = "kernel-modules";
@ -8,20 +8,20 @@ buildEnv {
postBuild =
''
source ${stdenv}/setup
kernelVersion=$(cd $out/lib/modules && ls -d *)
if test "$(echo $kernelVersion | wc -w)" != 1; then
echo "inconsistent kernel versions: $kernelVersion"
exit 1
fi
echo "kernel version is $kernelVersion"
# Regenerate the depmod map files. Be sure to pass an explicit
# kernel version number, otherwise depmod will use `uname -r'.
if test -w $out/lib/modules/$kernelVersion; then
rm -f $out/lib/modules/$kernelVersion/modules.*
MODULE_DIR=$out/lib/modules/ ${module_init_tools}/sbin/depmod -a $kernelVersion
${kmod}/sbin/depmod -b $out -a $kernelVersion
fi
'';
}

33
pkgs/os-specific/linux/lttng-modules/default.nix Normal file
View file

@ -0,0 +1,33 @@
{ stdenv, fetchurl, kernelDev }:
stdenv.mkDerivation rec {
pname = "lttng-modules-2.2.1";
name = "${pname}-${kernelDev.version}";
src = fetchurl {
url = "https://lttng.org/files/lttng-modules/${pname}.tar.bz2";
sha256 = "00ww1443ssv614s1ix6zby8llaf6zzlxcf5k4w7jsyji47ng33m2";
};
patches = [ ./lttng-fix-build-error-on-linux-3.2.patch ];
preConfigure = ''
export KERNELDIR="${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build"
export INSTALL_MOD_PATH="$out"
'';
installPhase = ''
make modules_install
'';
meta = with stdenv.lib; {
description = "Linux kernel modules for LTTng tracing";
homepage = http://lttng.org/;
# TODO: Add "mit" to the license list once the license attr set vs string
# decision has been made. (Having "mit" there breaks hydra evaluation.)
license = with licenses; [ lgpl21 gpl2 ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

33
pkgs/os-specific/linux/lttng-modules/lttng-fix-build-error-on-linux-3.2.patch Normal file
View file

@ -0,0 +1,33 @@
When building against linux 3.2, we get this build error:
building /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.o
CC [M] /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.o
In file included from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/lttng-events.h:759:0,
from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/define_trace.h:148,
from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/ext3.h:868,
from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.c:48:
/tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h: In function '__event_probe__ext3__page_op':
/tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type
/tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type
/tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type
/tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h: In function '__event_probe__ext3_invalidatepage':
/tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type
/tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type
/tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type
because a check for existing ext3/*h files in the kernel build tree is skipped
for linux < 3.4. Fix it by extending the ext3_dep_check thing to also be run
when building against linux >= 3.2 (not only linux >= 3.4).
diff -uNr lttng-modules-2.2.0.orig/probes/Makefile lttng-modules-2.2.0/probes/Makefile
--- lttng-modules-2.2.0.orig/probes/Makefile 2013-06-19 03:22:44.000000000 +0200
+++ lttng-modules-2.2.0/probes/Makefile 2013-07-06 13:22:15.902957717 +0200
@@ -59,7 +59,7 @@
ext3_dep_check = $(wildcard $(ext3_dep))
ext3 = $(shell \
if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 1 ] ; then \
- if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 4 -a \
+ if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 2 -a \
-z "$(ext3_dep_check)" ] ; then \
echo "warn" ; \
exit ; \

4
pkgs/servers/monitoring/zabbix/default.nix
View file

@ -2,11 +2,11 @@
let
version = "1.8.15";
version = "1.8.17";
src = fetchurl {
url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
sha256 = "0358syx6vck6l8j9wwlsb78faivh4qxrgy3jlkmjqr99xi6h3r3f";
sha256 = "0c2dpx7ncahp161p6zymrrxwyn3algkfzh6dz7x2j0wsnvb6lrp2";
};
preConfigure =

6
pkgs/tools/filesystems/btrfsprogs/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs, lzo }:
let version = "0.20pre20130509"; in
let version = "0.20pre20130705"; in
stdenv.mkDerivation {
name = "btrfs-progs-${version}";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git";
rev = "650e656a8b9c1fbe4ec5cd8c48ae285b8abd3b69";
sha256 = "e50e8ce9d24505711ed855f69a73d639dc5e401692a7d1c300753de3472abb21";
rev = "194aa4a1bd6447bb545286d0bcb0b0be8204d79f";
sha256 = "07c6762c9873cdcc1b9b3be0b412ba14b83457d8f5608d3dd945953b5e06f0f2";
};
buildInputs = [ zlib libuuid acl attr e2fsprogs lzo ];

30
pkgs/tools/misc/ponysay/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ stdenv, fetchurl, python3, texinfo, makeWrapper }:
stdenv.mkDerivation rec {
name = "ponysay-3.0.1";
src = fetchurl {
url = "https://github.com/erkin/ponysay/archive/3.0.1.tar.gz";
sha256 = "ab281f43510263b2f42a1b0a9097ee7831b3e33a9034778ecb12ccb51f6915ee";
};
buildInputs = [ python3 texinfo makeWrapper ];
phases = "unpackPhase patchPhase installPhase";
patches = [ ./pathfix.patch ];
installPhase = ''
python3 setup.py --prefix=$out --freedom=partial install --with-shared-cache=$out/share/ponysay
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
--prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
done
'';
meta = {
description = "cowsay reimplemention for ponies.";
homepage = http://terse.tk/ponysay/;
license = "GPLv3";
};
}

24
pkgs/tools/misc/ponysay/pathfix.patch Normal file
View file

@ -0,0 +1,24 @@
diff -urN ponysay-3.0.1/setup.py ponysay.p/setup.py
--- ponysay-3.0.1/setup.py 2013-04-05 14:28:18.000000000 +0200
+++ ponysay.p/setup.py 2013-08-10 01:09:30.181043877 +0200
@@ -514,7 +514,7 @@
for command in commands:
sourceed = 'completion/ponysay.%s' % (command)
generated = 'completion/%s-completion.%s' % (shell, command)
- generatorcmd = './completion/auto-auto-complete.py %s --output %s --source %s' % (shell, generated, sourceed)
+ generatorcmd = 'python3 completion/auto-auto-complete.py %s --output %s --source %s' % (shell, generated, sourceed)
Popen(generatorcmd.split(' ')).communicate()
if conf[command] is not None:
dest = generated + '.install'
@@ -559,9 +559,9 @@
for toolcommand in ('--dimensions', '--metadata'):
if not self.free:
print('%s, %s, %s' % ('./src/ponysaytool.py', toolcommand, sharedir))
- Popen(['./src/ponysaytool.py', toolcommand, sharedir], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate()
+ Popen(['python3', './src/ponysaytool.py', toolcommand, sharedir], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate()
else:
- params = ['./src/ponysaytool.py', toolcommand, sharedir, '--']
+ params = ['python3', './src/ponysaytool.py', toolcommand, sharedir, '--']
for sharefile in os.listdir(sharedir):
if sharefile.endswith('.pony') and (sharefile != '.pony'):
if not Setup.validateFreedom(sharedir + '/' + sharefile):

4
pkgs/tools/misc/unclutter/default.nix
View file

@ -16,7 +16,7 @@ stdenv.mkDerivation {
make DESTDIR="$out" MANPATH="$out/share/man" PREFIX="" install.man
'';
meta = {
meta = with stdenv.lib; {
description = "Hides mouse pointer while not in use.";
longDescription = ''
Unclutter hides your X mouse cursor when you do not need it, to prevent
@ -28,5 +28,7 @@ stdenv.mkDerivation {
unclutter -idle 1 &
'';
maintainers = with maintainers; [ iElectric ];
platforms = platforms.unix;
};
}

10
pkgs/tools/networking/openssh/default.nix
View file

@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
name = "openssh-6.2p1";
name = "openssh-6.2p2";
src = fetchurl {
url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz";
sha1 = "8824708c617cc781b2bb29fa20bd905fd3d2a43d";
sha1 = "c2b4909eba6f5ec6f9f75866c202db47f3b501ba";
};
prePatch = stdenv.lib.optionalString hpnSupport
@ -26,11 +26,7 @@ stdenv.mkDerivation rec {
export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
'';
patches =
[ ./locale_archive.patch
# Upstream fix for gratuitous "no such identity" warnings.
./fix-identity-warnings.patch
];
patches = [ ./locale_archive.patch ];
buildInputs = [ zlib openssl libedit pkgconfig pam ];

251
pkgs/tools/networking/openssh/fix-identity-warnings.patch
View file

@ -1,251 +0,0 @@
https://bugzilla.mindrot.org/show_bug.cgi?id=2084
@@ -, +, @@
- dtucker@cvs.openbsd.org 2013/02/17 23:16:57
[readconf.c ssh.c readconf.h sshconnect2.c]
Keep track of which IndentityFile options were manually supplied and which
were default options, and don't warn if the latter are missing.
ok markus@
- dtucker@cvs.openbsd.org 2013/02/22 04:45:09
[ssh.c readconf.c readconf.h]
Don't complain if IdentityFiles specified in system-wide configs are
missing. ok djm, deraadt.
Index: readconf.c
===================================================================
RCS file: /home/dtucker/openssh/cvs/openssh/readconf.c,v
--- a/readconf.c 2 Oct 2011 07:59:03 -0000 1.174
+++ b/readconf.c 5 Apr 2013 02:36:11 -0000
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.194 2011/09/23 07:45:05 markus Exp $ */
+/* $OpenBSD: readconf.c,v 1.196 2013/02/22 04:45:08 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -326,6 +326,26 @@ clear_forwardings(Options *options)
options->tun_open = SSH_TUNMODE_NO;
}
+void
+add_identity_file(Options *options, const char *dir, const char *filename,
+ int userprovided)
+{
+ char *path;
+
+ if (options->num_identity_files >= SSH_MAX_IDENTITY_FILES)
+ fatal("Too many identity files specified (max %d)",
+ SSH_MAX_IDENTITY_FILES);
+
+ if (dir == NULL) /* no dir, filename is absolute */
+ path = xstrdup(filename);
+ else
+ (void)xasprintf(&path, "%.100s%.100s", dir, filename);
+
+ options->identity_file_userprovided[options->num_identity_files] =
+ userprovided;
+ options->identity_files[options->num_identity_files++] = path;
+}
+
/*
* Returns the number of the token pointed to by cp or oBadOption.
*/
@@ -353,7 +373,7 @@ parse_token(const char *cp, const char *
int
process_config_line(Options *options, const char *host,
char *line, const char *filename, int linenum,
- int *activep)
+ int *activep, int userconfig)
{
char *s, **charptr, *endofnumber, *keyword, *arg, *arg2;
char **cpptr, fwdarg[256];
@@ -586,9 +606,7 @@ parse_yesnoask:
if (*intptr >= SSH_MAX_IDENTITY_FILES)
fatal("%.200s line %d: Too many identity files specified (max %d).",
filename, linenum, SSH_MAX_IDENTITY_FILES);
- charptr = &options->identity_files[*intptr];
- *charptr = xstrdup(arg);
- *intptr = *intptr + 1;
+ add_identity_file(options, NULL, arg, userconfig);
}
break;
@@ -1075,7 +1093,7 @@ parse_int:
int
read_config_file(const char *filename, const char *host, Options *options,
- int checkperm)
+ int flags)
{
FILE *f;
char line[1024];
@@ -1085,7 +1103,7 @@ read_config_file(const char *filename, c
if ((f = fopen(filename, "r")) == NULL)
return 0;
- if (checkperm) {
+ if (flags & SSHCONF_CHECKPERM) {
struct stat sb;
if (fstat(fileno(f), &sb) == -1)
@@ -1106,7 +1124,8 @@ read_config_file(const char *filename, c
while (fgets(line, sizeof(line), f)) {
/* Update line number counter. */
linenum++;
- if (process_config_line(options, host, line, filename, linenum, &active) != 0)
+ if (process_config_line(options, host, line, filename, linenum,
+ &active, flags & SSHCONF_USERCONF) != 0)
bad_options++;
}
fclose(f);
@@ -1280,30 +1299,17 @@ fill_default_options(Options * options)
options->protocol = SSH_PROTO_2;
if (options->num_identity_files == 0) {
if (options->protocol & SSH_PROTO_1) {
- len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1;
- options->identity_files[options->num_identity_files] =
- xmalloc(len);
- snprintf(options->identity_files[options->num_identity_files++],
- len, "~/%.100s", _PATH_SSH_CLIENT_IDENTITY);
+ add_identity_file(options, "~/",
+ _PATH_SSH_CLIENT_IDENTITY, 0);
}
if (options->protocol & SSH_PROTO_2) {
- len = 2 + strlen(_PATH_SSH_CLIENT_ID_RSA) + 1;
- options->identity_files[options->num_identity_files] =
- xmalloc(len);
- snprintf(options->identity_files[options->num_identity_files++],
- len, "~/%.100s", _PATH_SSH_CLIENT_ID_RSA);
-
- len = 2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1;
- options->identity_files[options->num_identity_files] =
- xmalloc(len);
- snprintf(options->identity_files[options->num_identity_files++],
- len, "~/%.100s", _PATH_SSH_CLIENT_ID_DSA);
+ add_identity_file(options, "~/",
+ _PATH_SSH_CLIENT_ID_RSA, 0);
+ add_identity_file(options, "~/",
+ _PATH_SSH_CLIENT_ID_DSA, 0);
#ifdef OPENSSL_HAS_ECC
- len = 2 + strlen(_PATH_SSH_CLIENT_ID_ECDSA) + 1;
- options->identity_files[options->num_identity_files] =
- xmalloc(len);
- snprintf(options->identity_files[options->num_identity_files++],
- len, "~/%.100s", _PATH_SSH_CLIENT_ID_ECDSA);
+ add_identity_file(options, "~/",
+ _PATH_SSH_CLIENT_ID_ECDSA, 0);
#endif
}
}
Index: readconf.h
===================================================================
RCS file: /home/dtucker/openssh/cvs/openssh/readconf.h,v
--- a/readconf.h 2 Oct 2011 07:59:03 -0000 1.83
+++ b/readconf.h 5 Apr 2013 02:36:11 -0000
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.91 2011/09/23 07:45:05 markus Exp $ */
+/* $OpenBSD: readconf.h,v 1.93 2013/02/22 04:45:09 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -96,6 +96,7 @@ typedef struct {
int num_identity_files; /* Number of files for RSA/DSA identities. */
char *identity_files[SSH_MAX_IDENTITY_FILES];
+ int identity_file_userprovided[SSH_MAX_IDENTITY_FILES];
Key *identity_keys[SSH_MAX_IDENTITY_FILES];
/* Local TCP/IP forward requests. */
@@ -148,15 +149,20 @@ typedef struct {
#define REQUEST_TTY_YES 2
#define REQUEST_TTY_FORCE 3
+#define SSHCONF_CHECKPERM 1 /* check permissions on config file */
+#define SSHCONF_USERCONF 2 /* user provided config file not system */
+
void initialize_options(Options *);
void fill_default_options(Options *);
int read_config_file(const char *, const char *, Options *, int);
int parse_forward(Forward *, const char *, int, int);
int
-process_config_line(Options *, const char *, char *, const char *, int, int *);
+process_config_line(Options *, const char *, char *, const char *, int, int *,
+ int);
void add_local_forward(Options *, const Forward *);
void add_remote_forward(Options *, const Forward *);
+void add_identity_file(Options *, const char *, const char *, int);
#endif /* READCONF_H */
Index: ssh.c
===================================================================
RCS file: /home/dtucker/openssh/cvs/openssh/ssh.c,v
--- a/ssh.c 6 Jul 2012 03:45:01 -0000 1.366
+++ b/ssh.c 5 Apr 2013 02:36:11 -0000
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.370 2012/07/06 01:47:38 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.372 2013/02/22 04:45:09 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -405,12 +405,7 @@ main(int ac, char **av)
strerror(errno));
break;
}
- if (options.num_identity_files >=
- SSH_MAX_IDENTITY_FILES)
- fatal("Too many identity files specified "
- "(max %d)", SSH_MAX_IDENTITY_FILES);
- options.identity_files[options.num_identity_files++] =
- xstrdup(optarg);
+ add_identity_file(&options, NULL, optarg, 1);
break;
case 'I':
#ifdef ENABLE_PKCS11
@@ -584,7 +579,8 @@ main(int ac, char **av)
dummy = 1;
line = xstrdup(optarg);
if (process_config_line(&options, host ? host : "",
- line, "command-line", 0, &dummy) != 0)
+ line, "command-line", 0, &dummy, SSHCONF_USERCONF)
+ != 0)
exit(255);
xfree(line);
break;
@@ -678,14 +674,15 @@ main(int ac, char **av)
* file if the user specifies a config file on the command line.
*/
if (config != NULL) {
- if (!read_config_file(config, host, &options, 0))
+ if (!read_config_file(config, host, &options, SSHCONF_USERCONF))
fatal("Can't open user config file %.100s: "
"%.100s", config, strerror(errno));
} else {
r = snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir,
_PATH_SSH_USER_CONFFILE);
if (r > 0 && (size_t)r < sizeof(buf))
- (void)read_config_file(buf, host, &options, 1);
+ (void)read_config_file(buf, host, &options,
+ SSHCONF_CHECKPERM|SSHCONF_USERCONF);
/* Read systemwide configuration file after user config. */
(void)read_config_file(_PATH_HOST_CONFIG_FILE, host,
Index: sshconnect2.c
===================================================================
RCS file: /home/dtucker/openssh/cvs/openssh/sshconnect2.c,v
--- a/sshconnect2.c 20 Mar 2013 01:55:15 -0000 1.184
+++ b/sshconnect2.c 5 Apr 2013 02:36:07 -0000
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.191 2013/02/15 00:21:01 dtucker Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.192 2013/02/17 23:16:57 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -1384,7 +1384,7 @@ pubkey_prepare(Authctxt *authctxt)
id = xcalloc(1, sizeof(*id));
id->key = key;
id->filename = xstrdup(options.identity_files[i]);
- id->userprovided = 1;
+ id->userprovided = options.identity_file_userprovided[i];
TAILQ_INSERT_TAIL(&files, id, next);
}
/* Prefer PKCS11 keys that are explicitly listed */

6
pkgs/tools/package-management/nix/unstable.nix
View file

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "nix-1.6pre3166_15e5ac8";
name = "nix-1.6pre3187_3fb7ae0";
src = fetchurl {
url = "http://hydra.nixos.org/build/5566779/download/5/${name}.tar.xz";
sha256 = "c25209bb93ca6859df84f74bd16cb0daee9e6c9820139e9dab1d2848129a2558";
url = "http://hydra.nixos.org/build/5663853/download/5/${name}.tar.xz";
sha256 = "3cd695b3bb23ea7f9e4779f5b79180319444204b30120ed2cc0f0bf1e070403f";
};
nativeBuildInputs = [ perl pkgconfig ];

29
pkgs/tools/security/torbutton/default.nix Normal file
View file

@ -0,0 +1,29 @@
{ stdenv, fetchgit, zip }:
stdenv.mkDerivation rec {
name = "torbutton-${version}.xpi";
version = "1.6.1";
src = fetchgit {
url = https://git.torproject.org/torbutton.git;
rev = "refs/tags/${version}";
sha256 = "0ypzrl8nhckrgh45rcwsjds1jnzz3w5nr09b926a4h3a5njammlv";
};
buildInputs = [ zip ];
buildPhase = ''
mkdir pkg
./makexpi.sh
'';
installPhase = "cat pkg/*.xpi > $out";
meta = with stdenv.lib; {
homepage = https://www.torproject.org/torbutton/;
description = "the component in Tor Browser Bundle that takes care of application-level security and privacy concerns in Firefox. To keep you safe, Torbutton disables many types of active content.";
license = licenses.mit;
maintainers = [ maintainers.phreedom ];
platforms = platforms.linux;
};
}

51
pkgs/top-level/all-packages.nix
View file

@ -1526,6 +1526,8 @@ let
polkit_gnome = callPackage ../tools/security/polkit-gnome { };
ponysay = callPackage ../tools/misc/ponysay { };
povray = callPackage ../tools/graphics/povray { };
ppl = callPackage ../development/libraries/ppl { };
@ -1786,6 +1788,8 @@ let
tor = callPackage ../tools/security/tor { };
torbutton = callPackage ../tools/security/torbutton { };
torsocks = callPackage ../tools/security/tor/torsocks.nix { };
trickle = callPackage ../tools/networking/trickle {};
@ -1828,7 +1832,7 @@ let
vfdecrypt = callPackage ../tools/misc/vfdecrypt { };
vifm = callPackage ../applications/misc/vifm {};
vifm = callPackage ../applications/misc/vifm { };
viking = callPackage ../applications/misc/viking {
inherit (gnome) scrollkeeper;
@ -2759,6 +2763,8 @@ let
ocaml_4_00_1 = callPackage ../development/compilers/ocaml/4.00.1.nix { };
orc = callPackage ../development/compilers/orc { };
metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { };
ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { };
@ -3152,9 +3158,7 @@ let
qi = callPackage ../development/compilers/qi { };
racket = callPackage ../development/interpreters/racket {
libpng = libpng15;
};
racket = callPackage ../development/interpreters/racket { };
regina = callPackage ../development/interpreters/regina {};
@ -3300,6 +3304,8 @@ let
avarice = callPackage ../development/tools/misc/avarice { };
babeltrace = callPackage ../development/tools/misc/babeltrace { };
bam = callPackage ../development/tools/build-managers/bam {};
binutils = callPackage ../development/tools/misc/binutils {
@ -3540,6 +3546,12 @@ let
ltrace = callPackage ../development/tools/misc/ltrace { };
lttngTools = callPackage ../development/tools/misc/lttng-tools { };
lttngUst = callPackage ../development/tools/misc/lttng-ust { };
lttv = callPackage ../development/tools/misc/lttv { };
mk = callPackage ../development/tools/build-managers/mk { };
neoload = callPackage ../development/tools/neoload {
@ -4844,6 +4856,8 @@ let
libtunepimp = callPackage ../development/libraries/libtunepimp { };
libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { };
libgeotiff = callPackage ../development/libraries/libgeotiff { };
libunistring = callPackage ../development/libraries/libunistring { };
@ -4856,6 +4870,8 @@ let
libunique = callPackage ../development/libraries/libunique/default.nix { };
liburcu = callPackage ../development/libraries/liburcu { };
libusb = callPackage ../development/libraries/libusb {
stdenv = if stdenv.isDarwin
then overrideGCC stdenv gccApple
@ -4882,6 +4898,8 @@ let
libvisio = callPackage ../development/libraries/libvisio { };
libvisual = callPackage ../development/libraries/libvisual { };
libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) {
inherit libtool libjpeg openssl zlib;
inherit (xlibs) xproto libX11 damageproto libXdamage
@ -6377,7 +6395,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 bc module_init_tools ubootChooser;
inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
kernelPatches =
[ kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_0
@ -6385,7 +6403,7 @@ let
};
linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
kernelPatches =
[ kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_2
@ -6393,7 +6411,7 @@ let
};
linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_48 ];
kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_50 ];
})) (args: { makeFlags = "DISABLE_PAX_PLUGINS=y";}));
linux_3_2_apparmor = lowPrio (linux_3_2.override {
@ -6411,7 +6429,7 @@ let
});
linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
kernelPatches =
[ kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_4
@ -6430,11 +6448,11 @@ let
});
linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
};
linux_3_9 = makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) {
inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
@ -6446,10 +6464,11 @@ let
};
linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) {
inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
kernelPatches.btrfs_send_backport
] ++ lib.optionals (platform.kernelArch == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
@ -6506,6 +6525,8 @@ let
iwlwifi4965ucode = iwlwifi4965ucodeV2;
lttngModules = callPackage ../os-specific/linux/lttng-modules { };
atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { };
broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
@ -6647,8 +6668,8 @@ let
mountall = callPackage ../os-specific/linux/mountall { };
aggregateModules = modules:
import ../os-specific/linux/module-init-tools/aggregator.nix {
inherit stdenv module_init_tools modules buildEnv;
callPackage ../os-specific/linux/kmod/aggregator.nix {
inherit modules;
};
multipath_tools = callPackage ../os-specific/linux/multipath-tools { };
@ -7998,7 +8019,7 @@ let
midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
inherit imagemagick intltool python pkgconfig webkit libxml2
which gettext makeWrapper file libidn sqlite docutils libnotify
vala dbus_glib;
vala dbus_glib glib_networking;
inherit gtk3 glib;
inherit (gnome) gtksourceview;
inherit (webkit.passthru.args) libsoup;
@ -9030,6 +9051,8 @@ let
stardust = callPackage ../games/stardust {};
steam = callPackage_i686 ../games/steam {};
stuntrally = callPackage ../games/stuntrally { };
superTux = callPackage ../games/super-tux { };

20
pkgs/top-level/haskell-packages.nix
View file

@ -647,9 +647,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
bytestringProgress = callPackage ../development/libraries/haskell/bytestring-progress {};
c2hs = callPackage ../development/libraries/haskell/c2hs {
languageC = self.languageC_0_3_2_1;
};
c2hs = callPackage ../development/libraries/haskell/c2hs {};
Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; };
Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; };
@ -756,6 +754,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {};
cryptoCipherTests = callPackage ../development/libraries/haskell/crypto-cipher-tests {};
cryptoCipherTypes = callPackage ../development/libraries/haskell/crypto-cipher-types {};
cryptoConduit = callPackage ../development/libraries/haskell/crypto-conduit {};
cryptohash = callPackage ../development/libraries/haskell/cryptohash {};
@ -1273,6 +1275,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
instantGenerics = callPackage ../development/libraries/haskell/instant-generics {};
intervals = callPackage ../development/libraries/haskell/intervals {};
ioChoice = callPackage ../development/libraries/haskell/io-choice {};
IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {};
@ -1308,9 +1312,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
knob = callPackage ../development/libraries/haskell/knob {};
languageC_0_4_2 = callPackage ../development/libraries/haskell/language-c/0.4.2.nix {};
languageC_0_3_2_1 = callPackage ../development/libraries/haskell/language-c/0.3.2.1.nix {};
languageC = self.languageC_0_4_2;
languageC = callPackage ../development/libraries/haskell/language-c {};
languageCQuote = callPackage ../development/libraries/haskell/language-c-quote {};
@ -1503,6 +1505,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
nonNegative = callPackage ../development/libraries/haskell/non-negative {};
numericExtras = callPackage ../development/libraries/haskell/numeric-extras {};
numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {};
NumInstances = callPackage ../development/libraries/haskell/NumInstances {};
@ -1751,6 +1755,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
scotty = callPackage ../development/libraries/haskell/scotty {};
securemem = callPackage ../development/libraries/haskell/securemem {};
sendfile = callPackage ../development/libraries/haskell/sendfile {};
semigroups = callPackage ../development/libraries/haskell/semigroups {};
@ -1984,6 +1990,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
unboundedDelays = callPackage ../development/libraries/haskell/unbounded-delays {};
unionFind = callPackage ../development/libraries/haskell/union-find {};
uniplate = callPackage ../development/libraries/haskell/uniplate {};
uniqueid = callPackage ../development/libraries/haskell/uniqueid {};

1
pkgs/top-level/perl-packages.nix
View file

@ -2947,6 +2947,7 @@ rec {
url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.67.tar.gz;
sha256 = "8831cd70e1eb3d4ab7d9a8c3692caa7b7220dc888cd1a8dc5640fb2a08379141";
};
doCheck = false;
meta = {
description = "Extensions and convenience methods to manage background processes";
license = "perl";

74
pkgs/top-level/python-packages.nix
View file

@ -808,11 +808,11 @@ pythonPackages = modules // rec {
colander = buildPythonPackage rec {
name = "colander-0.9.6";
name = "colander-1.0a5";
src = fetchurl {
url = "http://pypi.python.org/packages/source/c/colander/${name}.tar.gz";
md5 = "2d9f65a64cb6b7f35d6a0d7b607ce4c6";
md5 = "569dea523561f5d94338ef9d9a98d249";
};
propagatedBuildInputs = [ pythonPackages.translationstring ];
@ -1005,11 +1005,11 @@ pythonPackages = modules // rec {
deform = buildPythonPackage rec {
name = "deform-0.9.4";
name = "deform-0.9.7";
src = fetchurl {
url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz";
md5 = "2ed7b69644a6d8f4e1404e1892329240";
md5 = "d450eef05432d473257da5621c72c8b7";
};
buildInputs = [] ++ optional isPy26 unittest2;
@ -1020,6 +1020,9 @@ pythonPackages = modules // rec {
pythonPackages.colander
pythonPackages.translationstring
pythonPackages.chameleon
pythonPackages.zope_deprecation
pythonPackages.coverage
pythonPackages.nose
];
meta = {
@ -1394,6 +1397,8 @@ pythonPackages = modules // rec {
};
zope_deprecation = buildPythonPackage rec {
name = "zope.deprecation-3.5.0";
@ -1627,6 +1632,26 @@ pythonPackages = modules // rec {
};
django_tagging = buildPythonPackage rec {
name = "django-tagging-0.3.1";
src = fetchurl {
url = "http://pypi.python.org/packages/source/d/django-tagging/${name}.tar.gz";
md5 = "a0855f2b044db15f3f8a025fa1016ddf";
};
# error: invalid command 'test'
doCheck = false;
propagatedBuildInputs = [ django_1_3 ];
meta = {
description = "A generic tagging application for Django projects";
homepage = http://code.google.com/p/django-tagging/;
};
};
djblets = buildPythonPackage rec {
name = "Djblets-0.6.28";
@ -3822,6 +3847,26 @@ pythonPackages = modules // rec {
};
});
pycurl2 = buildPythonPackage (rec {
name = "pycurl2-7.20.0";
src = fetchgit {
url = "https://github.com/Lispython/pycurl.git";
rev = "0f00109950b883d680bd85dc6e8a9c731a7d0d13";
sha256 = "0mhg7f9y5zl0m2xgz3rf1yqjd6l8n0qhfk7bpf36r44jfnhj75ld";
};
buildInputs = [ pkgs.curl simplejson unittest2 nose ];
meta = {
homepage = https://pypi.python.org/pypi/pycurl2;
description = "A fork from original PycURL library that no maintained from 7.19.0";
platforms = stdenv.lib.platforms.linux;
};
});
pydot = buildPythonPackage rec {
name = "pydot-1.0.2";
@ -6288,11 +6333,11 @@ pythonPackages = modules // rec {
};
translationstring = buildPythonPackage rec {
name = "translationstring-0.4";
name = "translationstring-1.1";
src = fetchurl {
url = "http://pypi.python.org/packages/source/t/translationstring/${name}.tar.gz";
md5 = "392287923c475b660b7549b2c2f03dbc";
md5 = "0979b46d8f0f852810c8ec4be5c26cf2";
};
meta = {
@ -6399,8 +6444,7 @@ pythonPackages = modules // rec {
sha256 = "0wjhd87pvpcpvaj3wql2d92g8lpp33iwmxdkp7npic5mjl2y0dsg";
};
buildInputs = [ txamqp zope_interface twisted ];
propagatedBuildInputs = [ whisper ];
propagatedBuildInputs = [ whisper txamqp zope_interface twisted ];
# error: invalid command 'test'
doCheck = false;
@ -6456,7 +6500,19 @@ pythonPackages = modules // rec {
sha256 = "1gj8i6j2i172cldqw98395235bn78ciagw6v17fgv01rmind3lag";
};
buildInputs = [ django pkgs.pycairo ldap memcached modules.sqlite3 ];
propagatedBuildInputs = [ django_1_3 django_tagging modules.sqlite3 whisper pkgs.pycairo ldap memcached ];
postInstall = ''
wrapProgram $out/bin/run-graphite-devel-server.py \
--prefix PATH : ${pkgs.which}/bin
'';
preConfigure = ''
substituteInPlace webapp/graphite/thirdparty/pytz/__init__.py --replace '/usr/share/zoneinfo' '/etc/zoneinfo'
substituteInPlace webapp/graphite/settings.py --replace "join(WEBAPP_DIR, 'content')" "join(WEBAPP_DIR, 'webapp', 'content')"
cp webapp/graphite/manage.py bin/manage-graphite.py
substituteInPlace bin/manage-graphite.py --replace 'settings' 'graphite.settings'
'';
# error: invalid command 'test'
doCheck = false;