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

Merge branch 'master' into staging

Browse Source 
* master: (28 commits)
  go_1_9: skip flaky TestWaitGroupMisuse2
  erlangR18: fix patch hashes with fetchpatch
  xml2: replace dead links
  nixos/pam: fix docs about path to u2f_keys file
  cinelerra: add a note about parallel building
  msmtp: install docs and examples (#31769)
  kernel: Fix out-of-tree modules on aarch64
  nixos/tests/acme: update terms of service to fix test
  gixy: init at 0.1.8
  pythonPackages.ConfigArgParse: 0.9.3 -> 0.12.0, refactor, move to python-modules
  mono: init at 4.8
  wal-g: fix license so not to break evaluation
  wal-g: init at 0.1.2
  maintainers: add backuitist
  nixos/prometheus: Correct documentation for external_labels
  spidermonkey: replace broken links
  vagrant: removed custom rake gem
  vagrant: 2.0.0 -> 2.0.1
  nixos/prometheus: add external_labels option
  nixos/prometheus: add scrape_configs.honor_labels
  ...
This commit is contained in:
Orivej Desh 2017-11-17 18:06:22 +00:00
commit 1161741351
31 changed files with 305 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/languages-frameworks/rust.md
View File

@ -24,9 +24,7 @@ overlay](#using-the-rust-nightlies-overlay).
Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`:
```
with rustPlatform;
buildRustPackage rec {
rustPlatform.buildRustPackage rec {
name = "ripgrep-${version}";
version = "0.4.0";
@ -40,9 +38,9 @@ buildRustPackage rec {
cargoSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
meta = with stdenv.lib; {
description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";
description = "A fast line-oriented regex search tool, similar to ag and ack";
homepage = https://github.com/BurntSushi/ripgrep;
license = with licenses; [ unlicense ];
license = licenses.unlicense;
maintainers = [ maintainers.tailhook ];
platforms = platforms.all;
};

1
lib/maintainers.nix
View File

@ -67,6 +67,7 @@
avnik = "Alexander V. Nikolaev <avn@avnik.info>";
aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
bachp = "Pascal Bach <pascal.bach@nextrem.ch>";
backuitist = "Bruno Bieth";
badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
balajisivaraman = "Balaji Sivaraman <sivaraman.balaji@gmail.com>";
barrucadu = "Michael Walker <mike@barrucadu.co.uk>";

2
nixos/modules/security/pam.nix
View File

@ -41,7 +41,7 @@ let
type = types.bool;
description = ''
If set, users listed in
<filename>~/.yubico/u2f_keys</filename> are able to log in
<filename>~/.config/Yubico/u2f_keys</filename> are able to log in
with the associated U2F key.
'';
};

33
nixos/modules/services/monitoring/prometheus/default.nix
View File

@ -66,6 +66,16 @@ let
How frequently to evaluate rules by default.
'';
};
external_labels = mkOption {
type = types.attrsOf types.str;
description = ''
The labels to add to any time series or alerts when
communicating with external systems (federation, remote
storage, Alertmanager).
'';
default = {};
};
};
};
@ -100,6 +110,29 @@ let
The HTTP resource path on which to fetch metrics from targets.
'';
};
honor_labels = mkOption {
type = types.bool;
default = false;
description = ''
Controls how Prometheus handles conflicts between labels
that are already present in scraped data and labels that
Prometheus would attach server-side ("job" and "instance"
labels, manually configured target labels, and labels
generated by service discovery implementations).
If honor_labels is set to "true", label conflicts are
resolved by keeping label values from the scraped data and
ignoring the conflicting server-side labels.
If honor_labels is set to "false", label conflicts are
resolved by renaming conflicting labels in the scraped data
to "exported_&lt;original-label&gt;" (for example
"exported_instance", "exported_job") and then attaching
server-side labels. This is useful for use cases such as
federation, where all labels specified in the target should
be preserved.
'';
};
scheme = mkOption {
type = types.enum ["http" "https"];
default = "http";

4
nixos/tests/common/letsencrypt.nix
View File

@ -228,12 +228,12 @@ let
# Retrieved via:
# curl -s -I https://acme-v01.api.letsencrypt.org/terms \
# | sed -ne 's/^[Ll]ocation: *//p'
tosUrl = "https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf";
tosUrl = "https://letsencrypt.org/documents/2017.11.15-LE-SA-v1.2.pdf";
tosPath = builtins.head (builtins.match "https?://[^/]+(.*)" tosUrl);
tosFile = pkgs.fetchurl {
url = tosUrl;
sha256 = "08b2gacdz23mzji2pjr1pwnk82a84rzvr36isif7mmi9kydl6wv3";
sha256 = "0yvyckqzj0b1xi61sypcha82nanizzlm8yqy828h2jbza7cxi26c";
};
resolver = let

8
pkgs/applications/misc/octoprint/default.nix
View File

@ -54,13 +54,14 @@ let
in pythonPackages.buildPythonApplication rec {
name = "OctoPrint-${version}";
version = "1.3.4";
version = "1.3.5";
# 1.3.5, 2017-10-16, 77753ca02602d3a798d6b0a22535e6fd69ff448a
src = fetchFromGitHub {
owner = "foosel";
repo = "OctoPrint";
rev = version;
sha256 = "1hci8cfmbzcghla1vmrcn6zicm8nj50drm7gp2hkr0drglq5fgr2";
sha256 = "13krv9i6gm4jn4cb327q4qma4xwwashjnc0dia8vlnbjbbvkrni4";
};
# We need old Tornado
@ -69,7 +70,7 @@ in pythonPackages.buildPythonApplication rec {
semantic-version flask_principal werkzeug flaskbabel tornado
psutil pyserial flask_login netaddr markdown sockjs-tornado
pylru pyyaml sarge feedparser netifaces click websocket_client
scandir chainmap future dateutil
scandir chainmap future dateutil futures wrapt
];
buildInputs = with pythonPackages; [ nose mock ddt ];
@ -93,6 +94,7 @@ in pythonPackages.buildPythonApplication rec {
-e 's,future>=[^"]*,future,g' \
-e 's,pyserial>=[^"]*,pyserial,g' \
-e 's,semantic_version>=[^"]*,semantic_version,g' \
-e 's,wrapt>=[^"]*,wrapt,g' \
setup.py
'';

8
pkgs/applications/networking/instant-messengers/rambox/bare.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha }:
{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha, auth0ClientID, auth0Domain }:
stdenv.mkDerivation rec {
name = "rambox-bare-${version}";
@ -22,12 +22,6 @@ stdenv.mkDerivation rec {
patches = [ ./hide-check-for-updates.patch ./isDev.patch ];
# These credentials are only for this derivation. If you want to get credentials
# for another distribution, go to https://auth0.com. If you want to reuse the same
# domain, drop a line at yegortimoshenko@gmail.com!
auth0ClientID = "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU";
auth0Domain = "nixpkgs.auth0.com";
configurePhase = ''
echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js
ln -s ${node_modules} node_modules

11
pkgs/applications/networking/instant-messengers/rambox/default.nix
View File

@ -1,10 +1,17 @@
{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem }:
{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem
# These credentials are only for this derivation. If you want to get credentials
# for another distribution, go to https://auth0.com. If you want to reuse the same
# domain, drop a line at yegortimoshenko@gmail.com!
, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
, auth0Domain ? "nixpkgs.auth0.com" }:
let
callPackage = newScope self;
self = {
fetchNodeModules = callPackage ./fetchNodeModules.nix {};
rambox-bare = callPackage ./bare.nix {};
rambox-bare = callPackage ./bare.nix {
inherit auth0ClientID auth0Domain;
};
sencha = callPackage ./sencha {};
};
desktopItem = makeDesktopItem rec {

7
pkgs/applications/networking/msmtp/default.nix
View File

@ -8,7 +8,8 @@ let
journal = if stdenv.isLinux then "y" else "n";
in stdenv.mkDerivation rec {
name = "msmtp-${version}";
pname = "msmtp";
name = "${pname}-${version}";
version = "1.6.6";
src = fetchurl {
@ -30,6 +31,10 @@ in stdenv.mkDerivation rec {
stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ];
postInstall = ''
install -d $out/share/doc/${pname}/scripts
cp -r scripts/{find_alias,msmtpqueue,msmtpq,set_sendmail} $out/share/doc/${pname}/scripts
install -Dm644 doc/*.example $out/share/doc/${pname}
substitute scripts/msmtpq/msmtpq $out/bin/msmtpq \
--replace @msmtp@ $out/bin/msmtp \
--replace @nc@ ${netcat-gnu}/bin/nc \

4
pkgs/applications/video/cinelerra/default.nix
View File

@ -50,6 +50,10 @@ stdenv.mkDerivation {
fontconfig intltool
];
# Note: the build may fail with e.g.:
# CXX edl.o
# edl.C:50:25: fatal error: versioninfo.h: No such file or directory
# #include "versioninfo.h"
enableParallelBuilding = true;
meta = {

27
pkgs/applications/window-managers/i3/status-rust.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, gperftools }:
rustPlatform.buildRustPackage rec {
name = "i3status-rust-${version}";
version = "0.9.0.2017-11-09";
src = fetchFromGitHub {
owner = "greshake";
repo = "i3status-rust";
rev = "5daf2cdd611bed3db804d011d5d5af34b558e615";
sha256 = "0j6h7x5mm3m7wq0if20qxc9z3qw29xgf5qb3sqwdbdpz8ykpqdgk";
};
cargoSha256 = "1197hp6d4z14j0r22bvw9ly294li0ivg6yfql4lgi27hbvzag71h";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ dbus gperftools ];
meta = with stdenv.lib; {
description = "Very resource-friendly and feature-rich replacement for i3status";
homepage = https://github.com/greshake/i3status-rust;
license = licenses.gpl3;
maintainers = [ maintainers.backuitist ];
platforms = platforms.linux;
};
}

1
pkgs/development/compilers/go/1.9.nix
View File

@ -119,6 +119,7 @@ stdenv.mkDerivation rec {
./creds-test.patch
./remove-test-pie-1.9.patch
./go-1.9-skip-flaky-19608.patch
./go-1.9-skip-flaky-20072.patch
];
postPatch = optionalString stdenv.isDarwin ''

20
pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/src/sync/waitgroup_test.go b/src/sync/waitgroup_test.go
index e3e3096..f80d1e2 100644
--- a/src/sync/waitgroup_test.go
+++ b/src/sync/waitgroup_test.go
@@ -6,6 +6,7 @@ package sync_test
import (
"internal/race"
+ "internal/testenv"
"runtime"
. "sync"
"sync/atomic"
@@ -73,6 +74,7 @@ func TestWaitGroupMisuse2(t *testing.T) {
if runtime.NumCPU() <= 4 {
t.Skip("NumCPU<=4, skipping: this test requires parallelism")
}
+ testenv.SkipFlaky(t, 20072)
defer func() {
err := recover()
if err != "sync: negative WaitGroup counter" &&

7
pkgs/development/compilers/mono/4.8.nix Normal file
View File

@ -0,0 +1,7 @@
{ stdenv, callPackage, Foundation, libobjc }:
callPackage ./generic-cmake.nix (rec {
inherit Foundation libobjc;
version = "4.8.1.0";
sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq";
})

11
pkgs/development/compilers/rust/rust-src.nix Normal file
View File

@ -0,0 +1,11 @@
{ stdenv, rustc }:
stdenv.mkDerivation {
name = "rust-src";
src = rustc.src;
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
mv src $out
rm -rf $out/{ci,doc,driver,etc,grammar,llvm,rt,rtstartup,rustllvm,test,tools,vendor}
'';
}

10
pkgs/development/interpreters/erlang/R18.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl }:
{ mkDerivation, fetchpatch }:
let
rmAndPwdPatch = fetchurl {
rmAndPwdPatch = fetchpatch {
url = "https://github.com/erlang/otp/commit/98b8650d22e94a5ff839170833f691294f6276d0.patch";
sha256 = "0cd5pkqrigiqz6cyma5irqwzn0bi17k371k9vlg8ir31h3zmqfip";
sha256 = "0zjs7as83prgq4d5gaw2cmnajnsprdk8cjl5kklknx0pc2b3hfg5";
};
envAndCpPatch = fetchurl {
envAndCpPatch = fetchpatch {
url = "https://github.com/erlang/otp/commit/9f9841eb7327c9fe73e84e197fd2965a97b639cf.patch";
sha256 = "10h5348p6g279b4q01i5jdqlljww5chcvrx5b4b0dv79pk0p0m9f";
sha256 = "00fx5wc88ki3z71z5q4xzi9h3whhjw1zblpn09w995ygn07m9qhm";
};
in mkDerivation rec {

2
pkgs/development/interpreters/spidermonkey/31.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
# probably it would be more ideal to pull a particular tag/revision
# from the mercurial repo
src = fetchurl {
url = "https://people.mozilla.org/~sstangl/mozjs-31.5.0.tar.bz2";
url = "https://people.freebsd.org/~sunpoet/sunpoet/mozjs-31.5.0.tar.bz2";
sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd";
};

2
pkgs/development/interpreters/spidermonkey/38.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
# probably it would be more ideal to pull a particular tag/revision
# from the mercurial repo
src = fetchurl {
url = "https://people.mozilla.org/~sstangl/mozjs-${version}.tar.bz2";
url = "https://people.freebsd.org/~sunpoet/sunpoet/mozjs-${version}.tar.bz2";
sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681";
};

2
pkgs/development/libraries/gstreamer/core/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, perl, bison, flex, python, gobjectIntrospection
, glib, makeWrapper
, darwin
}:
stdenv.mkDerivation rec {
@ -24,6 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkgconfig perl bison flex python gobjectIntrospection makeWrapper
];
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices;
propagatedBuildInputs = [ glib ];

21
pkgs/development/python-modules/configargparse/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "ConfigArgParse";
version = "0.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "0fgkiqh6r3rbkdq3k8c48m85g52k96686rw3a6jg4lcncrkpvk98";
};
# no tests in tarball
doCheck = false;
meta = with lib; {
description = "A drop-in replacement for argparse";
homepage = https://github.com/zorro3/ConfigArgParse;
license = licenses.mit;
maintainer = [ maintainers.willibutz ];
};
}

25
pkgs/development/tools/rust/racer/default.nix
View File

@ -1,32 +1,33 @@
{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, rustup, substituteAll }:
rustPlatform.buildRustPackage rec {
name = "racer-${version}";
version = "2.0.9";
version = "2.0.12";
src = fetchFromGitHub {
owner = "racer-rust";
repo = "racer";
rev = version;
sha256 = "06k50f2vj2w08afh3nrlhs0amcvw2i45bhfwr70sgs395xicjswp";
sha256 = "0y1xlpjr8y8gsmmrjlykx4vwzf8akk42g35kg3kc419ry4fli945";
};
cargoSha256 = "1w5imxyqlyv24dvzncq6dy01zn2x8p1aciyvzh8ac1x1wdjcacjc";
cargoSha256 = "1h3jv4hajdv6k309kjr6b6298kxmd0faw081i3788sl794k9mp0j";
buildInputs = [ makeWrapper ];
# rustup is required for test
buildInputs = [ makeWrapper rustup ];
preCheck = ''
export RUST_SRC_PATH="${rustPlatform.rustcSrc}"
'';
patches = [
(substituteAll {
src = ./rust-src.patch;
inherit (rustPlatform) rustcSrc;
})
./ignore-tests.patch
];
doCheck = true;
installPhase = ''
mkdir -p $out/bin
cp -p target/release/racer $out/bin/
wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustPlatform.rustcSrc}"
'';
meta = with stdenv.lib; {
description = "A utility intended to provide Rust code completion for editors and IDEs";
homepage = https://github.com/racer-rust/racer;

22
pkgs/development/tools/rust/racer/ignore-tests.patch Normal file
View File

@ -0,0 +1,22 @@
diff -Naur --strip-trailing-cr source.org/src/racer/nameres.rs source/src/racer/nameres.rs
--- source.org/src/racer/nameres.rs 2017-11-15 20:37:38.571644733 +0000
+++ source/src/racer/nameres.rs 2017-11-15 20:23:20.521324031 +0000
@@ -577,6 +577,7 @@
out.into_iter()
}
+#[ignore]
#[test]
fn test_do_file_search() {
let cache = core::FileCache::default();
diff -Naur --strip-trailing-cr source.org/src/racer/util.rs source/src/racer/util.rs
--- source.org/src/racer/util.rs 2017-11-15 19:37:55.095344120 +0000
+++ source/src/racer/util.rs 2017-11-15 20:22:53.746624158 +0000
@@ -475,6 +475,7 @@
}
+#[ignore]
#[test]
fn test_get_rust_src_path_missing() {
use std::env;

10
pkgs/development/tools/rust/racer/rust-src.patch Normal file
View File

@ -0,0 +1,10 @@
--- source.org/src/racer/util.rs 1970-01-01 01:00:01.000000000 +0100
+++ source/src/racer/util.rs 2017-11-15 16:50:12.904216242 +0000
@@ -384,6 +384,7 @@
debug!("Nope. Trying default paths: /usr/local/src/rust/src and /usr/src/rust/src");
let default_paths = [
+ "@rustcSrc@",
"/usr/local/src/rust/src",
"/usr/src/rust/src",
];

16
pkgs/development/tools/vagrant/default.nix
View File

@ -1,14 +1,8 @@
{ stdenv, fetchurl, fetchpatch, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv
{ stdenv, fetchurl, fetchpatch, dpkg, curl, libarchive, openssl, rake, ruby, buildRubyGem, libiconv
, libxml2, libxslt, libffi, makeWrapper, p7zip, xar, gzip, cpio }:
let
version = "2.0.0";
rake = buildRubyGem {
inherit ruby;
gemName = "rake";
version = "10.4.2";
sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8";
};
version = "2.0.1";
url = if stdenv.isLinux
then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.deb"
@ -17,9 +11,9 @@ let
else "system ${stdenv.system} not supported";
sha256 = {
"x86_64-linux" = "184amybyxqlxqr8fk6lyx2znmci1fazsiby90q7d1xx2ihz3hm5x";
"i686-linux" = "19r1m5jila40x69m1qz2hslz7v1hdg8wwdhcq8d5qjnzwfmlw2qz";
"x86_64-darwin" = "154400iqs01235bclr8ic7g9jv01lfs766bmv7p8784r3xsblvsr";
"x86_64-linux" = "0kyqchjsy747vbvhqiynz81kik8g0xqpkv70rz7hyr9x7fl9i51g";
"i686-linux" = "0p3xhxy6shkd0393wjyj8qycdn3zqv60vnyz1b6zclz0kfah07zs";
"x86_64-darwin" = "01hr5j9k31hsdlcwv3srzk0lphd8w0n9z95jvfkschdyjm9clpwm";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch = builtins.replaceStrings ["-linux" "-darwin"] ["" ""] stdenv.system;

23
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -158,6 +158,13 @@ let
cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build
make modules_prepare $makeFlags "''${makeFlagsArray[@]}" O=$dev/lib/modules/${modDirVersion}/build
# Keep some extra files on some arches (powerpc, aarch64)
for f in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do
if [ -f "$buildRoot/$f" ]; then
cp $buildRoot/$f $dev/lib/modules/${modDirVersion}/build/$f
fi
done
# !!! No documentation on how much of the source tree must be kept
# If/when kernel builds fail due to missing files, you can add
# them here. Note that we may see packages requiring headers
@ -165,13 +172,14 @@ let
# headers on 3.10 though.
chmod u+w -R ../source
arch=`cd $dev/lib/modules/${modDirVersion}/build/arch; ls`
arch=$(cd $dev/lib/modules/${modDirVersion}/build/arch; ls)
# Remove unusued arches
mv arch/$arch .
rm -fR arch
mkdir arch
mv $arch arch
# Remove unused arches
for d in $(cd arch/; ls); do
if [ "$d" = "$arch" ]; then continue; fi
if [ "$arch" = arm64 ] && [ "$d" = arm ]; then continue; fi
rm -rf arch/$d
done
# Remove all driver-specific code (50M of which is headers)
rm -fR drivers
@ -179,6 +187,9 @@ let
# Keep all headers
find . -type f -name '*.h' -print0 | xargs -0 chmod u-w
# Keep linker scripts (they are required for out-of-tree modules on aarch64)
find . -type f -name '*.lds' -print0 | xargs -0 chmod u-w
# Keep root and arch-specific Makefiles
chmod u-w Makefile
chmod u-w arch/$arch/Makefile*

7
pkgs/servers/tvheadend/default.nix
View File

@ -3,7 +3,7 @@
, which, zlib }:
let
version = "4.2.1";
version = "4.2.4";
in stdenv.mkDerivation rec {
name = "tvheadend-${version}";
@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
owner = "tvheadend";
repo = "tvheadend";
rev = "v${version}";
sha256 = "1lhk8psvifmn4kjwyfxjj21z0apyr59zizzsfd4j22v7bk66rrl9";
sha256 = "1kydjmgv0nrllgi2s6aczq4x9ag01c8qm8w962qb52fzdfw7fs6k";
};
buildInputs = [
@ -39,7 +39,8 @@ in stdenv.mkDerivation rec {
preConfigure = ''
patchShebangs ./configure
substituteInPlace src/config.c --replace /usr/bin/tar ${gnutar}/bin/tar
substituteInPlace src/config.c \
--replace /usr/bin/tar ${gnutar}/bin/tar
# the version detection script `support/version` reads this file if it
# exists, so let's just use that

41
pkgs/tools/admin/gixy/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib, fetchFromGitHub, python }:
python.pkgs.buildPythonApplication rec {
name = "gixy-${version}";
version = "0.1.8";
# package is only compatible with python 2.7 and 3.5+
disabled = with python.pkgs; !(pythonAtLeast "3.5" || isPy27);
src = fetchFromGitHub {
owner = "yandex";
repo = "gixy";
rev = "v${version}";
sha256 = "0dg8j8pqlzdvmyfkphrizfqzggr64npb9mnm1dcwm6c3z6k2b0ii";
};
postPatch = ''
sed -ie '/argparse/d' setup.py
'';
propagatedBuildInputs = with python.pkgs; [
cached-property
ConfigArgParse
pyparsing
jinja2
nose
six
];
meta = with lib; {
description = "Nginx configuration static analyzer";
longDescription = ''
Gixy is a tool to analyze Nginx configuration.
The main goal of Gixy is to prevent security misconfiguration and automate flaw detection.
'';
homepage = https://github.com/yandex/gixy;
license = licenses.mpl20;
maintainers = [ maintainers.willibutz ];
platforms = platforms.linux;
};
}

16
pkgs/tools/backup/wal-g/default.nix Normal file
View File

@ -0,0 +1,16 @@
{ stdenv, buildGoPackage, fetchurl }:
buildGoPackage rec {
name = "wal-g-${version}";
version = "0.1.2";
src = fetchurl {
url = https://github.com/wal-g/wal-g/archive/v0.1.2.tar.gz;
sha256 = "0zkjs72gq7sc9cqqzxr6ms1ibk8466zpwmrziq9p4jv9r4iq3bfb";
};
goPackagePath = "github.com/wal-g/wal-g";
meta = {
homepage = https://github.com/wal-g/wal-g;
license = stdenv.lib.licenses.asl20;
description = "An archival restoration tool for Postgres";
maintainers = [ stdenv.lib.maintainers.ocharles ];
};
}

4
pkgs/tools/text/xml/xml2/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "xml2-0.5";
src = fetchurl {
url = "http://download.ofb.net/gale/${name}.tar.gz";
url = https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-0.5.tar.gz;
sha256 = "01cps980m99y99cnmvydihga9zh3pvdsqag2fi1n6k2x7rfkl873";
};
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libxml2 ];
meta = with stdenv.lib; {
homepage = http://ofb.net/~egnor/xml2/;
homepage = https://web.archive.org/web/20160515005047/http://dan.egnor.name:80/xml2;
description = "Tools for command line processing of XML, HTML, and CSV";
license = licenses.gpl2Plus;
platforms = platforms.all;

19
pkgs/top-level/all-packages.nix
View File

@ -1100,6 +1100,8 @@ with pkgs;
gist = callPackage ../tools/text/gist { };
gixy = callPackage ../tools/admin/gixy { };
glide = callPackage ../development/tools/glide { };
glock = callPackage ../development/tools/glock { };
@ -6181,6 +6183,11 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Foundation;
});
mono48 = lowPrio (callPackage ../development/compilers/mono/4.8.nix {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) Foundation;
});
mono50 = lowPrio (callPackage ../development/compilers/mono/5.0.nix {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) Foundation;
@ -6257,13 +6264,9 @@ with pkgs;
inherit rust;
};
rustcSrc = stdenv.mkDerivation {
name = "rust-src";
src = rust.rustc.src;
phases = ["unpackPhase" "installPhase"];
installPhase = "mv src $out";
rustcSrc = callPackage ../development/compilers/rust/rust-src.nix {
inherit (rust) rustc;
};
});
cargo-edit = callPackage ../tools/package-management/cargo-edit { };
@ -15174,6 +15177,8 @@ with pkgs;
i3status = callPackage ../applications/window-managers/i3/status.nix { };
i3status-rust = callPackage ../applications/window-managers/i3/status-rust.nix { };
i810switch = callPackage ../os-specific/linux/i810switch { };
icewm = callPackage ../applications/window-managers/icewm {};
@ -19948,4 +19953,6 @@ with pkgs;
dnstracer = callPackage ../tools/networking/dnstracer {
inherit (darwin) libresolv;
};
wal-g = callPackage ../tools/backup/wal-g {};
}

23
pkgs/top-level/python-packages.nix
View File

@ -8642,28 +8642,7 @@ in {
buildInputs = with self; [ nose ];
};
ConfigArgParse = buildPythonPackage rec {
name = "ConfigArgParse-${version}";
version = "0.9.3";
src = pkgs.fetchurl {
url = "mirror://pypi/C/ConfigArgParse/ConfigArgParse-${version}.tar.gz";
sha256 = "0a984pvv7370yz7zbkl6s6i7yyl9myahx0m9jkjvg3hz5q8mf70l";
};
# no tests in tarball
doCheck = false;
propagatedBuildInputs = with self; [
];
buildInputs = with self; [
];
meta = with stdenv.lib; {
homepage = "https://github.com/zorro3/ConfigArgParse";
};
};
ConfigArgParse = callPackage ../development/python-modules/configargparse { };
jsonschema = callPackage ../development/python-modules/jsonschema { };