mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00
Code Issues Wiki Activity
131691 commits 233 branches 124 tags 7 GiB
Commit graph

9493 commits

Author SHA1 Message Date
WilliButz ef90ff2d8e grafana: 5.0.0 -> 5.0.1 2018-03-12 23:37:29 +01:00
Franz Pletz b0fa004fa9
nixos/tests/containers-tmpfs: fix test name 2018-03-12 22:28:27 +01:00
Franz Pletz 255e2751cd
Merge pull request #36571 from srhb/acme-test-fix 
acme: Fix test
 2018-03-12 21:09:22 +00:00
Jörg Thalheim 9881934b57
Merge pull request #36783 from Infinisil/desciption/update/resilio 
resilio: Adjust option description to 3d17573
 2018-03-12 11:04:51 +00:00
Silvan Mosberger 86ca617948
resilio: Adjust option description to 3d17573 2018-03-11 01:18:34 +01:00
Silvan Mosberger 08704aa2f7
nixos/network-interfaces: Fix 2 small typos 2018-03-10 16:16:56 +01:00
Jörg Thalheim 558949f2c0
Merge pull request #36357 from matthewbauer/vbox-usable 
demo: make virtualbox more usable
 2018-03-09 11:36:13 +00:00
Sarah Brofeldt df3706c47c nixos/tests/acme: use mail-test-srv tls certs from source 2018-03-08 22:50:26 +01:00
Sarah Brofeldt bd35580860 nixos/tests/acme: go compat update, unvendor pkcs11 2018-03-08 22:50:26 +01:00
Daiderd Jordan db6fb869fb
Merge pull request #30418 from LnL7/inline-set-environment 
nixos: inline set-environment for bash and zsh
 2018-03-08 21:07:15 +01:00
Jörg Thalheim 196e21a160 nixos/tomcat: add types + proper systemd integration 
fixes #35443
 2018-03-08 09:09:42 +00:00
Benjamin Smith 024220bd7f nixos/tomcat: add serverXml, environment files and log directories 
* add serverXml verbatim override
* add environment file
* add log directory creation
 2018-03-08 09:09:42 +00:00
