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

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
This commit is contained in:
Eelco Dolstra
2014-10-16 15:16:50 +02:00
parent 3c6efec2c0 e39bf7a704
commit 09dc132e04
826 changed files with 8930 additions and 7226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/misc/colord/default.nix
View File

@@ -3,11 +3,11 @@
, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "colord-1.1.7";
name = "colord-1.2.3";
src = fetchurl {
url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
sha256 = "295395526ee0be30917ae9c352e68bfeb20c7fc266a605725bef969f20547f44";
sha256 = "1z3l6hb3b08fixfra6m887a2j3lvhib6vp798ik16jfh375gr490";
};
enableParallelBuilding = true;

18
pkgs/tools/misc/datamash/default.nix Normal file
View File

@@ -0,0 +1,18 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "datamash-${version}";
version = "1.0.6";
src = fetchurl {
url = "http://ftp.gnu.org/gnu/datamash/${name}.tar.gz";
sha256 = "0154c25c45b5506b6d618ca8e18d0ef093dac47946ac0df464fb21e77b504118";
};
meta = {
description = "GNU datamash";
homepage = http://www.gnu.org/software/datamash/;
platforms = stdenv.lib.platforms.all;
};
}

2
pkgs/tools/misc/dbacl/default.nix
View File

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "dbacl-1.14";
src = fetchurl {
url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
md5 = "85bfd88bc20f326dc0f31e794948e21c";
sha256 = "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7";
};
meta = {

2
pkgs/tools/misc/getopt/default.nix
View File

@@ -5,6 +5,6 @@ stdenv.mkDerivation {
builder = ./builder.sh;
src = fetchurl {
url = http://tarballs.nixos.org/getopt-1.1.4.tar.gz;
md5 = "02188ca68da27c4175d6e9f3da732101";
sha256 = "1arvjfzw6p310zbgv629w5hkyslrj44imf3r3s2r4ry2jfcks221";
};
}

2
pkgs/tools/misc/grub/default.nix
View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz;
md5 = "cd3f3eb54446be6003156158d51f4884";
sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af";
};
# Lots of patches from Gentoo, in particular splash screen support

2
pkgs/tools/misc/gummiboot/default.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-45.tar.xz/5d4957390e959cb9f325b87712ddd3f1/gummiboot-45.tar.xz;
md5 = "5d4957390e959cb9f325b87712ddd3f1";
sha256 = "15227d6abi90vg7rs234fm13af511nsd6dv87c3jvsjhgb9ib0hm";
};
meta = {

45
pkgs/tools/misc/ised/default.nix
View File

@@ -1,42 +1,17 @@
x@{builderDefsPackage
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
{ stdenv, fetchurl }:
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="ised";
version = "2.6.0";
name="${baseName}-${version}";
url="mirror://sourceforge/project/ised/${name}.tar.bz2";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
stdenv.mkDerivation rec {
name = "ised-${version}";
version = "2.6.0";
src = fetchurl {
url = "mirror://sourceforge/project/ised/${name}.tar.bz2";
sha256 = "0rf9brqkrad8f3czpfc1bxq9ybv3nxci9276wdxas033c82cqkjs";
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
meta = {
description = "A numeric sequence editor";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.gpl3Plus;
inherit version;
maintainers = with stdenv.lib.maintainers; [ raskin ];
platforms = with stdenv.lib.platforms; linux;
license = stdenv.lib.licenses.gpl3Plus;
};
}) x
}

2
pkgs/tools/misc/lbdb/default.nix
View File

@@ -8,7 +8,7 @@ stdenv.mkDerivation {
name = "lbdb-${version}";
src = fetchurl {
url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz";
md5 = "a8e65f1400c90818ff324dc4fd67eba2";
sha256 = "1279ssfrh4cqrjzq5q47xbdlw5qx3aazxjshi86ljm4cw6xxvgar";
};
buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) finger_bsd;

4
pkgs/tools/misc/less/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
name = "less-468";
name = "less-470";
src = fetchurl {
url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz";
sha256 = "1s36hppwcrvf2csw5xyjrbkyyfgshqp5vfg32ms480hdn76bbs28";
sha256 = "1vw6bp9wkr2ymvhmf0ikrv8m1zm5ww78s48ny7ks0zjf2i8xr4gi";
};
# Look for ‘sysless’ in /etc.

31
pkgs/tools/misc/logstash/contrib.nix Normal file
View File

@@ -0,0 +1,31 @@
{ stdenv, lib, fetchzip }:
# Note that plugins are supposed to be installed as:
# $path/logstash/{inputs,codecs,filters,outputs}/*.rb
stdenv.mkDerivation rec {
version = "1.4.2";
name = "logstash-contrib-${version}";
src = fetchzip {
url = "http://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz";
sha256 = "1yj8sf3b526gixh3c6zhgkfpg4f0c72p1lzhfhdx8b3lw7zjkj0k";
};
dontBuild = true;
dontPatchELF = true;
dontStrip = true;
dontPatchShebangs = true;
installPhase = ''
mkdir -p $out/logstash
cp -r lib/* $out
'';
meta = with lib; {
description = "Community-maintained logstash plugins";
homepage = https://github.com/elasticsearch/logstash-contrib;
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.unix;
maintainers = with maintainers; [ cstrahan ];
};
}

2
pkgs/tools/misc/mssys/default.nix
View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = mirror://sourceforge/ms-sys/ms-sys-2.1.3.tgz;
md5 = "6fad0a69ac89440ad4f696dbbbf11497";
sha256 = "05djdqp7gqfrfb4czrmbgxgd8qr0h3781gzqvsp3qhfx6ay37z0p";
};
buildInputs = [gettext];

2
pkgs/tools/misc/pastebinit/default.nix
View File

@@ -6,7 +6,7 @@ python3Packages.buildPythonPackage rec {
src = fetchurl {
url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${name}.tar.bz2";
md5 = "b771872a9483cf92be90a3e4420fd3c9";
sha256 = "1rl854izwn1fpaaib6zj7a1a9bis8n7w4zfxcapgfffj37zj0dy2";
};
configurePhase = "export DETERMINISTIC_BUILD=1";

2
pkgs/tools/misc/screen/default.nix
View File

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
preConfigure = ''
configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man --with-sys-screenrc=/etc/screenrc"
configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man --with-sys-screenrc=/etc/screenrc --enable-colors256"
sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in
'';

6
pkgs/tools/misc/units/default.nix
View File

@@ -1,10 +1,10 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "units-2.10";
name = "units-2.11";
src = fetchurl {
url = mirror://gnu/units/units-2.10.tar.gz;
sha256 = "0fa4bk5aqyis5zisz6l8mqqk76njj6zgx3pbrjp5kvraz1dz78lc";
url = mirror://gnu/units/units-2.11.tar.gz;
sha256 = "1gjs3wc212aaiq4r76hx9nl1h3fa39n0ljwl9420d6ixl3rdmdjk";
};
meta = {

2
pkgs/tools/misc/venus/default.nix
View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = "python runtests.py";
buildInputs = [ python python.modules.bsddb python.modules.ssl libxslt
buildInputs = [ python python.modules.bsddb libxslt
libxml2 pythonPackages.genshi pythonPackages.lxml makeWrapper ];
installPhase = ''