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

Merge recent master

Browse Source
This commit is contained in:
Vladimír Čunát
2014-06-10 20:14:08 +02:00
parent 5a98b9f514 bd7f3fbf0f
commit f2352f7ecf
199 changed files with 5598 additions and 2940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/build-managers/leiningen/default.nix
View File

@@ -3,20 +3,20 @@
stdenv.mkDerivation rec {
pname = "leiningen";
version = "2.3.4";
version = "2.4.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
sha256 = "1v83hpvp349pgqqiy4babc5m5b9lcwk0fif80fpv4jqvp0a8v6r7";
sha256 = "0mdfp5r5qid42x7rq1cmyxqmvjdj2hk9rjz8pryf4zq3bk38m1cg";
};
jarsrc = fetchurl {
url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar";
sha256 = "1pqc99p4vz4q3qcs90cqql6m7kc27ihx4hbqs5alxkzk7jv8s2bk";
url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.jar";
sha256 = "099r5qcldb214c3857i7dbbqn531aahzrz39qfhqxc6f476ncdh0";
};
patches = ./lein_2.3.0.patch;
patches = [ ./lein-fix-jar-path.patch ];
inherit rlwrap clojure gnupg findutils coreutils jdk;

0
pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch → pkgs/development/tools/build-managers/leiningen/lein-fix-jar-path.patch
View File

20
pkgs/development/tools/haskell/cabal-db/default.nix Normal file
View File

@@ -0,0 +1,20 @@
{ cabal, ansiWlPprint, Cabal, filepath, mtl, optparseApplicative
, tar, utf8String
}:
cabal.mkDerivation (self: {
pname = "cabal-db";
version = "0.1.9";
sha256 = "19mw5ycc2y5wkn1h7wkdm2gb29pq2sh0n8z52dbxlkf0rwcgjbfq";
isLibrary = false;
isExecutable = true;
buildDepends = [
ansiWlPprint Cabal filepath mtl optparseApplicative tar utf8String
];
meta = {
homepage = "http://github.com/vincenthz/cabal-db";
description = "query tools for the local cabal database (revdeps, graph, info, search-by, license, bounds)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

21
pkgs/development/tools/haskell/cabal-dev/default.nix
View File

@@ -1,21 +0,0 @@
{ cabal, Cabal, cabalInstall, filepath, HTTP, mtl, network, setenv
, tar, transformers, zlib
}:
cabal.mkDerivation (self: {
pname = "cabal-dev";
version = "0.9.2";
sha256 = "1372bpn8s7d7nm01ggp3m98ldrynidbchk3p14yrjysvxwr3l6q8";
isLibrary = false;
isExecutable = true;
buildDepends = [
Cabal filepath HTTP mtl network setenv tar transformers zlib
];
buildTools = [ cabalInstall ];
meta = {
homepage = "http://github.com/creswick/cabal-dev";
description = "Manage sandboxed Haskell build environments";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/tools/haskell/codex/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "codex";
version = "0.0.2";
sha256 = "156830krsn1qczrx27bn3ihqlis698sjf563sa2njvc7v85plx55";
version = "0.0.2.1";
sha256 = "0cwn44dw3fks1qaymrjn3q99lq6baginh12y6wwkhz53cd6cv41z";
isLibrary = true;
isExecutable = true;
buildDepends = [

3
pkgs/development/tools/haskell/hdevtools/default.nix
View File

@@ -1,4 +1,4 @@
{ cabal, cmdargs, ghcPaths, network, syb, time }:
{ cabal, cmdargs, ghcPaths, network, syb, time, fetchpatch }:
cabal.mkDerivation (self: {
pname = "hdevtools";
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "1a218m817q35f52fv6mn28sfv136i6fm2mzgdidpm24pc0585gl7";
isLibrary = false;
isExecutable = true;
patches = [ (fetchpatch { url = "https://github.com/bitc/hdevtools/pull/28.patch"; sha256 = "1rlv5zskg4ns9ba791x72gycxrr52lhy8x164q38gpq600gh5n40"; }) ];
buildDepends = [ cmdargs ghcPaths network syb time ];
meta = {
homepage = "https://github.com/bitc/hdevtools/";

3
pkgs/development/tools/haskell/hscolour/default.nix
View File

@@ -1,4 +1,4 @@
{ cabal, hyperlinkSource ? true }:
{ cabal }:
cabal.mkDerivation (self: {
pname = "hscolour";
@@ -6,7 +6,6 @@ cabal.mkDerivation (self: {
sha256 = "15ix93sw4p7g5ln2halcgqppdc0i0vmkzcjzxvqzkk9yp9pq3nrs";
isLibrary = true;
isExecutable = true;
hyperlinkSource = hyperlinkSource;
meta = {
homepage = "http://code.haskell.org/~malcolm/hscolour/";
description = "Colourise Haskell code";

4
pkgs/development/tools/haskell/threadscope/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "threadscope";
version = "0.2.3";
sha256 = "07kbkcckxfsb50zks8jgw2g0ary63hymicq5lqrm5jjaarjb80gr";
version = "0.2.4";
sha256 = "1208gp80vj3dngc4nrj1jk5y4h1181bgwq2qj764kcjvkaxch599";
isLibrary = false;
isExecutable = true;
buildDepends = [

8
pkgs/development/tools/jq/default.nix
View File

@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="jq";
version="1.3";
version="1.4";
name="${baseName}-${version}";
hash="1mzy9cj3d19y1m56mwk6slls543gnlhz8302hmnxkhdzdb1j6gv2";
url="http://stedolan.github.io/jq/download/source/jq-1.3.tar.gz";
sha256="1mzy9cj3d19y1m56mwk6slls543gnlhz8302hmnxkhdzdb1j6gv2";
hash="17dk17h7qj6xpnsbc09qwsqkm6r7jhqbfkjvwq246yxmpsx4334r";
url="http://stedolan.github.io/jq/download/source/jq-1.4.tar.gz";
sha256="17dk17h7qj6xpnsbc09qwsqkm6r7jhqbfkjvwq246yxmpsx4334r";
};
buildInputs = [
];

11
pkgs/development/tools/misc/arcanist/default.nix
View File

@@ -22,16 +22,17 @@ stdenv.mkDerivation rec {
unpackPhase = "true";
buildPhase = ''
ORIG=`pwd`
chmod +w -R ${libphutil}
cd ${libphutil}/support/xhpast
ls
cp -R ${libphutil} libphutil
cp -R ${arcanist} arcanist
chmod +w -R libphutil arcanist
cd libphutil/support/xhpast
make clean all install
cd $ORIG
'';
installPhase = ''
mkdir -p $out/bin $out/libexec
cp -R ${libphutil} $out/libexec/libphutil
cp -R ${arcanist} $out/libexec/arcanist
cp -R libphutil $out/libexec/libphutil
cp -R arcanist $out/libexec/arcanist
ln -s $out/libexec/arcanist/bin/arc $out/bin
wrapProgram $out/bin/arc \