Shea Levy a183563cf0
Revert "Merge branch 'setuid-wrapper-readlink'" 
Kernel symlinks don't have st_size. Really thought I tested this, guess I ran the
wrong NixOS test :(

This reverts commit 6dab907ebe, reversing
changes made to eab479a5f0.
 2018-03-07 17:09:05 -05:00
Michael Raskin 5a95fe2939
Merge pull request #36292 from xeji/xen-4-10 
xen: add v 4.10
 2018-03-07 22:07:14 +00:00
xeji 08894b4d8a xen 4.10: link /etc/xen/oxenstored.conf 
this is required for oxenstored to start
 2018-03-07 22:39:19 +01:00
xeji fbc0b8282e xen: fix broken version comparisons 
string compare breaks with xen 4.10 (because "4.10" < "4.8")
 2018-03-07 22:37:40 +01:00
Shea Levy 6dab907ebe
Merge branch 'setuid-wrapper-readlink' 2018-03-07 12:44:21 -05:00
Shea Levy dffa3d2b1f
nixos: setuid-wrapper: simplify readlink logic 2018-03-07 11:57:43 -05:00
Vladimír Čunát eab479a5f0
nixos release: more evaluation fixes 
... if missing x86 in supportedSystems
 2018-03-07 17:29:02 +01:00
Vladimír Čunát e59b91bc9a
nixos/release: fix evaluation if missing x86 
... in supportedSystems
 2018-03-07 16:06:30 +01:00
obadz ee9a785c30 nixos doc: give context and definition re NIXOS_LUSTRATE 
Re #36272
 2018-03-07 01:23:20 +00:00
Jörg Thalheim 9d937e3fc8
Merge pull request #36367 from NixOS/yegortimoshenko-patch-1 
tt-rss: use proper user and package for MySQL
 2018-03-06 14:20:55 +00:00
adisbladis c4c1d979e9
Merge pull request #35844 from adisbladis/jquery-mv 
jquery & jquery-ui: Move to nixos/lib/testing/
 2018-03-06 15:34:34 +08:00
aszlig 7f26c1b7fb
nixos/tests/keymap: Remove OCR-friendly SLiM theme 
The test doesn't use OCR, so we actually don't need an OCR-friendly
theme here.

Signed-off-by: aszlig <aszlig@nix.build>
 2018-03-06 04:25:53 +01:00
Yegor Timoshenko 5905fe069b
tt-rss: use proper user and package for MySQL 2018-03-06 03:10:24 +00:00
Jörg Thalheim 5fe1be88a5
Merge pull request #36350 from volth/nix-serve 
nix-serve: nix 2.0 fixes
 2018-03-05 23:18:27 +00:00
Matthew Bauer 1e621ff423 demo: autologin through xserver 
also disable upower on virtualbox
Fixes #36348
 2018-03-05 14:48:01 -06:00
volth 30877b1ed8 nix-serve: nix 2.0 fixes 2018-03-05 19:32:42 +00:00
Vladimír Čunát 7e968a47cd
18.03 -> 18.09 
I don't have a name ready :-(  so I have to fill it later.
 2018-03-05 19:47:39 +01:00
Frederik Rietdijk 8bcdb39a27
Merge pull request #27678 from volth/restore-bridge-slaves-dynamically-added-by-libvirt 
nixos/networking-scripted: restore bridge slaves dynamically added by…
 2018-03-05 17:31:22 +00:00
Dino Dai Zovi ddf13e6646 nixos/initrd-network: add udhcpc.extraArgs option (#36305) 
This can be used to fix issues where udhcpc times out before
acquiring a lease. For example of these issues, see:

https://bugs.alpinelinux.org/issues/3105#note-8

Signed-off-by: Dino A. Dai Zovi <ddz@theta44.org>
 2018-03-05 15:53:59 +00:00
Franz Pletz 17ba8bb3e0
Merge pull request #30416 from symphorien/luksnokey 
nixos/luksroot.nix: fallback to interactive password entry when no keyfile found
 2018-03-05 10:02:39 +00:00
Will Fancher 6b9a99e55d LightDM: Set default user session when possible. 2018-03-04 23:54:09 +00:00
Franz Pletz 0f78afdf25
Merge pull request #32248 from awakesecurity/parnell/fetchdocker 
Support fetching docker images from V2 registries
 2018-03-04 17:10:27 +00:00
Vladimír Čunát 498374a8bd
Merge #35554: nixos/opengl: unhide and document 2018-03-04 17:33:01 +01:00
obadz 9dc62dd915
Merge pull request #36272 from obadz/nixos-lustrate-doc 
nixos doc: document the installation process from other distros as well as NIXOS_LUSTRATE
 2018-03-04 16:21:54 +00:00
obadz 80ea345494 nixos-enter: specify absolute path to bash 
Not doing so makes it impossible to use nixos-enter from a non-NixOS
distro
 2018-03-04 16:19:52 +00:00
obadz 7af0aa846e nixos doc: document the installation process from other distros as well as NIXOS_LUSTRATE 2018-03-04 16:19:52 +00:00
Vladimír Čunát 2069a2a002
Merge #35454: nixos/pump.io: remove 2018-03-04 10:49:25 +01:00
Vladimír Čunát a2b8d8fbe2
nixos/pump.io: also comment-out the uid 2018-03-04 10:48:29 +01:00
Jörg Thalheim a5dcde1a6f Revert "networkd: also load builtin modules" 
This reverts commit d514dc220e.

breaks unpredicable network interfaces: https://github.com/NixOS/nixpkgs/pull/29768#issuecomment-370172863
 2018-03-04 06:29:08 +00:00
Jörg Thalheim 6749f6e26e
Merge pull request #36249 from Ekleog/openldap-module-declarative-contents 
Openldap module declarative contents
 2018-03-03 19:00:13 +00:00
Jörg Thalheim b2acbe58b2 nixos/openldap: add test 2018-03-03 18:53:52 +00:00
aszlig 0811e7f60e
nixos/netboot: Fix evaluation error 
The function arguments for make-squashfs.nix have changed in
df117acab7, so we need to change them here
as well.

The boot.netboot NixOS VM test now succeeds again.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra
 2018-03-03 19:31:19 +01:00
Jörg Thalheim 5d0d140f74
Merge pull request #34070 from lukeadams/prl-improve 
Improve parallels-tools
 2018-03-03 17:34:57 +00:00
Vladimír Čunát 729d72f9e4
18.03 release notes: nix-2.0 by default 2018-03-03 18:03:13 +01:00
Vladimír Čunát b70c93f211
Merge branch 'master' into nix-2.0 2018-03-03 18:02:35 +01:00
Vladimír Čunát ac3b53707c
18.03 release notes: highlight linux and gcc updates 2018-03-03 18:01:20 +01:00
Vladimír Čunát 7b2cf5b12e
lib.addPassthru: removed as scheduled 2018-03-03 17:57:38 +01:00
Jörg Thalheim 9936ed4920
Merge pull request #31019 from teto/strongswan_rebased 
[RFC/RDY] make l2tp work with Strongswan
 2018-03-03 15:56:05 +00:00