Merge remote-tracking branch 'upstream/master' into haskell-snap
Conflicts: pkgs/development/libraries/haskell/comonad-transformers/default.nix pkgs/development/libraries/haskell/semigroupoids/default.nix pkgs/top-level/haskell-packages.nix
This commit is contained in:
Alexander Foremny
commit
d987fedd43
53 changed files with 489 additions and 216 deletions
|
|
@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs =
|
||||
[ freetype zlib pkgconfig ]
|
||||
++ stdenv.lib.optional x11Support [ libX11 libXext mesa ]
|
||||
++ stdenv.lib.optionals x11Support [ libX11 libXext mesa ]
|
||||
++ stdenv.lib.optional alsaSupport alsaLib
|
||||
++ stdenv.lib.optional xvSupport libXv
|
||||
++ stdenv.lib.optional theoraSupport libtheora
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ sub findFiles {
|
|||
|
||||
unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) {
|
||||
if ($ignoreCollisions) {
|
||||
warn "collision between `$target' and `$oldTarget'";
|
||||
warn "collision between `$target' and `$oldTarget'" if $ignoreCollisions == 1;
|
||||
return;
|
||||
} else {
|
||||
die "collision between `$target' and `$oldTarget'";
|
||||
|
|
@ -122,7 +122,7 @@ while (scalar(keys %postponed) > 0) {
|
|||
my @pkgDirs = keys %postponed;
|
||||
%postponed = ();
|
||||
foreach my $pkgDir (sort @pkgDirs) {
|
||||
addPkg($pkgDir, 1);
|
||||
addPkg($pkgDir, 2);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -100,15 +100,10 @@ stdenv.mkDerivation (
|
|||
postHook = ''
|
||||
mkdir -p $out/nix-support
|
||||
echo "$system" > $out/nix-support/system
|
||||
. ${./functions.sh}
|
||||
|
||||
# If `src' is the result of a call to `makeSourceTarball', then it
|
||||
# has a subdirectory containing the actual tarball(s). If there are
|
||||
# multiple tarballs, just pick the first one.
|
||||
origSrc=$src
|
||||
if test -d $src/tarballs; then
|
||||
src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1)
|
||||
fi
|
||||
|
||||
src=$(findTarballs $src | head -1)
|
||||
'';
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -36,13 +36,8 @@ stdenv.mkDerivation (
|
|||
mkdir -p $out/nix-support
|
||||
echo "$system" > $out/nix-support/system
|
||||
|
||||
# If `src' is the result of a call to `makeSourceTarball', then it
|
||||
# has a subdirectory containing the actual tarball(s). If there are
|
||||
# multiple tarballs, just pick the first one.
|
||||
origSrc=$src
|
||||
if test -d $src/tarballs; then
|
||||
src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1)
|
||||
fi
|
||||
src=$(findTarballs $src | head -1)
|
||||
|
||||
if test -e $origSrc/nix-support/hydra-release-name; then
|
||||
releaseName=$(cat $origSrc/nix-support/hydra-release-name)
|
||||
|
|
|
|||
|
|
@ -30,17 +30,10 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
|
|||
|
||||
# !!! cut&paste from rpm-build.nix
|
||||
postHook = ''
|
||||
mkdir -p $out/nix-support
|
||||
cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name
|
||||
|
||||
# If `src' is the result of a call to `makeSourceTarball', then it
|
||||
# has a subdirectory containing the actual tarball(s). If there are
|
||||
# multiple tarballs, just pick the first one.
|
||||
echo $src
|
||||
if test -d $src/tarballs; then
|
||||
src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1)
|
||||
fi
|
||||
''; # */
|
||||
. ${./functions.sh}
|
||||
propagateImageName
|
||||
src=$(findTarballs $src | head -1) # Find a tarball.
|
||||
'';
|
||||
|
||||
installExtraDebsPhase = ''
|
||||
for i in $extraDebs; do
|
||||
|
|
|
|||
14
pkgs/build-support/release/functions.sh
Normal file
14
pkgs/build-support/release/functions.sh
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
findTarballs() {
|
||||
local suffix
|
||||
test -d "$1/tarballs/" && {
|
||||
for suffix in tar.gz tgz tar.bz2 tbz2 tar.xz tar.lzma; do
|
||||
ls $1/tarballs/*.$suffix 2> /dev/null
|
||||
done | sort
|
||||
}
|
||||
echo "$1"
|
||||
}
|
||||
|
||||
propagateImageName() {
|
||||
ensureDir $out/nix-support
|
||||
cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name
|
||||
}
|
||||
|
|
@ -58,13 +58,9 @@ stdenv.mkDerivation (
|
|||
name = name + (if src ? version then "-" + src.version else "");
|
||||
|
||||
postHook = ''
|
||||
# If `src' is the result of a call to `makeSourceTarball', then it
|
||||
# has a subdirectory containing the actual tarball(s). If there are
|
||||
# multiple tarballs, just pick the first one.
|
||||
. ${./functions.sh}
|
||||
origSrc=$src
|
||||
if test -d $src/tarballs; then
|
||||
src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz $src/tarballs/*.tar.xz | sort | head -1)
|
||||
fi
|
||||
src=$(findTarballs $src | head -1)
|
||||
|
||||
# Set GCC flags for coverage analysis, if desired.
|
||||
if test -n "${toString doCoverageAnalysis}"; then
|
||||
|
|
|
|||
|
|
@ -14,16 +14,10 @@ vmTools.buildRPM (
|
|||
name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p $out/nix-support
|
||||
cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name
|
||||
|
||||
# If `src' is the result of a call to `makeSourceTarball', then it
|
||||
# has a subdirectory containing the actual tarball(s). If there are
|
||||
# multiple tarballs, just pick the first one.
|
||||
if test -d $src/tarballs; then
|
||||
src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1)
|
||||
fi
|
||||
''; # */
|
||||
. ${./functions.sh}
|
||||
propagateImageName
|
||||
src=$(findTarballs $src | head -1) # Pick the first tarball.
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
declare -a rpms rpmNames
|
||||
|
|
@ -36,12 +30,12 @@ vmTools.buildRPM (
|
|||
done
|
||||
|
||||
echo "installing ''${rpms[*]}..."
|
||||
rpm -ip ''${rpms[*]} --excludepath /nix/store
|
||||
rpm -Up ''${rpms[*]} --excludepath /nix/store
|
||||
|
||||
eval "$postRPMInstall"
|
||||
|
||||
echo "uninstalling ''${rpmNames[*]}..."
|
||||
rpm -e ''${rpmNames[*]}
|
||||
rpm -e ''${rpmNames[*]} --nodeps
|
||||
|
||||
for i in $out/rpms/*/*.src.rpm; do
|
||||
echo "file srpm $i" >> $out/nix-support/hydra-build-products
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ kde {
|
|||
--replace /usr/share/X11 ${xkeyboard_config}/etc/X11
|
||||
'';
|
||||
|
||||
enableParallelBuilding = false;
|
||||
|
||||
meta = {
|
||||
description = "KDE workspace components such as Plasma, Kwin and System Settings";
|
||||
license = "GPLv2";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ in
|
|||
|
||||
composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
|
||||
|
||||
version = "5.3.14";
|
||||
version = "5.3.15";
|
||||
|
||||
name = "php-${version}";
|
||||
|
||||
|
|
@ -149,15 +149,12 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
|
|||
|
||||
installPhase = ''
|
||||
unset installPhase; installPhase;
|
||||
cp php.ini-${ if builtins.lessThan (builtins.compareVersions version "5.3") 0
|
||||
then "recommended" /* < PHP 5.3 */
|
||||
else "production" /* >= PHP 5.3 */
|
||||
} $iniFile
|
||||
cp php.ini-production $iniFile
|
||||
'';
|
||||
|
||||
src = args.fetchurl {
|
||||
url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
|
||||
sha256 = "1cqw0knkrb7wn49ki5kcly4i0hjnd12sf9l4rhk0vny5hdp5n1y8";
|
||||
sha256 = "1vzij845n2akh2lkpacgdc5r0f7nw6pk9l9vi1h8l8k4krjjbdzr";
|
||||
name = "php-${version}.tar.bz2";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "HsOpenSSL";
|
||||
version = "0.10.3.1";
|
||||
sha256 = "0dilmaibx18mfg4c8g96c1svhynhkrq4i5zzv3wg0a550g3xc0py";
|
||||
version = "0.10.3.2";
|
||||
sha256 = "15mlllzw8ahvrx259bz5vwisdig7bvkany1qjhmz6y8v2rcplr7f";
|
||||
buildDepends = [ network time ];
|
||||
extraLibraries = [ openssl ];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -2,12 +2,9 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "benchpress";
|
||||
version = "0.2.2.5";
|
||||
sha256 = "0md66nnn9ad8f3y0dd411plnza59fvhfd6nibag3a556bpfa0kgs";
|
||||
version = "0.2.2.6";
|
||||
sha256 = "19ygaf2g4yqkfbc6bw6fmf9jsymbj1iallzvl0zw3vjx860rchfg";
|
||||
buildDepends = [ mtl time ];
|
||||
patchPhase = ''
|
||||
sed -i -e 's|mtl .*,|mtl,|' benchpress.cabal
|
||||
'';
|
||||
meta = {
|
||||
homepage = "http://github.com/tibbe/benchpress";
|
||||
description = "Micro-benchmarking with detailed statistics";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
{ cabal, comonad, contravariant, distributive, semigroupoids
|
||||
, semigroups, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "comonad-transformers";
|
||||
version = "2.1.2";
|
||||
sha256 = "0yhpsifnqxrg1p8f9hjslwkrakiaxa2kk9726q923a5sj225cvis";
|
||||
buildDepends = [
|
||||
comonad contravariant distributive semigroupoids semigroups
|
||||
transformers
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/comonad-transformers/";
|
||||
description = "Comonad transformers";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "comonad-transformers";
|
||||
version = "2.1.2";
|
||||
sha256 = "0yhpsifnqxrg1p8f9hjslwkrakiaxa2kk9726q923a5sj225cvis";
|
||||
version = "3.0";
|
||||
sha256 = "1bjix61rdzmqcd1irh6p91jwy4sz1617sj4zic07p7ng9h7fsz24";
|
||||
buildDepends = [
|
||||
comonad contravariant distributive semigroupoids semigroups
|
||||
transformers
|
||||
|
|
|
|||
14
pkgs/development/libraries/haskell/semigroupoids/1.3.4.nix
Normal file
14
pkgs/development/libraries/haskell/semigroupoids/1.3.4.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal, comonad, contravariant, semigroups, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "semigroupoids";
|
||||
version = "1.3.4";
|
||||
sha256 = "0vnipjndbsldk5w1qw35i2zrd418rq13y10g0i33ylg1gwnsrqph";
|
||||
buildDepends = [ comonad contravariant semigroups transformers ];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/semigroupoids";
|
||||
description = "Haskell 98 semigroupoids: Category sans id";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "semigroupoids";
|
||||
version = "1.3.4";
|
||||
sha256 = "0vnipjndbsldk5w1qw35i2zrd418rq13y10g0i33ylg1gwnsrqph";
|
||||
version = "3.0";
|
||||
sha256 = "0wsax14ck363nby0xrhcpvdzf0pzspayl7gsm0br0lr6ipmpcrag";
|
||||
buildDepends = [ comonad contravariant semigroups transformers ];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/semigroupoids";
|
||||
|
|
|
|||
13
pkgs/development/libraries/haskell/snap/loader-static.nix
Normal file
13
pkgs/development/libraries/haskell/snap/loader-static.nix
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "snap-loader-static";
|
||||
version = "0.9.0";
|
||||
sha256 = "1blchmg0qfng7bw235z1gqkwyi764j78bc29vd5p6xxhmq111ys7";
|
||||
meta = {
|
||||
homepage = "http://snapframework.com/";
|
||||
description = "Snap: A Haskell Web Framework: static loader";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "tls";
|
||||
version = "0.9.7";
|
||||
sha256 = "0px34l6lw6nv3cbnrgf8ajwja7ifd1pckddmbvrbwk6q459w1pjh";
|
||||
version = "0.9.8";
|
||||
sha256 = "022hak5wy47j4zpf2f89zvz4j2586s3d0a5jkxvz54dkqimy63r6";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "vector-space";
|
||||
version = "0.8.1";
|
||||
sha256 = "0khbi46i9q585nhxhf842wsdifcj1i1dqm84hj0r36474rfh55z5";
|
||||
version = "0.8.2";
|
||||
sha256 = "09gndxxscyc9w85fih370gag8yd1xbfg94nxkwdvhzvbkns9k2ad";
|
||||
buildDepends = [ Boolean MemoTrie NumInstances ];
|
||||
meta = {
|
||||
homepage = "http://haskell.org/haskellwiki/vector-space";
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
|||
configureFlags = "--enable-shared --enable-sharedlib";
|
||||
|
||||
buildInputs = [ python perl gfortran ];
|
||||
propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) [ stdenv.glibc ];
|
||||
propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) stdenv.glibc;
|
||||
|
||||
patchPhase =
|
||||
'' for i in $(find -type f -not -name Makefile.\*)
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
|
||||
, pkgconfig, gstreamer, xineLib, glib }:
|
||||
|
||||
let v = "2.4.1"; in
|
||||
let v = "2.4.2"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opencv-${v}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/opencvlibrary/OpenCV-${v}.tar.bz2";
|
||||
sha256 = "1wxijbz1jfsg4695fls83825ppiacxfn5x07al0qkkx5rm7spdi9";
|
||||
sha256 = "0a1c4ys78k670dsk1fapylpf8hwfyzy944r9jvwivqh33s0j6039";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer ];
|
||||
|
|
|
|||
|
|
@ -3,4 +3,6 @@
|
|||
patch: [
|
||||
(patch "001" "1qxl74f4n0hv4a807byrgbk4ixd8m50apj3922q2ss9pfi0nra1q")
|
||||
(patch "002" "1m670g2xzib6r81315q9r24nh9brmxkpq07acch1fwxmih94jqqy")
|
||||
(patch "003" "0x13c9wir4r44v2vdg96y0ahn8kl3wcmb5y0xn15yvid6pzk28fb")
|
||||
(patch "004" "0xjlkxfssfsd6jwbqhfjs4hybcps0b9zgz8v86vbhnzag4j39g89")
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,36 +1,42 @@
|
|||
{ stdenv, fetchsvn, python, scons, readline, makeWrapper }:
|
||||
{ stdenv, fetchsvn, gyp, readline, python }:
|
||||
|
||||
assert readline != null;
|
||||
|
||||
let
|
||||
system = stdenv.system;
|
||||
arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else "";
|
||||
version = "3.6.6.25";
|
||||
version = "3.11.10.15";
|
||||
in
|
||||
|
||||
assert arch != "";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "v8-${version}";
|
||||
src = fetchsvn {
|
||||
url = "http://v8.googlecode.com/svn/tags/${version}";
|
||||
sha256 = "2a097cbea29a8488419840245bf7bf85513941ceb22c5ef0a3825bfe5edaa045";
|
||||
sha256 = "0pdw4r6crsb07gshww4kbfbavxgkal8yaxkaggnkz62lrwbcwrwi";
|
||||
};
|
||||
|
||||
buildInputs = [python scons readline makeWrapper];
|
||||
|
||||
buildPhase = ''
|
||||
export CXX=`type -p g++`
|
||||
export CPPPATH=${readline}/include
|
||||
export LIBPATH=${readline}/lib
|
||||
scons snapshot=on console=readline library=shared importenv=PATH arch=${arch} library d8
|
||||
configurePhase = ''
|
||||
mkdir build/gyp
|
||||
ln -sv ${gyp}/bin/gyp build/gyp/gyp
|
||||
'';
|
||||
|
||||
buildInputs = [ readline python ];
|
||||
|
||||
buildFlags = [
|
||||
"library=shared"
|
||||
"console=readline"
|
||||
"${arch}.release"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/lib
|
||||
|
||||
cp -v libv8.* $out/lib
|
||||
cp -v d8 $out/bin/d8
|
||||
cp -vR include $out/
|
||||
wrapProgram $out/bin/d8 --set ${if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} $out/lib
|
||||
mv -v out/${arch}.release/d8 $out/bin
|
||||
mv -v out/${arch}.release/lib.target/libv8.so $out/lib
|
||||
mv -v include $out/
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
26
pkgs/development/tools/node/npm2nix/default.nix
Normal file
26
pkgs/development/tools/node/npm2nix/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ stdenv, fetchurl, coffeescript }:
|
||||
|
||||
let version = "0.1"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "npm2nix-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/shlevy/npm2nix/get/${version}.tar.bz2";
|
||||
sha256 = "14rfs114k02yc9gx0bcjqy67f9cqgkrr1dccwlzl09q9b6qs1k3k";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
sed 's|#!/usr/bin/env coffee|#!${coffeescript}/bin/coffee|' npm2nix.coffee \
|
||||
> $out/bin/npm2nix
|
||||
chmod +x $out/bin/npm2nix
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A tool to generate nix expressions from npm packages";
|
||||
maintainer = stdenv.lib.maintainers.shlevy;
|
||||
};
|
||||
}
|
||||
35
pkgs/development/web/nodejs/build-node-package.nix
Normal file
35
pkgs/development/web/nodejs/build-node-package.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ stdenv, nodejs }:
|
||||
|
||||
args @ { src, deps, ... }:
|
||||
|
||||
stdenv.mkDerivation ({
|
||||
unpackPhase = "true";
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
mkdir node_modules
|
||||
${stdenv.lib.concatStrings (map (dep: ''
|
||||
ln -sv ${dep}/node_modules/${(builtins.parseDrvName dep.name).name} node_modules/
|
||||
'') deps)}
|
||||
export HOME=$(pwd)
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
${nodejs}/bin/npm --registry http://www.example.com install ${src}
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir $out
|
||||
mv node_modules $out
|
||||
if [ -d "$out/node_modules/.bin" ]; then
|
||||
ln -sv node_modules/.bin $out/bin
|
||||
find -L $out/node_modules/.bin/* -type f -print0 | \
|
||||
xargs -0 sed --follow-symlinks -i 's@#!/usr/bin/env node@#!${nodejs}/bin/node@'
|
||||
fi
|
||||
runHook postInstall
|
||||
'';
|
||||
} // args)
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, openssl, python, zlib, v8, linkV8Headers ? false }:
|
||||
{ stdenv, fetchurl, openssl, python, zlib, v8, linkV8Headers ? false, utillinux }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.6.19";
|
||||
version = "0.8.3";
|
||||
name = "nodejs-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
|
||||
sha256 = "1frgnl7i111b8x3fr43lh3zybwsszn0daa661gszq7dhfwj2jcsf";
|
||||
sha256 = "0dgcw6qpgvsxcvcbkmvpjz2i9f2r286zcrcg0jnxnds9fj41s2k0";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch;
|
||||
|
||||
prePatch = ''
|
||||
sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf}
|
||||
sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node
|
||||
'';
|
||||
|
||||
buildInputs = [ python openssl v8 zlib ];
|
||||
buildInputs = [ python openssl v8 zlib ] ++ stdenv.lib.optional stdenv.isLinux utillinux;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Event-driven I/O framework for the V8 JavaScript engine";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{stdenv, fetchurl}:
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ipw2100-fw-1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://pkgs.fedoraproject.org/repo/pkgs/ipw2100-firmware/ipw2100-fw-1.3.tgz/46aa75bcda1a00efa841f9707bbbd113/ipw2100-fw-1.3.tgz;
|
||||
sha256 = "18m7wgd062qwfdr6y0kjrvf1715wjcjn4yml2sk29ls8br2pq471";
|
||||
|
|
@ -13,7 +14,7 @@ stdenv.mkDerivation {
|
|||
# says: "Your rights to redistribute the Software shall be
|
||||
# contingent upon your installation of this Agreement in its
|
||||
# entirety in the same directory as the Software."
|
||||
installPhase = "mkdir -p $out; cp * $out";
|
||||
installPhase = "mkdir -p $out; cp ipw* LICENSE $out";
|
||||
|
||||
meta = {
|
||||
# "... you may transfer a copy of the Software ... provided such
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{stdenv, fetchurl}:
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ipw2200-fw-3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://pkgs.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-3.1.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-3.1.tgz;
|
||||
sha256 = "1gaqc8d827d6ji7zhhkpbr4fzznqpar68gzqbzak1h4cq48qr0f6";
|
||||
|
|
|
|||
|
|
@ -1,25 +1,28 @@
|
|||
{ stdenv, fetchurl, bison, flex, autoconf, automake }:
|
||||
{ stdenv, fetchurl, gzip, bzip2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kbd-1.15.2";
|
||||
name = "kbd-1.15.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.altlinux.org/pub/people/legion/kbd/${name}.tar.gz";
|
||||
sha256 = "0ff674y6d3b6ix08b9l2yzv8igns768biyp5y92vip7iz4xv2p2j";
|
||||
sha256 = "1vcl2791xshjdpi4w88iy87gkb7zv0dbvi83f98v30dvqc9mfl46";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ bison flex autoconf automake ];
|
||||
configureFlags = "--disable-nls";
|
||||
|
||||
# We get a warning in armv5tel-linux and the fuloong2f,
|
||||
# so we disable -Werror in it
|
||||
patchPhase = if (stdenv.isArm ||
|
||||
stdenv.system == "mips64el-linux")
|
||||
then ''
|
||||
sed -i s/-Werror// src/Makefile.am
|
||||
'' else "";
|
||||
|
||||
# Grrr, kbd 1.15.1 doesn't include a configure script.
|
||||
preConfigure = "autoreconf";
|
||||
patchPhase =
|
||||
''
|
||||
# Fix the path to gzip/bzip2.
|
||||
substituteInPlace src/findfile.c \
|
||||
--replace gzip ${gzip}/bin/gzip \
|
||||
--replace bzip2 ${bzip2}/bin/bzip2 \
|
||||
|
||||
# We get a warning in armv5tel-linux and the fuloong2f, so we
|
||||
# disable -Werror in it.
|
||||
${stdenv.lib.optionalString (stdenv.isArm || stdenv.system == "mips64el-linux") ''
|
||||
sed -i s/-Werror// src/Makefile.am
|
||||
''}
|
||||
'';
|
||||
|
||||
makeFlags = "setowner= ";
|
||||
|
||||
|
|
|
|||
|
|
@ -205,6 +205,7 @@ let
|
|||
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
|
||||
|
|
|
|||
|
|
@ -1,21 +1,25 @@
|
|||
{ stdenv, fetchurl, pam ? null, glibcCross ? null }:
|
||||
|
||||
let
|
||||
glibc = if stdenv ? cross
|
||||
then glibcCross
|
||||
else assert stdenv ? glibc; stdenv.glibc;
|
||||
|
||||
glibc =
|
||||
if stdenv ? cross
|
||||
then glibcCross
|
||||
else assert stdenv ? glibc; stdenv.glibc;
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "shadow-4.1.4.2";
|
||||
name = "shadow-4.1.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.bz2";
|
||||
sha256 = "1449ny7pdnwkavg92wvibapnkgdq5pas38nvl1m5xa37g5m7z64p";
|
||||
sha256 = "1yvqx57vzih0jdy3grir8vfbkxp0cl0myql37bnmi2yn90vk6cma";
|
||||
};
|
||||
|
||||
buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
|
||||
|
||||
patches = [ ./no-sanitize-env.patch ./su-name.patch ./keep-path.patch ];
|
||||
patches = [ ./keep-path.patch ];
|
||||
|
||||
# Assume System V `setpgrp (void)', which is the default on GNU variants
|
||||
# (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
|
||||
|
|
@ -26,6 +30,12 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc}/sbin/nscd
|
||||
'';
|
||||
|
||||
# Don't install ‘groups’, since coreutils already provides it.
|
||||
postInstall =
|
||||
''
|
||||
rm $out/bin/groups $out/share/man/man1/groups.*
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://pkg-shadow.alioth.debian.org/;
|
||||
description = "Suite containing authentication-related tools such as passwd and su";
|
||||
|
|
|
|||
|
|
@ -1,18 +1,15 @@
|
|||
Don't reset $PATH to /bin:/usr/bin. This is consistent with `su' in
|
||||
coreutils and important on NixOS.
|
||||
|
||||
diff -ru -x '*~' shadow-4.1.4.2-orig/src/su.c shadow-4.1.4.2/src/su.c
|
||||
--- shadow-4.1.4.2-orig/src/su.c 2009-07-23 22:38:56.000000000 +0200
|
||||
+++ shadow-4.1.4.2/src/su.c 2010-06-04 13:23:11.000000000 +0200
|
||||
@@ -827,6 +827,7 @@
|
||||
(void) signal (SIGINT, SIG_DFL);
|
||||
(void) signal (SIGQUIT, SIG_DFL);
|
||||
diff -ru shadow-4.1.5.1-orig/src/su.c shadow-4.1.5.1/src/su.c
|
||||
--- shadow-4.1.5.1-orig/src/su.c 2012-05-25 07:51:55.000000000 -0400
|
||||
+++ shadow-4.1.5.1/src/su.c 2012-07-25 17:22:57.013547930 -0400
|
||||
@@ -879,6 +879,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
+#if 0
|
||||
cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
|
||||
cp = getdef_str ((pw->pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
|
||||
if (NULL == cp) {
|
||||
addenv ("PATH=/bin:/usr/bin", NULL);
|
||||
@@ -835,6 +836,7 @@
|
||||
addenv ((pw->pw_uid == 0) ? "PATH=/sbin:/bin:/usr/sbin:/usr/bin" : "PATH=/bin:/usr/bin", NULL);
|
||||
@@ -887,6 +888,7 @@
|
||||
} else {
|
||||
addenv ("PATH", cp);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
Don't remove environment variables such as PATH or SHELL.
|
||||
|
||||
http://bugs.gentoo.org/show_bug.cgi?id=301957
|
||||
https://alioth.debian.org/scm/browser.php?group_id=30580
|
||||
|
||||
--- a/src/su.c
|
||||
+++ b/src/su.c
|
||||
@@ -342,7 +342,7 @@
|
||||
#endif
|
||||
#endif /* !USE_PAM */
|
||||
|
||||
- sanitize_env ();
|
||||
+ /* sanitize_env (); */
|
||||
|
||||
(void) setlocale (LC_ALL, "");
|
||||
(void) bindtextdomain (PACKAGE, LOCALEDIR);
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
When su is invoked with command line arguments for the shell (e.g. "su
|
||||
- -c 'cmd'"), set argv[0] in the shell to "-su" or "-<basename>" (as
|
||||
determined by the SU_NAME option in /etc/login.defs). This is
|
||||
necessary to make Bash compiled with the NON_INTERACTIVE_LOGIN_SHELLS
|
||||
option to read startup files. It is also consistent with the
|
||||
behaviour of `su' in coreutils, and with the case where there are no
|
||||
arguments ("su -").
|
||||
|
||||
diff -ru -x '*~' shadow-4.1.4.2-orig/src/su.c shadow-4.1.4.2/src/su.c
|
||||
--- shadow-4.1.4.2-orig/src/su.c 2009-07-23 22:38:56.000000000 +0200
|
||||
+++ shadow-4.1.4.2/src/su.c 2010-06-04 13:02:24.000000000 +0200
|
||||
@@ -983,7 +983,7 @@
|
||||
* Use the shell and create an argv
|
||||
* with the rest of the command line included.
|
||||
*/
|
||||
- argv[-1] = shellstr;
|
||||
+ argv[-1] = cp;
|
||||
#ifndef USE_PAM
|
||||
execve_shell (shellstr, &argv[-1], environ);
|
||||
err = errno;
|
||||
|
|
@ -34,6 +34,7 @@ stdenv.mkDerivation {
|
|||
rm -rf $out/include
|
||||
rm -rf $out/share/man/man5
|
||||
rm $(for i in $out/share/man/man8/*; do echo $i; done | grep -v 'pidof\|killall5')
|
||||
rm $out/bin/{mountpoint,wall} $out/share/man/man1/{mountpoint.1,wall.1}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
assert stdenv.isLinux;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "upower-0.9.16";
|
||||
name = "upower-0.9.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
|
||||
sha256 = "eb9a3d39a8cb62970fd612e333bc7a43437ab0e7890303578b0a7e3c67c8c212";
|
||||
sha256 = "0a1j2pg44r6ljj9jgzlw8i5fzabpm2b2jk058kxsr77ciz96i7yg";
|
||||
};
|
||||
|
||||
buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{stdenv, fetchurl, openssl, pam, bzip2, zlib}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dovecot-2.1.7";
|
||||
name = "dovecot-2.1.8";
|
||||
|
||||
buildInputs = [openssl pam bzip2 zlib];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dovecot.org/releases/2.1/${name}.tar.gz";
|
||||
sha256 = "0lpldhs0nvy6rxabqkp14wzcwf1cx4jvnbp1xcm74izrzxhvrdym";
|
||||
sha256 = "03801f4agcwdpqyg6dfxlga3750pnhk4gaf8m7sjq1qmz2277028";
|
||||
};
|
||||
|
||||
# It will hardcode this for /var/lib/dovecot.
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, buildPythonPackage, pythonPackages }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "ipython-0.11";
|
||||
name = "ipython-0.13";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
|
||||
md5 = "efc899e752a4a4a67a99575cea1719ef";
|
||||
sha256 = "1m4m0zf3llnicfgrbnl2h08p3662px7v2pzbhq4fq24vnyz6x5w2";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pythonPackages.readline pythonPackages.sqlite3 ];
|
||||
|
|
|
|||
20
pkgs/tools/filesystems/ciopfs/default.nix
Normal file
20
pkgs/tools/filesystems/ciopfs/default.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{ stdenv, fetchurl, pkgconfig, fuse, glib, attr }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ciopfs-0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.brain-dump.org/projects/ciopfs/${name}.tar.gz";
|
||||
sha256 = "0sr9i9b3qfwbfvzvk00yrrg3x2xqk1njadbldkvn7hwwa4z5bm9l";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig fuse glib attr ];
|
||||
|
||||
makeFlags = "DESTDIR=$(out) PREFIX=";
|
||||
|
||||
meta = {
|
||||
homepage = http://www.brain-dump.org/projects/ciopfs/;
|
||||
description = "A case-insensitive filesystem layered on top of any other filesystem";
|
||||
license = "GPLv2";
|
||||
};
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ntfs-3g_ntfsprogs";
|
||||
version = "2011.4.12";
|
||||
version = "2012.1.15";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
buildInputs = [libuuid] ++ stdenv.lib.optionals crypto [gnutls libgcrypt];
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "http://tuxera.com/opensource/${name}.tgz";
|
||||
sha256 = "01gfn94f4fdrl1rjhhxjvjbarr1mipdi4pmhhwirp0gy1dzp935a";
|
||||
sha256 = "09gvfgvqm4dswzxmwvg3r23bv39cp8y8b6qs2jcwmrqd032i25kg";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,12 +2,16 @@
|
|||
, EFIsupport ? false }:
|
||||
|
||||
let
|
||||
prefix = "grub${if EFIsupport then "-efi" else ""}";
|
||||
version = "1.99";
|
||||
unifont_bdf = fetchurl {
|
||||
url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
|
||||
sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
|
||||
};
|
||||
|
||||
prefix = "grub${if EFIsupport then "-efi" else ""}";
|
||||
|
||||
version = "2.00";
|
||||
|
||||
unifont_bdf = fetchurl {
|
||||
url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
|
||||
sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -15,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/grub/grub-${version}.tar.xz";
|
||||
sha256 = "06q2a7bg1mbsms604a89fkdnwrc1jg9hr2mmfdmg3il39j6i827k";
|
||||
sha256 = "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ flex bison ];
|
||||
|
|
@ -1,23 +1,28 @@
|
|||
{stdenv, fetchurl, openssh}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name="autossh-1.4b";
|
||||
src = fetchurl {
|
||||
url = "http://www.harding.motd.ca/autossh/autossh-1.4b.tgz";
|
||||
md5 = "8f9aa006f6f69e912d3c2f504622d6f7";
|
||||
};
|
||||
buildInputs = [ openssh ];
|
||||
installPhase = ''
|
||||
install -D -m755 autossh $out/bin/autossh || return 1
|
||||
install -D -m644 CHANGES $out/share/doc/autossh/CHANGES || return 1
|
||||
install -D -m644 README $out/share/doc/autossh/README || return 1
|
||||
install -D -m644 autossh.host $out/share/autossh/examples/autossh.host || return 1
|
||||
install -D -m644 rscreen $out/share/autossh/examples/rscreen || return 1
|
||||
install -D -m644 autossh.1 $out/man/man1/autossh.1 || return 1
|
||||
'';
|
||||
meta = {
|
||||
homepage = http://www.harding.motd.ca/autossh/;
|
||||
description = "Automatically restart SSH sessions and tunnels";
|
||||
};
|
||||
name = "autossh-1.4b";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.harding.motd.ca/autossh/autossh-1.4b.tgz";
|
||||
md5 = "8f9aa006f6f69e912d3c2f504622d6f7";
|
||||
};
|
||||
|
||||
buildInputs = [ openssh ];
|
||||
|
||||
installPhase =
|
||||
''
|
||||
install -D -m755 autossh $out/bin/autossh || return 1
|
||||
install -D -m644 CHANGES $out/share/doc/autossh/CHANGES || return 1
|
||||
install -D -m644 README $out/share/doc/autossh/README || return 1
|
||||
install -D -m644 autossh.host $out/share/autossh/examples/autossh.host || return 1
|
||||
install -D -m644 rscreen $out/share/autossh/examples/rscreen || return 1
|
||||
install -D -m644 autossh.1 $out/man/man1/autossh.1 || return 1
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.harding.motd.ca/autossh/;
|
||||
description = "Automatically restart SSH sessions and tunnels";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
34
pkgs/tools/networking/netrw/default.nix
Normal file
34
pkgs/tools/networking/netrw/default.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ stdenv, fetchurl
|
||||
, checksumType ? "built-in"
|
||||
, libmhash ? null
|
||||
, openssl ? null
|
||||
}:
|
||||
|
||||
assert checksumType == "mhash" -> libmhash != null;
|
||||
assert checksumType == "openssl" -> openssl != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "netrw-${version}";
|
||||
version = "1.3.2";
|
||||
|
||||
configureFlags = [
|
||||
"--with-checksum=${checksumType}"
|
||||
];
|
||||
|
||||
buildInputs = stdenv.lib.optional (checksumType == "mhash") libmhash
|
||||
++ stdenv.lib.optional (checksumType == "openssl") openssl;
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"http://mamuti.net/files/netrw/netrw-${version}.tar.bz2"
|
||||
"http://www.sourcefiles.org/Networking/FTP/Other/netrw-${version}.tar.bz2"
|
||||
];
|
||||
sha256 = "1gnl80i5zkyj2lpnb4g0q0r5npba1x6cnafl2jb3i3pzlfz1bndr";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A simple tool for transporting data over the network.";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
homepage = "http://mamuti.net/netrw/index.en.html";
|
||||
};
|
||||
}
|
||||
26
pkgs/tools/security/clamav/default.nix
Normal file
26
pkgs/tools/security/clamav/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ stdenv, fetchurl, zlib, bzip2, libiconv }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "clamav-${version}";
|
||||
version = "0.97.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://tenet.dl.sourceforge.net/project/clamav/clamav/${version}/clamav-${version}.tar.gz";
|
||||
sha256 = "039wm64wl2sx7k019g5ll5dkdlsq64fnd0ng0s00pjn8bqd5wv6v";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib bzip2 libiconv ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-zlib=${zlib}"
|
||||
"--with-libbz2-prefix=${bzip2}"
|
||||
"--with-iconv-dir=${libiconv}"
|
||||
"--disable-clamav" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.clamav.net;
|
||||
description = "an open source (GPL) antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats.";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.phreedom ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
41
pkgs/tools/security/fprot/default.nix
Normal file
41
pkgs/tools/security/fprot/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ stdenv, fetchurl }:
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "f-prot-${version}";
|
||||
version = "6.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://files.f-prot.com/files/unix-trial/fp-Linux.x86.32-ws.tar.gz;
|
||||
sha256 = "0qlsrkanf0inplwv1i6hqbimdg91syf5ggd1vahsm9lhivmnr0v5";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
cp fpscan $out/bin
|
||||
|
||||
ensureDir $out/opt/f-prot
|
||||
cp fpupdate $out/opt/f-prot
|
||||
cp product.data.default $out/opt/f-prot/product.data
|
||||
cp license.key $out/opt/f-prot/
|
||||
cp f-prot.conf.default $out/opt/f-prot/f-prot.conf
|
||||
ln -s $out/opt/f-prot/fpupdate $out/bin/fpupdate
|
||||
|
||||
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate
|
||||
|
||||
ensureDir $out/share/man/
|
||||
ensureDir $out/share/man/man1
|
||||
cp doc/man/fpscan.1 $out/share/man/man1
|
||||
ensureDir $out/share/man/man5
|
||||
cp doc/man/f-prot.conf.5 $out/share/man/man5
|
||||
ensureDir $out/share/man/man8
|
||||
cp doc/man/fpupdate.8 $out/share/man/man8
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.f-prot.com;
|
||||
description = "a popular proprietary antivirus, Linux workstation edition.";
|
||||
license = licenses.proprietary;
|
||||
maintainers = [ maintainers.phreedom ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ec2-ami-tools-1.4.0.7";
|
||||
|
||||
buildInputs = [ unzip makeWrapper ];
|
||||
|
||||
src = fetchurl {
|
||||
url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip;
|
||||
url = "http://nixos.org/tarballs/${name}.zip";
|
||||
sha256 = "0l8c623i1w30bh9k622cdjj5f57rlfc1zs0i01ya016ijyr08qip";
|
||||
};
|
||||
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, unzip, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ec2-api-tools-1.5.3.0";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ec2-api-tools-1.6.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip;
|
||||
sha256 = "15mxjay8pr6cvlmp9hdsg5z7zc15bicjrc30f27rknq72zyhxi8h";
|
||||
url = "http://nixos.org/tarballs/${name}.zip";
|
||||
sha256 = "1j9isvi6g68zhk7zxs29yad2d0rpnbqx8fz25yn5paqx9c8pzqcl";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip makeWrapper ];
|
||||
|
|
@ -383,9 +383,9 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
ec2apitools = callPackage ../tools/virtualization/amazon-ec2-api-tools { };
|
||||
ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
|
||||
|
||||
ec2amitools = callPackage ../tools/virtualization/amazon-ec2-ami-tools { };
|
||||
ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };
|
||||
|
||||
altermime = callPackage ../tools/networking/altermime {};
|
||||
|
||||
|
|
@ -519,6 +519,8 @@ let
|
|||
|
||||
cksfv = callPackage ../tools/networking/cksfv { };
|
||||
|
||||
ciopfs = callPackage ../tools/filesystems/ciopfs { };
|
||||
|
||||
colordiff = callPackage ../tools/text/colordiff { };
|
||||
|
||||
convertlit = callPackage ../tools/text/convertlit { };
|
||||
|
|
@ -529,6 +531,8 @@ let
|
|||
|
||||
usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
|
||||
|
||||
clamav = callPackage ../tools/security/clamav { };
|
||||
|
||||
cloog = callPackage ../development/libraries/cloog { };
|
||||
|
||||
cloogppl = callPackage ../development/libraries/cloog-ppl { };
|
||||
|
|
@ -716,6 +720,8 @@ let
|
|||
|
||||
fortune = callPackage ../tools/misc/fortune { };
|
||||
|
||||
fprot = callPackage ../tools/security/fprot { };
|
||||
|
||||
freeipmi = callPackage ../tools/system/freeipmi {};
|
||||
|
||||
freetalk = callPackage ../applications/networking/instant-messengers/freetalk {
|
||||
|
|
@ -826,11 +832,9 @@ let
|
|||
buggyBiosCDSupport = getConfig ["grub" "buggyBiosCDSupport"] true;
|
||||
};
|
||||
|
||||
grub19x = callPackage ../tools/misc/grub/1.9x.nix { };
|
||||
grub2 = callPackage ../tools/misc/grub/2.0x.nix { };
|
||||
|
||||
grub2 = grub19x;
|
||||
|
||||
grub2_efi = callPackage ../tools/misc/grub/1.9x.nix { EFIsupport = true; };
|
||||
grub2_efi = grub2.override { EFIsupport = true; };
|
||||
|
||||
gssdp = callPackage ../development/libraries/gssdp {
|
||||
inherit (gnome) libsoup;
|
||||
|
|
@ -971,6 +975,14 @@ let
|
|||
|
||||
nodejs = callPackage ../development/web/nodejs {};
|
||||
|
||||
nodePackages = recurseIntoAttrs (import ./node-packages.nix {
|
||||
inherit pkgs stdenv nodejs fetchurl;
|
||||
});
|
||||
|
||||
npm2nix = callPackage ../development/tools/node/npm2nix {
|
||||
coffeescript = nodePackages."coffee-script";
|
||||
};
|
||||
|
||||
ldns = callPackage ../development/libraries/ldns { };
|
||||
|
||||
lftp = callPackage ../tools/networking/lftp { };
|
||||
|
|
@ -1120,6 +1132,8 @@ let
|
|||
|
||||
netpbm = callPackage ../tools/graphics/netpbm { };
|
||||
|
||||
netrw = callPackage ../tools/networking/netrw { };
|
||||
|
||||
netselect = callPackage ../tools/networking/netselect { };
|
||||
|
||||
networkmanager = callPackage ../tools/networking/network-manager { };
|
||||
|
|
@ -5000,7 +5014,7 @@ let
|
|||
inherit (gnome) libsoup;
|
||||
};
|
||||
|
||||
v8 = callPackage ../development/libraries/v8 { };
|
||||
v8 = callPackage ../development/libraries/v8 { inherit (pythonPackages) gyp; };
|
||||
|
||||
xalanj = xalanJava;
|
||||
xalanJava = callPackage ../development/libraries/java/xalanj {
|
||||
|
|
@ -5016,7 +5030,6 @@ let
|
|||
|
||||
jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { };
|
||||
|
||||
|
||||
### DEVELOPMENT / PERL MODULES
|
||||
|
||||
buildPerlPackage = import ../development/perl-modules/generic perl;
|
||||
|
|
|
|||
|
|
@ -27,9 +27,14 @@
|
|||
binary = null; # now a core package
|
||||
};
|
||||
|
||||
ghc722Prefs = ghc741Prefs;
|
||||
ghc722Prefs =
|
||||
self : self.haskellPlatformArgs_2012_2_0_0 self // {
|
||||
haskellPlatform = self.haskellPlatform_2012_2_0_0;
|
||||
binary = null; # a core package
|
||||
deepseq = self.deepseq_1_3_0_0;
|
||||
};
|
||||
|
||||
ghc721Prefs = ghc741Prefs;
|
||||
ghc721Prefs = ghc722Prefs;
|
||||
|
||||
ghc704Prefs =
|
||||
self : self.haskellPlatformArgs_2011_4_0_0 self // {
|
||||
|
|
|
|||
|
|
@ -534,7 +534,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
|
||||
comonad_1_1_1_6 = callPackage ../development/libraries/haskell/comonad/1.1.1.6.nix {};
|
||||
|
||||
comonad = callPackage ../development/libraries/haskell/comonad/default.nix {};
|
||||
comonad = callPackage ../development/libraries/haskell/comonad {};
|
||||
|
||||
comonadTransformers_2_1_2 = callPackage ../development/libraries/haskell/comonad-transformers/2.1.2.nix {};
|
||||
|
||||
comonadTransformers = callPackage ../development/libraries/haskell/comonad-transformers {};
|
||||
|
||||
|
|
@ -546,14 +548,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
|
||||
configurator = callPackage ../development/libraries/haskell/configurator {};
|
||||
|
||||
contravariant = callPackage ../development/libraries/haskell/contravariant {};
|
||||
|
||||
convertible = callPackage ../development/libraries/haskell/convertible {
|
||||
time = self.time_1_1_3;
|
||||
};
|
||||
|
||||
continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {};
|
||||
|
||||
contravariant = callPackage ../development/libraries/haskell/contravariant {};
|
||||
|
||||
converge = callPackage ../development/libraries/haskell/converge {};
|
||||
|
||||
cookie = callPackage ../development/libraries/haskell/cookie {};
|
||||
|
|
@ -1307,11 +1309,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
|
||||
sendfile = callPackage ../development/libraries/haskell/sendfile {};
|
||||
|
||||
semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {
|
||||
comonad = self.comonad_1_1_1_6;
|
||||
semigroups = callPackage ../development/libraries/haskell/semigroups {};
|
||||
|
||||
semigroupoids_1_3_4 = callPackage ../development/libraries/haskell/semigroupoids/1.3.4.nix {
|
||||
comonad = self.comonad_1_1_16;
|
||||
};
|
||||
|
||||
semigroups = callPackage ../development/libraries/haskell/semigroups {};
|
||||
semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {};
|
||||
|
||||
shelly = callPackage ../development/libraries/haskell/shelly {};
|
||||
|
||||
|
|
@ -1325,6 +1329,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
|
||||
snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};
|
||||
|
||||
snapLoaderStatic = callPackage ../development/libraries/haskell/snap/loader-static.nix {};
|
||||
|
||||
snapServer = callPackage ../development/libraries/haskell/snap/server.nix {};
|
||||
|
||||
socks = callPackage ../development/libraries/haskell/socks {};
|
||||
|
|
|
|||
22
pkgs/top-level/node-packages.nix
Normal file
22
pkgs/top-level/node-packages.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ pkgs, stdenv, nodejs, fetchurl }:
|
||||
|
||||
let buildNodePackage = import ../development/web/nodejs/build-node-package.nix {
|
||||
inherit stdenv nodejs;
|
||||
}; in
|
||||
|
||||
let self = {
|
||||
"coffee-script" = self."coffee-script-1.3.3";
|
||||
|
||||
"coffee-script-1.3.3" = buildNodePackage rec {
|
||||
name = "coffee-script-1.3.3";
|
||||
src = fetchurl {
|
||||
url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz";
|
||||
sha256 = "deedd2cf9d5abe2bad724e6809bec40efa07215dae85f44d78cd37736bb50bc5";
|
||||
};
|
||||
deps = [
|
||||
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
in self
|
||||
|
|
@ -848,6 +848,27 @@ let pythonPackages = python.modules // rec {
|
|||
};
|
||||
|
||||
|
||||
gyp = buildPythonPackage rec {
|
||||
rev = "1435";
|
||||
name = "gyp-r${rev}";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "http://gyp.googlecode.com/svn/trunk";
|
||||
inherit rev;
|
||||
sha256 = "1wmd1svx5344alb8ff9vzdam1ccqdl0h7shp1xnsk843hqwc0fz0";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postUnpack = "find . -print0 | xargs -0 touch";
|
||||
|
||||
meta = {
|
||||
homepage = http://code.google.com/p/gyp;
|
||||
description = "Generate Your Projects";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
httplib2 = buildPythonPackage rec {
|
||||
name = "httplib2-0.6.0";
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue