Samuel Leathers
e0483a59cc
Merge pull request #31532 from romildo/upd.enlightenment
...
enlightenment: 0.21.10 -> 0.22.0
2017-11-12 21:44:54 -05:00
José Romildo Malaquias
c42a0fbf09
enlightenment: 0.21.10 -> 0.22.0
...
- Update to version 0.22.0
- Switch build tools from autotools to meson
- Change handling of setuid programs
2017-11-13 00:22:01 -02:00
Orivej Desh
27f5cc959b
make-disk-image: embed compression switch into the format name
2017-11-12 18:39:36 +00:00
Orivej Desh
608de48fe4
make-disk-image: add compressed option to compress qcow2 images
2017-11-12 18:28:06 +00:00
Orivej Desh
a2d3ee77b8
make-disk-image: clean up
2017-11-12 18:24:26 +00:00
Orivej Desh
f7bb8d2dfa
Merge pull request #31537 from orivej/lkl
...
lkl: 2017-10-18 -> 2017-11-10, make-disk-image: do not fake time for cptofs
2017-11-12 18:09:34 +00:00
rnhmjoj
2918f6a3f0
nixos/wireless: add manual network configuration
2017-11-11 23:11:46 +01:00
Renaud
1503409aac
Merge pull request #30943 from csingley/nzbget
...
nzbget.service override nzbget.conf broken paths with current derivation
2017-11-11 22:04:29 +01:00
Orivej Desh
a84ce72fdc
make-disk-image: do not use faketime
...
Since https://github.com/lkl/linux/pull/394 cptofs preserves the source time,
which is 1970-01-01T00:00:01Z for /nix/store and recent for other files.
This reverts commit f5b3f2c5a7
.
2017-11-11 20:57:14 +00:00
Orivej Desh
f218ef647c
make-disk-image: clean up
2017-11-11 20:24:26 +00:00
Orivej Desh
2dd9588834
Merge pull request #31071 from yegortimoshenko/nixos-install/mkdir-or-chmod
...
nixos-prepare-root: chmod if dir already exists, fixes #22413
2017-11-11 01:04:14 +00:00
Orivej Desh
30cbba9061
Merge pull request #31390 from Ma27/fix-buildphase-expressions
...
treewide: get rid of invalid `buildPhases` argument
2017-11-11 00:04:37 +00:00
Jörg Thalheim
b72e2ecfe4
Merge pull request #31476 from florianjacob/network-interfaces-assertion-messages
...
nixos/network-interfaces: Add " around network interface names
2017-11-10 11:12:49 +00:00
Dan Peebles
f5b3f2c5a7
make-disk-iamge: use faketime to get a consistent timestamp
...
This fixes #28768 because during an image build, Nix sees bad store
timestamps and attempts to fix them, but can't fix them on a running
system (due to being inside a builder). Since timestamps on the store
are supposed to be 1 anyway, if we fix this, that fixes image building
inside booted images made this way.
Note that this adds quite a bit of noise to the output, because running
`cptofs` under `faketime` causes a bunch of seemingly spurious error
messages and my attempts to suppress them all failed. We'll fix it when
`cptofs` gets a native timestamp preservation feature.
2017-11-10 05:15:37 +00:00
aszlig
0e790b9f66
nixos/atlassian: Fix eval error in jrePackage
...
The error got introduced by 4f3d971ef5
,
which removed the *Text attributes from the option.
This in turn leads to an evaluation error while building the
manual/manpage, because oraclejre8 is marked unfree.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @jbgi, @orivej, @globin
2017-11-09 20:31:41 +01:00
Florian Jacob
fe3751df8a
nixos/network-interfaces: Add " around network interface names
...
in assertion messages to avoid misinterpretations when the interface name contains a dot.
2017-11-09 20:27:33 +01:00
Eelco Dolstra
54da9cc944
Amazon image: Add NVMe support to the initrd
...
This is required by the new c5.* instance types.
Note that this changes disk names from /dev/xvd* to
/dev/nvme0n*. Amazon Linux has a udev rule that calls a Python script
named "ec2nvme-nsid" to create compatibility symlinks. We could use
that, but it would mean adding Python to the AMI closure...
2017-11-09 17:53:26 +01:00
Jean-Baptiste Giraudeau
4f3d971ef5
Atlassian apps: remove misleading JRE switch logic
...
Only the Oracle JRE is supported by Atlassian appsAtlassian apps
(see https://jira.atlassian.com/browse/JRASERVER-46152 )
Plus Atlassian apps are non free so the switch logic always chose
Oracle JRE anyway.
Option is kept in case someone want to patch apps to support openjdk.
2017-11-09 12:56:11 +01:00
Jean-Baptiste Giraudeau
3c06d9f0b0
Fix atlassian services (optional attr. and systemd)
...
- Properly handle optional configuration.
- Use ExecStart/ExecStop instead of script/stopScript.
2017-11-09 12:56:11 +01:00
Maximilian Bosch
161e80e3fd
treewide: get rid of invalid buildPhases
argument
...
I don't know where this comes from (I accidentally did that as well
once), but some derivations seem to use `buildPhases` rather than
`phases` in their derivations.
This kills all improper usages as the lack of a `phases` argument
didn't break the build, so this can be safely removed.
2017-11-08 21:38:06 +01:00
Jörg Thalheim
8d145da64a
Merge pull request #30127 from florianjacob/limit_interface_name_length
...
nixos/network-interfaces: assertion for too long interface names
2017-11-08 20:35:08 +00:00
Jörg Thalheim
999bcd098d
Merge pull request #31296 from ryantm/mattermost43
...
mattermost, nixos/mattermost: update to 4.3.0
2017-11-08 17:45:42 +00:00
Joerg Thalheim
00344162a7
Revert "nixos/test-instrumentation: softcode DISPLAY"
...
This reverts commit 4531ec5955
.
This broke waitForX: b11ac5d29d (commitcomment-25486347)
cc @Lassulus
2017-11-08 17:04:39 +00:00
Jörg Thalheim
b11ac5d29d
Merge pull request #31198 from Lassulus/test-display
...
nixos/test-instrumentation: take DISPLAY from system-config
2017-11-08 14:44:16 +00:00
Renaud
792dc7a859
Merge pull request #31252 from shaunren/compton
...
compton: change extraOptions type to types.lines
2017-11-07 23:10:41 +01:00
lassulus
4531ec5955
nixos/test-instrumentation: softcode DISPLAY
2017-11-07 23:01:59 +01:00
Raphael Das Gupta
27c8fd24e5
nixos/mysql: fix typo in description of mysql.bind option
2017-11-07 11:09:40 +01:00
Sarah Brofeldt
294bb6daea
nixos/tests/gitlab.nix: Unbreak config, still times out
2017-11-06 14:52:33 +01:00
Vaibhav Sagar
eece8755d1
ihaskell: re-enable
2017-11-06 09:58:28 +01:00
Orivej Desh
4435bb8ba8
Merge pull request #30665 from michaelpj/imp/plymouth-themes
...
plymouth: fix breeze-plymouth (and other themes)
2017-11-06 06:18:38 +00:00
Orivej Desh
30bd994724
Merge pull request #31161 from nocent/master
...
networkmanager: add power saving and mac address randomization options for wifi devices
2017-11-06 06:17:16 +00:00
Orivej Desh
9431da5396
Merge pull request #30966 from csingley/plexpy
...
Add plexpy user id
2017-11-06 06:16:00 +00:00
Christopher Singley
1a38312dae
plexpy: add user id
2017-11-06 06:15:28 +00:00
Ryan Mulligan
e8c8370425
nixos/mattermost: fix for webapp being renamed to client
2017-11-05 13:53:50 -08:00
Markus Mueller
4874862732
babeld module: init
2017-11-05 21:15:23 +01:00
Franz Pletz
711303952e
wireguard module: add device name environment var
...
This makes the interface name available as an environment variable for
the pre/post hooks.
2017-11-05 16:42:25 +01:00
Profpatsch
462c048c77
lib/types: add ints.positive
.
...
For values that are positive, but cannot be 0.
2017-11-05 15:56:32 +01:00
Profpatsch
c85f085062
lib/types: update docs to match the new type names
2017-11-05 15:56:32 +01:00
Profpatsch
3e3bfc66f7
lib/types: nixos manual documentation for signed/unsinged int
...
Synchronize the manual for the new types.
2017-11-05 15:56:32 +01:00
Profpatsch
c53d874277
lib/types: add intBetween
...
An int type that checks the value range.
2017-11-05 15:56:32 +01:00
Shaun Ren
eca212741e
compton: change extraOptions type to types.lines
2017-11-05 20:23:44 +09:00
Frederik Rietdijk
dd851a8d75
Merge pull request #31254 from LumiGuide/graphite-python-overrides
...
graphite: override django and django_tagging
2017-11-05 09:40:59 +01:00
Herwig Hochleitner
e64dc25434
Revert "services.xserver: assert that either desktop- or window manager is not "none""
...
This reverts commit 93c54acf97
.
This reopens #30517 @nbp @Ma27
Breaking people's config for this is hardly reasonable as is. If it
absolutely cannot be avoided, at the very least, we need to provide
clear instructions on what people need to upgrade in their config. I
actually had to bisect to the commit, to even find out what property I
should change or define, as the error message was useless. It didn't
even mention a property name.
Discussion on the PR seems to be ongoing, so I'm reverting this, so we
don't break people's systems on unstable.
2017-11-05 01:51:13 +01:00
Guillaume Maudoux
7325ad9ab7
graphite: override django and django_tagging
...
instead of depending on specific versions in the django_tagging_0_4_3
and graphite_web derivations.
This should fix: https://github.com/NixOS/nixpkgs/pull/30277#discussion_r145393088
This was joint work of @basvandijk and @layus at NixCon 2017.
2017-11-04 17:53:35 +01:00
Yegor Timoshenko
2c9e195eed
nixos-prepare-root: chmod if dir already exists
2017-11-04 15:07:36 +00:00
Tim Steinbach
97f172a1d5
Merge pull request #31146 from NeQuissimus/kafka_updates
...
Kafka: Update + Tests
2017-11-04 11:06:32 -04:00
Maximilian Bosch
93c54acf97
services.xserver: assert that either desktop- or window manager is not "none"
...
resolves #11064
2017-11-04 15:30:20 +01:00
Frederik Rietdijk
ae23084237
Merge pull request #30107 from danbst/patch-13
...
declarative containers: improve example config
2017-11-04 09:59:09 +01:00
Tim Steinbach
5925aebc03
Merge pull request #31201 from gnidorah/sway
...
sway module: setcap binary, not wrapper
2017-11-03 17:34:58 -04:00
Benjamin Staffin
600f393bc7
keybase service: Turn off debug logging
...
Keybase is _extremely_ verbose with its debug output when run with -d.
2017-11-03 14:45:08 -04:00