Commit graph

118954 commits

Author SHA1 Message Date
Vladimír Čunát 62ef08bc38
Merge #30963: pcre: security 8.40 -> 8.41 2017-10-30 22:30:27 +01:00
Vladimír Čunát 687943763c
Merge branch 'master' into staging 2017-10-30 22:30:14 +01:00
Jörg Thalheim 9d74a615ce
Merge pull request #31003 from Lassulus/gdm-fixx
gdm: don't start getty@tty1 if enabled
2017-10-30 21:06:32 +00:00
lassulus 440178d729 gdm: don't start getty@tty1 if enabled 2017-10-30 21:43:10 +01:00
Bas van Dijk 07e0c0e0a2 network-interfaces-scripted: fix NixOS/nixops#640
Reverse the PartOf dependency between network-setup and network-addresses-*

This was joint work of: @nh2, @domenkozar, @fpletz, @aszlig and @basvandijk
at the NixCon 2017 hackathon.
2017-10-30 20:45:32 +01:00
Frederik Rietdijk cd976095fe
Merge pull request #30986 from nixos-docs/remove-fetchgitrevision
fetchgitrevision: removed
2017-10-30 20:05:43 +01:00
Orivej Desh 3aa993bbad
Merge pull request #30992 from wizeman/u/fix-python-netaddr
pythonPackages.netaddr: fix patch hash
2017-10-30 18:39:51 +00:00
Samuel Leathers 1e2ba03519
Merge pull request #30989 from chris-martin/pr/acme-doc
nixos/acme: remove doc note about restarting nginx
2017-10-30 19:39:26 +01:00
Ricardo M. Correia 517a0723e4 pythonPackages.netaddr: fix patch hash 2017-10-30 19:18:59 +01:00
Nicolas B. Pierron 1d56d0c8a7 types.submodule: Fix the NixOS Manual, by escaping the <> symbols. 2017-10-30 17:52:00 +00:00
Chris Martin 0581038e8e nixos/acme: remove doc note about restarting nginx
Discussion from #30945 indicates that it is no longer true that you have
to restart nginx.
2017-10-30 13:51:35 -04:00
Falco Peijnenburg 3004b6f150 fetchgitrevision: removed
It doesn't work and was last referred to in 5553546c21
2017-10-30 18:37:20 +01:00
Tim Steinbach 25c8014a4b
gradle: 4.2.1 -> 4.3 2017-10-30 13:35:12 -04:00
Daiderd Jordan b93df24078 pari: enable darwin build 2017-10-30 18:24:22 +01:00
Rodney Lorrimar 9ec640ec70 bower2nix: fix execution under nix-shell --pure
bower2nix needs nix to compute store hashes.

Fixes rvl/bower2nix#16
2017-10-30 18:23:45 +01:00
Rodney Lorrimar 9b0d50e3d0 fetchbower: clean common uri characters from version string
Some bower.json files have URL dependencies missing a version.

Fixes rvl/bower2nix#18
2017-10-30 18:23:45 +01:00
Tim Steinbach 5d41dda02d
cyrus_sasl: Fix CVE-2013-4122 2017-10-30 13:18:52 -04:00
Franz Pletz 0a5ecde808
linux: 4.4.80 -> 4.4.95 2017-10-30 17:57:00 +01:00
Franz Pletz 36be7d3e85
Revert parts of "linux: remove unused kernel patches"
This reverts commit 05b8cae9ec that
removed the cgroup v2 patch for the 4.4 kernel.
2017-10-30 17:57:00 +01:00
Franz Pletz 517606d1d4
Revert "linux_4_4: remove"
This reverts commit 9f3f575ab3.

