Merge branch 'staging' into modular-stdenv
Conflicts: pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/stdenv/linux/default.nix
This commit is contained in:
Vladimír Čunát
@@ -1,11 +1,11 @@
|
||||
{ fetchurl, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "diffstat-1.58";
|
||||
name = "diffstat-1.59";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://invisible-island.net/diffstat/${name}.tgz";
|
||||
sha256 = "14rpf5c05ff30f6vn6pn6pzy0k4g4is5im656ahsxff3k58i7mgs";
|
||||
sha256 = "0w7jvfilbnfa9v3h8j8ipirvrj7n2x5gszfanzxvx748p10i8z96";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl, perl, gettext }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dos2unix-6.0.5";
|
||||
name = "dos2unix-6.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.5.tar.gz;
|
||||
sha256 = "13w5blhv0i473y9lyrxh4axz4niyrxcpj4v2qiq3w5kamyp20czx";
|
||||
url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.6.tar.gz;
|
||||
sha256 = "0xnj4gmav1ypkgwmqldnq41b6l3cg08dyngkbygn9vrhlvlx9fwa";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "GNU Enscript, a converter from ASCII to PostScript, HTML, or RTF";
|
||||
description = "Converter from ASCII to PostScript, HTML, or RTF";
|
||||
|
||||
longDescription =
|
||||
'' GNU Enscript converts ASCII files to PostScript, HTML, or RTF and
|
||||
|
||||
@@ -1,19 +1,16 @@
|
||||
{ stdenv, fetchurl, getopt, lua, boost }:
|
||||
|
||||
{ stdenv, fetchurl, getopt, lua, boost, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "highlight-3.9";
|
||||
name = "highlight-3.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.andre-simon.de/zip/${name}.tar.bz2";
|
||||
sha256 = "1vysj34zz8gk5yhlzm7g6lbphb8y6zfbd9smfgsgwkyawfargrja";
|
||||
sha256 = "0jsq78qb75sawwggbpx5pdqxk00wgjr1a0la0w8wihmamsjzgijm";
|
||||
};
|
||||
|
||||
buildInputs = [ getopt lua boost ];
|
||||
buildInputs = [ getopt lua boost pkgconfig ];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
"conf_dir=$(out)/etc/highlight/"
|
||||
];
|
||||
preConfigure = ''makeFlags="PREFIX=$out conf_dir=$out/etc/highlight"'';
|
||||
|
||||
meta = {
|
||||
description = "Source code highlighting tool";
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Mpage, many-to-one page printing utility";
|
||||
description = "Many-to-one page printing utility";
|
||||
|
||||
longDescription = ''
|
||||
Mpage reads plain text files or PostScript documents and prints
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = !stdenv.isLinux;
|
||||
|
||||
meta = {
|
||||
description = "Namazu, a full-text search engine";
|
||||
description = "Full-text search engine";
|
||||
|
||||
longDescription = ''
|
||||
Namazu is a full-text search engine intended for easy use. Not
|
||||
|
||||
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x";
|
||||
};
|
||||
|
||||
patches = [ ./msggen.patch ];
|
||||
|
||||
buildInputs = [ opensp perl ];
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/openjade/files/openjade-1.3.2-msggen.pl.patch?revision=1.2
|
||||
|
||||
Use Getopt::Std in place of getopts.pl.
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=420083
|
||||
|
||||
--- a/msggen.pl
|
||||
+++ b/msggen.pl
|
||||
@@ -4,6 +4,7 @@
|
||||
# See the file COPYING for copying permission.
|
||||
|
||||
use POSIX;
|
||||
+use Getopt::Std;
|
||||
|
||||
# Package and version.
|
||||
$package = 'openjade';
|
||||
@@ -18,8 +19,7 @@
|
||||
undef $opt_l;
|
||||
undef $opt_p;
|
||||
undef $opt_t;
|
||||
-do 'getopts.pl';
|
||||
-&Getopts('l:p:t:');
|
||||
+getopts('l:p:t:');
|
||||
$module = $opt_l;
|
||||
$pot_file = $opt_p;
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
else {
|
||||
$field[0] =~ /^[IWQXE][0-9]$/ || &error("invalid first field");;
|
||||
$type[$num] = substr($field[0], 0, 1);
|
||||
- $argc = int(substr($field[0], 1, 1));
|
||||
+ $argc = substr($field[0], 1, 1);
|
||||
}
|
||||
$nargs[$num] = $argc;
|
||||
$field[1] =~ /^[a-zA-Z_][a-zA-Z0-9_]+$/ || &error("invalid tag");
|
||||
@@ -1,13 +1,13 @@
|
||||
{stdenv, fetchgit, autoreconfHook, pkgconfig, pcre, zlib, lzma}:
|
||||
|
||||
let release = "0.21.0"; in
|
||||
let release = "0.24.1"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "silver-searcher-${release}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/ggreer/the_silver_searcher.git";
|
||||
rev = "refs/tags/${release}";
|
||||
sha256 = "bd49c6cadabeaf7bde130e5d2d0083367ae2d19cfedb40e45f5bb1ff9f4a3e51";
|
||||
sha256 = "1cwav217mkbwyg8isiak0wynydiil2j9gy4sx79harbcql0f3nl3";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/wdiff/;
|
||||
description = "GNU wdiff, comparing files on a word by word basis";
|
||||
description = "Comparing files on a word by word basis";
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
@@ -1,28 +1,29 @@
|
||||
{stdenv, fetchurl, wget, bash, coreutils}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.23";
|
||||
name = "wgetpaste-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://wgetpaste.zlin.dk/${name}.tar.bz2";
|
||||
sha256 = "1xam745f5pmqi16br72a866117hnmcfwjyvsw1jhg3npbdnm9x6n";
|
||||
};
|
||||
# currently zsh-autocompletion support is not installed
|
||||
{ stdenv, fetchurl, wget, bash, coreutils }:
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace wgetpaste --replace "/usr/bin/env bash" "${bash}/bin/bash"
|
||||
substituteInPlace wgetpaste --replace "LC_ALL=C wget" "LC_ALL=C ${wget}/bin/wget"
|
||||
'';
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.25";
|
||||
name = "wgetpaste-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://wgetpaste.zlin.dk/${name}.tar.bz2";
|
||||
sha256 = "1x209j85mryp3hxmv1gfsbvw03k306k5fa65ky0zxx07cs70fzka";
|
||||
};
|
||||
# currently zsh-autocompletion support is not installed
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin;
|
||||
cp wgetpaste $out/bin;
|
||||
'';
|
||||
prePatch = ''
|
||||
substituteInPlace wgetpaste --replace "/usr/bin/env bash" "${bash}/bin/bash"
|
||||
substituteInPlace wgetpaste --replace "LC_ALL=C wget" "LC_ALL=C ${wget}/bin/wget"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Command-line interface to various pastebins";
|
||||
homepage = http://wgetpaste.zlin.dk/;
|
||||
license = "publicDomain";
|
||||
maintainers = with stdenv.lib.maintainers; [qknight];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin;
|
||||
cp wgetpaste $out/bin;
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Command-line interface to various pastebins";
|
||||
homepage = http://wgetpaste.zlin.dk/;
|
||||
license = "publicDomain";
|
||||
maintainers = with stdenv.lib.maintainers; [ qknight iElectric ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user