Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
This commit is contained in:
Charles Strahan
2015-01-20 20:21:03 -05:00
823 changed files with 154029 additions and 7470 deletions

View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "6.1.1";
version = "6.2";
name = "checkstyle-${version}";
src = fetchurl {
url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
sha256 = "07qickjgayakzfq54nwb9rpxydjkymxw6lnhzxri36mxspq9pzda";
sha256 = "1pd03hl3c70g1hfs085c0x6c2k3jfh9z4akckh43ha9yv67ib095";
};
installPhase = ''

View File

@@ -0,0 +1,34 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
version = "6.0.1";
name = "coan-${version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/coan2/v${version}/${name}.tar.gz";
sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44";
};
buildInputs = [ perl ];
enableParallelBuilding = true;
postInstall = ''
mv -v $out/share/man/man1/coan.1.{1,gz}
'';
meta = with stdenv.lib; {
description = "The C preprocessor chainsaw";
longDescription = ''
A software engineering tool for analysing preprocessor-based
configurations of C or C++ source code. Its principal use is to simplify
a body of source code by eliminating any parts that are redundant with
respect to a specified configuration. Dead code removal is an
application of this sort.
'';
homepage = http://coan2.sourceforge.net/;
license = with licenses; bsd3;
platforms = with platforms; all;
maintainers = with maintainers; [ nckx ];
};
}

View File

@@ -1,8 +1,8 @@
{stdenv, fetchurl, zlib}:
{stdenv, version}:
with stdenv.lib;
{
inherit version;
rec {
platform = if stdenv.system == "i686-linux"
then "i686-unknown-linux-gnu"
else if stdenv.system == "x86_64-linux"
@@ -11,42 +11,14 @@ rec {
then "i686-apple-darwin"
else if stdenv.system == "x86_64-darwin"
then "x86_64-apple-darwin"
else throw "no snapshot to boostrap for this platform (missing platform url suffix)";
else throw "no snapshot to bootstrap for this platform (missing platform url suffix)";
snapshotHash = if stdenv.system == "i686-linux"
then "4dea04e278192c5409f43794a98f20a8f59df2d9"
else if stdenv.system == "x86_64-linux"
then "3e48c573d3c4d26591feb7bfe988174720f08374"
else if stdenv.system == "i686-darwin"
then "dc3d498c0567af4a0820e91756dcfff8fde0efac"
else if stdenv.system == "x86_64-darwin"
then "f301bd8c3c93a5c88698c69190e464af1525ac96"
else throw "no snapshot for platform ${stdenv.system}";
snapshotDate = "2014-12-21";
snapshotName = "cargo-nightly-${platform}.tar.gz";
snapshot = stdenv.mkDerivation {
name = "cargo-snapshot-${snapshotDate}";
src = fetchurl {
url = "https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${snapshotDate}/${snapshotName}";
sha1 = snapshotHash;
};
dontStrip = true;
installPhase = ''
mkdir -p "$out"
cp -r bin "$out/bin"
'' + (if stdenv.isLinux then ''
patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
--set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/:${zlib}/lib" \
"$out/bin/cargo"
'' else "");
};
meta = {
meta = with stdenv.lib; {
homepage = http://crates.io;
description = "Downloads your Rust project's dependencies and builds your project";
license = [ licenses.mit licenses.asl20 ];
platforms = platforms.linux;
};
name = "cargo-${version}";
}

View File

@@ -2,6 +2,42 @@
/* Cargo binary snapshot */
with ((import ./common.nix) { inherit stdenv fetchurl zlib; });
let snapshotDate = "2014-12-30";
in
snapshot // { inherit meta; }
with ((import ./common.nix) { inherit stdenv; version = "snapshot-${snapshotDate}"; });
let snapshotHash = if stdenv.system == "i686-linux"
then "ab8bba0918d3d2ddbd7fd21f147e223dbf04cece"
else if stdenv.system == "x86_64-linux"
then "0efe0f7bcbcbeb5494affcc8a2207db448a08c45"
else if stdenv.system == "i686-darwin"
then "e5097005b0a27c186b8edee24982fd4c3ebba81e"
else if stdenv.system == "x86_64-darwin"
then "6c0bb776e5645fb93b67341b111c715f39b25511"
else throw "no snapshot for platform ${stdenv.system}";
snapshotName = "cargo-nightly-${platform}.tar.gz";
in
stdenv.mkDerivation {
inherit name;
inherit version;
inherit meta;
src = fetchurl {
url = "https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${snapshotDate}/${snapshotName}";
sha1 = snapshotHash;
};
dontStrip = true;
installPhase = ''
mkdir -p "$out"
cp -r bin "$out/bin"
'' + (if stdenv.isLinux then ''
patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
--set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/:${zlib}/lib" \
"$out/bin/cargo"
'' else "");
}

View File

@@ -42,6 +42,6 @@ stdenv.mkDerivation {
homepage = http://www.gnu.org/software/make/;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
};
}

View File

@@ -57,7 +57,7 @@ stdenv.mkDerivation {
homepage = http://www.gnu.org/software/make/;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}

View File

@@ -43,7 +43,7 @@ stdenv.mkDerivation {
homepage = http://www.gnu.org/software/make/;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}

View File

@@ -0,0 +1,41 @@
{ stdenv, fetchurl }:
let
version = "4.1";
in
stdenv.mkDerivation {
name = "gnumake-${version}";
src = fetchurl {
url = "mirror://gnu/make/make-${version}.tar.bz2";
sha256 = "19gwwhik3wdwn0r42b7xcihkbxvjl9r2bdal8nifc3k5i4rn3iqb";
};
patchFlags = "-p0";
patches = [
# Purity: don't look for library dependencies (of the form `-lfoo') in /lib
# and /usr/lib. It's a stupid feature anyway. Likewise, when searching for
# included Makefiles, don't look in /usr/include and friends.
./impure-dirs.patch
];
meta = {
homepage = http://www.gnu.org/software/make/;
description = "A tool to control the generation of non-source files from sources";
license = stdenv.lib.licenses.gpl3Plus;
longDescription = ''
Make is a tool which controls the generation of executables and
other non-source files of a program from the program's source files.
Make gets its knowledge of how to build your program from a file
called the makefile, which lists each of the non-source files and
how to compute it from other files. When you write a program, you
should write a makefile for it, so that it is possible to use Make
to build and install the program.
'';
maintainers = with stdenv.lib.maintainers; [ simons ];
platforms = stdenv.lib.platforms.all;
};
}

View File

@@ -0,0 +1,34 @@
diff -rc read.c read.c
*** read.c 2006-03-17 15:24:20.000000000 +0100
--- read.c 2007-05-24 17:16:31.000000000 +0200
***************
*** 99,107 ****
--- 99,109 ----
#endif
INCLUDEDIR,
#ifndef _AMIGA
+ #if 0
"/usr/gnu/include",
"/usr/local/include",
"/usr/include",
+ #endif
#endif
0
};
diff -rc reremake.c
*** remake.c 2006-03-20 03:36:37.000000000 +0100
--- remake.c 2007-05-24 17:06:54.000000000 +0200
***************
*** 1452,1460 ****
--- 1452,1462 ----
static char *dirs[] =
{
#ifndef _AMIGA
+ #if 0
"/lib",
"/usr/lib",
#endif
+ #endif
#if defined(WINDOWS32) && !defined(LIBDIR)
/*
* This is completely up to the user at product install time. Just define

View File

@@ -7,7 +7,7 @@ mkdir -pv $out/bin $out/share/java
out_bin=$out/bin/lein
cp -v $src $out_bin
cp -v $jarsrc $out/share/java
cp -v $jarsrc "$out/share/java/$name-standalone.jar"
for p in $patches;
do

View File

@@ -3,17 +3,18 @@
stdenv.mkDerivation rec {
pname = "leiningen";
version = "2.5.0";
version = "2.5.1";
name = "${pname}-${version}";
src = fetchurl {
url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
sha256 = "1drl35313xp2gg5y52wp8414i2fm806rhgcsghl4igrm3afrv85x";
sha256 = "0pqqb2bh0a17426diwyhk5vbxcfz45rppbxmjydsmai94jm3cgix";
};
jarsrc = fetchurl {
url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.jar";
sha256 = "0fd7yqrj9asx1n3nszli7hr4fj47v2pdr9msk5g75955pw7yavp9";
# NOTE: This is actually a .jar, Github has issues
url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip";
sha256 = "1irl3w66xq1xbbs4g10dnw1vknfw8al70nhr744gfn2za27w0xdl";
};
patches = [ ./lein-fix-jar-path.patch ];

View File

@@ -1,21 +0,0 @@
{ stdenv }:
let
version = "2014-11-28";
in stdenv.mkDerivation {
name = "skarnet-conf-compile-${version}";
phases = [ "fixupPhase" ];
setupHook = ./setup-hook.sh;
meta = {
homepage = http://www.skarnet.org/software/conf-compile.html;
description = "Support for configuring skarnet.org packages for nix builds";
platforms = stdenv.lib.platforms.all;
};
}

View File

@@ -1,47 +0,0 @@
# Packages from skarnet.org use a unique build system. These functions
# assist with some common configuration and shebang patching.
skarnetConfigure() {
runHook preConfigure
pushd conf-compile >/dev/null
# paths
> conf-defaultpath printf "$out/bin"
> conf-etc printf "$out/etc"
> conf-install-command printf "$out/bin"
> conf-install-include printf "$out/include"
> conf-install-libexec printf "$out/libexec"
> conf-install-library printf "$out/lib"
> conf-install-library.so printf "$out/lib"
> conf-install-sysdeps printf "$out/sysdeps"
# use generic 'cc' to support both gcc and clang (darwin) stdenvs
for file in conf-cc conf-dynld conf-ld; do
substituteInPlace $file --replace gcc cc
done
# let nix builder strip things, cross-platform
truncate --size 0 conf-stripbins conf-striplibs
rm -f flag-slashpackage
touch flag-allstatic
touch flag-forcedevr # only used for skalibs
# build inputs
truncate --size 0 import path-include path-library
for input in $nativeBuildInputs; do
[[ -a "$input/sysdeps" ]] && >> import printf "$input/sysdeps"
[[ -a "$input/include" ]] && >> path-include printf "$input/include"
[[ -a "$input/lib" ]] && >> path-library printf "$input/lib"
done
popd >/dev/null
# patch various scripts to use stdenv shell
patchShebangs src/sys
runHook postConfigure
}
export configurePhase=skarnetConfigure

View File

@@ -0,0 +1,51 @@
{ stdenv, fetchFromGitHub, fuse, pkgconfig }:
stdenv.mkDerivation rec {
name = "tup-${version}";
version = "0.7.3";
src = fetchFromGitHub {
owner = "gittup";
repo = "tup";
rev = "v${version}";
sha256 = "1x2grwmlf2izip4djb8cjwgl8p3x0bmfqwzjsc017mqi17qkijy8";
};
buildInputs = [ fuse pkgconfig ];
configurePhase = ''
sed -i 's/`git describe`/v${version}/g' Tupfile
'';
# Regular tup builds require fusermount to have suid, which nix cannot
# currently provide in a build environment, so we bootstrap and use 'tup
# generate' instead
buildPhase = ''
./build.sh
./build/tup generate script.sh
./script.sh
'';
installPhase = ''
mkdir -p $out/bin
cp tup $out/bin/
mkdir -p $out/share/man/man1
cp tup.1 $out/share/man/man1/
'';
meta = with stdenv.lib; {
description = "A fast, file-based build system";
longDescription = ''
Tup is a file-based build system for Linux, OSX, and Windows. It inputs a list
of file changes and a directed acyclic graph (DAG), then processes the DAG to
execute the appropriate commands required to update dependent files. Updates are
performed with very little overhead since tup implements powerful build
algorithms to avoid doing unnecessary work. This means you can stay focused on
your project rather than on your build system.
'';
homepage = http://gittup.org/tup/;
license = licenses.gpl2;
platforms = platforms.linux ++ platforms.darwin;
};
}

View File

@@ -4,12 +4,12 @@
# the tarball. Is there a nicer way than duplicating code?
let
version = "0.4";
version = "0.5";
in
eggDerivation {
src = fetchurl {
url = "https://github.com/the-kenny/egg2nix/archive/${version}.tar.gz";
sha256 = "1xn79fgqxg0i47asjah31zi56v60is1n8d0cy8w4gbj0i41z7pvm";
sha256 = "0adal428v4i7h9lzs7sfq75q2mxhsbf1qqwzrsjv8j41paars20y";
};
name = "egg2nix-${version}";

View File

@@ -1,7 +1,7 @@
{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "0.4.3";
version = "0.4.5";
name = "etcdctl-${version}";
src = import ./deps.nix {

View File

@@ -7,8 +7,8 @@ let
src = fetchFromGitHub {
owner = "coreos";
repo = "etcdctl";
rev = "061135b2a02797a6b3c2b6c01183517c1bc76a2c";
sha256 = "1hl9cz9ygr2k4d67qj9q1xj0n64b28qjy5sv7zylgg9h9ag2j2p4";
rev = "a1b38c93245542e340971189750baef7a55d306e";
sha256 = "1kbri59ppil52v7s992q8r6i1zk9lac0s2w00z2lsgc9w1z59qs0";
};
}
];

View File

@@ -1,4 +1,4 @@
{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
{ stdenv, lib, go_1_3, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "golint";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
};
buildInputs = [ go ];
buildInputs = [ go_1_3 ];
buildPhase = ''
export GOPATH=$src

View File

@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
'';
homepage = http://www.nongnu.org/g-wrap/;
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
};
}

View File

@@ -1,17 +1,17 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, Cabal, doctest, filepath, hackageDb, mtl, regexPosix
, transformers
{ cabal, Cabal, deepseq, doctest, filepath, hackageDb, mtl
, regexPosix, transformers
}:
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.72";
sha256 = "0xa7v9nwhaymc40qlh7ndv6xvqmfxmc3rp860v0h4swfqsb9bsvr";
version = "1.73";
sha256 = "1nskcr8k5a8wm9q5is0b1kww574q2nq45f16agya8z44hgk97xiv";
isLibrary = false;
isExecutable = true;
buildDepends = [
Cabal filepath hackageDb mtl regexPosix transformers
Cabal deepseq filepath hackageDb mtl regexPosix transformers
];
testDepends = [ doctest ];
doCheck = self.stdenv.lib.versionOlder "7.8" self.ghc.version;

View File

@@ -2,23 +2,35 @@
stdenv.mkDerivation rec {
name = "ihaskell-" + ihaskell.version ;
inherit (ihaskell) name pname src version meta;
buildInputs = [ makeWrapper ];
preferLocalBuild = true;
buildCommand = ''
buildCommand = let profile = "${pname}-${version}/profile/profile.tar"; in ''
tar xf $src ${profile}
mkdir -p $out/share/`dirname ${profile}`
mkdir profile
cd profile
tar xf ../${profile}
for cfg in ipython_*config.py;do
sed -i -e "1iexe = '${ihaskell}/bin/IHaskell'" $cfg
done
tar cf $out/share/${profile} .
makeWrapper "${ihaskell}/bin/IHaskell" "$out/bin/ihaskell" \
--prefix PATH : "${ghc}/bin:${ihaskell}/bin:${ipython}/bin" \
--prefix LD_LIBRARY_PATH : "${ihaskell}/lib/ghc-${ghc.version}/${name}/" \
--add-flags "--ipython=${ipython}/bin/ipython" \
--set PROFILE_DIR "\$HOME/.ipython/profile_haskell" \
--set PROFILE_TAR "$(find ${ihaskell} -iname "profile.tar")" \
--set PROFILE_INIT "\$([ ! -d \$PROFILE_DIR ] && mkdir -p \$PROFILE_DIR && tar xvf \$PROFILE_TAR -C \$PROFILE_DIR)" \
--prefix GHC_PACKAGE_PATH : "\$(${ghc.GHCGetPackages} ${ghc.version}|sed -e 's, -package-db ,:,g'|cut -b 2-):${ihaskell}/lib/ghc-${ghc.version}/package.conf.d/${name}.installedconf" \
--set PROFILE_TAR "$out/share/${profile}" \
--set PROFILE_INIT "\$([ ! -d \$PROFILE_DIR ] \
&& mkdir -p \$PROFILE_DIR \
&& tar xf \$PROFILE_TAR -C \$PROFILE_DIR \
; [ -d \$PROFILE_DIR ] && for cfg in \$PROFILE_DIR/ipython_*config.py;do \
sed -i -e '/.*exe.*IHaskell.*/d' \$cfg; sed -i -e \"1iexe = '${ihaskell}/bin/IHaskell'\" \$cfg;done ) \
" \
--prefix GHC_PACKAGE_PATH : "\$(${ghc.GHCGetPackages} ${ghc.version}|sed -e 's, -package-db ,:,g'|cut -b 2-):${ihaskell}/lib/ghc-${ghc.version}/package.conf.d/${pname}-${version}.installedconf" \
--set GHC_PACKAGE_PATH "\$GHC_PACKAGE_PATH:" # always end with : to include base packages
'';
inherit (ihaskell) meta;
}

View File

@@ -0,0 +1,26 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, ansiTerminal, attoparsec, bifunctors, cmdargs, deepseq
, filemanip, filepath, hashable, intern, mtl, ocaml, parsec, syb
, text, textFormat, transformers, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "liquid-fixpoint";
version = "0.2.1.0";
sha256 = "11l9750ldxcb5jq34dl0iggpi9dh1zwjnlzgmwg4qvsgcq8cakdf";
isLibrary = true;
isExecutable = true;
buildDepends = [
ansiTerminal attoparsec bifunctors cmdargs deepseq filemanip
filepath hashable intern mtl parsec syb text textFormat
transformers unorderedContainers
];
buildTools = [ ocaml ];
meta = {
homepage = "https://github.com/ucsd-progsys/liquid-fixpoint";
description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@@ -0,0 +1,32 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, ansiTerminal, bifunctors, cmdargs, cpphs
, dataDefault, deepseq, Diff, filemanip, filepath, fingertree
, ghcPaths, hashable, hscolour, intern, liquidFixpoint, mtl
, optparseApplicative, parsec, syb, tagged, tasty, tastyHunit
, tastyRerun, text, time, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "liquidhaskell";
version = "0.2.1.0";
sha256 = "172ki1pr096jc1azs6hq1p6czjr2gxb0zafmlg9bicn4nwp2h7vy";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson ansiTerminal bifunctors cmdargs cpphs dataDefault deepseq
Diff filemanip filepath fingertree ghcPaths hashable hscolour
intern liquidFixpoint mtl parsec syb text time unorderedContainers
vector
];
testDepends = [
filepath optparseApplicative tagged tasty tastyHunit tastyRerun
];
doCheck = false;
meta = {
homepage = "http://goto.ucsd.edu/liquidhaskell";
description = "Liquid Types for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@@ -10,10 +10,20 @@ stdenv.mkDerivation rec {
sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3";
};
firmware = fetchurl {
url = "http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.2.tar.gz";
sha256 = "0w0w6l015d16181mx8mgyjha4bv3ba7x36p86k9n1x52809433gj";
};
buildInputs = [ pkgconfig libzip glib libusb1 libftdi check libserialport
librevisa
];
postInstall = ''
mkdir -p "$out/share/sigrok-firmware/"
tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/"
'';
meta = with stdenv.lib; {
description = "Core library of the sigrok signal analysis software suite";
homepage = http://sigrok.org/;

View File

@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
};
}

View File

@@ -50,6 +50,6 @@ let version = "5.18"; in
homepage = http://www.gnu.org/software/autogen/;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
};
}

