Skip to content

Commit 1161741

Browse files
orivejorivej
committedNov 17, 2017
Merge branch 'master' into staging
* 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 ...
·
branch-off-24.1118.03-beta
2 parents eb36534 + 73598e3 commit 1161741

File tree

31 files changed

+305
-90
lines changed

31 files changed

+305
-90
lines changed
 

‎doc/languages-frameworks/rust.md

+3-5
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ overlay](#using-the-rust-nightlies-overlay).
2424
Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`:
2525

2626
```
27-
with rustPlatform;
28-
29-
buildRustPackage rec {
27+
rustPlatform.buildRustPackage rec {
3028
name = "ripgrep-${version}";
3129
version = "0.4.0";
3230
@@ -40,9 +38,9 @@ buildRustPackage rec {
4038
cargoSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
4139
4240
meta = with stdenv.lib; {
43-
description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";
41+
description = "A fast line-oriented regex search tool, similar to ag and ack";
4442
homepage = https://github.com/BurntSushi/ripgrep;
45-
license = with licenses; [ unlicense ];
43+
license = licenses.unlicense;
4644
maintainers = [ maintainers.tailhook ];
4745
platforms = platforms.all;
4846
};

‎lib/maintainers.nix

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

‎nixos/modules/security/pam.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ let
4141
type = types.bool;
4242
description = ''
4343
If set, users listed in
44-
<filename>~/.yubico/u2f_keys</filename> are able to log in
44+
<filename>~/.config/Yubico/u2f_keys</filename> are able to log in
4545
with the associated U2F key.
4646
'';
4747
};

‎nixos/modules/services/monitoring/prometheus/default.nix

+33
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,16 @@ let
6666
How frequently to evaluate rules by default.
6767
'';
6868
};
69+
70+
external_labels = mkOption {
71+
type = types.attrsOf types.str;
72+
description = ''
73+
The labels to add to any time series or alerts when
74+
communicating with external systems (federation, remote
75+
storage, Alertmanager).
76+
'';
77+
default = {};
78+
};
6979
};
7080
};
7181

