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

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/kde-4.7/; revision=28144
This commit is contained in:
Eelco Dolstra 2011-08-03 22:00:49 +00:00
commit fcce78c0f4
32 changed files with 537 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/networking/instant-messengers/kadu/config.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/.config b/.config
index e0068bf..808ebf4 100644
--- a/.config
+++ b/.config
@@ -187,8 +187,8 @@ module_history_migration=m
# PL: Obsługa szyfrowania wiadomości przy pomocy OpenSSLa
# Platform: Linux, Mac OS X, Windows
# Needs: libcrypto, libssl
-module_encryption_ng=m
-module_encryption_ng_simlite=m
+module_encryption_ng=n
+module_encryption_ng_simlite=n
# Description: Auto away module
# PL: Obsługa automatycznej zmiany statusu po określonym czasie bezczynności

28
pkgs/applications/networking/instant-messengers/kadu/default.nix
View File

@ -1,33 +1,33 @@
{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, qca2
, libX11, alsaLib }:
{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, libX11,
alsaLib, aspell, libidn, qca2 }:
stdenv.mkDerivation {
name = "kadu-0.6.5.4";
name = "kadu-0.9.2";
src = fetchurl {
url = http://www.kadu.net/download/stable/kadu-0.6.5.4.tar.bz2;
sha256 = "09bdcyx75lca1pl6x3vfpawmdjn5pfxvwivb9xdhk4bdvswxgv4x";
url = http://www.kadu.net/download/stable/kadu-0.9.2.tar.bz2;
sha256 = "05lpx7m2adx8vv4h62rsiwlgay24m6cxdbibg7vzl4xkq9ybv30b";
};
buildInputs = [
cmake qt4 libgadu libXScrnSaver libsndfile qca2 libX11 alsaLib
cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2
];
cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF";
configureFlags = "CPPFLAGS=-DQT_NO_DEBUG";
cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS' -DCMAKE_BUILD_TYPE=Release";
prePatch = ''
patchShebangs .
'';
patches = [
./includes.patch
];
patches = [ ./config.patch ];
NIX_LDFLAGS="-lX11";
meta = {
description = "An instance messanger client for the gadu-gadu network (most popular polish IM network)";
meta = {
description = "An instant-messenger client for the gadu-gadu network (most popular polish IM network)";
homepage = http://www.kadu.net/w/English:Main_Page;
license = "GPLv2";
platforms = stdenv.lib.platforms.linux;

13
pkgs/applications/networking/instant-messengers/kadu/includes.patch
View File

@ -1,13 +0,0 @@
--- kadu/kadu-core/main.cpp 2011-01-27 22:58:22.000000000 +0100
+++ kadu/kadu-core/main.cpp 2011-01-27 22:58:28.000000000 +0100
@@ -20,10 +20,8 @@
#include <winsock2.h>
#include <windows.h>
#endif
-#ifdef Q_OS_BSD4
#include <sys/types.h>
#include <sys/stat.h>
-#endif
#include "config_file.h"
#include "debug.h"

12
pkgs/applications/networking/instant-messengers/kadu/more-icons.patch
View File

@ -1,12 +0,0 @@
--- kadu/.config 2010-01-18 17:13:31.000000000 +0100
+++ kadu/.config 2010-09-28 21:21:48.000000000 +0200
@@ -559,10 +559,10 @@ icons_glass16=y
icons_glass22=y
# Desctiption: Tango 16x16 icons made by BlotoPosniegowe
-icons_tango16=n
+icons_tango16=y
# Description: Oxygen 16x16 icons maintained by Piotr Pelzowski
-icons_oxygen16=n
+icons_oxygen16=y

4
pkgs/applications/networking/remote/rdesktop/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation (rec {
pname = "rdesktop";
version = "1.6.0";
version = "1.7.0";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
sha256 = "0y890s5rv47ipcijcrmcy9988br22ipr4c1ppb88pjhlism6w0im";
sha256 = "0x2hnzvm0smnanin28n4mvzx9chpj2qnjfrxy307x21mgw6l5q1v";
};
buildInputs = [openssl libX11];

8
pkgs/applications/networking/skype/default.nix
View File

@ -1,5 +1,6 @@
{stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib
, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig}:
{ stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib
, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig
, pulseaudio }:
assert stdenv.system == "i686-linux";
@ -12,7 +13,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib
alsaLib
pulseaudio
stdenv.glibc
stdenv.gcc.gcc
libXv

10
pkgs/applications/version-management/veracity/src-for-default.nix
View File

@ -1,9 +1,9 @@
rec {
version="0.9.0.10466";
name="veracity-0.9.0.10466";
hash="19mi6pw4cy4f0w7v7myx0i1ajy40i9pgkmgr9rvfilcyi9rlvj6q";
url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.9.0.10466.tar.gz";
version="1.0.0.10517";
name="veracity-1.0.0.10517";
hash="08bka5zzn7i7c3dm3xp57n3szvm9msmi7mq1zynqb6i210qix79g";
url="http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-${version}.tar.gz";
advertisedUrl="http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-1.0.0.10517.tar.gz";
}

4
pkgs/applications/version-management/veracity/src-info-for-default.nix
View File

@ -1,5 +1,5 @@
{
#downloadPage = "http://sourcegear.com/veracity/downloads.html";
downloadPage = "http://download-us.sourcegear.com/Veracity/nightly/index.html";
downloadPage = "http://veracity-scm.org/downloads.html";
#downloadPage = "http://download-us.sourcegear.com/Veracity/nightly/index.html";
baseName = "veracity";
}

4
pkgs/applications/window-managers/dwm/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, libX11, libXinerama, patches ? []}:
stdenv.mkDerivation rec {
name = "dwm-5.8.2";
name = "dwm-5.9";
src = fetchurl {
url = "http://dl.suckless.org/dwm/${name}.tar.gz";
sha256 = "0rlv72fls2k4s48a0mw7mxa05d4qdxgs8pqbkyqkpzz3jb3kn965";
sha256 = "0cp25zqgaqj5k1mlvgxnc5jqi252chqjc5v0fzpqbhrklaidbk9d";
};
buildInputs = [ libX11 libXinerama ];

2
pkgs/development/compilers/gcc-4.1/default.nix
View File

@ -37,6 +37,8 @@ stdenv.mkDerivation {
inherit noSysDirs profiledCompiler staticCompiler;
buildInputs = [gmp mpfr texinfo];
enableParallelBuilding = true;
configureFlags = "
--disable-multilib

40
pkgs/development/compilers/llvm/clang-include-paths-svn.patch Normal file
View File

@ -0,0 +1,40 @@
diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/lib/Frontend/InitHeaderSearch.cpp
--- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2010-09-03 18:45:53.000000000 +0200
+++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2011-02-05 14:59:08.669573190 +0100
@@ -480,6 +480,7 @@
AddPath(*i, System, false, false, false);
return;
}
+#if 0
switch (os) {
case llvm::Triple::Win32: {
@@ -593,7 +593,9 @@
}
if ( os != llvm::Triple::RTEMS )
AddPath("/usr/include", System, false, false, false);
+#endif
+ AddPath(C_INCLUDE_PATH, System, false, false, false);
}
void InitHeaderSearch::
@@ -550,6 +553,7 @@
triple);
return;
}
+#if 0
// FIXME: temporary hack: hard-coded paths.
if (triple.isOSDarwin()) {
@@ -769,6 +773,10 @@
default:
break;
}
+#endif
+ AddGnuCPlusPlusIncludePaths(
+ CPP_INCLUDE_PATH,
+ CPP_HOST, "", "", triple);
}
void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang,

66
pkgs/development/compilers/llvm/svn-head.nix Normal file
View File

@ -0,0 +1,66 @@
{ stdenv, fetchurl, gcc, flex, perl, libtool, groff, fetchsvn
, buildClang ? false }:
let rev = "134309"; in
stdenv.mkDerivation ({
name = "llvm-r${rev}";
src = fetchsvn {
url = "http://llvm.org/svn/llvm-project/llvm/trunk";
inherit rev;
sha256 = "136qwpcl22r5bl9y4kk94vgbha1m58xrggy7qw19lg7jkgxxj8s6";
};
buildInputs = [ gcc flex perl groff ];
configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ];
meta = {
homepage = http://llvm.org/;
description = "Collection of modular and reusable compiler and toolchain technologies";
license = "BSD";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; all;
};
}
// stdenv.lib.optionalAttrs buildClang (
# I write the assert because 'gcc.libc' will be evaluated although 'triplet' would not
# evaluate properly (in the preConfigure below)
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let
triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu"
else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu"
else throw "System not supported";
in rec {
name = "clang-r${rev}";
srcClang = fetchsvn {
url = http://llvm.org/svn/llvm-project/cfe/trunk;
inherit rev;
sha256 = "0afbrjakfw6zgsplxblgzr2kwjndlnr2lnqjnbj16ggam5fcnhlr";
};
prePatch = ''
cp -r ${srcClang} tools/clang
chmod u+rwX -R tools/clang
'';
patches = [ ./clang-include-paths-svn.patch ];
# Set up the header file paths
preConfigure = ''
sed -i -e 's,C_INCLUDE_PATH,"${gcc.libc}/include/",' \
-e 's,CPP_HOST,"${triplet}",' \
-e 's,CPP_INCLUDE_PATH,"${gcc.gcc}/include/c++/${gcc.gcc.version}",' \
tools/clang/lib/Frontend/InitHeaderSearch.cpp
'';
meta = {
homepage = http://clang.llvm.org/;
description = "A C language family frontend for LLVM";
license = "BSD";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}
))

