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

Merge recent master into staging

Browse Source 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
This commit is contained in:
Vladimír Čunát
2014-08-30 10:04:02 +02:00
parent a283bec71c 4e0d2706f1
commit e51f73652d
756 changed files with 18877 additions and 13683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
description = "LCOV, a code coverage tool that enhances GNU gcov";
description = "Code coverage tool that enhances GNU gcov";
longDescription =
'' LCOV is an extension of GCOV, a GNU tool which provides information

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

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
description = "Sparse, a semantic parser for C";
description = "Semantic parser for C";
homepage = "https://git.kernel.org/cgit/devel/sparse/sparse.git/";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;

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

@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.valgrind.org/;
description = "Valgrind, a debugging and profiling tool suite";
description = "Debugging and profiling tool suite";
longDescription = ''
Valgrind is an award-winning instrumentation framework for

2
pkgs/development/tools/build-managers/gradle/default.nix
View File

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ unzip jdk makeWrapper ];
meta = {
description = "Gradle is an enterprise-grade build system";
description = "Enterprise-grade build system";
longDescription = ''
Gradle is a build system which offers you ease, power and freedom.
You can choose the balance for yourself. It has powerful multi-project

2
pkgs/development/tools/documentation/doxygen/default.nix
View File

@@ -39,7 +39,7 @@ stdenv.mkDerivation {
meta = {
license = stdenv.lib.licenses.gpl2Plus;
homepage = "http://doxygen.org/";
description = "Doxygen, a source code documentation generator tool";
description = "Source code documentation generator tool";
longDescription = ''
Doxygen is a documentation system for C++, C, Java, Objective-C,

2
pkgs/development/tools/documentation/haddock/2.14.3.nix
View File

@@ -12,7 +12,7 @@ cabal.mkDerivation (self: {
isExecutable = true;
buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ];
testDepends = [ Cabal deepseq filepath hspec QuickCheck ];
doCheck = false;
preCheck = "unset GHC_PACKAGE_PATH";
meta = {
homepage = "http://www.haskell.org/haddock/";
description = "A documentation-generation tool for Haskell libraries";

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

@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "cabal-bounds";
version = "0.8.4";
sha256 = "00vj6ca9liqlqg69d4ziacsxz6x9365sbyc1ag6g18bhibyinsh2";
version = "0.8.5";
sha256 = "19lai2gdxs76mrvcz77sjsx7hh87cf1f4qmy7z1zcd130z11q04a";
isLibrary = true;
isExecutable = true;
buildDepends = [

11
pkgs/development/tools/haskell/cabal2nix/default.nix
View File

@@ -1,15 +1,18 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, Cabal, doctest, filepath, hackageDb, HTTP, mtl, regexPosix
{ cabal, Cabal, doctest, filepath, hackageDb, mtl, regexPosix
, transformers
}:
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.68";
sha256 = "0w9ayvr3ljfxgi17yaayqvyxflbgf7b5245pc3m011lp3cfnj849";
version = "1.69";
sha256 = "0430086lh1h7w8wxc42aqrdjb8i12vz8m0jr1q2c45h3k6brb5r5";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
buildDepends = [
Cabal filepath hackageDb mtl regexPosix transformers
];
testDepends = [ doctest ];
doCheck = self.stdenv.lib.versionOlder "7.6" self.ghc.version;
meta = {

2
pkgs/development/tools/java/fastjar/default.nix
View File

@@ -14,7 +14,7 @@ let version = "0.94"; in
doCheck = true;
meta = {
description = "FastJar, a fast Java archiver written in C";
description = "Fast Java archiver written in C";
longDescription = ''
Fastjar is a version of Sun's `jar' utility, written entirely in C, and

2
pkgs/development/tools/misc/binutils/default.nix
View File

@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
description = "GNU Binutils, tools for manipulating binaries (linker, assembler, etc.)";
description = "Tools for manipulating binaries (linker, assembler, etc.)";
longDescription = ''
The GNU Binutils are a collection of binary tools. The main

122
pkgs/development/tools/misc/bossa/bin2c.c Normal file
View File

@@ -0,0 +1,122 @@
// bin2c.c
//
// convert a binary file into a C source vector
//
// THE "BEER-WARE LICENSE" (Revision 3.1415):
// sandro AT sigala DOT it wrote this file. As long as you retain this notice you can do
// whatever you want with this stuff. If we meet some day, and you think this stuff is
// worth it, you can buy me a beer in return. Sandro Sigala
//
// syntax: bin2c [-c] [-z] <input_file> <output_file>
//
// -c add the "const" keyword to definition
// -z terminate the array with a zero (useful for embedded C strings)
//
// examples:
// bin2c -c myimage.png myimage_png.cpp
// bin2c -z sometext.txt sometext_txt.cpp
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifndef PATH_MAX
#define PATH_MAX 1024
#endif
int useconst = 0;
int zeroterminated = 0;
int myfgetc(FILE *f)
{
int c = fgetc(f);
if (c == EOF && zeroterminated)
{
zeroterminated = 0;
return 0;
}
return c;
}
void process(const char *ifname, const char *ofname)
{
FILE *ifile, *ofile;
ifile = fopen(ifname, "rb");
if (ifile == NULL)
{
fprintf(stderr, "cannot open %s for reading\n", ifname);
exit(1);
}
ofile = fopen(ofname, "wb");
if (ofile == NULL)
{
fprintf(stderr, "cannot open %s for writing\n", ofname);
exit(1);
}
char buf[PATH_MAX], *p;
const char *cp;
if ((cp = strrchr(ifname, '/')) != NULL)
{
++cp;
} else {
if ((cp = strrchr(ifname, '\\')) != NULL)
++cp;
else
cp = ifname;
}
strcpy(buf, cp);
for (p = buf; *p != '\0'; ++p)
{
if (!isalnum(*p))
*p = '_';
}
fprintf(ofile, "static %sunsigned char %s[] = {\n", useconst ? "const " : "", buf);
int c, col = 1;
while ((c = myfgetc(ifile)) != EOF)
{
if (col >= 78 - 6)
{
fputc('\n', ofile);
col = 1;
}
fprintf(ofile, "0x%.2x, ", c);
col += 6;
}
fprintf(ofile, "\n};\n");
fclose(ifile);
fclose(ofile);
}
void usage(void)
{
fprintf(stderr, "usage: bin2c [-cz] <input_file> <output_file>\n");
exit(1);
}
int main(int argc, char **argv)
{
while (argc > 3)
{
if (!strcmp(argv[1], "-c"))
{
useconst = 1;
--argc;
++argv;
} else if (!strcmp(argv[1], "-z"))
{
zeroterminated = 1;
--argc;
++argv;
} else {
usage();
}
}
if (argc != 3)
{
usage();
}
process(argv[1], argv[2]);
return 0;
}

49
pkgs/development/tools/misc/bossa/default.nix Normal file
View File

@@ -0,0 +1,49 @@
{ stdenv, fetchgit, wxGTK, libX11, readline }:
let
# BOSSA needs a "bin2c" program to embed images.
# Source taken from:
# http://wiki.wxwidgets.org/Embedding_PNG_Images-Bin2c_In_C
bin2c = stdenv.mkDerivation {
name = "bossa-bin2c";
src = ./bin2c.c;
unpackPhase = "true";
buildPhase = ''cc $src -o bin2c'';
installPhase = ''mkdir -p $out/bin; cp bin2c $out/bin/'';
};
in
stdenv.mkDerivation rec {
name = "bossa";
src = fetchgit {
url = https://github.com/shumatech/BOSSA;
rev = "0f0a41cb1c3a65e909c5c744d8ae664e896a08ac"; /* arduino branch */
sha256 = "01y8r45fw02rps9q995mv82bxrm6p0mysv4wir5glpagrhnyw7md";
};
nativeBuildInputs = [ bin2c ];
buildInputs = [ wxGTK libX11 readline ];
# Explicitly specify targets so they don't get stripped.
makeFlags = [ "bin/bossac" "bin/bossash" "bin/bossa" ];
installPhase = ''
mkdir -p $out/bin
cp bin/bossa{c,sh,} $out/bin/
'';
meta = with stdenv.lib; {
description = "A flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers";
longDescription = ''
BOSSA is a flash programming utility for Atmel's SAM family of
flash-based ARM microcontrollers. The motivation behind BOSSA is
to create a simple, easy-to-use, open source utility to replace
Atmel's SAM-BA software. BOSSA is an acronym for Basic Open
Source SAM-BA Application to reflect that goal.
'';
homepage = http://www.shumatech.com/web/products/bossa;
license = licenses.bsd3;
platforms = platforms.linux;
};
}

2
pkgs/development/tools/misc/cflow/default.nix
View File

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
description = "GNU cflow, a tool to analyze the control flow of C programs";
description = "Tool to analyze the control flow of C programs";
longDescription = ''
GNU cflow analyzes a collection of C source files and prints a

2
pkgs/development/tools/misc/coccinelle/default.nix
View File

@@ -37,7 +37,7 @@ in stdenv.mkDerivation {
configureFlags = "--enable-release";
meta = {
description = "Coccinelle, a program to apply C code semantic patches";
description = "Program to apply semantic patches to C code";
longDescription =
'' Coccinelle is a program matching and transformation engine which

2
pkgs/development/tools/misc/complexity/default.nix
View File

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "GNU Complexity, C code complexity measurement tool";
description = "C code complexity measurement tool";
longDescription =
'' GNU Complexity is a tool designed for analyzing the complexity of C

2
pkgs/development/tools/misc/cppi/default.nix
View File

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://savannah.gnu.org/projects/cppi/;
description = "GNU cppi, a cpp directive indenter";
description = "A C preprocessor directive indenter";
longDescription =
'' GNU cppi indents C preprocessor directives to reflect their nesting

2
pkgs/development/tools/misc/cscope/default.nix
View File

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
};
meta = {
description = "Cscope, a developer's tool for browsing source code";
description = "A developer's tool for browsing source code";
longDescription = ''
Cscope is a developer's tool for browsing source code. It has

2
pkgs/development/tools/misc/ctags/default.nix
View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://ctags.sourceforge.net/";
description = "Exuberant Ctags, a tool for fast source code browsing";
description = "A tool for fast source code browsing (exuberant ctags)";
license = stdenv.lib.licenses.gpl2Plus;
longDescription = ''

2
pkgs/development/tools/misc/gdb/default.nix
View File

@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
doCheck = false;
meta = with stdenv.lib; {
description = "GDB, the GNU Project debugger";
description = "The GNU Project debugger";
longDescription = ''
GDB, the GNU Project debugger, allows you to see what is going

2
pkgs/development/tools/misc/gengetopt/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
description = "GNU Gengetopt, a command-line option parser generator";
description = "Command-line option parser generator";
longDescription =
'' GNU Gengetopt program generates a C function that uses getopt_long

2
pkgs/development/tools/misc/global/default.nix
View File

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "GNU GLOBAL source code tag system";
description = "Source code tag system";
longDescription = ''
GNU GLOBAL is a source code tagging system that works the same way

2
pkgs/development/tools/misc/gperf/default.nix
View File

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
meta = {
description = "GNU gperf, a perfect hash function generator";
description = "Perfect hash function generator";
longDescription = ''
GNU gperf is a perfect hash function generator. For a given

2
pkgs/development/tools/misc/help2man/default.nix
View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = {
description = "GNU help2man generates man pages from `--help' output";
description = "Generate man pages from `--help' output";
longDescription =
'' help2man produces simple manual pages from the ‘--help’ and

2
pkgs/development/tools/misc/libtool/default.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
dontPatchShebangs = true;
meta = {
description = "GNU Libtool, a generic library support script";
description = "Generic library support script";
longDescription = ''
GNU libtool is a generic library support script. Libtool hides

20
pkgs/development/tools/misc/nixbang/default.nix Normal file
View File

@@ -0,0 +1,20 @@
{ lib, pythonPackages, fetchgit }:
let version = "0.1.1"; in
pythonPackages.buildPythonPackage {
name = "nixbang-${version}";
namePrefix = "";
src = fetchgit {
url = "git://github.com/madjar/nixbang.git";
rev = "refs/tags/${version}";
sha256 = "1n8jq32r2lzk3g0d95ksfq7vdqciz34jabribrr4hcnz4nlijshf";
};
meta = {
homepage = https://github.com/madjar/nixbang;
description = "A special shebang to run scripts in a nix-shell";
maintainers = [ lib.maintainers.madjar ];
platforms = lib.platforms.all;
};
}

2
pkgs/development/tools/misc/sloccount/default.nix
View File

@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "SLOCCount, a set of tools for counting physical Source Lines of Code (SLOC)";
description = "Set of tools for counting physical Source Lines of Code (SLOC)";
longDescription = ''
This is the home page of "SLOCCount", a set of tools for

2
pkgs/development/tools/misc/swig/default.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--disable-ccache";
meta = {
description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
description = "Interface compiler that connects C/C++ code to higher-level languages";
longDescription = ''
SWIG is an interface compiler that connects programs written in C and

2
pkgs/development/tools/misc/texinfo/4.13a.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
#doCheck = true;
meta = {
description = "GNU Texinfo, the GNU documentation system";
description = "The GNU documentation system";
longDescription = ''
Texinfo is the official documentation format of the GNU project.

2
pkgs/development/tools/misc/texinfo/5.2.nix
View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://www.gnu.org/software/texinfo/";
description = "GNU Texinfo, the GNU documentation system";
description = "The GNU documentation system";
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all;

2
pkgs/development/tools/ocaml/omake/default.nix
View File

@@ -30,7 +30,7 @@ stdenv.mkDerivation {
# buildFlags = "world.opt";
meta = {
description = "Omake build system";
description = "A build system designed for scalability and portability";
homepage = "${webpage}";
license = "GPL";
};

2
pkgs/development/tools/parsing/bison/2.x.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://www.gnu.org/software/bison/";
description = "GNU Bison, a Yacc-compatible parser generator";
description = "Yacc-compatible parser generator";
license = stdenv.lib.licenses.gpl3Plus;
longDescription = ''

2
pkgs/development/tools/parsing/bison/3.x.nix
View File

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://www.gnu.org/software/bison/";
description = "GNU Bison, a Yacc-compatible parser generator";
description = "Yacc-compatible parser generator";
license = stdenv.lib.licenses.gpl3Plus;
longDescription = ''

2
pkgs/development/tools/profiling/oprofile/default.nix
View File

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "OProfile, a system-wide profiler for Linux";
description = "System-wide profiler for Linux";
longDescription = ''
OProfile is a system-wide profiler for Linux systems, capable of
profiling all running code at low overhead. It consists of a

2
pkgs/development/tools/profiling/sysprof/default.nix
View File

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://sysprof.com/;
description = "Sysprof, a system-wide profiler for Linux";
description = "System-wide profiler for Linux";
license = stdenv.lib.licenses.gpl2Plus;
longDescription = ''

2
pkgs/development/tools/sqsh/default.nix
View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
];
meta = {
description = "SQSH is command line tool for querying Sybase/MSSQL databases";
description = "Command line tool for querying Sybase/MSSQL databases";
longDescription =
''
Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell),