ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 13:08:39 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into systemd

Browse Source
This commit is contained in:
Eelco Dolstra 2012-12-12 16:09:19 +01:00
commit 6a176c79cf
88 changed files with 1065 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/editors/vbindiff/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
name = "vbindiff-${version}";
version = "3.0_beta4";
buildInputs = [ ncurses ];
src = fetchurl {
url = "http://www.cjmweb.net/vbindiff/${name}.tar.gz";
sha256 = "0gcqy4ggp60qc6blq1q1gc90xmhip1m6yvvli4hdqlz9zn3mlpbx";
};
meta = {
description = "A terminal visual binary diff viewer";
homepage = "http://www.cjmweb.net/vbindiff/";
license = stdenv.lib.licenses.gpl2Plus;
};
}

38
pkgs/applications/misc/librecad/2.0.nix Normal file
View File

@ -0,0 +1,38 @@
{ stdenv, fetchurl, qt4, muparser, which, boost}:
stdenv.mkDerivation {
name = "librecad-2.0.0beta1";
src = fetchurl {
url = https://github.com/LibreCAD/LibreCAD/tarball/2.0.0beta1;
name = "librecad-2.0.0beta1.tar.gz";
sha256 = "8bf969b79be115f3b3ff72cc030a4c21fe93164dd0cb19ddfb78a7d66b8bc770";
};
patchPhase = ''
sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp
'';
configurePhase = ''
qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost}
'';
installPhase = ''
ensureDir $out/bin $out/share
cp -R unix/librecad $out/bin
cp -R unix/resources $out/share/librecad
'';
buildInputs = [ qt4 muparser which boost ];
enableParallelBuilding = true;
meta = {
description = "A 2D CAD package based upon Qt";
homepage = http://librecad.org;
license = "GPLv2";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

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

@ -6,13 +6,13 @@
sha256 = "1i7ga1qhnjvnw2gynmpmsvvl5pxcb5z9sgldp87d9yalim5sra6s";
};
beta = {
version = "24.0.1312.27";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.27.tar.bz2";
sha256 = "0w3yq3c1kf3z6k4xdgmny7l5yxyl8zidq698nsf4fm70pgav2zj1";
version = "24.0.1312.35";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.35.tar.bz2";
sha256 = "0mb6xz5lrnzjk1zqr83jyprsxv20svy3a7lyxv9iwdb2bh1i13ci";
};
stable = {
version = "23.0.1271.95";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.95.tar.bz2";
sha256 = "0g7ig49790szn8kal8jkf97qbm2qhn2bprpbq2ylq4zzvwhps29h";
version = "23.0.1271.97";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.97.tar.bz2";
sha256 = "1qf21n6msj1jmxhnlw8fapsz7q6dd851rxdqv4334v06ny4i5fip";
};
}

14
pkgs/applications/office/abiword/default.nix
View File

