Rob Vermaas
a9f054c834
dd-agent: Add default config files of dd-agent and auto_conf dir
...
to /etc/dd-agent/conf.d by default, and make sure
/etc/dd-agent/conf.d is used.
Before NixOS 17.03, we were using dd-agent 5.5.X which
used configuration from /etc/dd-agent/conf.d
In NixOS 17.03 the default conf.d location is first used relative,
meaning that $out/agent/conf.d was used without NixOS overrides.
This change implements similar functionality as PR #25288 , without
breaking backwards compatibility.
(cherry picked from commit 77c85b0ecb
)
2017-05-04 09:47:21 +00:00
Jörg Thalheim
f556d94527
Merge pull request #25484 from l2dy/nix-confdir
...
nix: add confDir argument
2017-05-03 21:52:01 +01:00
Eelco Dolstra
20d846bcdd
nixUnstable.perlBindings: Fix Nix::Config generation
...
The configure script calls nix-instantiate, which fails if /nix/var
doesn't exist (e.g. in a sandbox). This caused a bogus Nix::Config
module to be generated, causing issues in Hydra.
2017-05-03 17:39:43 +02:00
Zero King
8bb7328300
nix: add confDir argument
2017-05-03 13:04:52 +00:00
Pascal Wittmann
c5a5ac1ef7
Merge pull request #25471 from aneeshusa/update-mosh-to-1.3.0
...
mosh: 1.2.6 -> 1.3.0
2017-05-03 07:33:44 +02:00
Aneesh Agrawal
bc4e30a12b
mosh: 1.2.6 -> 1.3.0
...
Release announcement is available at
http://mailman.mit.edu/pipermail/mosh-users/2017-March/000341.html .
2017-05-02 19:39:25 -04:00
Aneesh Agrawal
ded7953478
treewide: meta.platform -> meta.platforms
2017-05-02 19:32:02 -04:00
Matthew Bauer
1234825656
xsv: fix "has invalid meta attribute"
...
Without this there's an eval error, when running nix-env -f '<nixpkgs>'
--query --available --json.
derivation ‘xsv-0.11.0’ has invalid meta attribute ‘override’
derivation ‘xsv-0.11.0’ has invalid meta attribute ‘overrideDerivation’
[Bjørn: extend commit message.]
2017-05-02 21:04:34 +02:00
Ioannis Koutras
cc4e2505e4
efivar: 31 -> 30
...
According to the release page, version 31 of efivar is still considered
as a pre-release and the sha256sum has changed at least once. This commit
switches to the last, stable release.
2017-05-02 20:56:36 +02:00
Matthew Bauer
aac48708c1
jing-trang: supports all unix
...
This is needed to build the manual on macOS.
2017-05-02 20:52:19 +02:00
Pascal Wittmann
cac205c252
Merge pull request #25436 from romildo/upd.cmst
...
cmst: 2016.10.03 -> 2017.03.18
2017-05-02 15:00:04 +02:00
Vladimír Čunát
d7501b986a
luajit: 2.1.0-beta2 -> 2.1.0-beta3
...
The removal of `luaL_reg` alias caused lots of breakage.
Only sysdig and knot-resolver needed (also) other changes.
2017-05-02 14:00:45 +02:00
romildo
ed76d724d3
cmst: 2016.10.03 -> 2017.03.18
2017-05-02 08:50:55 -03:00
Pascal Wittmann
de48ca0466
Merge pull request #25425 from romildo/upd.connman
...
connman: 1.33 -> 1.34
2017-05-02 12:21:22 +02:00
Peter Hoeg
d4dbef90f3
rockboxutility: do not pull in espeak by default
2017-05-02 15:52:10 +08:00
Peter Hoeg
13bca4ba2d
rockboxutility: fix linking to Qt libs
2017-05-02 14:34:52 +08:00
romildo
ac8698b7d1
connman: 1.33 -> 1.34
2017-05-01 23:35:18 -03:00
Michael Raskin
a5f436814a
Merge pull request #21017 from AndersonTorres/rst2html5
...
rst2html5: init at 1.9.3
2017-05-01 23:58:28 +02:00
AndersonTorres
4a87eae13c
rst2html5: put its expression in a separate file
...
As recommended by @7c6f434c and @FRidh, rst2html5 now resides
in its proper file.
2017-05-01 18:12:36 -03:00
Michael Raskin
208fa65256
Merge pull request #23080 from nixy/init/linode-cli
...
linode-cli: init at 1.4.7
2017-05-01 19:27:30 +02:00
Michael Raskin
ee790bf944
Merge pull request #23321 from jensbin/networkmanager_dmenu
...
networkmanager_dmenu: init at unstable-2017-04-13
2017-05-01 19:25:44 +02:00
Jens Binkert
4c6d267ae8
networkmanager_dmenu: init at unstable-2017-04-13
2017-05-01 19:06:23 +02:00
Jens Grunert
87a450e466
Adding networkmanager_dmenu
2017-05-01 19:00:33 +02:00
Andrew R. M
61668b036a
linode-cli: init at 1.4.7
2017-05-01 12:58:54 -04:00
Michael Raskin
008bd11363
Merge pull request #25237 from ericsagnes/pkg-update/fcitx-related
...
fcitx-engines.mozc: 2.17.2313.102.1 -> 2.18.2612.102.1 and other minor fcitx packages updates
2017-05-01 18:58:53 +02:00
Vladimír Čunát
92ee3b02e8
Merge branch 'staging'
...
Master is seeing a very large rebuild now, and this version of staging
seemed rather fine already (only a few thousand builds remaining now).
I really didn't want to wait a few more days because of this.
2017-05-01 18:00:21 +02:00
Michael Raskin
8a4bb1beb6
Merge pull request #25130 from jeaye/simp_le-0.2.0
...
simp_le: 0.1.1 -> 0.2.0
2017-05-01 14:40:08 +02:00
Michael Raskin
5ef193446e
Merge pull request #24997 from romildo/upd.efibootmgr
...
efibootmgr: 13 -> 15
2017-05-01 13:22:28 +02:00
Pascal Wittmann
c133bf6a79
nzbget: 18.0 -> 18.1
2017-05-01 12:03:41 +02:00
Michael Raskin
4d2f7b63e0
Merge pull request #24803 from pajowu/master
...
browserpass: init at 1.0.2
2017-05-01 11:27:17 +02:00
Michael Raskin
1a380c094f
Remove empty longDescription
2017-05-01 11:27:03 +02:00
Cray Elliott
c5fbf35be0
xpra: fix missed ffmpeg_3_2 reference
2017-04-30 16:58:33 -07:00
Cray Elliott
c49a454210
mpv, xpra: depend on ffmpeg instead of ffmpeg_3_2
...
effectively updates them to depend on ffmpeg_3_3
2017-04-30 16:52:49 -07:00
José Romildo Malaquias
2b140a795c
offlineimap: 7.0.13 -> 7.1.0 ( #25342 )
2017-05-01 00:06:48 +02:00
Daiderd Jordan
ed8fbe3dae
Merge pull request #25358 from sigma/pr/fzf-0.16.7
...
fzf: 0.16.6 -> 0.16.7
2017-04-30 23:21:54 +02:00
Benno Fünfstück
17a8227c3c
Merge pull request #25360 from sigma/pr/pt-2.1.5
...
the_platinum_searcher: 2.1.3 -> 2.1.5
2017-04-30 23:04:11 +02:00
Yann Hodique
5c9986e406
the_platinum_searcher: 2.1.3 -> 2.1.5
2017-04-30 12:51:58 -07:00
Michael Raskin
d5ec7bc748
Merge pull request #23697 from sargon/master
...
sshguard + service: init at 2.0.0
2017-04-30 21:43:12 +02:00
Yann Hodique
078b7c9f16
fzf: 0.16.6 -> 0.16.7
2017-04-30 11:38:58 -07:00
Michael Raskin
eedc0f0a78
Merge pull request #23333 from romildo/upd.qt5ct
...
qt5ct: 0.24 -> 0.30
2017-04-30 19:42:31 +02:00
Michael Raskin
ebc9e7a201
Merge pull request #22660 from timbertson/nix-update-source
...
nix-update-source: init at 0.3.0
2017-04-30 18:49:07 +02:00
Michael Raskin
b3d1050cf2
Merge pull request #22438 from rnhmjoj/masscan
...
masscan: init at 2016-11-03
2017-04-30 18:40:58 +02:00
Vladimír Čunát
9860e77f79
Merge branch 'master' into staging
2017-04-30 14:40:39 +02:00
obadz
f5939cde52
Merge pull request #25341 from womfoo/bump/facter-3.6.4
...
facter: 3.6.0 -> 3.6.4 and related deps
2017-04-30 12:47:20 +01:00
Kranium Gikos Mendoza
673ac9506b
facter: 3.6.0 -> 3.6.4
2017-04-30 21:13:26 +10:00
Frederik Rietdijk
3425c37ac6
Merge pull request #25336 from matthewbauer/nix-bundle
...
nix-bundle: v0.1.1 -> v0.1.3
2017-04-30 09:58:18 +02:00
Matthew Bauer
8b5854e260
nix-bundle: 0.1.2 -> 0.1.3
2017-04-30 02:23:31 -05:00
Joachim F
f15dae36fe
Merge pull request #25295 from mguentner/youtubedl_170428
...
youtube-dl: 2017.04.17 -> 2017.04.28
2017-04-29 22:06:50 +01:00
Jörg Thalheim
fddeacfe4c
Merge pull request #25316 from ericsagnes/pkg-update/ibus-mozc
...
ibus-engines.mozc: 2.17.2313.102 -> 2.20.2673.102
2017-04-29 11:14:00 +02:00
Jaka Hudoklin
85d16bd7af
Merge pull request #25312 from calvertvl/update-xpra-2_0_2
...
xpra: 2.0.1 -> 2.0.2
2017-04-29 10:33:32 +02:00