16
pkgs/development/compilers/openjdk/cppflags-include-fix.patch Normal file
View File

@ -0,0 +1,16 @@
diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
--- openjdk-orig/jdk/make/sun/awt/mawt.gmk 2011-06-27 13:19:26.000000000 -0400
+++ openjdk/jdk/make/sun/awt/mawt.gmk 2011-07-31 17:42:11.370026854 -0400
@@ -223,12 +223,6 @@
-I$(PLATFORM_SRC)/native/$(PKGDIR) \
$(EVENT_MODEL)
-ifeq ($(PLATFORM), linux)
- # Checking for the X11/extensions headers at the additional location
- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
- $(wildcard /usr/include/X11/extensions))
-endif
-
ifeq ($(PLATFORM), solaris)
CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
endif

94
pkgs/development/compilers/openjdk/default.nix
View File

@ -1,16 +1,98 @@
{stdenv, fetchurl}:
{ stdenv
, fetchurl
, unzip
, zip
, procps
, coreutils
, alsaLib
, ant
, freetype
, cups
, which
, jdk
, nettools
, libX11
, libXt
, libXext
, libXrender
, libXtst
, libXi
, cpio
, jreOnly ? false
}:
stdenv.mkDerivation {
name = "openjdk6-b16-24_apr_2009-r1";
stdenv.mkDerivation rec {
name = "openj${if jreOnly then "re" else "dk"}-7b127";
src = fetchurl {
url = http://hg.bikemonkey.org/archive/openjdk6_darwin/openjdk6-b16-24_apr_2009-r1.tar.bz2;
sha256 = "14pbv6jjk95k7hbgiwyvjdjv8pccm7m8a130k0q7mjssf4qmpx1v";
url = http://www.java.net/download/openjdk/jdk7/promoted/b147/openjdk-7-fcs-src-b147-27_jun_2011.zip;
sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs";
};
buildInputs = [
unzip
procps
ant
which
zip
cpio
nettools
alsaLib
libX11
libXt
libXext
libXrender
libXtst
libXi
];
postUnpack = ''
sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \
-e "s@/bin/ls@${coreutils}/bin/ls@" \
openjdk/hotspot/make/linux/makefiles/sa.make
sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \
openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk
sed -i "s@<Xrender.h>@<X11/extensions/Xrender.h>@" \
openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
'';
patches = [ ./cppflags-include-fix.patch ./printf-fix.patch ];
makeFlags = [
"SORT=${coreutils}/bin/sort"
"ALSA_INCLUDE=${alsaLib}/include/alsa/version.h"
"FREETYPE_HEADERS_PATH=${freetype}/include"
"FREETYPE_LIB_PATH=${freetype}/lib"
"MILESTONE=release"
"BUILD_NUMBER=127"
"CUPS_HEADERS_PATH=${cups}/include"
"USRBIN_PATH="
"COMPILER_PATH="
"DEVTOOLS_PATH="
"UNIXCOMMAND_PATH="
"BOOTDIR=${jdk}"
"ALLOW_DOWNLOADS=true"
];
configurePhase = ''
make $makeFlags sanity
'';
installPhase = ''
ensureDir $out
cp -vR * $out/
cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out
'';
meta = {
homepage = http://openjdk.java.net/;
license = "GPLv2";
description = "The open-source Java Development Kit";
maintainers = [ stdenv.lib.maintainers.shlevy ];
};
}

12
pkgs/development/compilers/openjdk/printf-fix.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Naur openjdk-orig/make/Defs-internal.gmk openjdk/make/Defs-internal.gmk
--- openjdk-orig/make/Defs-internal.gmk 2011-06-27 11:44:06.000000000 -0400
+++ openjdk/make/Defs-internal.gmk 2011-07-31 18:30:15.784506762 -0400
@@ -79,7 +79,7 @@
# Find all build_time_* files and print their contents in a list sorted
# on the name of the sub repository.
define ReportBuildTimes
-$(PRINTF) "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \
+$(PRINTF) -- "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \
$1 \
"`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
"`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \

10
pkgs/development/compilers/sbcl/src-for-default.nix
View File

@ -1,9 +1,9 @@
rec {
version="1.0.49";
name="sbcl-1.0.49";
hash="1s3am56vh1rr91zkdc5ba4rirc8ydnla3sgk8yhh56sd101c7q0v";
url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.49/sbcl-1.0.49-source.tar.bz2";
advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.49/sbcl-1.0.49-source.tar.bz2";
version="1.0.50";
name="sbcl-1.0.50";
hash="1asbb43rmrp87ia2kq66ymdlgdx3jvihlz3dlgwhlz7syd9z3wc3";
url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.50/sbcl-1.0.50-source.tar.bz2";
advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.50/sbcl-1.0.50-source.tar.bz2";
}

48
pkgs/development/libraries/afflib/default.nix Normal file
View File

@ -0,0 +1,48 @@
x@{builderDefsPackage
, libewf, zlib, curl, expat, fuse, openssl
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="afflib";
version="3.6.12";
name="${baseName}-${version}";
url="http://afflib.org/downloads/${name}.tar.gz";
hash="1l13nrqjlvad112543qbyvrzai5by43zl96d3miklrhn26q9rs07";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
meta = {
description = "Advanced forensic format library";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.bsdOriginal;
};
passthru = {
updateInfo = {
downloadPage = "http://afflib.org/";
};
};
}) x

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

