3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

257283 commits

Author SHA1 Message Date
Maximilian Bosch 55ef9612a2
nixos/nginx: improve documentation for config
Unfortunately, I had a use-case where `services.nginx.config` was
necessary quite recently. While working on that config I had to look up
the module's code to understand which options can be used and which
don't.

To slightly improve the situation, I changed the documentation like
this:

* Added `types.str` as type since `config` is not mergeable on purpose.
  It must be a string as it's rendered verbatim into `nginx.conf` and if
  the type is `unspecified`, it can be confused with RFC42-like options.

* Mention which config options that don't generate config in
  `nginx.conf` are NOT mutually exclusive.
2020-12-06 17:26:13 +01:00
Marin 3d629ef723
rage: fix macOS build (#106051)
Without the explicit Foundation dep, linker fails with this message:
```
  = note: ld: framework not found Foundation
          clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
          

error: aborting due to previous error

error: could not compile `i18n-embed-fl`
```

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
2020-12-06 10:26:39 -05:00
Raghav Sood 6c94fd93bc
Merge pull request #106010 from rnhmjoj/monero
monero 0.17.1.3 -> 0.17.1.5
2020-12-06 14:48:59 +00:00
Ryan Mulligan 5b06df093f
Merge pull request #106045 from r-ryantm/auto-update/libgpiod
libgpiod: 1.6.1 -> 1.6.2
2020-12-06 06:17:49 -08:00
Gabriel Ebner a6dabb2a86
Merge pull request #103941 from poita66/cura_4.8.0
cura: 4.7.1 -> 4.8.0
2020-12-06 15:01:04 +01:00
Raghav Sood b07dcf9715
Merge pull request #106064 from nyanloutre/ledger_update_2_18
ledger-live-desktop: 2.17.1 -> 2.18.0
2020-12-06 14:00:20 +00:00
nyanloutre 1dac33ca13
ledger-live-desktop: 2.17.1 -> 2.18.0 2020-12-06 14:40:16 +01:00
Doron Behar 336fd62920
Merge pull request #98500 from doronbehar/pkg/octave/sundials
sundials: assert that lapack and blas are compatible
2020-12-06 13:48:57 +02:00
Emery Hemingway c3bd560905 glow: remove ehmry from maintainers
Glow is potential spyware.
2020-12-06 12:39:19 +01:00
Michael Weiss c7cbc7098a
gns3-{gui,server}: 2.2.16 -> 2.2.17 2020-12-06 12:21:39 +01:00
markuskowa 30c976b5fe
Merge pull request #96047 from numinit/update-easy-rsa
easyrsa: 3.0.0 -> 3.0.8
2020-12-06 12:07:22 +01:00
Frederik Rietdijk b6e98f1895
Merge pull request #105584 from NixOS/staging-next
Staging next
2020-12-06 11:48:51 +01:00
markuskowa 46f7fbd5fc
Merge pull request #98968 from charvp/pr/init-greenfoot
greenfoot: init at 3.6.1
2020-12-06 11:48:35 +01:00
Doron Behar 01bb2154bb pdfarranger: don't wrap twice 2020-12-06 12:32:24 +02:00
Doron Behar 0b52dbe322 pdfarranger: 1.6.0 -> 1.6.2 2020-12-06 12:32:22 +02:00
Jan Tojnar 3afc4e8a81
androidsdk_9_0: fix evaluation without aliases 2020-12-06 11:07:40 +01:00
rnhmjoj 7e3fc72080
monero-gui: 0.17.1.4 -> 0.17.1.5 2020-12-06 10:39:54 +01:00
Vincent Laporte cf7475d206 ocamlPackages.odate: init at 0.6 2020-12-06 09:56:40 +01:00
Jörg Thalheim 1df84d17b9
Merge pull request #103755 from hlolli/feature/fetchmaven-classifiers 2020-12-06 08:37:15 +00:00
R. RyanTM 69a30a4d68 libgpiod: 1.6.1 -> 1.6.2 2020-12-06 08:34:48 +00:00
Sandro 5b7667a1c5
Merge pull request #106039 from breakds/clickhouse-driver 2020-12-06 08:18:44 +01:00
Jörg Thalheim c0ff5c7b7a
Merge remote-tracking branch 'upstream/master' into HEAD 2020-12-06 08:12:29 +01:00
Raghav Sood 6dfa0d8c5f
Merge pull request #106042 from breakds/marl
marl: init at 1.0.0
2020-12-06 06:28:06 +00:00
github-actions[bot] 8a52c4c658
Merge master into staging-next 2020-12-06 06:17:06 +00:00
Break Yang e9293077ff marl: init at 1.0.0 2020-12-05 22:14:03 -08:00
Break Yang 53b2e8a202 pythonPacakges.clickhouse-driver: init at 0.1.5 2020-12-05 21:29:48 -08:00
Break Yang 21d212d96e pythonPacakges.clickhouse-cityhash: init at 1.0.2.3 2020-12-05 21:29:32 -08:00
Raghav Sood bb2a7b9439
Merge pull request #105968 from RaghavSood/clickhouse/2011
clickhouse: 20.5.2.7 -> 20.11.4.13
2020-12-06 04:46:29 +00:00
Sandro 823444404a
Merge pull request #106026 from r-ryantm/auto-update/jenkins
jenkins: 2.249.3 -> 2.263.1
2020-12-06 04:49:08 +01:00
Mario Rodas d0751daf37
Merge pull request #104647 from lopsided98/pykdl-fix
pythonPackages.pykdl: fix build with latest SIP
2020-12-05 22:40:39 -05:00
Mario Rodas 6ec45ce0c8
Merge pull request #106021 from r-ryantm/auto-update/groovy
groovy: 3.0.6 -> 3.0.7
2020-12-05 22:36:17 -05:00
Mario Rodas 99040b2174
Merge pull request #106037 from r-ryantm/auto-update/ktlint
ktlint: 0.39.0 -> 0.40.0
2020-12-05 22:30:49 -05:00
Mario Rodas cbf343314a
Merge pull request #106022 from r-ryantm/auto-update/k9s
k9s: 0.24.1 -> 0.24.2
2020-12-05 22:30:24 -05:00
Raghav Sood 37a449fd90
Merge pull request #105835 from hjones2199/gpsd-up
gpsd: 3.16 -> 3.21
2020-12-06 03:19:58 +00:00
Raghav Sood a776aea536
clickhouse: 20.5.2.7 -> 20.11.4.13 2020-12-06 03:04:51 +00:00
R. RyanTM 919fee97b3 ktlint: 0.39.0 -> 0.40.0 2020-12-06 02:35:39 +00:00
Jan Tojnar 6ce08f74dc
Merge branch 'master' into staging-next 2020-12-06 03:28:13 +01:00
Sandro 18493dab88
Merge pull request #106035 from r-ryantm/auto-update/inspectrum
inspectrum: 0.2.2 -> 0.2.3
2020-12-06 03:19:01 +01:00
zowoq fad293d452 nixos/doc/rl-2103: fix build 2020-12-06 12:15:26 +10:00
R. RyanTM 85d6e4a25a inspectrum: 0.2.2 -> 0.2.3 2020-12-06 02:05:57 +00:00
Sandro baa9439525
Merge pull request #105978 from dywedir/pijul
pijul: 1.0.0-alpha.11 -> 1.0.0-alpha.17
2020-12-06 03:04:43 +01:00
Sandro e45a472c22
Merge pull request #105967 from bhipple/add/milc
python3Packages.milc: init at 1.0.10
2020-12-06 03:04:16 +01:00
Sandro 308cdda0d1
Merge pull request #105966 from urbas/py-air-control-exporter
python3Packages.py-air-control-exporter: init at 0.1.4
2020-12-06 02:51:36 +01:00
Peter Stewart b9e970027f cura: 4.7.1 -> 4.8.0 2020-12-06 12:41:39 +11:00
Peter Stewart 78526ad4d6 curaengine: 4.7.1 -> 4.8.0 2020-12-06 12:41:39 +11:00
Peter Stewart 8cd2d07858 python3Packages.libarcus: 4.7.1 -> 4.8.0 2020-12-06 12:41:39 +11:00
Peter Stewart c305f86a64 python3Packages.libsavitar: 4.7.1 -> 4.8.0 2020-12-06 12:41:39 +11:00
Peter Stewart 7769e4629b python3Packages.pynest2d: init at 4.8.0 2020-12-06 12:41:39 +11:00
Peter Stewart d4905adc32 libnest2d: init at 2020-10-09-unstable 2020-12-06 12:41:20 +11:00
Sandro 41c5eb83b3
Merge pull request #106025 from r-ryantm/auto-update/ibus-bamboo 2020-12-06 02:37:10 +01:00