@@ -100,6 +110,29 @@ let
100110
The HTTP resource path on which to fetch metrics from targets.
101111
'';
102112
};
113+
honor_labels = mkOption {
114+
type = types.bool;
115+
default = false;
116+
description = ''
117+
Controls how Prometheus handles conflicts between labels
118+
that are already present in scraped data and labels that
119+
Prometheus would attach server-side ("job" and "instance"
120+
labels, manually configured target labels, and labels
121+
generated by service discovery implementations).
122+
123+
If honor_labels is set to "true", label conflicts are
124+
resolved by keeping label values from the scraped data and
125+
ignoring the conflicting server-side labels.
126+
127+
If honor_labels is set to "false", label conflicts are
128+
resolved by renaming conflicting labels in the scraped data
129+
to "exported_&lt;original-label&gt;" (for example
130+
"exported_instance", "exported_job") and then attaching
131+
server-side labels. This is useful for use cases such as
132+
federation, where all labels specified in the target should
133+
be preserved.
134+
'';
135+
};
103136
scheme = mkOption {
104137
type = types.enum ["http" "https"];
105138
default = "http";

‎nixos/tests/common/letsencrypt.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,12 @@ let
228228
# Retrieved via:
229229
# curl -s -I https://acme-v01.api.letsencrypt.org/terms \
230230
# | sed -ne 's/^[Ll]ocation: *//p'
231-
tosUrl = "https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf";
231+
tosUrl = "https://letsencrypt.org/documents/2017.11.15-LE-SA-v1.2.pdf";
232232
tosPath = builtins.head (builtins.match "https?://[^/]+(.*)" tosUrl);
233233

234234
tosFile = pkgs.fetchurl {
235235
url = tosUrl;
236-
sha256 = "08b2gacdz23mzji2pjr1pwnk82a84rzvr36isif7mmi9kydl6wv3";
236+
sha256 = "0yvyckqzj0b1xi61sypcha82nanizzlm8yqy828h2jbza7cxi26c";
237237
};
238238

239239
resolver = let

‎pkgs/applications/misc/octoprint/default.nix

+5-3
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,14 @@ let
5454

5555
in pythonPackages.buildPythonApplication rec {
5656
name = "OctoPrint-${version}";
57-
version = "1.3.4";
57+
version = "1.3.5";
58+
# 1.3.5, 2017-10-16, 77753ca02602d3a798d6b0a22535e6fd69ff448a
5859

5960
src = fetchFromGitHub {
6061
owner = "foosel";
6162
repo = "OctoPrint";
6263
rev = version;
63-
sha256 = "1hci8cfmbzcghla1vmrcn6zicm8nj50drm7gp2hkr0drglq5fgr2";
64+
sha256 = "13krv9i6gm4jn4cb327q4qma4xwwashjnc0dia8vlnbjbbvkrni4";
6465
};
6566

6667
# We need old Tornado
@@ -69,7 +70,7 @@ in pythonPackages.buildPythonApplication rec {
6970
semantic-version flask_principal werkzeug flaskbabel tornado
7071
psutil pyserial flask_login netaddr markdown sockjs-tornado
7172
pylru pyyaml sarge feedparser netifaces click websocket_client
72-
scandir chainmap future dateutil
73+
scandir chainmap future dateutil futures wrapt
7374
];
7475

7576
buildInputs = with pythonPackages; [ nose mock ddt ];
@@ -93,6 +94,7 @@ in pythonPackages.buildPythonApplication rec {
9394
-e 's,future>=[^"]*,future,g' \
9495
-e 's,pyserial>=[^"]*,pyserial,g' \
9596
-e 's,semantic_version>=[^"]*,semantic_version,g' \
97+
-e 's,wrapt>=[^"]*,wrapt,g' \
9698
setup.py
9799
'';
98100

‎pkgs/applications/networking/instant-messengers/rambox/bare.nix

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha }:
1+
{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha, auth0ClientID, auth0Domain }:
22

33
stdenv.mkDerivation rec {
44
name = "rambox-bare-${version}";
@@ -22,12 +22,6 @@ stdenv.mkDerivation rec {
2222

2323
patches = [ ./hide-check-for-updates.patch ./isDev.patch ];
2424

25-
# These credentials are only for this derivation. If you want to get credentials
26-
# for another distribution, go to https://auth0.com. If you want to reuse the same
27-
# domain, drop a line at yegortimoshenko@gmail.com!
28-
auth0ClientID = "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU";
29-
auth0Domain = "nixpkgs.auth0.com";
30-
3125
configurePhase = ''
3226
echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js
3327
ln -s ${node_modules} node_modules

‎pkgs/applications/networking/instant-messengers/rambox/default.nix

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
1-
{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem }:
1+
{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem
2+
# These credentials are only for this derivation. If you want to get credentials
3+
# for another distribution, go to https://auth0.com. If you want to reuse the same
4+
# domain, drop a line at yegortimoshenko@gmail.com!
5+
, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
6+
, auth0Domain ? "nixpkgs.auth0.com" }:
27

38
let
49
callPackage = newScope self;
510
self = {
611
fetchNodeModules = callPackage ./fetchNodeModules.nix {};
7-
rambox-bare = callPackage ./bare.nix {};
12+
rambox-bare = callPackage ./bare.nix {
13+
inherit auth0ClientID auth0Domain;
14+
};
815
sencha = callPackage ./sencha {};
916
};
1017
desktopItem = makeDesktopItem rec {

‎pkgs/applications/networking/msmtp/default.nix

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ let
88
journal = if stdenv.isLinux then "y" else "n";
99

1010
in stdenv.mkDerivation rec {
11-
name = "msmtp-${version}";
11+
pname = "msmtp";
12+
name = "${pname}-${version}";
1213
version = "1.6.6";
1314

1415
src = fetchurl {
@@ -30,6 +31,10 @@ in stdenv.mkDerivation rec {
3031
stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ];
3132

3233
postInstall = ''
34+
install -d $out/share/doc/${pname}/scripts
35+
cp -r scripts/{find_alias,msmtpqueue,msmtpq,set_sendmail} $out/share/doc/${pname}/scripts
36+
install -Dm644 doc/*.example $out/share/doc/${pname}
37+
3338
substitute scripts/msmtpq/msmtpq $out/bin/msmtpq \
3439
--replace @msmtp@ $out/bin/msmtp \
3540
--replace @nc@ ${netcat-gnu}/bin/nc \

‎pkgs/applications/video/cinelerra/default.nix

+4
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ stdenv.mkDerivation {
5050
fontconfig intltool
5151
];
5252

53+
# Note: the build may fail with e.g.:
54+
# CXX edl.o
55+
# edl.C:50:25: fatal error: versioninfo.h: No such file or directory
56+
# #include "versioninfo.h"
5357
enableParallelBuilding = true;
5458

5559
meta = {

‎pkgs/applications/window-managers/i3/status-rust.nix

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, gperftools }:
2+
3+
rustPlatform.buildRustPackage rec {
4+
name = "i3status-rust-${version}";
5+
version = "0.9.0.2017-11-09";
6+
7+
src = fetchFromGitHub {
8+
owner = "greshake";
9+
repo = "i3status-rust";
10+
rev = "5daf2cdd611bed3db804d011d5d5af34b558e615";
11+
sha256 = "0j6h7x5mm3m7wq0if20qxc9z3qw29xgf5qb3sqwdbdpz8ykpqdgk";
12+
};
13+
14+
cargoSha256 = "1197hp6d4z14j0r22bvw9ly294li0ivg6yfql4lgi27hbvzag71h";
15+
16+
nativeBuildInputs = [ pkgconfig ];
17+
18+
buildInputs = [ dbus gperftools ];
19+
20+
meta = with stdenv.lib; {
21+
description = "Very resource-friendly and feature-rich replacement for i3status";
22+
homepage = https://github.com/greshake/i3status-rust;
23+
license = licenses.gpl3;
24+
maintainers = [ maintainers.backuitist ];
25+
platforms = platforms.linux;
26+
};
27+
}

‎pkgs/development/compilers/go/1.9.nix

+1
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ stdenv.mkDerivation rec {
119119
./creds-test.patch
120120
./remove-test-pie-1.9.patch
121121
./go-1.9-skip-flaky-19608.patch
122+
./go-1.9-skip-flaky-20072.patch
122123
];
123124

124125
postPatch = optionalString stdenv.isDarwin ''

‎pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/src/sync/waitgroup_test.go b/src/sync/waitgroup_test.go
2+
index e3e3096..f80d1e2 100644
3+
--- a/src/sync/waitgroup_test.go
4+
+++ b/src/sync/waitgroup_test.go
5+
@@ -6,6 +6,7 @@ package sync_test
6+
7+
import (
8+
"internal/race"
9+
+ "internal/testenv"
10+
"runtime"
11+
. "sync"
12+
"sync/atomic"
13+
@@ -73,6 +74,7 @@ func TestWaitGroupMisuse2(t *testing.T) {
14+
if runtime.NumCPU() <= 4 {
15+
t.Skip("NumCPU<=4, skipping: this test requires parallelism")
16+
}
17+
+ testenv.SkipFlaky(t, 20072)
18+
defer func() {
19+
err := recover()
20+
if err != "sync: negative WaitGroup counter" &&

‎pkgs/development/compilers/mono/4.8.nix

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{ stdenv, callPackage, Foundation, libobjc }:
2+
3+
callPackage ./generic-cmake.nix (rec {
4+
inherit Foundation libobjc;
5+
version = "4.8.1.0";
6+
sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq";
7+
})

‎pkgs/development/compilers/rust/rust-src.nix

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{ stdenv, rustc }:
2+
3+
stdenv.mkDerivation {
4+
name = "rust-src";
5+
src = rustc.src;
6+
phases = [ "unpackPhase" "installPhase" ];
7+
installPhase = ''
8+
mv src $out
9+
rm -rf $out/{ci,doc,driver,etc,grammar,llvm,rt,rtstartup,rustllvm,test,tools,vendor}
10+
'';
11+
}

‎pkgs/development/interpreters/erlang/R18.nix

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
{ mkDerivation, fetchurl }:
1+
{ mkDerivation, fetchpatch }:
22

33
let
4-
rmAndPwdPatch = fetchurl {
4+
rmAndPwdPatch = fetchpatch {
55
url = "https://github.com/erlang/otp/commit/98b8650d22e94a5ff839170833f691294f6276d0.patch";
6-
sha256 = "0cd5pkqrigiqz6cyma5irqwzn0bi17k371k9vlg8ir31h3zmqfip";
6+
sha256 = "0zjs7as83prgq4d5gaw2cmnajnsprdk8cjl5kklknx0pc2b3hfg5";
77
};
88

9-
envAndCpPatch = fetchurl {
9+
envAndCpPatch = fetchpatch {
1010
url = "https://github.com/erlang/otp/commit/9f9841eb7327c9fe73e84e197fd2965a97b639cf.patch";
11-
sha256 = "10h5348p6g279b4q01i5jdqlljww5chcvrx5b4b0dv79pk0p0m9f";
11+
sha256 = "00fx5wc88ki3z71z5q4xzi9h3whhjw1zblpn09w995ygn07m9qhm";
1212
};
1313

1414
in mkDerivation rec {

‎pkgs/development/interpreters/spidermonkey/31.nix

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

‎pkgs/development/interpreters/spidermonkey/38.nix

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

‎pkgs/development/libraries/gstreamer/core/default.nix

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{ stdenv, fetchurl, pkgconfig, perl, bison, flex, python, gobjectIntrospection
22
, glib, makeWrapper
3+
, darwin
34
}:
45

56
stdenv.mkDerivation rec {
@@ -24,6 +25,7 @@ stdenv.mkDerivation rec {
2425
nativeBuildInputs = [
2526
pkgconfig perl bison flex python gobjectIntrospection makeWrapper
2627
];
28+
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices;
2729

2830
propagatedBuildInputs = [ glib ];
2931

‎pkgs/development/python-modules/configargparse/default.nix

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{ stdenv, lib, buildPythonPackage, fetchPypi }:
2+
3+
buildPythonPackage rec {
4+
pname = "ConfigArgParse";
5+
version = "0.12.0";
6+
7+
src = fetchPypi {
8+
inherit pname version;
9+
sha256 = "0fgkiqh6r3rbkdq3k8c48m85g52k96686rw3a6jg4lcncrkpvk98";
10+
};
11+
12+
# no tests in tarball
13+
doCheck = false;
14+
15+
meta = with lib; {
16+
description = "A drop-in replacement for argparse";
17+
homepage = https://github.com/zorro3/ConfigArgParse;
18+
license = licenses.mit;
19+
maintainer = [ maintainers.willibutz ];
20+
};
21+
}

0 commit comments

Comments
 (0)
Please sign in to comment.