Tuomas Tynkkynen
1e107443ad
Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging
2018-03-03 22:40:32 +02:00
Jan Tojnar
618ac29687
cantarell-fonts: rename from cantarell_fonts
2018-03-03 00:36:38 +01:00
Bjørn Forsman
5de8f99f03
nixos/jenkins: ensure postStart follows redirects
...
Pass the -L flag to curl to make it follow redirects. This fixes an
issue I found when setting up reverse proxy for Jenkins. Without this
fix, the returned HTTP code was stuck at 302, making postStart fail the
service (it expects 200 or 403).
2018-03-02 08:48:38 +01:00
Shea Levy
2802101e9f
Merge branch 'dropbear-2018-76-fix'
2018-03-01 21:35:06 -05:00
Shea Levy
f2937b7485
initrd-ssh: Fix for new dropbear version.
...
For some reason 2018.76 dropped the -m flag.
2018-03-01 21:21:27 -05:00
Shea Levy
34487947ce
nixos: Add nixpkgs.crossSystem option for cross-compilation
2018-03-01 14:58:15 -05:00
Shea Levy
95579af5ec
Merge remote-tracking branch 'origin/staging' into cross-nixos
2018-03-01 14:56:58 -05:00
Shea Levy
fec543436d
nixos: Move uses of stdenv.shell to runtimeShell.
2018-03-01 14:38:53 -05:00
Shea Levy
948e290895
stage-2-init: Use the host bash as SHELL
2018-03-01 14:03:41 -05:00
Frederik Rietdijk
810dd0f984
Merge remote-tracking branch 'upstream/master' into HEAD
2018-03-01 20:00:42 +01:00
Shea Levy
897b7c7e9b
nixos: Fix initrd dependency detection when cross-compiling.
2018-03-01 13:31:36 -05:00
WilliButz
5ea2c87464
grafana: 4.6.3 -> 5.0.0
2018-03-01 17:50:09 +01:00
Shea Levy
20072d733b
nixos: manual: Fix cross-compilation.
2018-03-01 10:41:50 -05:00
Shea Levy
c54730dde8
gobjectIntrospection: Enable building without X11 support.
...
Also disable it when noXlibs in NixOS.
2018-03-01 07:36:36 -05:00
lejonet
565f22d27a
nixos/ceph: init module ( #35299 )
...
All 5 daemon types can be enabled and configured through the module and the module both creates the ceph.conf required but also creates and enables specific services for each daemon, based on the systemd service files that upstream provides.
2018-03-01 11:47:13 +00:00
Jörg Thalheim
12422149a7
Merge pull request #29768 from Mic92/networkd
...
networkd: also load builtin modules
2018-03-01 09:16:18 +00:00
Tuomas Tynkkynen
b8b2225f6b
Merge remote-tracking branch 'upstream/master' into staging
2018-03-01 06:09:20 +02:00
Shea Levy
4d5be58a8f
Merge remote-tracking branch 'origin/master' into cross-nixos
2018-02-28 17:07:13 -05:00
Shea Levy
5ff15fbf7d
Merge branch 'nix-ssh-ng'
2018-02-28 17:04:19 -05:00
Shea Levy
4de72b90f3
nixos: nix.sshServe: Support ssh-ng.
2018-02-28 16:55:00 -05:00
Jörg Thalheim
47ce3021a9
Merge pull request #36136 from hedning/nix-bash-completions-on-enableCompletion
...
programs/bash: install nix-bash-completions if completion is enabled
2018-02-28 21:23:53 +00:00
Frederik Rietdijk
cf0c20e0de
Merge pull request #35892 from Nadrieril/update-usbguard
...
usbguard: 0.7.0 -> 0.7.2
2018-02-28 20:30:30 +00:00
Sander van der Burg
8fbfd67f1f
disnix module: make dbus service configurable
2018-02-28 21:29:24 +01:00
Shea Levy
fe406d66b2
nixos: sudo: Use build-time visudo for syntax check.
2018-02-28 15:01:33 -05:00
Shea Levy
8e6520540e
nixos: keymap: Fix cross-compilation.
2018-02-28 15:01:32 -05:00
Shea Levy
cc81202293
nixos: initrd-kmod-blacklist-ubuntu: Fix cross-compilation.
2018-02-28 15:01:32 -05:00
Shea Levy
b28cb72908
nixos: stage-1: Don't try to test binaries when cross-compiling.
2018-02-28 15:01:32 -05:00
Shea Levy
aebb024b2f
nixos: Take glibcLocales from buildPackages.
...
No need to cross-compile pure data...
2018-02-28 15:01:32 -05:00
Shea Levy
c0e814a434
nixos: udev: Generate hwdb with build-native udevadm.
2018-02-28 15:01:31 -05:00
Shea Levy
a929301281
nixos: kexec: Disable on non-keexecable systems.
2018-02-28 15:01:31 -05:00
Tuomas Tynkkynen
34f95d92a2
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/misc/pytrainer/default.nix
pkgs/development/tools/pew/default.nix
pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02:00
Tor Hedin Brønner
c58072309c
programs/bash: install nix-bash-completions if completion is enabled
2018-02-28 19:13:02 +01:00
David Asabina
e41ca3b347
digitalbitbox: init at 2.2.2 ( #33787 )
...
* digitalbitbox: init at 2.2.2
The commits that lead to this have been squashed from independent
commits see branch @vidbina/add/digitalbitbox-wip that did the
following:
- 0a3030fa0ec digitalbitbox: init at 2.2.2
- c18ffa3ffd4 digitalbitbox: moved meta to EOF
- 0c5f3d6972a digitalbitbox: using preConfigure + configureFlags
- a85b1dfc3fd digitalbitbox: nativeBuildInputs
- 90bdd35ef0f digitalbitbox: autoreconfHook
- 91810eea055 digitalbitbox: default installPhase & makeWrapper
- 90e43fb7e2a digitalbitbox: doc rm $PWD hack & printf-tee deal
- fd033b2fe5a digitalbitbox: cleanup, alphabetically sort attrs
- c5907982db3 digitalbitbox: added hardware module
- 88e46bc9ae0 digitalbitbox: added program module
- amend to change name: dbb-app -> digitalbitbox
- amend to add install instructions based on feedback
(https://github.com/NixOS/nixpkgs/pull/33787#issuecomment-362813149 )
- amend to add longDescription
- moved program to its own dir
- overridable udev rules handling
- added docs to manual
- added package attr to program module
- added package attr to hardware module
* digitalbitbox: use libsForQt5.callPackage
2018-02-27 22:40:22 +00:00
Nadrieril
297fac40ca
nixos/usbguard: Do not check permissions on rules file (using undocumented -P flag)
2018-02-27 18:34:02 +00:00
Frederik Rietdijk
d10c201252
Merge remote-tracking branch 'upstream/master' into HEAD
2018-02-27 16:22:37 +01:00
adisbladis
4f59f26faf
nodejs: Add release note about dropped 4_x packages
2018-02-27 10:19:23 +01:00
Frederik Rietdijk
ad5127c417
Merge remote-tracking branch 'upstream/master' into HEAD
2018-02-27 09:18:49 +01:00
Frederik Rietdijk
05623d202c
Merge pull request #35061 from lopsided98/buildbot-update
...
buildbot: 0.9.15.post1 -> 1.0.0
2018-02-27 07:43:46 +00:00
Will Dietz
ec6ce86266
Merge pull request #35682 from volth/patch-110
...
nixos/tests: add forgotten xrdp.nix
2018-02-26 21:46:22 -06:00
Vladimír Čunát
6168c2e45f
Merge master into staging
...
This is to cleanup the (re-)revert of merge to master.
2018-02-26 22:55:11 +01:00
Aristid Breitkreuz
b8f4df9d9e
attempt to fix #30940 more robustly
2018-02-26 22:19:12 +01:00
volth
7e4c8db475
nixos/tests: add forgotten xrdp.nix
2018-02-26 19:55:07 +00:00
Frederik Rietdijk
4f08b0fbac
Merge remote-tracking branch 'upstream/master' into HEAD
2018-02-26 10:50:18 +01:00
Franz Pletz
37c009ca74
Merge pull request #34028 from florianjacob/matomo
...
piwik is now matomo
2018-02-26 06:53:58 +00:00
Peter Hoeg
095260a1c9
nixos udevil: set up wrapper for udevil
2018-02-26 14:30:22 +08:00
Peter Hoeg
f9cc3c08e2
Merge pull request #35432 from timokau/syncthing-deprecate-inotify
...
syncthing,qsyncthingtray: remove syncthing-inotify
2018-02-26 11:04:33 +08:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes
2018-02-25 17:41:16 +01:00
Sarah Brofeldt
2ea8f8acdf
nixos/mysql: Unbreak initial database creation
2018-02-24 20:07:55 +01:00
Jörg Thalheim
c0b652d6cd
Merge pull request #35461 from lheckemann/grub-by-id
...
grub module: suggest by-id paths for devices
2018-02-24 11:30:34 +00:00
Linus Heckemann
fd77a08b34
grub module: suggest by-id paths for devices
...
Since they are more stable, their use should be encouraged over that of
potentially volatile identifiers like /dev/[sh]da.
2018-02-24 10:50:23 +00:00