JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
232,281 Commits 2 Branches 0 Tags 12 GiB
7055516fca
Commit Graph

17605 Commits

Author SHA1 Message Date
Niklas Hambüchen
5c5f7a22fe
Merge pull request #90701 from nh2/issue-90613-fix-consul-reboot-test 
consul.passthru.tests: Fix failure on current consul versions, add more tests
 2020-06-26 19:40:10 +02:00
Marek Mahut
31cd000bb6
Merge pull request #91613 from 1000101/1000101 
maintainers: fix previously uncaught name issues
 2020-06-26 17:12:34 +02:00
1000101
6c3b36212a maintainers: fix previously uncaught name issues 2020-06-26 16:38:27 +02:00
zowoq
a8efeed583
Merge pull request #91138 from zowoq/podman 
podman: 1.9.3 -> 2.0.1
 2020-06-26 12:14:22 +10:00
zowoq
29b75dc074
Merge pull request #91458 from mdlayher/mdl-corerad-0.2.7 
corerad: 0.2.6 -> 0.2.7
 2020-06-26 09:45:59 +10:00
zowoq
e89446656d nixos/{podman,containers}: libpod.conf -> containers.conf 2020-06-26 08:09:36 +10:00
zowoq
033ba9c73d nixos/podman: use cgroupfs for rootless crun test 2020-06-26 08:09:36 +10:00
Frederik Rietdijk
bef20b38ef Merge master into staging-next 2020-06-25 13:48:05 +02:00
Kim Lindberger
c00bf081d9
Merge pull request #88940 from stigtsp/package/convos-init 
convos: init at 4.22
 2020-06-25 09:32:33 +02:00
Matt Layher
09f0d65317
nixos/corerad: set systemd unit Type=notify 
Signed-off-by: Matt Layher <mdlayher@gmail.com>
 2020-06-24 22:09:20 -04:00
Timo Kaufmann
41ba255e23
Merge pull request #77982 from symphorien/sshl_ipv6 
nixos/sslh: make it possible (and the default) to listen on ipv6, plus regression test
 2020-06-24 22:13:19 +02:00
Frederik Rietdijk
16287a8cb8 Merge master into staging-next 2020-06-24 19:04:03 +02:00
Fabian Möller
c07a6f8743
nixos/generic-extlinux-compatible: fix docbook syntax 2020-06-23 20:51:02 +02:00
Vladimír Čunát
64cf1e79dd
Merge #91363: small treewide: his -> theirs/its 2020-06-23 19:11:13 +02:00
Florian Klink
d227d81c9a
Merge pull request #91195 from flokli/extlinux-conf-builder-dtbname 
extlinux-conf-builder: expose and use base builder command, allow a custom FDT to be specified
 2020-06-23 18:07:31 +02:00
Profpatsch
517be84135 small treewide: his -> theirs/its 
SJW brigade represent. ;)

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
 2020-06-23 16:49:50 +02:00
Markus S. Wamser
e4356601d3
tests/taskserver: fix gnutls invocation 
test failed because gnutls-cli does not properly report connection
errors any more, fixed by increasing the debug level for gnutls-cli

Fixes: #84507
Closes: #90718
 2020-06-23 12:01:54 +02:00
Michele Guerini Rocco
1b5e0d480e
Merge pull request #91261 from rnhmjoj/intel 
nixos/doc: add section on Intel DDX drivers
 2020-06-23 11:29:38 +02:00
Jörg Thalheim
7aaffa71dc
Merge pull request #91216 from Mic92/nixos-config-generate 
nixos-generate-config: refer to nixos-hardware
 2020-06-22 23:52:48 +01:00
Jörg Thalheim
e943489f24
nixos-generate-config: refer to nixos-hardware 2020-06-22 23:51:08 +01:00
rnhmjoj
1b17b3b915
nixos/doc: add section on Intel DDX drivers 2020-06-22 17:50:18 +02:00
Stig Palmquist
a71fd5cb20
nixos/convos: add test 2020-06-22 13:58:35 +02:00
Stig Palmquist
042a2d8baf
nixos/convos: init 2020-06-22 13:58:34 +02:00
Frederik Rietdijk
7481da9cbd Merge master into staging-next 2020-06-22 08:46:16 +02:00
Florian Klink
44d75efd7f
Merge pull request #91214 from flokli/make-ext4-fs-fudge-factor 
nixos/make-ext4-fs: increase fudge factor from 1.03 to 1.10
 2020-06-21 22:13:12 +02:00
Jörg Thalheim
9aa668ef04
Merge pull request #91154 from Mic92/homeassistant 2020-06-21 13:59:28 +01:00
Florian Klink
387f3b58d2 hardware.deviceTree: add name 
This can be used to explicitly specify a specific dtb file, relative to
the dtb base.

Update the generic-extlinux-compatible module to make use of this option.
 2020-06-21 13:48:22 +02:00
Florian Klink
bd8137aef1 extlinux-conf-builder.sh: allow a custom FDT to be specified 
Some bootloaders might not properly detect the model.
If the specific model is known by configuration, provide a way to
explicitly point to a specific dtb in the extlinux.conf.
 2020-06-21 13:48:22 +02:00