@ -0,0 +1,13 @@
{cabal, numtype}:
cabal.mkDerivation (self : {
pname = "dimensional";
version = "0.10";
sha256 = "5d0ab2a0ca566f7d9a4fe1ec180a1bcf4138a3647a2c287a908506c8911cd385";
propagatedBuildInputs = [numtype];
meta = {
description = "library providing data types for performing arithmetic with physical quantities and units";
license = "BSD";
maintainers = [self.stdenv.lib.maintainers.simons];
};
})

12
pkgs/development/libraries/haskell/numtype/default.nix Normal file
View File

@ -0,0 +1,12 @@
{cabal}:
cabal.mkDerivation (self : {
pname = "numtype";
version = "1.0";
sha256 = "2606e81d7bcef0ba76b1e6ffc8d513c36fef5fefaab3bdd02da18761ec504e1f";
meta = {
description = "unary type level representations of the (positive and negative) integers";
license = "BSD";
maintainers = [self.stdenv.lib.maintainers.simons];
};
})

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

@ -0,0 +1,13 @@
{cabal, csv, html}:
cabal.mkDerivation (self : {
pname = "tabular";
version = "0.2.2.3";
sha256 = "cf6d9f1928ec6981edcbb06c4dcbaea7a96deef5272192ad4290caa18711ea76";
propagatedBuildInputs = [csv html];
meta = {
description = "a DSL for describing (and rendering) two-dimensional data tables";
license = "BSD";
maintainers = [self.stdenv.lib.maintainers.simons];
};
})

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

