Vladimír Čunát
09f5763784
Merge branch 'master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/pathspec/default.nix
The hashes are equivalent, so it's not a real conflict.
- pkgs/top-level/static.nix
I can't see a solution, deffered redoing this to the later PR:
https://github.com/NixOS/nixpkgs/pull/136849
2021-09-07 08:43:26 +02:00
Vladimír Čunát
dbc3228248
Merge branch 'master' into staging-next
...
(It's a little older version of master, to bring haskell updates now.)
2021-09-07 08:21:02 +02:00
Jörg Thalheim
e622dd1c84
Merge pull request #129154 from bobby285271/pr15
...
nixos/doc: convert Chapter 1, 3, 4 to CommonMark
2021-09-07 06:29:19 +01:00
Jörg Thalheim
c7d32059b1
Merge pull request #129136 from bobby285271/pr14
...
nixos/doc: convert "Chapter 58. Writing NixOS Modules" to CommonMark
2021-09-07 06:28:57 +01:00
Jörg Thalheim
929f0156cc
Merge pull request #128933 from bobby285271/pr5
...
nixos/doc: convert "8.1. LUKS-Encrypted File Systems" to CommonMark
2021-09-07 06:28:37 +01:00
Jörg Thalheim
48dc5e4ba6
Merge pull request #129003 from bobby285271/pr10
...
nixos/doc: convert "2.5. Additional installation notes" to CommonMark
2021-09-07 06:24:42 +01:00
Jörg Thalheim
0d789e992f
Merge pull request #128937 from bobby285271/pr8
...
nixos/doc: convert "Chapter 55. Container Management" to CommonMark
2021-09-07 06:24:21 +01:00
Jörg Thalheim
5de68de484
Merge pull request #128935 from bobby285271/pr7
...
nixos/doc: convert "Chapter 56. Troubleshooting" to CommonMark
2021-09-07 06:20:47 +01:00
Jörg Thalheim
2a55504a99
Merge pull request #128934 from bobby285271/pr6
...
nixos/doc: convert "6.2. Ad-Hoc Package Management" to CommonMark
2021-09-07 06:20:26 +01:00
Jörg Thalheim
96c98af211
Merge pull request #128892 from bobby285271/pr4
...
nixos/doc: convert "Chapter 13. Networking" to CommonMark
2021-09-07 06:20:04 +01:00
Jörg Thalheim
c0735214e1
Merge pull request #129083 from bobby285271/pr12
...
nixos/doc: convert Chapter 49, 50, 51, 52, 53, 54 to CommonMark
2021-09-07 06:19:33 +01:00
Anderson Torres
2be182ab81
Merge pull request #136829 from r-ryantm/auto-update/bibletime
...
bibletime: 3.0.1 -> 3.0.2
2021-09-07 01:55:24 -03:00
Anderson Torres
6fedf3160d
Merge pull request #136941 from fabaff/pontos
...
python3Packages.pontos: init at 21.7.4
2021-09-07 01:20:31 -03:00
Artturi
6ef6ac1f16
Merge pull request #133395 from baloo/baloo/tpm2-tss/dlopen-abrmd-support
...
tpm2-tss: fix support for abrmd
2021-09-07 07:20:02 +03:00
Anderson Torres
e80112450e
Merge pull request #136939 from fabaff/youless-api
...
python3Packages.youless-api: init at 0.12
2021-09-07 01:14:32 -03:00
Anderson Torres
ec3d20fa1a
Merge pull request #136935 from fabaff/bump-boschshcpy
...
python3Packages.boschshcpy: 0.2.19 -> 0.2.20
2021-09-07 01:07:23 -03:00
Anderson Torres
19d20c3aab
Merge pull request #136928 from nagy/reckon
...
reckon: 0.7.1 -> 0.8.0
2021-09-07 01:06:59 -03:00
midchildan
21a7695b8a
mirakurun: build with yarn2nix
2021-09-07 12:22:59 +09:00
happysalada
9cbdd2655c
elasticsearch: auto_import_dangling_indices in single-node mode
2021-09-07 12:18:16 +09:00
happysalada
f4b40d572c
elasticsearch: update configuration
...
- transport.tcp.port -> transport.port https://www.elastic.co/guide/en/elasticsearch/reference/current/breaking-changes-7.1.html
- default to start a single-node cluster https://stackoverflow.com/questions/59350069/elasticsearch-start-up-error-the-default-discovery-settings-are-unsuitable-for
2021-09-07 12:18:16 +09:00
Jörg Thalheim
6e17c53b98
Merge pull request #128885 from bobby285271/pr3
...
nixos/doc: convert "Chapter 5. Configuration Syntax" to CommonMark
2021-09-07 03:56:34 +01:00
Jörg Thalheim
b9ed8cbaff
Merge pull request #128878 from bobby285271/pr2
...
nixos/doc: convert "6.1. Declarative Package Management" to CommonMark
2021-09-07 03:55:22 +01:00
Jörg Thalheim
c0e53b6857
Merge pull request #128760 from bobby285271/master
...
nixos/doc: convert "Chapter 45. Profiles" to CommonMark
2021-09-07 03:54:22 +01:00
Jörg Thalheim
76491d0c3b
Merge pull request #136746 from r-ryantm/auto-update/worker
...
worker: 4.8.1 -> 4.9.0
2021-09-07 03:52:12 +01:00
Jörg Thalheim
5cb6896e00
Merge pull request #136747 from r-ryantm/auto-update/xlockmore
...
xlockmore: 5.66 -> 5.67
2021-09-07 03:50:42 +01:00
Jörg Thalheim
3bff19d21a
Merge pull request #136810 from kira-bruneau/go-migrate
...
go-migrate: add meta.mainProgram
2021-09-07 03:50:13 +01:00
Jörg Thalheim
55f44283e0
Merge pull request #136830 from r-ryantm/auto-update/brave
...
brave: 1.28.106 -> 1.29.77
2021-09-07 03:48:11 +01:00
Jörg Thalheim
bd8ce4f9a6
Merge pull request #136833 from r-ryantm/auto-update/cargo-tarpaulin
...
cargo-tarpaulin: 0.18.0 -> 0.18.2
2021-09-07 03:46:19 +01:00
Jörg Thalheim
c5c9b61c23
Merge pull request #136835 from r-ryantm/auto-update/cfssl
...
cfssl: 1.6.0 -> 1.6.1
2021-09-07 03:44:37 +01:00
Bernardo Meurer
7c86f038e3
Merge pull request #136792 from cpcloud/bump-black
2021-09-06 19:40:57 -07:00
Jörg Thalheim
7dfcc576b9
Merge pull request #136774 from Mindavi/cabextract/cross
...
cabextract: support cross-compilation
2021-09-07 03:36:41 +01:00
Jörg Thalheim
935e64716f
Merge pull request #136805 from prusnak/gocryptfs
...
gocryptfs: build documentation on aarch64-darwin again
2021-09-07 03:36:16 +01:00
Jörg Thalheim
52b5ba2db5
Merge pull request #136771 from Mindavi/sysklogd/cross
...
sysklogd: support cross-compilation
2021-09-07 03:35:22 +01:00
Jörg Thalheim
dc4d290aa4
Merge pull request #136884 from r-ryantm/auto-update/python3.8-pybullet
...
python38Packages.pybullet: 3.1.7 -> 3.1.8
2021-09-07 03:31:46 +01:00
Jörg Thalheim
52b679448e
Merge pull request #136896 from r-ryantm/auto-update/libplctag
...
libplctag: 2.3.6 -> 2.3.7
2021-09-07 03:29:04 +01:00
Jörg Thalheim
c3bf66eeaa
Merge pull request #136910 from kira-bruneau/protontricks
...
protontricks: 1.5.2 → 1.6.0
2021-09-07 03:27:09 +01:00
Jörg Thalheim
bd0914491b
Merge pull request #136878 from r-ryantm/auto-update/hydrogen
...
hydrogen: 1.0.2 -> 1.1.0
2021-09-07 03:26:08 +01:00
Jörg Thalheim
fd713c6bed
Merge pull request #136895 from r-ryantm/auto-update/liblouis
...
liblouis: 3.18.0 -> 3.19.0
2021-09-07 03:18:24 +01:00
Jörg Thalheim
26c10279a1
Merge pull request #136849 from elohmeier/liblinear-static
...
liblinear: fix static build
2021-09-07 03:16:00 +01:00
Jörg Thalheim
02c9b30a53
Merge pull request #136860 from r-ryantm/auto-update/fbcat
...
fbcat: 0.5.1 -> 0.5.2
2021-09-07 03:15:00 +01:00
Jörg Thalheim
649b7e3e88
Merge pull request #136882 from r-ryantm/auto-update/jbang
...
jbang: 0.78.0 -> 0.79.0
2021-09-07 03:14:05 +01:00
Anderson Torres
674586d428
Merge pull request #136744 from AndersonTorres/new-st
...
A plethora of ST forks
2021-09-06 23:00:17 -03:00
Jörg Thalheim
1869360d19
Merge pull request #136919 from 0x4A6F/master-age
...
age: 1.0.0-rc.3 -> 1.0.0
2021-09-07 02:59:45 +01:00
Jörg Thalheim
0d08e816f9
Merge pull request #136916 from tshaynik/kaidan-long-desc
...
kaidan: add long description
2021-09-07 02:57:30 +01:00
Jörg Thalheim
bfd72d09c7
Merge pull request #136947 from jbedo/rPackages-ssh
...
rPackages.ssh: include missing libssh buildInput
2021-09-07 02:55:43 +01:00
Jörg Thalheim
b68b3dcb1a
Merge pull request #135148 from r-ryantm/auto-update/flyctl
...
flyctl: 0.0.232 -> 0.0.233
2021-09-07 02:52:52 +01:00
Jörg Thalheim
63184ef461
Merge pull request #135146 from r-ryantm/auto-update/fluxctl
...
fluxctl: 1.23.2 -> 1.24.0
2021-09-07 02:52:26 +01:00
Jörg Thalheim
9f8df4cdb1
Merge pull request #135128 from r-ryantm/auto-update/drone-cli
...
drone-cli: 1.3.0 -> 1.3.1
2021-09-07 02:52:03 +01:00
Luke Granger-Brown
8dbbdbc04e
Merge pull request #136946 from lukegb/staging-next
...
curl: reenable ca-fallback when not using wolfsslSupport
2021-09-07 02:46:10 +01:00
Dennis Gosnell
5749dec4a1
Merge pull request #136589 from NixOS/haskell-updates
...
haskellPackages: update stackage and hackage
2021-09-07 10:45:08 +09:00