Merge remote-tracking branch 'upstream/master' into hardened-stdenv
This commit is contained in:
Robin Gloster
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "augeas-${version}";
|
||||
version = "1.2.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.augeas.net/${name}.tar.gz";
|
||||
sha256 = "1q41yilxc0nvjz5h9phm38k2b73k2v0b9jg11y92228bps7b5bpl";
|
||||
sha256 = "0gzpafrflkr0incq58vjkabfncrpc97d7mdgglkr57iyzvkbcfr2";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig readline libxml2 ];
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
, udev ? null
|
||||
, varnish ? null
|
||||
, yajl ? null
|
||||
, net_snmp ? null
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.5.1";
|
||||
@@ -43,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached
|
||||
cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
|
||||
lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool
|
||||
varnish yajl jdk libtool python udev
|
||||
varnish yajl jdk libtool python udev net_snmp
|
||||
];
|
||||
|
||||
# for some reason libsigrok isn't auto-detected
|
||||
|
||||
@@ -16,9 +16,19 @@ stdenv.mkDerivation {
|
||||
makeFlags="DESTROOT=$out"
|
||||
|
||||
# We want to ignore the $glibc/include/paths.h definition of
|
||||
# sendmail path
|
||||
echo "#undef _PATH_SENDMAIL" >> pathnames.h
|
||||
echo '#define _PATH_SENDMAIL "${sendmailPath}"' >> pathnames.h
|
||||
# sendmail path.
|
||||
# Also set a usable default PATH (#16518).
|
||||
cat >> pathnames.h <<__EOT__
|
||||
#undef _PATH_SENDMAIL
|
||||
#define _PATH_SENDMAIL "${sendmailPath}"
|
||||
|
||||
#undef _PATH_DEFPATH
|
||||
#define _PATH_DEFPATH "/var/setuid-wrappers:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/run/current-system/sw/bin:/run/current-system/sw/sbin:/usr/bin:/bin"
|
||||
__EOT__
|
||||
|
||||
# Implicit saved uids do not work here due to way NixOS uses setuid wrappers
|
||||
# (#16518).
|
||||
echo "#undef HAVE_SAVED_UIDS" >> externs.h
|
||||
'';
|
||||
|
||||
preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8";
|
||||
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "an enhanced version of GNU dd";
|
||||
description = "An enhanced version of GNU dd";
|
||||
|
||||
homepage = http://dcfldd.sourceforge.net/;
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
homepage = "http://projects.gw-computing.net/projects/dfc";
|
||||
description = "displays file system space usage using graphs and colors";
|
||||
description = "Displays file system space usage using graphs and colors";
|
||||
license="free";
|
||||
maintainers = with stdenv.lib.maintainers; [qknight];
|
||||
platforms = with stdenv.lib.platforms; all;
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "di-4.37";
|
||||
name = "di-4.42";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gentoo.com/di/${name}.tar.gz";
|
||||
sha256 = "1ljamhbpfps5b3n6gsk11znjv2f0cqfy7imda2qmzrlb8dipjs0h";
|
||||
sha256 = "1i6m9zdnidn8268q1lz9fd8payk7s4pgwh5zlam9rr4dy6h6a67n";
|
||||
};
|
||||
|
||||
makeFlags = "INSTALL_DIR=$(out)";
|
||||
makeFlags = [ "INSTALL_DIR=$(out)" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A disk information utility, displaying everything (and more) that your 'df' command does";
|
||||
description = "Disk information utility; displays everything 'df' does and more";
|
||||
homepage = http://www.gentoo.com/di/;
|
||||
license = licenses.zlib;
|
||||
maintainers = with maintainers; [ manveru ];
|
||||
|
||||
@@ -4,14 +4,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "evemu-${version}";
|
||||
version = "2.0.0";
|
||||
version = "2.4.0";
|
||||
|
||||
# We could have downloaded a release tarball from cgit, but it changes hash
|
||||
# each time it is downloaded :/
|
||||
src = fetchgit {
|
||||
url = git://git.freedesktop.org/git/evemu;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "0qv2ib3rb0wp881sfkzmhpkfc3nbrswdmll3087pmzpwd701g42l";
|
||||
sha256 = "07iha13xrpf4z59rzl9cm2h1zkc5xhyipbd3ajd3c1d4hhpn9w9s";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
|
||||
repositories.git = git://git.freedesktop.org/git/evemu;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.amorsillo ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "facter-${version}";
|
||||
version = "3.1.6";
|
||||
version = "3.1.8";
|
||||
src = fetchurl {
|
||||
url = "https://downloads.puppetlabs.com/facter/${name}.tar.gz";
|
||||
sha256 = "1kv4k9zqpsiw362kk1rw1a4sixd0pmnh57ghd4k4pffr2dkmdfsv";
|
||||
sha256 = "1fhfjf5bm5kyjiady14fxhpp7hdrkgx56vsvdbqj82km0xqcxpj9";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ];
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ stdenv, fetchFromGitHub, libaio, python, zlib }:
|
||||
|
||||
let
|
||||
version = "2.9";
|
||||
sha256 = "10x5b1f1pdsh33kqzc8yf2v4mijlmkh72lmh9za6kz7hb3hp1nvi";
|
||||
version = "2.12";
|
||||
sha256 = "1m0fx0x1v2375vyxhd2i12b9w1qy4yh75f6qhwlcr78himcsmpp9";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'hiera-eyaml', '2.1.0'
|
||||
@@ -0,0 +1,17 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
hiera-eyaml (2.1.0)
|
||||
highline (~> 1.6.19)
|
||||
trollop (~> 2.0)
|
||||
highline (1.6.21)
|
||||
trollop (2.1.2)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
hiera-eyaml (= 2.1.0)
|
||||
|
||||
BUNDLED WITH
|
||||
1.11.2
|
||||
@@ -0,0 +1,28 @@
|
||||
{ lib, bundlerEnv, stdenv }:
|
||||
|
||||
let
|
||||
name = "hiera-eyaml-${env.gems.hiera-eyaml.version}";
|
||||
|
||||
env = bundlerEnv {
|
||||
inherit name;
|
||||
gemfile = ./Gemfile;
|
||||
lockfile = ./Gemfile.lock;
|
||||
gemset = ./gemset.nix;
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
ln -s ${env}/bin/eyaml $out/bin/eyaml
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Per-value asymmetric encryption of sensitive data for Hiera";
|
||||
homepage = https://github.com/TomPoulton/hiera-eyaml;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.benley ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
{
|
||||
hiera-eyaml = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1h25pfv89macjf3sjdrx7slhlq1af4zybai42ci3gj02b6hli4a6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
};
|
||||
highline = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.21";
|
||||
};
|
||||
trollop = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.2";
|
||||
};
|
||||
}
|
||||
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
homepage = http://skarnet.org/software/s6-rc/;
|
||||
description = "a service manager for s6-based systems";
|
||||
description = "A service manager for s6-based systems";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
license = stdenv.lib.licenses.isc;
|
||||
maintainers = with stdenv.lib.maintainers; [ pmahoney ];
|
||||
|
||||
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "data recovery tool for damaged hardware";
|
||||
description = "Data recovery tool for damaged hardware";
|
||||
|
||||
longDescription =
|
||||
'' Safecopy is a data recovery tool which tries to extract as much data as possible from a
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "stress-ng-${version}";
|
||||
version = "0.06.01";
|
||||
version = "0.06.11";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "1bk3sj6gyrgp5qfxiz6k7zml28m01iljgvxhp4yq391xzfyvrlg9";
|
||||
sha256 = "0481aji9hdq8qbslrrc87r2p2pn8jxf913ac8wm5kxj02yqf7ccv";
|
||||
url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
|
||||
};
|
||||
|
||||
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
|
||||
longDescription = ''
|
||||
Stress test a system in various selectable ways, exercising both various
|
||||
physical subsystems and various operating system kernel interfaces:
|
||||
- over 60 different stress tests
|
||||
- over 50 CPU specific stress tests that exercise floating point,
|
||||
- over 130 different stress tests
|
||||
- over 70 CPU specific stress tests that exercise floating point,
|
||||
integer, bit manipulation and control flow
|
||||
- over 20 virtual memory stress tests
|
||||
stress-ng was originally intended to make a machine work hard and trip
|
||||
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://vicerveza.homeunix.net/~viric/soft/tm";
|
||||
description = "terminal mixer - multiplexer for the i/o of terminal applications";
|
||||
description = "Terminal mixer - multiplexer for the i/o of terminal applications";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ viric ];
|
||||
platforms = platforms.all;
|
||||
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
homepage = "http://mama.indstate.edu/users/ice/tree/";
|
||||
description = "command to produce a depth indented directory listing";
|
||||
description = "Command to produce a depth indented directory listing";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
|
||||
longDescription = ''
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://vicerveza.homeunix.net/~viric/soft/ts";
|
||||
description = "task spooler - batch queue";
|
||||
description = "Task spooler - batch queue";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ viric ];
|
||||
platforms = platforms.all;
|
||||
|
||||
Reference in New Issue
Block a user