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

Merge branch 'master' into staging

Browse Source 
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
This commit is contained in:
Vladimír Čunát
2014-11-14 14:28:23 +01:00
parent 5ad9db0473 961ed7c8b4
commit b4af993c3f
151 changed files with 6654 additions and 1254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/analysis/checkstyle/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "6.0";
version = "6.1";
name = "checkstyle-${version}";
src = fetchurl {
url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
sha256 = "08qjx7yfx5p7ydbcm6lzm15qcwkgcf1jw27i9fnyr01wppz9yrsx";
sha256 = "0g5ywnc64v2c4zlamm3l2x0l1z79199mcjz0xzv3j5wx7rsyasrc";
};
installPhase = ''

2
pkgs/development/tools/analysis/valgrind/default.nix
View File

@@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
--replace 'obj:/usr/X11R6/lib' 'obj:*/lib' \
--replace 'obj:/usr/lib' 'obj:*/lib'
done
paxmark m $out/lib/valgrind/*-*-linux
'';
meta = {

49
pkgs/development/tools/atom-shell/default.nix Normal file
View File

@@ -0,0 +1,49 @@
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, unzip
}:
let
atomEnv = buildEnv {
name = "env-atom";
paths = [
stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr
xlibs.libXcursor libcap
];
};
in stdenv.mkDerivation rec {
name = "atom-shell-${version}";
version = "0.19.1";
src = fetchurl {
url = "https://github.com/atom/atom-shell/releases/download/v0.19.1/atom-shell-v0.19.1-linux-x64.zip";
sha256 = "10q1slwv2lkiqqxpv0m5a1k0gj2yp8bi9a7ilb05zz1wg7j3yw4y";
name = "${name}.zip";
};
buildInputs = [ atomEnv makeWrapper unzip ];
phases = [ "installPhase" "fixupPhase" ];
unpackCmd = "unzip";
installPhase = ''
mkdir -p $out/bin
unzip -d $out/bin $src
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
$out/bin/atom
mv $out/bin/atom $out/bin/atom-shell
wrapProgram $out/bin/atom-shell \
--prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64"
'';
meta = with stdenv.lib; {
description = "Cross platform desktop application shell";
homepage = https://github.com/atom/atom-shell;
license = [ licenses.mit ];
maintainers = [ maintainers.fluffynukeit ];
platforms = [ "x86_64-linux" ];
};
}

28
pkgs/development/tools/build-managers/icmake/default.nix Normal file
View File

@@ -0,0 +1,28 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "icmake-${version}";
version = "7.21.01";
src = fetchurl {
url = "mirror://sourceforge/icmake/icmake_${version}.orig.tar.gz";
sha256 = "0jx547bb0h1z5f3v9kvjiq5bgarbrcs1h47y1nnwdkg0q1mqma1h";
};
preConfigure = ''
patchShebangs ./
sed -i "s;usr/;;g" INSTALL.im
'';
buildPhase = "./icm_bootstrap $out";
installPhase = "./icm_install all /";
meta = with stdenv.lib; {
description = "A program maintenance (make) utility using a C-like grammar";
homepage = http://icmake.sourceforge.net/;
license = licenses.gpl3;
maintainers = with maintainers; [ pSub ];
platforms = platforms.linux;
};
}

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "PastePipe";
version = "1.6";
sha256 = "08rsq2j3gy98a69pjldvbhawmnzxgld7abh9kszrb0kpjmd9sgc4";
version = "1.7";
sha256 = "0had11n44y7zjhhymdbvahwmxcxxrbxy7c9jxijhw3n7xqhdmva0";
isLibrary = true;
isExecutable = true;
buildDepends = [ cmdargs HTTP network networkUri ];

4
pkgs/development/tools/haskell/cabal-bounds/default.nix
View File

@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "cabal-bounds";
version = "0.8.7";
sha256 = "03kp59nhdyq3bl91akd38iwvwwy3zgvadx85lwl3827nr6s774qk";
version = "0.8.8";
sha256 = "0jd901r6312yw4rzxvy5x7q18kjwjhgr5s5npczhwc4q7zvxdj7q";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "ghcid";
version = "0.3.1";
sha256 = "09dyynqa42q6rcms8pghlyih8a3fahb5fbhc500grqc094kgfs7c";
version = "0.3.2";
sha256 = "1kx20la4snldhd709y69za8bs57v90nblghfrxrvmzhrmpvh4bn3";
isLibrary = true;
isExecutable = true;
buildDepends = [ cmdargs extra filepath terminalSize time ];

12
pkgs/development/tools/haskell/hlint/default.nix
View File

@@ -1,18 +1,18 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cmdargs, cpphs, filepath, haskellSrcExts, hscolour
, transformers, uniplate
{ cabal, ansiTerminal, cmdargs, cpphs, extra, filepath
, haskellSrcExts, hscolour, transformers, uniplate
}:
cabal.mkDerivation (self: {
pname = "hlint";
version = "1.9.10";
sha256 = "08pfc0mhqkhali0hjxpa26hr5ykfdmyldh0r04v1b42a1c60k1id";
version = "1.9.12";
sha256 = "0ga66b7lpvgx2w1fg5gnilncg75dfxcjcrx9hvjyxh7fin4y1z6a";
isLibrary = true;
isExecutable = true;
buildDepends = [
cmdargs cpphs filepath haskellSrcExts hscolour transformers
uniplate
ansiTerminal cmdargs cpphs extra filepath haskellSrcExts hscolour
transformers uniplate
];
meta = {
homepage = "http://community.haskell.org/~ndm/hlint/";

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

@@ -11,8 +11,8 @@
cabal.mkDerivation (self: {
pname = "keter";
version = "1.3.5.1";
sha256 = "1g8cq74cjhy8r0435m4il0iak5g03jdiz40sn4801iy765rcylpv";
version = "1.3.5.3";
sha256 = "18dpi97q4sz5zxv2yc6ar5nbf9gvs71n6gmxd9mv5myknvsliif2";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@@ -1,26 +1,24 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, binary, cairo, deepseq, filepath, ghcEvents, glib, gtk
, mtl, pango, time
, mtl, pango, text, time
}:
cabal.mkDerivation (self: {
pname = "threadscope";
version = "0.2.4";
sha256 = "1208gp80vj3dngc4nrj1jk5y4h1181bgwq2qj764kcjvkaxch599";
version = "0.2.5";
sha256 = "1nrhgir855n6n764fapaqd94dhqmsxn07ky3zf04nrx0lca9ir52";
isLibrary = false;
isExecutable = true;
buildDepends = [
binary cairo deepseq filepath ghcEvents glib gtk mtl pango time
binary cairo deepseq filepath ghcEvents glib gtk mtl pango text
time
];
configureFlags = "--ghc-options=-rtsopts";
patches = [ ./threadscope.patch ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/ThreadScope";
description = "A graphical tool for profiling parallel Haskell programs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
broken = true;
};
})

14
pkgs/development/tools/haskell/threadscope/threadscope.patch
View File

@@ -1,14 +0,0 @@
--- a/threadscope.cabal.orig 2014-11-03 15:23:29.000000000 -0600
+++ b/threadscope.cabal 2014-11-03 15:24:01.000000000 -0600
@@ -41,7 +41,10 @@
Executable threadscope
Main-is: Main.hs
Build-Depends: base >= 4.0 && < 5,
- gtk >= 0.12, cairo, glib, pango,
+ gtk >= 0.12 && < 0.13,
+ cairo < 0.13,
+ glib < 0.13,
+ pango < 0.13,
binary, array, mtl, filepath,
ghc-events >= 0.4.2,
containers >= 0.2 && < 0.6,

17
pkgs/development/tools/misc/ShellCheck/default.nix
View File

@@ -1,19 +1,24 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, json, mtl, parsec, QuickCheck, regexCompat }:
{ cabal, json, mtl, parsec, QuickCheck, regexCompat, transformers
}:
cabal.mkDerivation (self: {
pname = "ShellCheck";
version = "0.3.4";
sha256 = "07fw8c33p7h1kvg899dwnvqpxpywcidhbw9jhjd8xsma7kz471iw";
version = "0.3.5";
sha256 = "0x4rvhpzrjkn9a9fsmp9iwv9g21hkrd8fgq05iy4wgv8nfhgv2cj";
isLibrary = true;
isExecutable = true;
buildDepends = [ json mtl parsec QuickCheck regexCompat ];
testDepends = [ json mtl parsec QuickCheck regexCompat ];
buildDepends = [
json mtl parsec QuickCheck regexCompat transformers
];
testDepends = [
json mtl parsec QuickCheck regexCompat transformers
];
meta = {
homepage = "http://www.shellcheck.net/";
description = "Shell script analysis tool";
license = "unknown";
license = self.stdenv.lib.licenses.agpl3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ aycanirican ];
};

55
pkgs/development/tools/misc/yodl/default.nix
View File

@@ -1,31 +1,40 @@
# This package is only used to create the documentation of zsh-cvs
# eg have a look at http://www.zsh.org/mla/users/2008/msg00715.html
# latest release is newer though
{ stdenv, fetchurl, perl, icmake }:
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
name = "yodl-${version}";
version = "3.04.00";
stdenv.mkDerivation {
name = "yodl-2.14.3";
buildInputs = [ perl ];
buildInputs = [ perl icmake ];
src = fetchurl {
url = "mirror://sourceforge/yodl/yodl_2.14.3.orig.tar.gz";
sha256 = "0paypm76p34hap3d18vvks5rrilchcw6q56rvq6pjf9raqw8ynd4";
url = "mirror://sourceforge/yodl/yodl_${version}.orig.tar.gz";
sha256 = "14sqd03j3w9g5l5rkdnqyxv174yz38m39ycncx86bq86g63igcv6";
};
patches =
[ (fetchurl {
url = "mirror://sourceforge/yodl/yodl_2.14.3-1.diff.gz";
sha256 = "176hlbiidv7p9051f04anzj4sr9dwlp9439f9mjvvgks47ac0qx4";
})
];
# This doesn't isntall docs yet, do you need them?
installPhase = ''
# -> $out
sed -i "s@'/usr/@'$out/@" contrib/build.pl
perl contrib/build.pl make-software
perl contrib/build.pl install-software
preConfigure = ''
patchShebangs scripts/.
sed -i 's;/usr;;g' INSTALL.im
substituteInPlace build --replace /usr/bin/icmake ${icmake}/bin/icmake
substituteInPlace macros/rawmacros/startdoc.pl --replace /usr/bin/perl ${perl}/bin/perl
'';
buildPhase = ''
./build programs
./build man
./build macros
'';
installPhase = ''
./build install programs $out
./build install man $out
./build install macros $out
'';
meta = with stdenv.lib; {
description = "A package that implements a pre-document language and tools to process it";
homepage = http://yodl.sourceforge.net/;
license = licenses.gpl3;
maintainers = with maintainers; [ pSub ];
platforms = platforms.linux;
};
}

1
pkgs/development/tools/pydb/default.nix
View File

@@ -19,5 +19,6 @@ stdenv.mkDerivation {
description = "Python debugger with GDB-like commands and Emacs bindings";
homepage = http://bashdb.sourceforge.net/pydb/;
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.all;
};
}

51
pkgs/development/tools/winpdb/default.nix Normal file
View File

@@ -0,0 +1,51 @@
{ stdenv, fetchurl, buildPythonPackage, wxPython, makeDesktopItem }:
buildPythonPackage rec {
name = "winpdb-1.4.8";
namePrefix = "";
src = fetchurl {
url = "https://winpdb.googlecode.com/files/${name}.tar.gz";
sha256 = "0vkpd24r40j928vc04c721innv0168sbllg97v4zw10adm24d8fs";
};
propagatedBuildInputs = [ wxPython ];
desktopItem = makeDesktopItem {
name = "winpdb";
exec = "winpdb";
icon = "winpdb";
comment = "Platform independend Python debugger";
desktopName = "Winpdb";
genericName = "Python Debugger";
categories = "Application;Development;Debugger;";
};
# Don't call gnome-terminal with "--disable-factory" flag, which is
# unsupported since GNOME >= 3.10. Apparently, debian also does this fix:
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757718
postPatch = ''
sed -i "s/--disable-factory//" rpdb2.py
'';
postInstall = ''
mkdir -p "$out"/share/applications
cp "$desktopItem"/share/applications/* "$out"/share/applications/
mkdir -p "$out"/share/icons
cp artwork/winpdb-icon.svg "$out"/share/icons/winpdb.svg
'';
meta = with stdenv.lib; {
description = "Platform independent Python debugger";
longDescription = ''
Winpdb is a platform independent GPL Python debugger with support for
multiple threads, namespace modification, embedded debugging, encrypted
communication and is up to 20 times faster than pdb.
'';
homepage = http://winpdb.org/;
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = [ maintainers.bjornfor ];
};
}