Support from upstream has been extended to Feb 2022.
2017-10-30 17:57:00 +01:00
Franz Pletz f41f5a8f77
php71: 7.1.9 -> 7.1.11 2017-10-30 17:56:59 +01:00
Franz Pletz 3975f267ab
php70: 7.0.24 -> 7.0.25 2017-10-30 17:56:59 +01:00
Franz Pletz ecdf4f1c51
php56: 5.6.31 -> 5.6.32 2017-10-30 17:56:59 +01:00
Jörg Thalheim 283c271bf9
Merge pull request #30941 from ljli/rustup-update
rustup: patch and update
2017-10-30 16:32:23 +00:00
Eelco Dolstra c3255fe8ec
fetchzip and friends: Set "name" to "source" by default
This makes them produce the same store paths as builtins.fetchgit,
builtins.fetchTarball etc. See
65b5f177b5.
2017-10-30 17:17:07 +01:00
Christine Koppelt 821a7a38ea prometheus-alertmanager: 0.8.0 -> 0.9.1 2017-10-30 17:04:56 +01:00
Daniel Peebles c5dadc7f32
Merge pull request #30973 from nixos-docs/feat-remove-fetch-adc
fetchadc: removed
2017-10-30 16:53:44 +01:00
Falco Peijnenburg febe376f13 fetchadc: removed
It's not being used
2017-10-30 16:48:26 +01:00
zimbatm 4a4f6ba418 CODEOWNERS: fix path matching 2017-10-30 15:20:54 +00:00
zimbatm 0a46a71a6e gitAndTools.git-codeowners: init at 0.1.1 2017-10-30 15:14:24 +00:00
zimbatm abbea503b9 CODEOWNERS: add zimbatm to ruby modules 2017-10-30 15:13:47 +00:00
Tim Steinbach ca901691bc
Merge pull request #30970 from earldouglas/jenkins-2.87
jenkins: 2.86 -> 2.87
2017-10-30 11:09:59 -04:00
James Earl Douglas da866a6f29
jenkins: 2.86 -> 2.87 2017-10-30 08:57:54 -06:00
Orivej Desh 3c6bcab73b
Merge pull request #30956 from teto/pandas
pandas: 0.20.3 -> 0.21.0
2017-10-30 14:48:31 +00:00
Matthieu Coudron d22a1f6abc pandas: 0.20.3 -> 0.21.0
Now needs 'moto' to complete tests.
2017-10-31 03:08:43 +09:00
Graham Christensen edc2796b15
Merge pull request #30968 from WilliButz/highlight-update
highlight: 3.39 -> 3.40
2017-10-30 09:50:39 -04:00
WilliButz 367a3e45fd
highlight: 3.39 -> 3.40, fetch src from Github 2017-10-30 14:44:41 +01:00
Samuel Leathers 119ebee6a4 pcre: 8.40 -> 8.41 (fixes multiple CVEs) 2017-10-30 14:42:35 +01:00
zimbatm 933060fe19 mikutter: mark as broken
The package doesn't build anymore

/cc @midchildan
2017-10-30 13:35:00 +00:00
Tim Steinbach 70f35a99a4
linux: 4.14-rc6 -> 4.14-rc7 2017-10-30 08:30:29 -04:00
Nicolas B. Pierron d8987135c2 types.submodule: Replace a friendly comment by a more gentle one. 2017-10-30 13:06:18 +01:00
Vincent Laporte dd0cdc2fb4
ocamlPackages.camlp5: 7.02 -> 7.03 2017-10-30 11:58:05 +00:00
Márton Boros c556c72a2e nixos/gitlab: fix secret generation
This line previously produced an error and an empty secret file.
2017-10-30 12:49:27 +01:00
Márton Boros 00c03e9003 nixos/gitlab: fix preStart script 2017-10-30 12:49:27 +01:00
Márton Boros 29e80bde40 nixos/gitlab: fix hard-coded database name 2017-10-30 12:49:27 +01:00
Matthew Pickering b8a7c455f6 Fix idrisPackages.with-packages
1. The ln step was failing due to a file already existing
2. gcc was invoked directly which caused failure on OS X.
2017-10-30 12:25:33 +01:00
Joachim F 5c35db3e9b
Merge pull request #30953 from teto/sxiv
sxiv: installs .desktop file
2017-10-30 08:56:51 +00:00
Matthieu Coudron cdbcb19e83 sxiv: installs .desktop file
sxiv won't appear in meus as it has NoDisplay but it can be used to
generate the mimetypes.
2017-10-31 01:16:43 +09:00
Frederik Rietdijk 6d41ae55dd Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-30 07:51:09 +01:00
Frederik Rietdijk ff40e1b2a4
Merge pull request #30948 from adisbladis/pythonPackages.ofxclient-bs4
pythonPackages.ofxclient: Depend on beautifulsoup4 instead of beautifulsoup3
2017-10-30 07:48:06 +01:00