@ -4,12 +4,24 @@
stdenv.mkDerivation {
name = "abiword-2.8.6";
src = fetchurl {
url = http://www.abisource.org/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz;
sha256 = "059sd2apxdmcacc4pll880i7vm18h0kyjsq299m1mz3c7ak8k46r";
};
prePatch = ''
sed -i -e '/#include <glib\/gerror.h>/d' src/af/util/xp/ut_go_file.h
sed -i -e 's|#include <glib/gmacros.h>|#include <glib.h>|' \
goffice-bits/goffice/app/goffice-app.h
sed -i -e 's/ptr->jmpbuf/jmpbuf(png_ptr)/' src/af/util/xp/ut_png.cpp
sed -i -e 's/\(m_pPNG\)->\(jmpbuf\)/png_\2(\1)/' \
src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
sed -i -e 's/--no-undefined //' src/Makefile*
'';
enableParallelBuilding = true;
buildInputs =
[ pkgconfig gtk libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
libgsf enchant wv libjpeg

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

@ -76,6 +76,11 @@ rec {
inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl;
};
hub = import ./hub {
inherit (rubyLibs) rake;
inherit stdenv fetchgit groff makeWrapper;
};
gitFastExport = import ./fast-export {
inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion;
};

28
pkgs/applications/version-management/git-and-tools/hub/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchgit, groff, rake, makeWrapper }:
stdenv.mkDerivation rec {
name = "hub-${version}";
version = "1.10.3";
src = fetchgit {
url = "git://github.com/defunkt/hub.git";
rev = "refs/tags/v${version}";
sha256 = "0j0krmf0sf09hhw3nsn0w1y97d67762g4qrc8080bwcx38lbyvbg";
};
buildInputs = [ rake makeWrapper ];
installPhase = ''
rake install "prefix=$out"
'';
fixupPhase = ''
wrapProgram $out/bin/hub --prefix PATH : ${groff}/bin
'';
meta = {
description = "A GitHub specific wrapper for git";
homepage = "http://defunkt.io/hub/";
license = stdenv.lib.licenses.mit;
};
}

19
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -4,6 +4,7 @@
, xorriso, makeself, perl, pkgconfig
, javaBindings ? false, jdk ? null
, pythonBindings ? false, python ? null
, enableExtensionPack ? false, requireFile ? null, patchelf ? null
}:
with stdenv.lib;
@ -11,6 +12,7 @@ with stdenv.lib;
let
version = "4.2.4";
extpackRevision = "81684";
forEachModule = action: ''
for mod in \
@ -29,6 +31,14 @@ let
done
'';
extensionPack = requireFile {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}"
+ ".vbox-extpack";
# Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
sha256 = "62078e057a4ab56aec5ac086746522b3d94787333d0444169471fa5152c609ed";
url = "https://www.virtualbox.org/wiki/Downloads";
};
in stdenv.mkDerivation {
name = "virtualbox-${version}-${kernel.version}";
@ -108,6 +118,15 @@ in stdenv.mkDerivation {
ln -s "$libexec/$file" $out/bin/$file
done
${optionalString enableExtensionPack ''
"$libexec/VBoxExtPackHelperApp" install \
--base-dir "$libexec/ExtensionPacks" \
--cert-dir "$libexec/ExtPackCertificates" \
--name "Oracle VM VirtualBox Extension Pack" \
--tarball "${extensionPack}"
--sha-256 "${extensionPack.outputHash}"
''}
# Create and fix desktop item
mkdir -p $out/share/applications
sed -i -e "s|Icon=VBox|Icon=$libexec/VBox.png|" $libexec/virtualbox.desktop

2
pkgs/build-support/fetchurl/mirrors.nix
View File

@ -248,8 +248,6 @@ rec {
];
postgresql = [
http://ftp2.nl.postgresql.org/
ftp://ftp.nl.postgresql.org/pub/mirror/postgresql/
ftp://ftp.postgresql.org/pub/
ftp://ftp-archives.postgresql.org/pub/
];

7
pkgs/development/libraries/boost/1.52.nix
View File

@ -63,7 +63,12 @@ stdenv.mkDerivation {
buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
installPhase = ":";
# normal install does not install bjam, this is a separate step
installPhase = ''
cd tools/build/v2
sh bootstrap.sh
./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install
'';
crossAttrs = rec {
buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];

2
pkgs/development/libraries/ftgl/2.1.2.nix
View File

@ -13,6 +13,8 @@ stdenv.mkDerivation {
buildInputs = [freetype mesa];
NIX_LDFLAGS = "-lGLU -lGL";
patches = [ ./gcc.patch ];
configureFlags = "--enable-shared";

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "blaze-html";
version = "0.5.1.2";
sha256 = "1lzv7s6b5hv4ja1134gjj8h5ygckhlnfb02vp5c29mbnqjpdwk5a";
version = "0.5.1.3";
sha256 = "0ia7pk346lc7664w859q09p163cxgxjjpkk7cbmbl1wj2shshh1w";
buildDepends = [ blazeBuilder blazeMarkup text ];
meta = {
homepage = "http://jaspervdj.be/blaze";

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "blaze-markup";
version = "0.5.1.3";
sha256 = "138d1p4a8y6fs3ilkv2y9dmv9m0czjgan0n27qvmn7pzpj9fxd50";
version = "0.5.1.4";
sha256 = "0g316qhk7yv6y680w93613apfhm458a01g3jmq42yv4ndydkv4rr";
buildDepends = [ blazeBuilder text ];
meta = {
homepage = "http://jaspervdj.be/blaze";

14
pkgs/development/libraries/haskell/blaze-svg/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, blazeMarkup, mtl }:
cabal.mkDerivation (self: {
pname = "blaze-svg";
version = "0.3.3.0";
sha256 = "1wi4nc73ic3qmbx6v9fniacwcz2nlvmp5snn144fdiwb22klfn5f";
buildDepends = [ blazeMarkup mtl ];
meta = {
homepage = "https://github.com/deepakjois/blaze-svg";
description = "SVG combinator library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

13
pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
View File

@ -1,10 +1,15 @@
{ cabal, classyPrelude, conduit, xmlConduit }:
{ cabal, classyPrelude, conduit, monadControl, resourcet
, transformers, void, xmlConduit
}:
cabal.mkDerivation (self: {
pname = "classy-prelude-conduit";
version = "0.4.1";
sha256 = "0llir0xnnyhgxifay019x64jw7mnn9p1sqs1xwm14gjcqr2nqqg8";
buildDepends = [ classyPrelude conduit xmlConduit ];
version = "0.4.2";
sha256 = "1p5j519s95cgiy5ig0agbfs4vyay8srzwsimnblij68zz5jjfrzp";
buildDepends = [
classyPrelude conduit monadControl resourcet transformers void
xmlConduit
];
meta = {
homepage = "https://github.com/snoyberg/classy-prelude";
description = "conduit instances for classy-prelude";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "classy-prelude";
version = "0.4.1";
sha256 = "14s1qirss8qbicdw4bc7smdnk1xrpp1xsii8kgmrb1z4ji0h9bf1";
version = "0.4.2";
sha256 = "082zqhyswzlnl250g8pf88nmh7pkwxwjwnkp0pm9960qsl6kbn7s";
buildDepends = [
basicPrelude hashable systemFilepath text transformers
unorderedContainers vector

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cprng-aes";
version = "0.3.0";
sha256 = "1a8imapda8k0rf0bvag1iin66f2r97pfgip7dkvpvmdkp3j1212h";
version = "0.3.1";
sha256 = "0z1kpgy9d4yp1vmcparsv3r5g1khv2yqqkr99ac3mgvr6pyh24dk";
buildDepends = [
cipherAes cryptoApi cryptoRandomApi entropy random
];

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "crypto-conduit";
version = "0.4.1";
sha256 = "1gdznwcq3fb9ls68lgpwna6k1k612j241c8441z7r2kx3a64dqwv";
version = "0.4.2";
sha256 = "0kg99kvpm5h8v28sylrp9z868ksz5737377akqy09y90xzb8pak3";
buildDepends = [ cereal conduit cryptoApi transformers ];
meta = {
homepage = "https://github.com/meteficha/crypto-conduit";

6
pkgs/development/libraries/haskell/cryptohash/default.nix
View File

@ -2,10 +2,8 @@
cabal.mkDerivation (self: {
pname = "cryptohash";
version = "0.7.10";
sha256 = "02qvjic4xnljimpd156q28gmqf3g8m0hgijn18rx7digilqjmsgl";
isLibrary = true;
isExecutable = true;
version = "0.8.1";
sha256 = "1xxnmxfpd77ahyjhy2fq3fxhiivhj6k12v1z72ndyhrd3369zqky";
buildDepends = [ cereal cryptoApi tagged ];
meta = {
homepage = "http://github.com/vincenthz/hs-cryptohash";

12
pkgs/development/libraries/haskell/diagrams/cairo.nix
View File

@ -1,15 +1,15 @@
{ cabal, cairo, cmdargs, diagramsCore, diagramsLib, filepath, gtk
, mtl, split
{ cabal, cairo, cmdargs, colour, diagramsCore, diagramsLib
, filepath, mtl, split, time
}:
cabal.mkDerivation (self: {
pname = "diagrams-cairo";
version = "0.5.0.2";
sha256 = "1wwk65c2cx7rkhmai5spms791fjhl3snwhj0w9399q8pgj6g4lj8";
version = "0.6";
sha256 = "0fxqwkv2cpgpkr80q828rm91ybn7j0dwj1p5ysc3648w28jvhkil";
buildDepends = [
cairo cmdargs diagramsCore diagramsLib filepath gtk mtl split
cairo cmdargs colour diagramsCore diagramsLib filepath mtl split
time
];
jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/diagrams";
description = "Cairo backend for diagrams drawing EDSL";

18
pkgs/development/libraries/haskell/diagrams/contrib.nix Normal file
View File

@ -0,0 +1,18 @@
{ cabal, colour, dataDefault, diagramsLib, forceLayout, lens, mtl
, vectorSpace
}:
cabal.mkDerivation (self: {
pname = "diagrams-contrib";
version = "0.6";
sha256 = "059ljwsbrkzj2wvx9q4viinz46nw5lf4yjmx2c1dmwaqfz3i7j7i";
buildDepends = [
colour dataDefault diagramsLib forceLayout lens mtl vectorSpace
];
meta = {
homepage = "http://projects.haskell.org/diagrams/";
description = "Collection of user contributions to diagrams EDSL";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

12
pkgs/development/libraries/haskell/diagrams/core.nix
View File

@ -1,15 +1,15 @@
{ cabal, MemoTrie, newtype, semigroups, vectorSpace
, vectorSpacePoints
{ cabal, dualTree, MemoTrie, monoidExtras, newtype, semigroups
, vectorSpace, vectorSpacePoints
}:
cabal.mkDerivation (self: {
pname = "diagrams-core";
version = "0.5.0.1";
sha256 = "073fk9cxm1kh92alr51dgwps9wxc5w3470axc6q7w91sk5cskpxy";
version = "0.6";
sha256 = "15frd5jdzkgpdcvyyhd0mbi5d4a69ajcnxawa1gafl4c3byz1778";
buildDepends = [
MemoTrie newtype semigroups vectorSpace vectorSpacePoints
dualTree MemoTrie monoidExtras newtype semigroups vectorSpace
vectorSpacePoints
];
jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/diagrams";
description = "Core libraries for diagrams EDSL";

10
pkgs/development/libraries/haskell/diagrams/diagrams.nix
View File

@ -1,10 +1,12 @@
{ cabal, diagramsCairo, diagramsCore, diagramsLib }:
{ cabal, diagramsContrib, diagramsCore, diagramsLib, diagramsSvg }:
cabal.mkDerivation (self: {
pname = "diagrams";
version = "0.5";
sha256 = "163h2fg3gpmsfm57gjyja2rxh9pl6s3xnzlidfdy201zbk1mzdg5";
buildDepends = [ diagramsCairo diagramsCore diagramsLib ];
version = "0.6";
sha256 = "1i62jbixjzw82y622ymp6lrp4kzgn7iv55arivvh0y46bbmybqvh";
buildDepends = [
diagramsContrib diagramsCore diagramsLib diagramsSvg
];
noHaddock = true;
meta = {
homepage = "http://projects.haskell.org/diagrams";

12
pkgs/development/libraries/haskell/diagrams/lib.nix
View File

@ -1,14 +1,14 @@
{ cabal, active, colour, dataDefault, diagramsCore, newtype
, NumInstances, semigroups, vectorSpace
{ cabal, active, colour, dataDefault, diagramsCore, monoidExtras
, newtype, NumInstances, semigroups, vectorSpace
}:
cabal.mkDerivation (self: {
pname = "diagrams-lib";
version = "0.5.0.1";
sha256 = "0spfsllr2z064cxkdqcij02f0ikxxmll2dqj7rfikp4738wj21dy";
version = "0.6";
sha256 = "05nfp5ggjk4fviwvwiblmzzw5dbzbi1w8dx5dimvah7wxb0km3lf";
buildDepends = [
active colour dataDefault diagramsCore newtype NumInstances
semigroups vectorSpace
active colour dataDefault diagramsCore monoidExtras newtype
NumInstances semigroups vectorSpace
];
meta = {
homepage = "http://projects.haskell.org/diagrams";

19
pkgs/development/libraries/haskell/diagrams/svg.nix Normal file
View File

@ -0,0 +1,19 @@
{ cabal, blazeSvg, cmdargs, colour, diagramsCore, diagramsLib
, filepath, monoidExtras, mtl, split, time, vectorSpace
}:
cabal.mkDerivation (self: {
pname = "diagrams-svg";
version = "0.6";
sha256 = "0yiqilpksgsy87dxx4664pgbbgqcr98j1da4krb751x0yxkglyh5";
buildDepends = [
blazeSvg cmdargs colour diagramsCore diagramsLib filepath
monoidExtras mtl split time vectorSpace
];
meta = {
homepage = "http://projects.haskell.org/diagrams/";
description = "SVG backend for diagrams drawing EDSL";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "digestive-functors-heist";
version = "0.5.0.0";
sha256 = "1cqzpnr53mailnmjgkbqk4f4hrjd84h6682mr8x7qg5v27zvcdbn";
version = "0.5.1.0";
sha256 = "1rycf6y1c0car2m71iia929si5iqpc2rdyyxzp326q0rgj94whpk";
buildDepends = [ digestiveFunctors heist text xmlhtml ];
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";

13
pkgs/development/libraries/haskell/dual-tree/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ cabal, monoidExtras, newtype, semigroups }:
cabal.mkDerivation (self: {
pname = "dual-tree";
version = "0.1.0.0";
sha256 = "0av525gjxzd2hhrg5da647chwbv4j30gccaff2b3n5qijzy8l167";
buildDepends = [ monoidExtras newtype semigroups ];
meta = {
description = "Rose trees with cached and accumulating monoidal annotations";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

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

@ -0,0 +1,14 @@
{ cabal, semigroupoids, semigroups, transformers }:
cabal.mkDerivation (self: {
pname = "either";
version = "3.0.2";
sha256 = "1s3rpxxqc9052hrmiznwqwxhl4826qzbgpivpv5acxfhm0w06lhg";
buildDepends = [ semigroupoids semigroups transformers ];
meta = {
homepage = "http://github.com/ekmett/either/";
description = "Haskell 98 either monad transformer";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

13
pkgs/development/libraries/haskell/errors/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ cabal, either, safe, transformers }:
cabal.mkDerivation (self: {
pname = "errors";
version = "1.3.1";
sha256 = "0vfpnpkiz362bvjyaf35spfk3h6vw7xi1x3f8agzs7kmxrdvrfik";
buildDepends = [ either safe transformers ];
meta = {
description = "Simplified error-handling";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

13
pkgs/development/libraries/haskell/force-layout/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ cabal, lens, newtype, vectorSpace, vectorSpacePoints }:
cabal.mkDerivation (self: {
pname = "force-layout";
version = "0.2";
sha256 = "0aif7a28qs8ya7q9sklp02gb5228jyj8k4jabbp2sia7j4khrkpv";
buildDepends = [ lens newtype vectorSpace vectorSpacePoints ];
meta = {
description = "Simple force-directed layout";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "1.11.2";
sha256 = "0df1g57mwgd9avd2smnc7j97n14553p3zdmnbjanhnzin2fqj0dc";
version = "1.11.3";
sha256 = "13r3cz25lf0ndsyfc5adqx5mdv7hcl3qp7n2syg2msrn133xpwb2";
isLibrary = false;
isExecutable = true;
buildDepends = [

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "gloss";
version = "1.7.7.1";
sha256 = "0g5ik7zv2iywvqingnjvmb9ihk31fwpnjkbfiglzslmga5cjix2a";
version = "1.7.8.1";
sha256 = "0bi60zprgq1dd6prshvgqyyp13l6n5f171aryxg254kjagvrm3lf";
buildDepends = [ bmp GLUT OpenGL ];
jailbreak = true;
meta = {

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "glpk-hs";
version = "0.3.3";
sha256 = "1pnq0v5va7f40ky9xb8c4z9wcmmnny2vk4afasz5pwivbxh42mfl";
version = "0.3.4";
sha256 = "0wyasd0dqi5nnh52lx980vnyhm0rwib0sd7qnpj4s9hq8rn994cm";
buildDepends = [ deepseq mtl ];
extraLibraries = [ glpk ];
meta = {

1
pkgs/development/libraries/haskell/hakyll/default.nix
View File

@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer
tagsoup text time
];
jailbreak = true;
meta = {
homepage = "http://jaspervdj.be/hakyll";
description = "A static website compiler library";

16
pkgs/development/libraries/haskell/heist/default.nix
View File

@ -1,20 +1,20 @@
{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree
, filepath, MonadCatchIOTransformers, mtl, random, text, time
, unorderedContainers, vector, xmlhtml
, dlist, errors, filepath, hashable, MonadCatchIOTransformers, mtl
, random, text, time, unorderedContainers, vector, xmlhtml
}:
cabal.mkDerivation (self: {
pname = "heist";
version = "0.8.2";
sha256 = "0zamggvfq9054vxznbnfq1fihk110ih8q0dza1rmsjb1h2s88rkj";
version = "0.10.0";
sha256 = "0cabn1yw57qa7psmypqa20k4viis140al5zm31jlpmz599rkbi9z";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml directoryTree filepath
MonadCatchIOTransformers mtl random text time unorderedContainers
vector xmlhtml
aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
filepath hashable MonadCatchIOTransformers mtl random text time
unorderedContainers vector xmlhtml
];
meta = {
homepage = "http://snapframework.com/";
description = "An (x)html templating system";
description = "An Haskell template system supporting both HTML5 and XML";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};

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

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.8.5";
sha256 = "0zmvbmp80gc9f5vsfjb8f5x2cf29yhrilknqxszh1b3ym0kwcrnr";
version = "1.8.5.1";
sha256 = "1v70rslnga063mlpfs1w03y1s4x7kfisjqwbcbczynhz15s9hymx";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cookie

4
pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "http-reverse-proxy";
version = "0.1.0.6";
sha256 = "0ybhzyim8b2k1kv5bz0qbignj5lwf8pbpqmrp1vrvyz8a2iy71c8";
version = "0.1.0.7";
sha256 = "1fshng7bcpzjq5iqnvl2qsyia9yi80b8sbif18a3w86gsw5xcakk";
buildDepends = [
blazeBuilder caseInsensitive classyPreludeConduit conduit
httpConduit httpTypes liftedBase monadControl network

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "iproute";
version = "1.2.8";
sha256 = "0vialraqr8r5d4bvknp3hd9412vpva43nqyv6y7bj0505xxr06l2";
version = "1.2.9";
sha256 = "0r0g8dd0f5n462kil3m2lhycl84ygd0ayh900h9x8phgwzfxzv8i";
buildDepends = [ appar byteorder network ];
meta = {
homepage = "http://www.mew.org/~kazu/proj/iproute/";

4
pkgs/development/libraries/haskell/language-c-quote/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "language-c-quote";
version = "0.4.3";
sha256 = "13xpmj3jrqkcgilkh4p8ycxhlk5yvfsisx4c1ax7n7aafg1n7phf";
version = "0.4.4";
sha256 = "1g233ja3qy64xcimy9irfb3n8zys00vg1d0s4g3hr48ilc95dl8l";
buildDepends = [
exceptionMtl exceptionTransformers filepath haskellSrcMeta
mainlandPretty mtl srcloc syb symbol

6
pkgs/development/libraries/haskell/largeword/default.nix
View File

@ -2,10 +2,10 @@
cabal.mkDerivation (self: {
pname = "largeword";
version = "1.0.3";
sha256 = "18b6nhq1cww4wdbrfq0cb828kncxzcsibgs5dbgxa66y6iw93vkg";
version = "1.0.4";
sha256 = "19nrzbbbmsvxdhfhh6wc53lbk0xyjvbcwvjw0snym666j1w2b2l5";
meta = {
homepage = "http://trac.haskell.org/largeword/wiki";
homepage = "https://github.com/idontgetoutmuch/largeword";
description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

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

@ -0,0 +1,14 @@
{ cabal, text }:
cabal.mkDerivation (self: {
pname = "minimorph";
version = "0.1.4.0";
sha256 = "16ri9hfriszrgqcm111b1pp5x65s034hrc35kjz5qax32mnc9rn6";
buildDepends = [ text ];
meta = {
homepage = "http://darcsden.com/kowey/minimorph";
description = "English spelling functions with an emphasis on simplicity";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

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

@ -0,0 +1,14 @@
{ cabal, minimorph, text }:
cabal.mkDerivation (self: {
pname = "miniutter";
version = "0.4.0";
sha256 = "1l275aad8svrqp22jv9s0mmlam7wbdlf6m4m97658rm8ks4j2mbx";
buildDepends = [ minimorph text ];
meta = {
homepage = "https://github.com/Mikolaj/miniutter";
description = "Simple English clause creation from arbitrary words";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

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

@ -0,0 +1,13 @@
{ cabal, semigroups }:
cabal.mkDerivation (self: {
pname = "monoid-extras";
version = "0.2.2.1";
sha256 = "0n2zwkwwq8kg9m6qr79mrhlxsfsrjzbyg96gfhcgk21zgc09zary";
buildDepends = [ semigroups ];
meta = {
description = "Various extra monoid-related definitions and utilities";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

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

@ -2,10 +2,9 @@
cabal.mkDerivation (self: {
pname = "mpppc";
version = "0.1.2";
sha256 = "1zms71wx5a6rd60xy1pv6g1kxlx0hzh36pbr5a5lkfflc583z1k5";
version = "0.1.3";
sha256 = "1zcilskpslpqyrbwpabwbry4p3kpcfca94wchh9dkq9g8pg8laxi";
buildDepends = [ ansiTerminal split text ];
jailbreak = true;
meta = {
description = "Multi-dimensional parametric pretty-printer with color";
license = "GPL";

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "optparse-applicative";
version = "0.4.2";
sha256 = "0hxl4hhh24hz1fc23mbsx83ccnv2fkxbar37d9c5cmiaalsrfb19";
version = "0.4.3";
sha256 = "1zsydxgq3lcgzrf9iwas3gkjy0vxn4z2cj6h3m63h0qqa26sfcwz";
buildDepends = [ transformers ];
meta = {
homepage = "https://github.com/pcapriotti/optparse-applicative";

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "persistent-template";
version = "1.1.0";
sha256 = "18c2mawq8v094szbjncnm113fmbgzyidcfvs430xy6klag1gh629";
version = "1.1.1";
sha256 = "18rxjqgmjzx0j0sbg9ms779pkq264vf8w0qz679xsyn98wc95i36";
buildDepends = [ aeson monadControl persistent text transformers ];
meta = {
homepage = "http://www.yesodweb.com/book/persistent";

8
pkgs/development/libraries/haskell/persistent/default.nix
View File

@ -1,17 +1,17 @@
{ cabal, aeson, attoparsec, base64Bytestring, blazeHtml
, blazeMarkup, conduit, liftedBase, monadControl, monadLogger
, pathPieces, poolConduit, resourcet, sqlite, text, time
, pathPieces, poolConduit, resourcet, silently, sqlite, text, time
, transformers, transformersBase, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "persistent";
version = "1.1.0";
sha256 = "15wsw3mnpic8x7qrb8w7ww47p9sazfljp6kcdx13yv2sxa8dv153";
version = "1.1.0.1";
sha256 = "07b9d9fcah3k03r2pm6mfl3qsdp4s9gbb376by3122nvc26w6sjc";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
liftedBase monadControl monadLogger pathPieces poolConduit
resourcet text time transformers transformersBase
resourcet silently text time transformers transformersBase
unorderedContainers vector
];
extraLibraries = [ sqlite ];

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

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "shelly";
version = "0.14.3";
sha256 = "0nlspgk5svc9zr2gry96sykhd8i7vdmqxpsvfsz22khw8climqzj";
version = "0.15.0";
sha256 = "138x2c76ynv0kl0kg86pawnnlk6973dqkaapycb30rf44p1m53j2";
buildDepends = [
mtl systemFileio systemFilepath text time unixCompat
];

4
pkgs/development/libraries/haskell/snap/loader-dynamic.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "snap-loader-dynamic";
version = "0.9.0.1";
sha256 = "1pzn8lfqngn8cqm1dpxn5wsx70xcd7r90rd2948n4p5309qgh9mq";
version = "0.10";
sha256 = "0wnrsbnf3crfxhhraz4my08m6yhmqj632rv6cdy9ili3wxjkqd57";
buildDepends = [ directoryTree hint mtl snapCore time ];
meta = {
homepage = "http://snapframework.com/";

4
pkgs/development/libraries/haskell/snap/loader-static.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "snap-loader-static";
version = "0.9.0";
sha256 = "1blchmg0qfng7bw235z1gqkwyi764j78bc29vd5p6xxhmq111ys7";
version = "0.9.0.1";
sha256 = "0xlb8611r9l9ld97rs27nji7k1qvjg5i62b4al38xj6i0f2skyyi";
meta = {
homepage = "http://snapframework.com/";
description = "Snap: A Haskell Web Framework: static loader";

24
pkgs/development/libraries/haskell/snap/snap.nix
View File

@ -1,23 +1,23 @@
{ cabal, aeson, attoparsec, cereal, clientsession, configurator
, dataLens, dataLensTemplate, directoryTree, filepath, hashable
, heist, logict, MonadCatchIOTransformers, mtl, mwcRandom
, pwstoreFast, snapCore, snapServer, stm, syb, text, time
, transformers, unorderedContainers, vector, vectorAlgorithms
{ cabal, aeson, attoparsec, cereal, clientsession, comonad
, configurator, directoryTree, dlist, errors, filepath, hashable
, heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom
, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text
, time, transformers, unorderedContainers, vector, vectorAlgorithms
, xmlhtml
}:
cabal.mkDerivation (self: {
pname = "snap";
version = "0.9.2.2";
sha256 = "1ql9c8b9arcd8zwlwsiipl4diah87sp339ljc5bc7yls1g4d9zsw";
version = "0.10.0.1";
sha256 = "14j9lgcdyxh7n4yidfvn1r94nziljiqz6nsqgq114v34bnn6l2yn";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson attoparsec cereal clientsession configurator dataLens
dataLensTemplate directoryTree filepath hashable heist logict
MonadCatchIOTransformers mtl mwcRandom pwstoreFast snapCore
snapServer stm syb text time transformers unorderedContainers
vector vectorAlgorithms xmlhtml
aeson attoparsec cereal clientsession comonad configurator
directoryTree dlist errors filepath hashable heist lens logict
MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix
snapCore snapServer stm syb text time transformers
unorderedContainers vector vectorAlgorithms xmlhtml
];
meta = {
homepage = "http://snapframework.com/";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "stylish-haskell";
version = "0.5.5.1";
sha256 = "0zkxvyj3h21ypzvwdkbpcf5gp4s5rdgiw5ciy62k99h6ch1kcwcr";
version = "0.5.5.2";
sha256 = "1whl8qdqyw2saic70kav8srg4f6bcn77mc86m0vk8i8n5mb3q4ny";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "uniplate";
version = "1.6.8";
sha256 = "0ic1fqm6i7b9lvv2m5l591xw5wkc80lvyvwdvvxbzsbb5vz7kphy";
version = "1.6.9";
sha256 = "1s1863w4867lz0xn70xga5nss8vvm11rr1kia4icbws6r52sqjlh";
buildDepends = [ hashable syb unorderedContainers ];
meta = {
homepage = "http://community.haskell.org/~ndm/uniplate/";

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "vector-space";
version = "0.8.4";
sha256 = "1hrilbv44lrqm9p3z97xw8nlgxam98abll4iqik8a4d6ky225bwq";
version = "0.8.6";
sha256 = "03kz2qhnynbgs4vk7348zjkkakzzwvxhbasl0lcazj1cx1ay7c4l";
buildDepends = [ Boolean MemoTrie NumInstances ];
meta = {
description = "Vector & affine spaces, linear maps, and derivatives";

4
pkgs/development/libraries/haskell/wai-app-static/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "wai-app-static";
version = "1.3.0.4";
sha256 = "1dcgw6b10j5y2xa1jpqfsgcq8w6c7cdbp4pfc8nb6n54bys4linn";
version = "1.3.0.5";
sha256 = "1fz2a30f3imn0m5q6hjkm2xan0ddalhfbzx78pklz4g7k79s1ncn";
buildDepends = [
base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal
cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes

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

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "1.3.5.1";
sha256 = "1i38h2324bplkk1xh0z7cg491vl27sjd6mjs5yzb70wjz0h5ixnk";
version = "1.3.6";
sha256 = "0aw5m7apj7l6fjb0w59bmgiy4j0rmdwjil4ppgp5qz2q2njqbbnj";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
httpTypes liftedBase network networkConduit simpleSendfile

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "word8";
version = "0.0.2";
sha256 = "0ij8l5h9kj93srsizwxiss4jcgj0hy2gsskw88l58lgd2v4c9dnb";
version = "0.0.3";
sha256 = "1k5sq91pidgw7w8fc62k9gl8iynb65pcza6mjx8pa3n2lslp7125";
meta = {
description = "Word8 library";
license = self.stdenv.lib.licenses.bsd3;

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

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "yesod-auth";
version = "1.1.2.1";
sha256 = "1bz3h5w5wbls5s1pf65yzdgjgl6ndsxrrfgfkjxkj55lc50ybdcp";
version = "1.1.2.2";
sha256 = "16g2lnnwp5219i77fb4pv2y8ljz4msflj38mvh0zw3x93747baf7";
buildDepends = [
aeson authenticate blazeHtml blazeMarkup hamlet httpConduit
liftedBase mimeMail network persistent persistentTemplate pureMD5

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

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "yesod-default";
version = "1.1.2";
sha256 = "0asz9daf7by0d8sx8zqjsbxbzbyy59bvrdkq4f533fbn0nm1bn38";
version = "1.1.3";
sha256 = "1g0hb6jl0bp2q50pw2cy3hkbww1l230al08s7vfpqir68n9infiy";
buildDepends = [
dataDefault hamlet networkConduit safe shakespeareCss shakespeareJs
text transformers unorderedContainers wai waiExtra warp yaml

29
pkgs/development/libraries/haskell/yesod/default.nix
View File

@ -1,30 +1,31 @@
{ cabal, aeson, attoparsec, base64Bytestring, blazeBuilder
, blazeHtml, blazeMarkup, Cabal, conduit, fileEmbed, filepath
, fsnotify, ghcPaths, hamlet, httpConduit, httpReverseProxy
, httpTypes, liftedBase, monadControl, network, optparseApplicative
, parsec, projectTemplate, resourcet, shakespeare, shakespeareCss
, shakespeareJs, shakespeareText, split, systemFileio
, systemFilepath, tar, text, time, transformers, unixCompat
, unorderedContainers, wai, waiExtra, warp, yaml, yesodAuth
, yesodCore, yesodDefault, yesodForm, yesodJson, yesodPersistent
, zlib
, httpTypes, liftedBase, monadControl, network, networkConduit
, optparseApplicative, parsec, projectTemplate, resourcet
, shakespeare, shakespeareCss, shakespeareJs, shakespeareText
, split, systemFileio, systemFilepath, tar, text, time
, transformers, unixCompat, unorderedContainers, wai, waiExtra
, warp, yaml, yesodAuth, yesodCore, yesodDefault, yesodForm
, yesodJson, yesodPersistent, zlib
}:
cabal.mkDerivation (self: {
pname = "yesod";
version = "1.1.5";
sha256 = "1w34cwnqd92hjrjhqikpgzkjd4fnv3n844zziprk5kg0mlrylpvq";
version = "1.1.7";
sha256 = "1qcvmy8ichri9ivfkanj4gp687lwymgi170sbdzwf5phy34bhkc5";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson attoparsec base64Bytestring blazeBuilder blazeHtml
blazeMarkup Cabal conduit fileEmbed filepath fsnotify ghcPaths
hamlet httpConduit httpReverseProxy httpTypes liftedBase
monadControl network optparseApplicative parsec projectTemplate
resourcet shakespeare shakespeareCss shakespeareJs shakespeareText
split systemFileio systemFilepath tar text time transformers
unixCompat unorderedContainers wai waiExtra warp yaml yesodAuth
yesodCore yesodDefault yesodForm yesodJson yesodPersistent zlib
monadControl network networkConduit optparseApplicative parsec
projectTemplate resourcet shakespeare shakespeareCss shakespeareJs
shakespeareText split systemFileio systemFilepath tar text time
transformers unixCompat unorderedContainers wai waiExtra warp yaml
yesodAuth yesodCore yesodDefault yesodForm yesodJson
yesodPersistent zlib
];
meta = {
homepage = "http://www.yesodweb.com/";

10
pkgs/development/libraries/opencascade/default.nix
View File

@ -2,10 +2,10 @@
ftgl, freetype}:
stdenv.mkDerivation rec {
name = "opencascade-6.5.2";
name = "opencascade-6.5.4";
src = fetchurl {
url = http://files.opencascade.com/OCCT/OCC_6.5.2_release/OpenCASCADE652.tar.gz;
sha256 = "0nsfjhd6rv1fmq8jbyzcs0f13h4xfld487vqs9bwd4lbwcfqxwcy";
url = http://files.opencascade.com/OCCT/OCC_6.5.4_release/OpenCASCADE654.tar.gz;
sha256 = "1di08mc0wly4cdi3rh9kj52bk0bfpyk6dy03c9yfnv04i7z03kmy";
};
buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ];
@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
# -fpermissive helps building opencascade, although gcc detects a flaw in the code
# and reports an error otherwise. Further versions may fix that.
NIX_CFLAGS_COMPILE = "-I${ftgl}/include/FTGL -I${freetype}/include/freetype2 -fpermissive";
NIX_CFLAGS_COMPILE = "-fpermissive";
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" ];
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ];
postInstall = ''
mv $out/inc $out/include

4
pkgs/development/libraries/opencv/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
, pkgconfig, gstreamer, xineLib, glib }:
let v = "2.4.2"; in
let v = "2.4.3"; in
stdenv.mkDerivation rec {
name = "opencv-${v}";
src = fetchurl {
url = "mirror://sourceforge/opencvlibrary/OpenCV-${v}.tar.bz2";
sha256 = "0a1c4ys78k670dsk1fapylpf8hwfyzy944r9jvwivqh33s0j6039";
sha256 = "16zmyr383x9ka81mp6h2s9hlfzd383njddf3x1rswkldjy2ykyzq";
};
buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer ];

12
pkgs/games/LambdaHack/default.nix
View File

@ -1,12 +1,16 @@
{ cabal, binary, ConfigFile, filepath, gtk, mtl, random, zlib }:
{ cabal, binary, ConfigFile, filepath, gtk, miniutter, mtl, random
, text, zlib
}:
cabal.mkDerivation (self: {
pname = "LambdaHack";
version = "0.2.6";
sha256 = "03adjwzbql1k1ky05vivry7waa8p41ha3lsnv9j9mdgpwqldypwd";
version = "0.2.6.5";
sha256 = "114s3adqs5mh566dbn0bb20v088wgg8arsm6m8hs9vx8j3jc8nx5";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary ConfigFile filepath gtk mtl random zlib ];
buildDepends = [
binary ConfigFile filepath gtk miniutter mtl random text zlib
];
meta = {
homepage = "http://github.com/kosmikus/LambdaHack";
description = "A roguelike game engine in early and active development";

49
pkgs/games/gnuchess/default.nix
View File

@ -1,36 +1,29 @@
{builderDefsPackage, flex} @ x:
builderDefsPackage
(a :
let
fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "5.07" a;
buildInputs = with a; [
{stdenv, fetchurl, flex}:
let
s = # Generated upstream information
rec {
baseName="gnuchess";
version="6.0.2";
name="${baseName}-${version}";
hash="1xd3g28glz2xyjnca0zfw3k0jl5vhgd7wvy4n9km5wnn9z7287l2";
url="http://ftp.gnu.org/gnu/chess/gnuchess-6.0.2.tar.gz";
sha256="1xd3g28glz2xyjnca0zfw3k0jl5vhgd7wvy4n9km5wnn9z7287l2";
};
buildInputs = [
flex
];
in
rec {
stdenv.mkDerivation rec {
inherit (s) name version;
src = fetchurl {
url = "mirror://gnu/chess/gnuchess-${version}.tar.gz";
sha256 = "0zh15m35fzbsrk1aann9pwlkv54dwb00snx99pk3xbg5bwkf125k";
inherit (s) url sha256;
};
inherit buildInputs;
configureFlags = [];
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "preBuild" "doMakeInstall"];
preBuild = a.fullDepEntry (''
sed -i src/input.c -e 's/static pthread_t/pthread_t/'
sed -i "s@gnuchess@$out/bin/gnuchess@" -i src/gnuchessx
sed -e s/getline/gnuchess_local_getline/g -i $(grep getline -rl .)
'') ["minInit" "doUnpack"];
name = "gnuchess-" + version;
meta = {
description = "GNU Chess playing program";
inherit (s) version;
description = "GNU Chess engine";
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl3Plus;
};
}) x
}

1
pkgs/games/gnuchess/default.upstream Normal file
View File

@ -0,0 +1 @@
url http://ftp.gnu.org/gnu/chess/

55
pkgs/games/scid/default.nix Normal file
View File

@ -0,0 +1,55 @@
{ stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }:
stdenv.mkDerivation rec {
name = "scid-${version}";
version = "4.3";
src = fetchurl {
url = "mirror://sourceforge/scid/scid-4.3.tar.bz2";
sha256 = "0zb5qp04x8w4gn2kvfdfq2p44kmzfcqn7v167dixz6nlyxg41hrw";
};
buildInputs = [ tcl tk libX11 zlib makeWrapper ];
prePatch = ''
sed -i -e '/^ *set headerPath *{/a ${tcl}/include ${tk}/include' \
-e '/^ *set libraryPath *{/a ${tcl}/lib ${tk}/lib' \
-e '/^ *set x11Path *{/a ${libX11}/lib/' \
configure
sed -i -e '/^ *set scidShareDir/s|\[file.*|"'"$out/share"'"|' \
tcl/config.tcl
'';
configureFlags = [
"BINDIR=$(out)/bin"
"SHAREDIR=$(out)/share"
];
dontPatchShebangs = true;
postFixup = ''
for cmd in sc_addmove sc_eco sc_epgn scidpgn \
sc_import sc_spell sc_tree spliteco
do
sed -i -e '1c#!'"$out"'/bin/tcscid' "$out/bin/$cmd"
done
sed -i -e '1c#!${tcl}/bin/tcslsh' "$out/bin/spf2spi"
sed -i -e '1c#!${tk}/bin/wish' "$out/bin/sc_remote"
sed -i -e '1c#!'"$out"'/bin/tkscid' "$out/bin/scid"
for cmd in $out/bin/*
do
wrapProgram "$cmd" \
--set TCLLIBPATH "${tcl}/${tcl.libdir}" \
--set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
done
'';
meta = {
description = "Chess database with play and training functionality";
homepage = "http://scid.sourceforge.net/";
license = stdenv.lib.licenses.gpl2;
};
}

49
pkgs/games/xboard/default.nix
View File

@ -1,33 +1,32 @@
a:
let
fetchurl = a.fetchurl;
buildInputs = with a; [
{stdenv, fetchurl, libX11, xproto, libXt, libXaw, libSM, libICE, libXmu
, libXext, gnuchess, texinfo, libXpm
}:
let
s = # Generated upstream information
rec {
baseName="xboard";
version="4.6.2";
name="${baseName}-${version}";
hash="1pw90fh1crf0nkqyql54z728vn2093hwdh2v5i5703z9qv9g4mrf";
url="http://ftp.gnu.org/gnu/xboard/xboard-4.6.2.tar.gz";
sha256="1pw90fh1crf0nkqyql54z728vn2093hwdh2v5i5703z9qv9g4mrf";
};
buildInputs = [
libX11 xproto libXt libXaw libSM libICE libXmu
libXext gnuchess texinfo libXpm
];
s = import ./src-for-default.nix;
in
rec {
src = fetchurl {
inherit(s) url;
sha256 = s.hash;
};
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
configureFlags = [];
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "preBuild" "doMakeInstall"];
preBuild = a.fullDepEntry(''
sed -e '/FIRST_CHESS_PROGRAM/s@gnuchessx@${a.gnuchess}/bin/gnuchessx@' -i xboard.h
sed -e '/SECOND_CHESS_PROGRAM/s@gnuchessx@${a.gnuchess}/bin/gnuchessx@' -i xboard.h
'') ["doUnpack" "minInit"];
inherit(s) name;
src = fetchurl {
inherit (s) url sha256;
};
meta = {
description = "XBoard - a chess board compatible with GNU Chess";
inherit (s) version;
description = ''GUI for chess engines'';
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl3Plus;
};
}

1
pkgs/games/xboard/default.upstream Normal file
View File

@ -0,0 +1 @@
url http://ftp.gnu.org/gnu/xboard/

9
pkgs/games/xboard/src-for-default.nix
View File

@ -1,9 +0,0 @@
rec {
version="4.4.2";
name="xboard-4.4.2";
hash="1ihg39nnwp90w410rzwxj9layadavz08gc9m2b1jg5z5c6ky28zp";
url="http://ftp.gnu.org/gnu/xboard/xboard-${version}.tar.gz";
advertisedUrl="http://ftp.gnu.org/gnu/xboard/xboard-4.4.2.tar.gz";
}

4
pkgs/games/xboard/src-info-for-default.nix
View File

@ -1,4 +0,0 @@
{
downloadPage = "http://ftp.gnu.org/gnu/xboard/?C=T,M;O=D";
baseName = "xboard";
}

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

@ -134,6 +134,7 @@ stdenv.mkDerivation {
homepage = http://www.kernel.org/;
maintainers = [
lib.maintainers.eelco
lib.maintainers.shlevy
lib.maintainers.chaoflow
];
platforms = lib.platforms.linux;

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

@ -230,7 +230,7 @@ in
import ./generic.nix (
rec {
version = "3.0.54";
version = "3.0.56";
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@ -238,7 +238,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0jqdqp5rx05ph2wkj431rdcm9s8jpbzlbl53pbb6vp7yr3nichvg";
sha256 = "0dfj8nlrlwyq9jp85y8acmhpm7f5bdd9668ikafyd7rljqmkq61f";
};
config = configWithPlatform stdenv.platform;

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

@ -239,7 +239,7 @@ in
import ./generic.nix (
rec {
version = "3.4.21";
version = "3.4.23";
testing = false;
preConfigure = ''
@ -248,7 +248,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0g5w2whs1bhkga8niizsx0x7hskk2inb04mx8qzbacaya107sg9x";
sha256 = "1xznslbhby6ks10sb7h6zh5647ffavpmfsxxb1c5hj4cyj4d9k2z";
};
config = configWithPlatform stdenv.platform;

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

@ -244,7 +244,7 @@ in
import ./generic.nix (
rec {
version = "3.6.9";
version = "3.6.10";
testing = false;
preConfigure = ''
@ -253,7 +253,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0d4z6rycn2qdfpv2i52li0z5c6pd8d8v46sw2k0liw0apw4zfvzl";
sha256 = "0cqslk460yvgh3iv1m9lkdlnfy9v9ghcn4kjpf8019dsfia7pr7x";
};
config = configWithPlatform stdenv.platform;

272
pkgs/os-specific/linux/kernel/linux-3.7.nix Normal file
View File

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

51
pkgs/os-specific/linux/nvidia-x11/legacy304.nix Normal file
View File

@ -0,0 +1,51 @@
{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
, gtk, atk, pango, glib, gdk_pixbuf
, # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit
# Linux.
libsOnly ? false
}:
with stdenv.lib;
let versionNumber = "304.64"; in
stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
builder = ./builder.sh;
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
sha256 = "0li27nlhx9bbln9424xpxw46sarjdch2fxpn4kvh0npaywll2ii3";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
sha256 = "1x33f6b9zcsnpjcxlv38l1w0blimsv1y3bbrrzg48wwwb5wvynxl";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
inherit versionNumber libsOnly;
kernel = if libsOnly then null else kernel;
dontStrip = true;
glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc];
programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath
[ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );
buildInputs = [ perl ];
meta = {
homepage = http://www.nvidia.com/object/unix.html;
description = "X.org driver and kernel module for NVIDIA graphics cards";
license = "unfree";
};
}

4
pkgs/servers/sql/postgresql/8.3.x.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, ncurses, readline }:
let version = "8.3.21"; in
let version = "8.3.22"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "1y1lw83jr3v91920xdhd4ypaa5iazmdh4snl5qzq0yq6z3lnsjx6";
sha256 = "1iphzr8mpfz050f95vhcji4k22mih3wl65z4559y4hh4kiqg7f0p";
};
buildInputs = [ zlib ncurses readline ];

4
pkgs/servers/sql/postgresql/8.4.x.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, ncurses, readline }:
let version = "8.4.14"; in
let version = "8.4.15"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "0fhk3mmk95p5gwmg2skqv1rfi7ylk8gw195hx8rska7fbdryfwhi";
sha256 = "0kdwg598c7ws2bvi5q5qgn2pbvznzpxs63chvp0xj6nzpcdpg0va";
};
buildInputs = [ zlib ncurses readline ];

4
pkgs/servers/sql/postgresql/9.0.x.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, readline }:
let version = "9.0.10"; in
let version = "9.0.11"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "0af7in1fp4qxkvzbipz74gxm06x31a9n4z9g91mcis4r015ii523";
sha256 = "0b3vw1a1x658famvgsfi1dladrbkc5j3h1ibaasgx9ffqn6xrp56";
};
buildInputs = [ zlib readline ];

4
pkgs/servers/sql/postgresql/9.1.x.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, readline }:
let version = "9.1.6"; in
let version = "9.1.7"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "1rridkybr55xw4a1h0ppqwv2x2ffwvmpjai9yzsvk58scb56lfbf";
sha256 = "10iw6c6v1s7a00s0dr8agvb2fg2dmdvg84mk05206rb0islyl6fz";
};
buildInputs = [ zlib readline ];

8
pkgs/servers/x11/xorg/overrides.nix
View File

@ -272,6 +272,14 @@ in
buildInputs = attrs.buildInputs ++ [xorg.libXrender];
};
xinit = attrs: attrs // {
configureFlags = "--with-xserver=${xorg.xorgserver}/bin/X";
propagatedBuildInputs = [ xorg.xauth ];
prePatch = ''
sed -i 's|^defaultserverargs="|&-logfile \"$HOME/.xorg.log\"|p' startx.cpp
'';
};
xwd = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.libXt];
};

25
pkgs/tools/X11/xcalib/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenv, fetchurl, libX11, libXxf86vm, libXext }:
stdenv.mkDerivation rec {
name = "xcalib-0.8";
src = fetchurl {
url = "mirror://sourceforge/xcalib/xcalib-source-0.8.tar.gz";
sha256 = "8a112ee710e5446f6c36e62345b2066f10639d500259db8c48bf1716caea06e6";
};
buildInputs = [ libX11 libXxf86vm libXext ];
installPhase = ''
mkdir -p $out/bin
cp xcalib $out/bin/
'';
meta = with stdenv.lib; {
homepage = http://xcalib.sourceforge.net/;
description = "A tiny monitor calibration loader for X and MS-Windows";
license = licenses.gpl2;
maintainers = [ maintainers.rickynils ];
platforms = platforms.linux;
};
}

48
pkgs/tools/networking/hping/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ stdenv, fetchurl, libpcap, tcl }:
stdenv.mkDerivation rec {
name = "hping-${version}";
version = "20051105";
src = fetchurl {
url = "http://www.hping.org/hping3-${version}.tar.gz";
sha256 = "1s5f9xd1msx05ibhwaw37jmc7l9fahcxxslqz8a83p0i5ak739pm";
};
buildInputs = [ libpcap tcl ];
configurePhase = ''
MANPATH="$out/share/man" ./configure
sed -i -r -e 's|/usr(/s?bin)|'"$out"'\1|g' Makefile
'';
TCLSH = "${tcl}/bin/tclsh";
prePatch = ''
sed -i -e '/#if.*defined(__i386__)/a \
|| defined(__x86_64__) \\
' bytesex.h
sed -i -e 's|#include.*net/bpf.h|#include <pcap/bpf.h>|' \
libpcap_stuff.c script.c
sed -i -r -e 's|"(/usr/(local/)?)?bin/"|"${tcl}/bin"|g' \
-e 's!/usr/(local/)?(lib|include)!${tcl}/\2!g' \
configure
'';
preInstall = ''
mkdir -vp "$out/sbin" "$out/share/man/man8"
'';
postInstall = ''
ln -vs hping3.8.gz "$out/share/man/man8/hping.8.gz"
ln -vs hping3.8.gz "$out/share/man/man8/hping2.8.gz"
'';
meta = {
description = "A command-line oriented TCP/IP packet assembler/analyzer";
homepage = "http://www.hping.org/";
license = stdenv.lib.licenses.gpl2;
};
}

17
pkgs/tools/networking/samplicator/default.nix Normal file
View File

@ -0,0 +1,17 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "samplicator-${version}";
version = "1.3.7-beta6";
src = fetchurl {
url = "http://samplicator.googlecode.com/files/${name}.tar.gz";
sha1 = "2091af1898d6508ad9fd338a07e352e2387522d4";
};
meta = {
description = "Send copies of (UDP) datagrams to multiple receivers";
homepage = "http://code.google.com/p/samplicator/";
license = stdenv.lib.licenses.gpl2Plus;
};
}

21
pkgs/tools/networking/wbox/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "wbox-${version}";
version = "5";
installPhase = ''
install -vD wbox "$out/bin/wbox"
'';
src = fetchurl {
url = "http://www.hping.org/wbox/${name}.tar.gz";
sha256 = "06daxwbysppvbh1mwprw8fgsp6mbd3kqj7a978w7ivn8hdgdi28m";
};
meta = {
description = "A simple HTTP benchmarking tool";
homepage = "http://www.hping.org/wbox/";
license = stdenv.lib.licenses.bsd3;
};
}

25
pkgs/tools/text/ascii/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "ascii-${version}";
version = "3.12";
src = fetchurl {
url = "http://www.catb.org/~esr/ascii/${name}.tar.gz";
sha256 = "17jhmmdbhzzaai0lr5aslg0nmqchq1ygdxwd8pgl7qn2jnxhc6ci";
};
prePatch = ''
sed -i -e 's|$(DESTDIR)/usr|$(out)|g' Makefile
'';
preInstall = ''
mkdir -vp "$out/bin" "$out/share/man/man1"
'';
meta = {
description = "Interactive ASCII name and synonym chart";
homepage = "http://www.catb.org/~esr/ascii/";
license = stdenv.lib.licenses.bsd3;
};
}

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

@ -373,6 +373,8 @@ let
archivemount = callPackage ../tools/filesystems/archivemount { };
ascii = callPackage ../tools/text/ascii { };
asymptote = builderDefsPackage ../tools/graphics/asymptote {
inherit freeglut ghostscriptX imagemagick fftw boehmgc
mesa ncurses readline gsl libsigsegv python zlib perl
@ -903,6 +905,8 @@ let
host = callPackage ../tools/networking/host { };
hping = callPackage ../tools/networking/hping { };
httpfs2 = callPackage ../tools/filesystems/httpfs { };
# FIXME: This Hydra snapshot is outdated and depends on the `nixPerl',
@ -1454,6 +1458,8 @@ let
salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {};
samplicator = callPackage ../tools/networking/samplicator { };
screen = callPackage ../tools/misc/screen { };
scrot = callPackage ../tools/graphics/scrot { };
@ -1498,9 +1504,9 @@ let
sourceHighlight = callPackage ../tools/text/source-highlight { };
socat2pre = builderDefsPackage ../tools/networking/socat/2.0.0-b3.nix {
socat2pre = lowPrio (builderDefsPackage ../tools/networking/socat/2.0.0-b3.nix {
inherit fetchurl stdenv openssl;
};
});
squashfsTools = callPackage ../tools/filesystems/squashfs { };
@ -1614,6 +1620,8 @@ let
vtun = callPackage ../tools/networking/vtun { };
wbox = callPackage ../tools/networking/wbox {};
welkin = callPackage ../tools/graphics/welkin {};
testdisk = callPackage ../tools/misc/testdisk { };
@ -5900,6 +5908,19 @@ let
];
};
linux_3_7 = makeOverridable (import ../os-specific/linux/kernel/linux-3.7.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
#kernelPatches.aufs3_6
] ++ lib.optionals (platform.kernelArch == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
};
/* Linux kernel modules are inherently tied to a specific kernel. So
rather than provide specific instances of those packages for a
specific kernel, we have a function that builds those packages
@ -5960,6 +5981,7 @@ let
nvidia_x11_legacy96 = callPackage ../os-specific/linux/nvidia-x11/legacy96.nix { };
nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { };
nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { };
openafsClient = callPackage ../servers/openafs-client { };
@ -6026,6 +6048,7 @@ let
linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4);
linuxPackages_3_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_5 pkgs.linuxPackages_3_5);
linuxPackages_3_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6 pkgs.linuxPackages_3_6);
linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 pkgs.linuxPackages_3_7);
# The current default kernel / kernel modules.
linux = linuxPackages.kernel;
@ -7297,6 +7320,8 @@ let
librecad = callPackage ../applications/misc/librecad { };
librecad2 = callPackage ../applications/misc/librecad/2.0.nix { };
libreoffice = callPackage ../applications/office/openoffice/libreoffice.nix {
inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome) GConf ORBit2 gnome_vfs;
@ -7845,6 +7870,8 @@ let
gtk = gtk3;
};
vbindiff = callPackage ../applications/editors/vbindiff { };
vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
veracity = callPackage ../applications/version-management/veracity {};
@ -7979,6 +8006,8 @@ let
xbindkeys = callPackage ../tools/X11/xbindkeys { };
xcalib = callPackage ../tools/X11/xcalib { };
xchat = callPackage ../applications/networking/irc/xchat { };
xchm = callPackage ../applications/misc/xchm { };
@ -8232,6 +8261,8 @@ let
sauerbraten = callPackage ../games/sauerbraten {};
scid = callPackage ../games/scid { };
scummvm = callPackage ../games/scummvm { };
scorched3d = callPackage ../games/scorched3d { };
@ -8335,11 +8366,7 @@ let
worldofgoo = callPackage ../games/worldofgoo { };
xboard = builderDefsPackage (import ../games/xboard) {
inherit (xlibs) libX11 xproto libXt libXaw libSM
libICE libXmu libXext libXpm;
inherit gnuchess texinfo;
};
xboard = callPackage ../games/xboard { };
xconq = callPackage ../games/xconq {};

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

@ -516,6 +516,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
blazeMarkup = callPackage ../development/libraries/haskell/blaze-markup {};
blazeSvg = callPackage ../development/libraries/haskell/blaze-svg {};
blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {};
bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {};
@ -689,12 +691,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
derp = callPackage ../development/libraries/haskell/derp {};
diagrams = callPackage ../development/libraries/haskell/diagrams/diagrams.nix {};
diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix {};
diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {};
diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix {};
diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {};
diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix {};
Diff = callPackage ../development/libraries/haskell/Diff {};
@ -736,6 +737,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
dstring = callPackage ../development/libraries/haskell/dstring {};
dualTree = callPackage ../development/libraries/haskell/dual-tree {};
editDistance = callPackage ../development/libraries/haskell/edit-distance {};
editline = callPackage ../development/libraries/haskell/editline {};
@ -750,6 +753,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
erf = callPackage ../development/libraries/haskell/erf {};
errors = callPackage ../development/libraries/haskell/errors {};
either = callPackage ../development/libraries/haskell/either {};
exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {};
exceptionTransformers = callPackage ../development/libraries/haskell/exception-transformers {};
@ -796,6 +803,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
fingertree = callPackage ../development/libraries/haskell/fingertree {};
forceLayout = callPackage ../development/libraries/haskell/force-layout {};
fsnotify = callPackage ../development/libraries/haskell/fsnotify {};
gamma = callPackage ../development/libraries/haskell/gamma {};
@ -1158,6 +1167,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {};
minimorph = callPackage ../development/libraries/haskell/minimorph {};
miniutter = callPackage ../development/libraries/haskell/miniutter {};
mimeMail = callPackage ../development/libraries/haskell/mime-mail {};
mimeTypes = callPackage ../development/libraries/haskell/mime-types {};
@ -1192,6 +1205,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
monadsTf = callPackage ../development/libraries/haskell/monads-tf {};
monoidExtras = callPackage ../development/libraries/haskell/monoid-extras {};
mongoDB = callPackage ../development/libraries/haskell/mongoDB {};
mpppc = callPackage ../development/libraries/haskell/mpppc {};

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

@ -14,7 +14,7 @@ rec {
''
# Virtualisation (KVM, Xen...).
PARAVIRT_GUEST y
KVM_CLOCK y
KVM_CLOCK? y #Part of KVM_GUEST since linux 3.7
KVM_GUEST y
XEN y
KSM y