Florian Klink
afa627730e nixos/sd-image-*: use boot.loader.generic-extlinux-compatible.populateCmd 
While getting rid of the separate extlinux-conf-builder import, this now
also honors boot.loader.timeout in the initial sd card image if
specified.
 2020-06-21 13:48:17 +02:00
Florian Klink
54129e72b4 nixos/generic-extlinux-compatible: introduce boot.loader.generic-extlinux-compatible.populateCmd 
This option exposes the builder command used to populate an image,
honoring all options except the -c <path-to-default-configuration>
argument.

Useful to have for sdImage.populateRootCommands.

Special care needs to be taken w.r.t cross - the populate command runs
on the host platform, the activation script on the build platform (so
the builders differ)
 2020-06-21 13:41:22 +02:00
Jörg Thalheim
a68c7e0fa7
nixos/home-assistant: fix tests 2020-06-21 10:58:29 +01:00
edef
c27fc6a5e5
nixos/gerrit: allow configuring replication declaratively (#91200) 2020-06-21 08:54:14 +00:00
Florian Klink
43424688db nixos/deviceTree: fix description 
hardware.deviceTree.base points to a path, not a package (and also if of
types.path)

It defaults to ${config.boot.kernelPackages.kernel}/dtbs.
 2020-06-21 10:39:10 +02:00
Florian Klink
079de14fd3 nixos/make-ext4-fs: increase fudge factor from 1.03 to 1.10 
Turns out, on smaller images (~800MiB uncompressed sdcard image size),
the current fudge factor is way too small to even get the system to the
phase where it can resize itself.

I first tried with 1.05, but it wasn't enough.
 2020-06-21 09:47:02 +02:00
Edmund Wu
00f7558225
Revert "libinput: ensure that we only apply touchpad options to touchpads" 
This reverts commit 912a58428c.
 2020-06-20 20:46:17 -04:00
Samuel Dionne-Riel
f203b8b277
Merge pull request #90119 from samueldr/feature/rpi4-fixups 
Fix some pitfalls from the Raspberry Pi 4 specific sd image
 2020-06-20 17:02:51 -04:00
Michael Raskin
132ace5fe6
Merge pull request #89344 from JJJollyjim/openresty-no-perl 
openresty: disable perl module by default
 2020-06-20 18:45:44 +00:00
Michele Guerini Rocco
1eef920a8d
Merge pull request #91128 from bbigras/rslsync-localhost 
nixos/resilio: listen on [::1] by default
 2020-06-20 20:43:04 +02:00
Bruno Bigras
dbb5bdfa09 nixos/resilio: listen on [::1] by default 2020-06-20 14:28:23 -04:00
Maximilian Bosch
c9462630bd
Merge pull request #91149 from nlewo/nextcloud-expose-occ 
nixos/nextcloud: add occ internal option
 2020-06-20 19:28:25 +02:00
Marek Mahut
0ff1bdb7c0
Merge pull request #90884 from mmahut/wasabi 
nixos/wasabibackend: init 1.1.11.1
 2020-06-20 15:30:32 +02:00
Graham Christensen
5d0725a063
Revert "Merge nixos-hardware into nixpkgs under /nixos/hardware" 2020-06-20 08:21:15 -04:00
Profpatsch
cc0bf76d2f
Merge pull request #91160 from Profpatsch/nixos-hardware-merge 
Merge nixos-hardware into nixpkgs under `/nixos/hardware`
 2020-06-20 14:02:35 +02:00
lewo
2fd146f6ae
Merge pull request #89427 from Ma27/nextcloud19 
nextcloud19: init at 19.0.0
 2020-06-20 13:59:47 +02:00
Profpatsch
2c282fb537 nixos/hardware: remove .travis.yml 
We are going to have to integrate the tests differently, but it’s fine
for now.
 2020-06-20 13:26:51 +02:00
Symphorien Gibol
4593482d4e nixos: add test for sslh 2020-06-20 13:24:19 +02:00
Profpatsch
b89f6adb84 nixos/hardware: remove .gitignore 
It’s a full subset of the toplevel .gitignore.
 2020-06-20 13:06:18 +02:00
Profpatsch
ba2dcbce23 nixos/hardware: move CODEOWNERS to toplevel 2020-06-20 13:05:20 +02:00
Profpatsch
ef3f3a4eb0 Merge branch 'nixos-hardware-merge-preparations' into nixos-hardware-merge 
Merges https://github.com/NixOS/nixos-hardware into nixpkgs.

This will give better discoverability, and considering the low
turnover (less than 100 commits in the last year and only 350 total)
it won’t make any dent on the size of nixpkgs.

We have a monorepo, let’s use it
 2020-06-20 12:57:47 +02:00
Profpatsch
b9a7e21ef6 nixos-hardware: prepare for merge by moving to nixos/hardware 
It is going to be merged into nixpkgs, under `nixos/hardware`.

This will give better discoverability, and considering the low
turnover (less than 100 commits in the last year and only 350 total)
it won’t make any dent on the size of nixpkgs.

We have a monorepo, let’s use it.
 2020-06-20 12:55:55 +02:00