View File

@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
};
}

View File

@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
};
}

View File

@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
Standards. Automake requires the use of Autoconf.
'';
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

View File

@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
Standards. Automake requires the use of Autoconf.
'';
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

View File

@@ -1,7 +1,5 @@
{stdenv, fetchurl, runCommand, gcc, zlib}:
assert stdenv.isLinux;
let
ccache =
stdenv.mkDerivation {

View File

@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/cflow/;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
/* On Darwin, build fails with:

View File

@@ -8,13 +8,15 @@ let
'';
in stdenv.mkDerivation rec {
name = "chruby";
name = "chruby-${version}";
version = "0.3.9";
src = fetchFromGitHub {
owner = "postmodern";
repo = "chruby";
rev = "d5ae98410311aec1358d4cfcc1e3ec02de593c3b";
sha256 = "1iq9milnnj3189yw02hkly2pnnh4g0vn2fxq6dfx90kldjwpwxq5";
rev = "v${version}";
sha256 = "1894g6fymr8kra9vwhbmnrcr58l022mcd7g9ans4zd3izla2j3gx";
};
phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];

View File

@@ -1,16 +1,12 @@
{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig, makeWrapper }:
let
name = "coccinelle-1.0.0-rc15";
sha256 = "07fab4e17512925b958890bb13c0809797074f2e44a1107b0074bdcc156b9596";
in stdenv.mkDerivation {
inherit name;
stdenv.mkDerivation rec {
name = "coccinelle-${version}";
version = "1.0.0-rc23";
src = fetchurl {
url = "http://coccinelle.lip6.fr/distrib/${name}.tgz";
inherit sha256;
sha256 = "1qrd4kr3wc0hm4l60fwn19iwzwqcjsx85mm3k4gm3cdhljjma82p";
};
buildInputs = with ocamlPackages; [
@@ -38,25 +34,23 @@ in stdenv.mkDerivation {
meta = {
description = "Program to apply semantic patches to C code";
longDescription =
'' Coccinelle is a program matching and transformation engine which
provides the language SmPL (Semantic Patch Language) for specifying
desired matches and transformations in C code. Coccinelle was
initially targeted towards performing collateral evolutions in
Linux. Such evolutions comprise the changes that are needed in
client code in response to evolutions in library APIs, and may
include modifications such as renaming a function, adding a function
argument whose value is somehow context-dependent, and reorganizing
a data structure. Beyond collateral evolutions, Coccinelle is
successfully used (by us and others) for finding and fixing bugs in
systems code.
'';
longDescription = ''
Coccinelle is a program matching and transformation engine which
provides the language SmPL (Semantic Patch Language) for
specifying desired matches and transformations in C code.
Coccinelle was initially targeted towards performing collateral
evolutions in Linux. Such evolutions comprise the changes that
are needed in client code in response to evolutions in library
APIs, and may include modifications such as renaming a function,
adding a function argument whose value is somehow
context-dependent, and reorganizing a data structure. Beyond
collateral evolutions, Coccinelle is successfully used (by us
and others) for finding and fixing bugs in systems code.
'';
homepage = http://coccinelle.lip6.fr/;
license = stdenv.lib.licenses.gpl2;
maintainers = [ ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
};
}

View File

@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/complexity/;
platforms = stdenv.lib.platforms.gnu;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
};
}

View File

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}

View File

@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
};
}

View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, libusb }:
let
version = "0.7.0";
version = "0.7.1";
in
stdenv.mkDerivation rec {
name="dfu-programmer-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz";
sha256 = "17lglglk5xrqd2n0impg5bkq4j96qc51cw3kzcghzmzmn6fvg3gf";
sha256 = "0cwy7z5h6f13yx9bkgh61bphzii6lcl21j2gckskphf37bfzazwz";
};
configureFlags = [ "--disable-libusb_1_0" ];

View File

@@ -0,0 +1,48 @@
{ stdenv
, fetchFromGitHub
, autoconf
, automake114x
, findutils # for xargs
, gettext_0_19
, libtool
, makeWrapper
, texinfo
}:
let
version = "1.4.6";
in stdenv.mkDerivation {
name = "fswatch-${version}";
src = fetchFromGitHub {
owner = "emcrisostomo";
repo = "fswatch";
rev = version;
sha256 = "0flq8baqzifhmf61zyiipdipvgy4h0kl551clxrhwa8gvzf75im4";
};
buildInputs = [ autoconf automake114x gettext_0_19 libtool makeWrapper texinfo ];
preConfigure = ''
./autogen.sh
'';
postFixup = ''
for prog in fswatch-run fswatch-run-bash; do
wrapProgram $out/bin/$prog \
--prefix PATH "${findutils}/bin"
done
'';
meta = with stdenv.lib; {
description = "A cross-platform file change monitor with multiple backends";
homepage = https://github.com/emcrisostomo/fswatch;
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = with maintainers; [ pSub ];
};
}

View File

@@ -1,5 +1,5 @@
{ fetchurl, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo
, dejagnu, python, pkgconfig, guile, target ? null
, dejagnu, python, perl, pkgconfig, guile, target ? null
# Additional dependencies for GNU/Hurd.
, mig ? null, hurd ? null
@@ -8,7 +8,7 @@
let
basename = "gdb-7.8";
basename = "gdb-7.8.2";
# Whether (cross-)building for GNU/Hurd. This is an approximation since
# having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and
@@ -27,17 +27,17 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnu/gdb/${basename}.tar.xz";
sha256 = "49c4abe174f79f54e1f9e75210ffb590d9b497d5b5200b5398c0e073a4ecb875";
sha256 = "11a4fj1vpsny71kz7xqqbqk3kgzbs5cfjj3z9gm0hpvxfkam8nb0";
};
patches = [ ./edit-signals.patch ];
# I think python is not a native input, but I leave it
# here while I will not need it cross building
nativeBuildInputs = [ texinfo python ]
nativeBuildInputs = [ texinfo python perl ]
++ stdenv.lib.optional isGNU mig;
buildInputs = [ ncurses readline gmp mpfr expat pkgconfig guile ]
buildInputs = [ ncurses readline gmp mpfr expat /* pkgconfig guile */ ]
++ stdenv.lib.optional isGNU hurd
++ stdenv.lib.optional doCheck dejagnu;