@ -1,12 +1,14 @@
{ fetchurl, stdenv, zlib, openssl, libuuid }:
{ fetchurl, stdenv, zlib, openssl, libuuid, file }:
stdenv.mkDerivation rec {
name = "libewf-20080501";
name = "libewf-20100226";
src = fetchurl {
url = mirror://sourceforge/libewf/libewf-20080501.tar.gz;
sha256 = "0s8fp7kmpk0976zii0fbk8vhi8k1br2fjp510rmgr6q1ssqdbi36";
url = "mirror://sourceforge/libewf/${name}.tar.gz";
sha256 = "aedd2a6b3df6525ff535ab95cd569ebb361a4022eb4163390f26257913c2941a";
};
preConfigure = ''sed -e 's@/usr/bin/file@file@g' -i configure'';
buildInputs = [ zlib openssl libuuid ];
meta = {

20
pkgs/development/tools/haskell/bnfc/default.nix Normal file
View File

@ -0,0 +1,20 @@
{stdenv, fetchurl, ghc}:
stdenv.mkDerivation {
name = "bnfc-2.4-beta1";
src = fetchurl {
url = "https://svn.spraakdata.gu.se/clt/release/bnfc_2.4_beta_1.tgz";
sha256 = "1njnck3m6qpp0qw11v1chf6m217j8f85bsgjl7zcpb4py18mjjrx";
};
buildInputs = [ghc];
preConfigure = "cd source";
meta = {
description = "Compiler construction tool generating a compiler front-end from a Labelled BNF grammar";
platforms = stdenv.lib.platforms.haskellPlatforms;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

8
pkgs/misc/emulators/wine/src-for-default.nix
View File

@ -1,9 +1,9 @@
rec {
version="1.3.22";
name="wine-1.3.22";
hash="11m5m6dc2hx3nhjwlcxy8z880612aa4qh7ph6fanycby1ha5rh47";
version="1.3.25";
name="wine-1.3.25";
hash="1ahwgq6j8js9gkj8ynar5r1ifn1y1lfkkmhgk8y9fbzxdsb5llpm";
url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.22.tar.bz2";
advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.25.tar.bz2";
}

6
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -7,7 +7,7 @@
with stdenv.lib;
let versionNumber = "275.09.07"; in
let versionNumber = "280.13"; in
stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
@ -18,12 +18,12 @@ stdenv.mkDerivation {
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
sha256 = "037zl60adks465vpcfxb74n2h7rzfwibv07d4gj5dg8i7h3v5l97";
sha256 = "16xcidshamxvc80sdnkph5rpgf72m5zz4x155amg2433kkhsy8mj";
}
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 = "1k26z747iy0gh94288d39cgzb90wcbm339hbhd4gw3klkswhza39";
sha256 = "14x80qirwlfxhphzqvi92lpgs82qnzb7hq0vd02rkbwvvnkhgdxd";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";

7
pkgs/tools/archivers/zip/builder.sh
View File

@ -1,7 +0,0 @@
source $stdenv/setup
buildFlags="-f unix/Makefile generic"
installFlags="-f unix/Makefile prefix=$out INSTALL=cp"
genericBuild

17
pkgs/tools/archivers/zip/default.nix
View File

@ -1,12 +1,19 @@
{stdenv, fetchurl}: stdenv.mkDerivation {
name = "zip-2.32";
builder = ./builder.sh;
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "zip-3.0";
src = fetchurl {
url = ftp://ftp.info-zip.org/pub/infozip/src/zip232.tgz;
md5 = "8a4da4460386e324debe97f3b7fe4d96";
url = ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz;
sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h";
};
buildFlags="-f unix/Makefile generic";
installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp";
meta = {
homepage = http://www.info-zip.org;
};
}

66
pkgs/tools/misc/mc/default.nix
View File

@ -1,66 +1,20 @@
{ stdenv, fetchurl, lib, pkgconfig, glib, ncurses, e2fsprogs, gpm
, libX11, libXt, shebangfix, perl, zip, unzip, gettext, slang}:
{ stdenv, fetchurl, pkgconfig, glib, gpm, file, e2fsprogs
, libX11, libICE, perl, zip, unzip, gettext, slang}:
stdenv.mkDerivation rec {
name = "mc-4.6.1";
name = "mc-4.7.5.3";
src = fetchurl {
url = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/${name}.tar.gz";
sha256 = "0zly25mwdn84s0wqx9mzyqi177mm828716nv1n6a4a5cm8yv0sh8";
url = http://www.midnight-commander.org/downloads/mc-4.7.5.3.tar.bz2;
sha256 = "1di8fsdg6y98iq3846j145qjk4bf5rgjj2hxnxdbcwfp8p3v8x88";
};
buildInputs = [pkgconfig glib ncurses libX11 libXt
shebangfix perl zip unzip slang gettext e2fsprogs gpm];
# Fix the paths to the terminfo files. Otherwise mc has no colors
preConfigure = ''
sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" configure
'';
configureFlags = "--enable-charset";
# Stole some patches from LFS which fix some nasty bugs
patches = [ ./mc-4.6.1-bash32-1.patch ./mc-4.6.1-debian_fixes-1.patch ];
# Required to enable the Debian UTF8 fixes
CPPFLAGS = "-DUTF8";
# The Debian UTF8 patch expects that the documentation is in UTF8 format,
# therefore we have to convert them (I stole this also from LFS)
postBuildPhase = ''
for file in lib/mc.hint{,.es,.it,.nl} doc/{es,it}/mc.hlp.*
do
iconv -f ISO-8859-1 -t UTF-8 $file > $file.utf8 &&
mv $file.utf8 $file
done &&
for file in lib/mc.hint{.cs,.hu,.pl} doc/{hu,pl}/mc.hlp.*
do
iconv -f ISO-8859-2 -t UTF-8 $file > $file.utf8 &&
mv $file.utf8 $file
done &&
for file in lib/mc.hint.sr doc/sr/mc.hlp.sr
do
iconv -f ISO-8859-5 -t UTF-8 $file > $file.utf8 &&
mv $file.utf8 $file
done &&
for file in doc/ru/mc.hlp.ru lib/mc.hint.ru
do
iconv -f KOI8-R -t UTF-8 $file > $file.utf8 &&
mv $file.utf8 $file
done &&
buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs ];
iconv -f KOI8-U -t UTF-8 lib/mc.hint.uk > lib/mc.hint.uk.utf8 &&
mv lib/mc.hint.uk.utf8 lib/mc.hint.uk &&
iconv -f BIG5 -t UTF-8 lib/mc.hint.zh > lib/mc.hint.zh.utf8 &&
mv lib/mc.hint.zh.utf8 lib/mc.hint.zh
# foo
'';
makeFlags = "UNZIP=unzip";
postInstall = ''
find $out -iname "*.pl" | xargs shebangfix;
'';
meta = {
description = "File Manager and User Shell for the GNU Project";
homepage = http://www.ibiblio.org/mc;
maintainers = [ lib.maintainers.sander ];
homepage = http://www.midnight-commander.org;
license = "GPLv2+";
maintainers = [ stdenv.lib.maintainers.sander ];
};
}

48
pkgs/tools/system/sleuthkit/default.nix Normal file
View File

@ -0,0 +1,48 @@
x@{builderDefsPackage
, libewf, afflib, openssl, zlib
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="sleuthkit";
version="3.2.2";
name="${baseName}-${version}";
url="mirror://sourceforge/project/${baseName}/${baseName}/${version}/${name}.tar.gz";
hash="02hik5xvbgh1dpisvc3wlhhq1aprnlsk0spbw6h5khpbq9wqnmgj";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
meta = {
description = "A forensic/data recovery tool";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = "IBM Public License";
};
passthru = {
updateInfo = {
downloadPage = "http://sourceforge.net/projects/sleuthkit/files/sleuthkit";
};
};
}) x

20
pkgs/tools/text/mairix/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, zlib, bzip2, bison, flex }:
stdenv.mkDerivation rec {
name = "mairix-0.22";
src = fetchurl {
url = "mirror://sourceforge/mairix/${name}.tar.gz";
sha256 = "0kwxq738nbv8ip5gkq2bw320qs1vg0pnv7wsc0p5cxwzxxrv47ql";
};
buildInputs = [ zlib bzip2 bison flex ];
meta = {
homepage = http://www.rc0.org.uk/mairix;
license = "GPLv2+";
description = "Program for indexing and searching email messages stored in maildir, MH or mbox";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; all;
};
}

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

@ -912,6 +912,8 @@ let
guile = guile_1_8;
};
mairix = callPackage ../tools/text/mairix { };
man = callPackage ../tools/misc/man { };
man_db = callPackage ../tools/misc/man-db { };
@ -1281,6 +1283,8 @@ let
siege = callPackage ../tools/networking/siege {};
sleuthkit = callPackage ../tools/system/sleuthkit {};
slimrat = callPackage ../tools/networking/slimrat {
inherit (perlPackages) WWWMechanize LWP;
};
@ -1606,6 +1610,10 @@ let
buildClang = true;
};
clangSVN = llvmSVN.override {
buildClang = true;
};
clean = callPackage ../development/compilers/clean { };
cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
@ -1654,7 +1662,8 @@ let
});
gcc41 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.1) {
inherit fetchurl stdenv noSysDirs;
inherit fetchurl noSysDirs gmp mpfr;
stdenv = overrideGCC stdenv gcc42;
texinfo = texinfo49;
profiledCompiler = false;
});
@ -2113,6 +2122,12 @@ let
openjdkDarwin = callPackage ../development/compilers/openjdk-darwin { };
openjdk = callPackage ../development/compilers/openjdk { };
openjre = callPackage ../development/compilers/openjdk {
jreOnly = true;
};
j2sdk14x = (
assert system == "i686-linux";
import ../development/compilers/jdk/default-1.4.nix {
@ -2152,6 +2167,9 @@ let
llvm = callPackage ../development/compilers/llvm { };
# Works partially
llvmSVN = callPackage ../development/compilers/llvm/svn-head.nix { };
mitscheme = callPackage ../development/compilers/mit-scheme { };
mlton = callPackage ../development/compilers/mlton { };
@ -2255,6 +2273,9 @@ let
roadsend = callPackage ../development/compilers/roadsend { };
# TODO: the corresponding nix file is missing
# rust = pkgsi686Linux.callPackage ../development/compilers/rust {};
sbcl = builderDefsPackage (import ../development/compilers/sbcl) {
inherit makeWrapper clisp;
};
@ -2884,6 +2905,8 @@ let
adns = callPackage ../development/libraries/adns { };
afflib = callPackage ../development/libraries/afflib {};
agg = callPackage ../development/libraries/agg { };
allegro = callPackage ../development/libraries/allegro {};
@ -3200,7 +3223,7 @@ let
glibc = glibc212;
glibc25 = callPackage ../development/libraries/glibc-2.5 {
kernelHeaders = linuxHeaders;
kernelHeaders = linuxHeaders_2_6_28;
installLocales = false;
};
@ -7636,6 +7659,9 @@ let
xconq = callPackage ../games/xconq {};
# TODO: the corresponding nix file is missing
# xracer = callPackage ../games/xracer { };
xsokoban = builderDefsPackage (import ../games/xsokoban) {
inherit (xlibs) libX11 xproto libXpm libXt;
};

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

@ -361,6 +361,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
bmp = callPackage ../development/libraries/haskell/bmp {};
bnfc = callPackage ../development/tools/haskell/bnfc {};
Boolean = callPackage ../development/libraries/haskell/Boolean {};
bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {};
@ -442,6 +444,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
inherit (pkgs) zlib;
};
dimensional = callPackage ../development/libraries/haskell/dimensional {};
directoryTree = callPackage ../development/libraries/haskell/directory-tree {};
dlist = callPackage ../development/libraries/haskell/dlist {};
@ -754,6 +758,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {};
numtype = callPackage ../development/libraries/haskell/numtype {};
OneTuple = callPackage ../development/libraries/haskell/OneTuple {};
OpenAL = callPackage ../development/libraries/haskell/OpenAL {
@ -961,6 +967,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
svgcairo = callPackage ../development/libraries/haskell/svgcairo {};
tabular = callPackage ../development/libraries/haskell/tabular {};
tagged = callPackage ../development/libraries/haskell/tagged {};
tagsoup = callPackage ../development/libraries/haskell/tagsoup {};

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

@ -1781,6 +1781,24 @@ let pythonPackages = python.modules // rec {
};
vnc2flv = buildPythonPackage rec {
name = "vnc2flv-20100207";
namePrefix = "";
src = fetchurl {
url = "http://pypi.python.org/packages/source/v/vnc2flv/${name}.tar.gz";
md5 = "8492e46496e187b49fe5569b5639804e";
};
doCheck = false;
meta = {
description = "Tool to record VNC sessions to Flash Video";
homepage = http://www.unixuser.org/~euske/python/vnc2flv/;
};
};
webob = buildPythonPackage rec {
version = "1.0.6";
name = "webob-${version}";