View File

@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/global/;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
platforms = stdenv.lib.platforms.unix;
};
}

View File

@@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "grafana-${version}";
version = "1.8.0-rc1";
version = "1.9.1";
src = fetchurl {
url = "http://grafanarel.s3.amazonaws.com/${name}.zip";
sha256 = "1wx4zwkpgvb8lxcrkp67zgqd8aqms4bnxzwz3i9190sl55j1yf4i";
sha256 = "1zyzsbspxrzaf2kk6fysp6c3y025s6nd75rc2p9qq9q95dv8fj23";
};
buildInputs = [ unzip ];

View File

@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
platforms = platforms.gnu; # arbitrary choice
maintainers = with maintainers; [ ludo pSub ];
maintainers = with maintainers; [ pSub ];
};
}

View File

@@ -35,7 +35,7 @@ stdenv.mkDerivation (rec {
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
};
}

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "yodl-${version}";
version = "3.04.00";
version = "3.05.00";
buildInputs = [ perl icmake ];
src = fetchurl {
url = "mirror://sourceforge/yodl/yodl_${version}.orig.tar.gz";
sha256 = "14sqd03j3w9g5l5rkdnqyxv174yz38m39ycncx86bq86g63igcv6";
sha256 = "12hv5ghrsk6kdi414glg888v3qk3m1nmicl8f0h5k4szm1i00dig";
};
preConfigure = ''
@@ -20,14 +20,14 @@ stdenv.mkDerivation rec {
buildPhase = ''
./build programs
./build man
./build macros
./build man
'';
installPhase = ''
./build install programs $out
./build install man $out
./build install macros $out
./build install man $out
'';
meta = with stdenv.lib; {

View File

@@ -14,8 +14,8 @@ else assert licenseAccepted;
# the installer is very picky and demands 1.7.0.07
let dotInstall4j = path: writeTextFile { name = "dot-install4j"; text = ''
JRE_VERSION ${jre}${path} 1 7 0 7
JRE_INFO ${jre}${path} 94
JRE_VERSION ${path} 1 7 0 7
JRE_INFO ${path} 94
''; };
responseVarfile = writeTextFile { name = "response.varfile"; text = ''
@@ -55,20 +55,20 @@ in stdenv.mkDerivation rec {
sed -e 's/^if \[ -f jre.tar.gz/if false /' $src > installer
chmod a+x installer
cp ${dotInstall4j ""} .install4j
cp ${dotInstall4j jre} .install4j
chmod u+w .install4j
sed -e "s|INSTALLDIR|$out|" ${responseVarfile} > response.varfile
export HOME=`pwd`
export INSTALL4J_JAVA_HOME=${jre}
export INSTALL4J_JAVA_HOME=${jre.home}
export FONTCONFIG_FILE=${fontsConf}
bash -ic './installer -q -varfile response.varfile'
sed -i 's/Xmx450m/Xmx900m/;s/Xss192k/Xss384k/' $out/lib/neoload/conf/agent.properties
for i in $out/bin/*; do
wrapProgram $i --run 'cp ${dotInstall4j "/lib/openjdk/jre"} ~/.install4j' \
wrapProgram $i --run 'cp ${dotInstall4j "${jre.home}/jre"} ~/.install4j' \
--run 'chmod u+w ~/.install4j'
done

View File

@@ -5,11 +5,11 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
stdenv.mkDerivation {
name = "merlin-2.0";
name = "merlin-2.1";
src = fetchurl {
url = https://github.com/the-lambda-church/merlin/archive/v2.0.tar.gz;
sha256 = "1khvmncj6gfk9p5wl07gp6ii9csc5s1bcv892lkfpfbnsspis7cp";
url = https://github.com/the-lambda-church/merlin/archive/v2.1.tar.gz;
sha256 = "0rk5ffhr69wbhr50ixgw1vnv0wkhxwh1z3cpbcwkm72cnac74nj6";
};
buildInputs = [ ocaml findlib yojson menhir ]

View File

@@ -30,7 +30,7 @@ stdenv.mkDerivation {
ocp-build is a build system for OCaml application, based on simple
descriptions of packages. ocp-build combines the descriptions of
packages, and optimize the parallel compilation of files depending on
the number of cores and the automatically-infered dependencies
the number of cores and the automatically-inferred dependencies
between source files.
'';
license = licenses.gpl3;

View File

@@ -18,17 +18,8 @@ stdenv.mkDerivation {
createFindlibDestdir = true;
# The supplied installer uses opam-installer which breaks when run
# normally since it tries to `mkdir $HOME`. However, we can use
# `opam-installer --script` to get the shell script that performs only
# the installation and just run that. Furthermore, we do the same that is
# done by pkgs/development/ocaml-modules/react and rename the paths meant
# for opam-installer so that they are in line with the other OCaml
# libraries in Nixpkgs.
installPhase = ''
opam-installer --script --prefix=$out ocp-indent.install \
| sed s!lib/ocp-indent!lib/ocaml/${getVersion ocaml}/site-lib/ocp-indent! \
| sh
postInstall = ''
mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/}
'';
meta = with stdenv.lib; {

View File

@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://github.com/UpstandingHackers/hammer";
sha256 = "1v8f2a6bgjgdkhbqz751bqjlwb9lmqn5x63xcskwcl2b9n36vqi9";
rev = "e7aa73446e23f4af2fce5f88572aae848f212c16";
sha256 = "18bb0p896ch4crhcfxpbvpc17wg8gzv8696pcc51i34mza76jiz9";
rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533";
};
buildInputs = [ glib pkgconfig python scons ];
@@ -26,4 +26,4 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
platforms = platforms.linux;
};
}
}

View File

@@ -1,28 +1,28 @@
{stdenv, fetchgit, rust, makeWrapper }:
let
rustSrc = rust.src;
in
{stdenv, fetchgit, rustc, cargo, makeWrapper }:
stdenv.mkDerivation rec {
#TODO add emacs support
name = "racer-git-2014-12-04";
name = "racer-git-2015-01-20";
src = fetchgit {
url = https://github.com/phildawes/racer;
rev = "cc633ad2477cb064ba6e4d23b58c124c8521410c";
sha256 = "1nqlgdqnqhzbnbxvhs60gk5hjzrxfq8blyh1riiknxdlq5kqaky7";
rev = "599aa524ea949ec5f9f0be0375dbb1df9cb852ae";
sha256 = "1kasm7vffn176wr072m1dmqg1rb3wqai9yisxf8mia62548pdx88";
};
buildInputs = [ rust makeWrapper ];
buildInputs = [ rustc cargo makeWrapper ];
buildPhase = ''
cargo build --release
'';
installPhase = ''
mkdir -p $out/bin
cp -p bin/racer $out/bin/
wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustSrc}/src"
cp -p target/release/racer $out/bin/
wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustc.src}/src"
'';
meta = with stdenv.lib; {
description = "A utility intended to provide rust code completion for editors and IDEs.";
description = "A utility intended to provide Rust code completion for editors and IDEs.";
homepage = https://github.com/phildawes/racer;
license = stdenv.lib.licenses.mit;
maintainers = [ maintainers.jagajaga ];

View File

@@ -34,7 +34,7 @@ stdenv.mkDerivation {
echo 'export SLIMERJSLAUNCHER=${firefox}/bin/firefox' >> "$out/bin/slimerjs"
echo "'$out/lib/slimerjs/slimerjs' \"\$@\"" >> "$out/bin/slimerjs"
chmod a+x "$out/bin/slimerjs"
sed -e 's@MaxVersion=32[.]@MaxVersion=33.@' -i "$out/lib/slimerjs/application.ini"
sed -e 's@MaxVersion=3[0-9][.]@MaxVersion=40.@' -i "$out/lib/slimerjs/application.ini"
'';
meta = {
inherit (s) version;

View File

@@ -0,0 +1,30 @@
{ pkgs }:
let
nodePackages = import <nixpkgs/pkgs/top-level/node-packages.nix> {
inherit pkgs;
inherit (pkgs) stdenv nodejs fetchurl fetchgit;
neededNatives = [ pkgs.python ] ++ pkgs.lib.optional pkgs.stdenv.isLinux pkgs.utillinux;
self = nodePackages;
generated = ./package.nix;
};
in rec {
build = nodePackages.buildNodePackage {
name = "sloc-0.1.6";
src = [
(pkgs.fetchgit {
url = "https://github.com/flosse/sloc.git";
sha256 = "0064va0cd4604vqp8y8ggm33klp2xgqmgrwk9ilp7230x27wykyf";
rev = "refs/tags/v0.1.6";
})
];
buildInputs = [ nodePackages.coffee-script ];
postInstall = ''
coffee -o $out/lib/node_modules/sloc/lib/ -c $src/src/
'';
deps = [ nodePackages.commander nodePackages.async nodePackages.cli-table nodePackages.readdirp ];
passthru.names = [ "sloc" ];
};
}

View File

@@ -0,0 +1,614 @@
{ self, fetchurl, fetchgit ? null, lib }:
{
by-spec."assertion-error"."1.0.0" =
self.by-version."assertion-error"."1.0.0";
by-version."assertion-error"."1.0.0" = lib.makeOverridable self.buildNodePackage {
name = "node-assertion-error-1.0.0";
src = [
(fetchurl {
url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz";
name = "assertion-error-1.0.0.tgz";
sha1 = "c7f85438fdd466bc7ca16ab90c81513797a5d23b";
})
];
buildInputs =
(self.nativeDeps."assertion-error" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "assertion-error" ];
};
by-spec."async"."~0.9.0" =
self.by-version."async"."0.9.0";
by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage {
name = "node-async-0.9.0";
src = [
(fetchurl {
url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
name = "async-0.9.0.tgz";
sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7";
})
];
buildInputs =
(self.nativeDeps."async" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "async" ];
};
"async" = self.by-version."async"."0.9.0";
by-spec."chai"."~1.9.1" =
self.by-version."chai"."1.9.1";
by-version."chai"."1.9.1" = lib.makeOverridable self.buildNodePackage {
name = "node-chai-1.9.1";
src = [
(fetchurl {
url = "http://registry.npmjs.org/chai/-/chai-1.9.1.tgz";
name = "chai-1.9.1.tgz";
sha1 = "3711bb6706e1568f34c0b36098bf8f19455c81ae";
})
];
buildInputs =
(self.nativeDeps."chai" or []);
deps = [
self.by-version."assertion-error"."1.0.0"
self.by-version."deep-eql"."0.1.3"
];
peerDependencies = [
];
passthru.names = [ "chai" ];
};
"chai" = self.by-version."chai"."1.9.1";
by-spec."cli-table"."^0.3.0" =
self.by-version."cli-table"."0.3.0";
by-version."cli-table"."0.3.0" = lib.makeOverridable self.buildNodePackage {
name = "node-cli-table-0.3.0";
src = [
(fetchurl {
url = "http://registry.npmjs.org/cli-table/-/cli-table-0.3.0.tgz";
name = "cli-table-0.3.0.tgz";
sha1 = "44a43c2641667701e084202bff7aa934128aa13e";
})
];
buildInputs =
(self.nativeDeps."cli-table" or []);
deps = [
self.by-version."colors"."0.6.2"
];
peerDependencies = [
];
passthru.names = [ "cli-table" ];
};
"cli-table" = self.by-version."cli-table"."0.3.0";
by-spec."coffee-script"."~1.8.0" =
self.by-version."coffee-script"."1.8.0";
by-version."coffee-script"."1.8.0" = lib.makeOverridable self.buildNodePackage {
name = "coffee-script-1.8.0";
src = [
(fetchurl {
url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz";
name = "coffee-script-1.8.0.tgz";
sha1 = "9c9f1d2b4a52a000ded15b659791703648263c1d";
})
];
buildInputs =
(self.nativeDeps."coffee-script" or []);
deps = [
self.by-version."mkdirp"."0.3.5"
];
peerDependencies = [
];
passthru.names = [ "coffee-script" ];
};
"coffee-script" = self.by-version."coffee-script"."1.8.0";
by-spec."colors"."0.6.2" =
self.by-version."colors"."0.6.2";
by-version."colors"."0.6.2" = lib.makeOverridable self.buildNodePackage {
name = "node-colors-0.6.2";
src = [
(fetchurl {
url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
name = "colors-0.6.2.tgz";
sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
})
];
buildInputs =
(self.nativeDeps."colors" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "colors" ];
};
by-spec."commander"."0.6.1" =
self.by-version."commander"."0.6.1";
by-version."commander"."0.6.1" = lib.makeOverridable self.buildNodePackage {
name = "node-commander-0.6.1";
src = [
(fetchurl {
url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
name = "commander-0.6.1.tgz";
sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
})
];
buildInputs =
(self.nativeDeps."commander" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "commander" ];
};
by-spec."commander"."2.0.0" =
self.by-version."commander"."2.0.0";
by-version."commander"."2.0.0" = lib.makeOverridable self.buildNodePackage {
name = "node-commander-2.0.0";
src = [
(fetchurl {
url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz";
name = "commander-2.0.0.tgz";
sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928";
})
];
buildInputs =
(self.nativeDeps."commander" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "commander" ];
};
by-spec."commander"."~2.3.0" =
self.by-version."commander"."2.3.0";
by-version."commander"."2.3.0" = lib.makeOverridable self.buildNodePackage {
name = "node-commander-2.3.0";
src = [
(fetchurl {
url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
name = "commander-2.3.0.tgz";
sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873";
})
];
buildInputs =
(self.nativeDeps."commander" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "commander" ];
};
"commander" = self.by-version."commander"."2.3.0";
by-spec."core-util-is"."~1.0.0" =
self.by-version."core-util-is"."1.0.1";
by-version."core-util-is"."1.0.1" = lib.makeOverridable self.buildNodePackage {
name = "node-core-util-is-1.0.1";
src = [
(fetchurl {
url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
name = "core-util-is-1.0.1.tgz";
sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538";
})
];
buildInputs =
(self.nativeDeps."core-util-is" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "core-util-is" ];
};
by-spec."debug"."*" =
self.by-version."debug"."2.0.0";
by-version."debug"."2.0.0" = lib.makeOverridable self.buildNodePackage {
name = "node-debug-2.0.0";
src = [
(fetchurl {
url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz";
name = "debug-2.0.0.tgz";
sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef";
})
];
buildInputs =
(self.nativeDeps."debug" or []);
deps = [
self.by-version."ms"."0.6.2"
];
peerDependencies = [
];
passthru.names = [ "debug" ];
};
by-spec."deep-eql"."0.1.3" =
self.by-version."deep-eql"."0.1.3";
by-version."deep-eql"."0.1.3" = lib.makeOverridable self.buildNodePackage {
name = "node-deep-eql-0.1.3";
src = [
(fetchurl {
url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz";
name = "deep-eql-0.1.3.tgz";
sha1 = "ef558acab8de25206cd713906d74e56930eb69f2";
})
];
buildInputs =
(self.nativeDeps."deep-eql" or []);
deps = [
self.by-version."type-detect"."0.1.1"
];
peerDependencies = [
];
passthru.names = [ "deep-eql" ];
};
by-spec."diff"."1.0.7" =
self.by-version."diff"."1.0.7";
by-version."diff"."1.0.7" = lib.makeOverridable self.buildNodePackage {
name = "node-diff-1.0.7";
src = [
(fetchurl {
url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz";
name = "diff-1.0.7.tgz";
sha1 = "24bbb001c4a7d5522169e7cabdb2c2814ed91cf4";
})
];
buildInputs =
(self.nativeDeps."diff" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "diff" ];
};
by-spec."glob"."3.2.3" =
self.by-version."glob"."3.2.3";
by-version."glob"."3.2.3" = lib.makeOverridable self.buildNodePackage {
name = "node-glob-3.2.3";
src = [
(fetchurl {
url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
name = "glob-3.2.3.tgz";
sha1 = "e313eeb249c7affaa5c475286b0e115b59839467";
})
];
buildInputs =
(self.nativeDeps."glob" or []);
deps = [
self.by-version."minimatch"."0.2.14"
self.by-version."graceful-fs"."2.0.3"
self.by-version."inherits"."2.0.1"
];
peerDependencies = [
];
passthru.names = [ "glob" ];
};
by-spec."graceful-fs"."~2.0.0" =
self.by-version."graceful-fs"."2.0.3";
by-version."graceful-fs"."2.0.3" = lib.makeOverridable self.buildNodePackage {
name = "node-graceful-fs-2.0.3";
src = [
(fetchurl {
url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz";
name = "graceful-fs-2.0.3.tgz";
sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0";
})
];
buildInputs =
(self.nativeDeps."graceful-fs" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "graceful-fs" ];
};
by-spec."growl"."1.8.x" =
self.by-version."growl"."1.8.1";
by-version."growl"."1.8.1" = lib.makeOverridable self.buildNodePackage {
name = "node-growl-1.8.1";
src = [
(fetchurl {
url = "http://registry.npmjs.org/growl/-/growl-1.8.1.tgz";
name = "growl-1.8.1.tgz";
sha1 = "4b2dec8d907e93db336624dcec0183502f8c9428";
})
];
buildInputs =
(self.nativeDeps."growl" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "growl" ];
};
by-spec."inherits"."2" =
self.by-version."inherits"."2.0.1";
by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage {
name = "node-inherits-2.0.1";
src = [
(fetchurl {
url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
name = "inherits-2.0.1.tgz";
sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
})
];
buildInputs =
(self.nativeDeps."inherits" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "inherits" ];
};
by-spec."inherits"."~2.0.1" =
self.by-version."inherits"."2.0.1";
by-spec."isarray"."0.0.1" =
self.by-version."isarray"."0.0.1";
by-version."isarray"."0.0.1" = lib.makeOverridable self.buildNodePackage {
name = "node-isarray-0.0.1";
src = [
(fetchurl {
url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
name = "isarray-0.0.1.tgz";
sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
})
];
buildInputs =
(self.nativeDeps."isarray" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "isarray" ];
};
by-spec."jade"."0.26.3" =
self.by-version."jade"."0.26.3";
by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage {
name = "jade-0.26.3";
src = [
(fetchurl {
url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
name = "jade-0.26.3.tgz";
sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c";
})
];
buildInputs =
(self.nativeDeps."jade" or []);
deps = [
self.by-version."commander"."0.6.1"
self.by-version."mkdirp"."0.3.0"
];
peerDependencies = [
];
passthru.names = [ "jade" ];
};
by-spec."lru-cache"."2" =
self.by-version."lru-cache"."2.5.0";
by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage {
name = "node-lru-cache-2.5.0";
src = [
(fetchurl {
url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz";
name = "lru-cache-2.5.0.tgz";
sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb";
})
];
buildInputs =
(self.nativeDeps."lru-cache" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "lru-cache" ];
};
by-spec."minimatch"."~0.2.11" =
self.by-version."minimatch"."0.2.14";
by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage {
name = "node-minimatch-0.2.14";
src = [
(fetchurl {
url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
name = "minimatch-0.2.14.tgz";
sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
})
];
buildInputs =
(self.nativeDeps."minimatch" or []);
deps = [
self.by-version."lru-cache"."2.5.0"
self.by-version."sigmund"."1.0.0"
];
peerDependencies = [
];
passthru.names = [ "minimatch" ];
};
by-spec."minimatch"."~0.2.12" =
self.by-version."minimatch"."0.2.14";
by-spec."mkdirp"."0.3.0" =
self.by-version."mkdirp"."0.3.0";
by-version."mkdirp"."0.3.0" = lib.makeOverridable self.buildNodePackage {
name = "node-mkdirp-0.3.0";
src = [
(fetchurl {
url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
name = "mkdirp-0.3.0.tgz";
sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e";
})
];
buildInputs =
(self.nativeDeps."mkdirp" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "mkdirp" ];
};
by-spec."mkdirp"."0.3.5" =
self.by-version."mkdirp"."0.3.5";
by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage {
name = "node-mkdirp-0.3.5";
src = [
(fetchurl {
url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
name = "mkdirp-0.3.5.tgz";
sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
})
];
buildInputs =
(self.nativeDeps."mkdirp" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "mkdirp" ];
};
by-spec."mkdirp"."~0.3.5" =
self.by-version."mkdirp"."0.3.5";
by-spec."mocha"."~1.21.4" =
self.by-version."mocha"."1.21.4";
by-version."mocha"."1.21.4" = lib.makeOverridable self.buildNodePackage {
name = "mocha-1.21.4";
src = [
(fetchurl {
url = "http://registry.npmjs.org/mocha/-/mocha-1.21.4.tgz";
name = "mocha-1.21.4.tgz";
sha1 = "e77d69c3773ba3e2b4fe6b628c28b5dd43880adc";
})
];
buildInputs =
(self.nativeDeps."mocha" or []);
deps = [
self.by-version."commander"."2.0.0"
self.by-version."growl"."1.8.1"
self.by-version."jade"."0.26.3"
self.by-version."diff"."1.0.7"
self.by-version."debug"."2.0.0"
self.by-version."mkdirp"."0.3.5"
self.by-version."glob"."3.2.3"
];
peerDependencies = [
];
passthru.names = [ "mocha" ];
};
"mocha" = self.by-version."mocha"."1.21.4";
by-spec."ms"."0.6.2" =
self.by-version."ms"."0.6.2";
by-version."ms"."0.6.2" = lib.makeOverridable self.buildNodePackage {
name = "node-ms-0.6.2";
src = [
(fetchurl {
url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
name = "ms-0.6.2.tgz";
sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
})
];
buildInputs =
(self.nativeDeps."ms" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "ms" ];
};
by-spec."readable-stream"."~1.0.26-2" =
self.by-version."readable-stream"."1.0.31";
by-version."readable-stream"."1.0.31" = lib.makeOverridable self.buildNodePackage {
name = "node-readable-stream-1.0.31";
src = [
(fetchurl {
url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz";
name = "readable-stream-1.0.31.tgz";
sha1 = "8f2502e0bc9e3b0da1b94520aabb4e2603ecafae";
})
];
buildInputs =
(self.nativeDeps."readable-stream" or []);
deps = [
self.by-version."core-util-is"."1.0.1"
self.by-version."isarray"."0.0.1"
self.by-version."string_decoder"."0.10.31"
self.by-version."inherits"."2.0.1"
];
peerDependencies = [
];
passthru.names = [ "readable-stream" ];
};
by-spec."readdirp"."^1.1.0" =
self.by-version."readdirp"."1.1.0";
by-version."readdirp"."1.1.0" = lib.makeOverridable self.buildNodePackage {
name = "node-readdirp-1.1.0";
src = [
(fetchurl {
url = "http://registry.npmjs.org/readdirp/-/readdirp-1.1.0.tgz";
name = "readdirp-1.1.0.tgz";
sha1 = "6506f9d5d8bb2edc19c855a60bb92feca5fae39c";
})
];
buildInputs =
(self.nativeDeps."readdirp" or []);
deps = [
self.by-version."graceful-fs"."2.0.3"
self.by-version."minimatch"."0.2.14"
self.by-version."readable-stream"."1.0.31"
];
peerDependencies = [
];
passthru.names = [ "readdirp" ];
};
"readdirp" = self.by-version."readdirp"."1.1.0";
by-spec."sigmund"."~1.0.0" =
self.by-version."sigmund"."1.0.0";
by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
name = "node-sigmund-1.0.0";
src = [
(fetchurl {
url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz";
name = "sigmund-1.0.0.tgz";
sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296";
})
];
buildInputs =
(self.nativeDeps."sigmund" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "sigmund" ];
};
by-spec."string_decoder"."~0.10.x" =
self.by-version."string_decoder"."0.10.31";
by-version."string_decoder"."0.10.31" = lib.makeOverridable self.buildNodePackage {
name = "node-string_decoder-0.10.31";
src = [
(fetchurl {
url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
name = "string_decoder-0.10.31.tgz";
sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
})
];
buildInputs =
(self.nativeDeps."string_decoder" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "string_decoder" ];
};
by-spec."type-detect"."0.1.1" =
self.by-version."type-detect"."0.1.1";
by-version."type-detect"."0.1.1" = lib.makeOverridable self.buildNodePackage {
name = "node-type-detect-0.1.1";
src = [
(fetchurl {
url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz";
name = "type-detect-0.1.1.tgz";
sha1 = "0ba5ec2a885640e470ea4e8505971900dac58822";
})
];
buildInputs =
(self.nativeDeps."type-detect" or []);
deps = [
];
peerDependencies = [
];
passthru.names = [ "type-detect" ];
};
}

View File

@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
export SYBASE=${freetds}
'';
buildInputs = [
freetds
buildInputs = [
freetds
readline
];

View File

@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "watchman-${version}";
version = "2.9.8";
version = "3.0.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "watchman";
rev = "v${version}";
sha256 = "196d71ci7ki4p6xx49w55cqd0bqrx19nf79na3a91mrfa6f22sp6";
sha256 = "0sf0cp9p7savlgmzqj5m9fkpfa5a15pv98rkilxnbmx9wrjvypwk";
};
buildInputs = [ autoconf automake pcre ];