1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Commit graph

105852 commits

Author SHA1 Message Date
aszlig 8266c89b55
nixos/xserver: Fix up/refactor xrandrHeads option
Using invalid module options in the submodule isn't very nice, because
it doesn't give very useful errors in case of type mismatch, also we
don't get descriptions of these options as they're effecively
nonexistent to the module system. Another downside of this is that
merging of these options isn't done correctly as well (eg. for
types.lines).

So we now have proper submodules for each xrandrHead and we also use
corcedTo in the type of xrandrHeads so that we can populate the
submodule's "output" option in case a plain string is defined for a list
item.

Instead of silently skipping multiple primary heads, we now have an
assertion, which displays a message and aborts configuration evaluation
appropriately.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-04-24 11:22:55 +02:00
Roger Qiu bb6a5b079f nixos/xserver: Changed xrandrHeads to support corresponding monitor section configuration in Xorg 2017-04-21 22:01:29 +10:00
Tim Steinbach 75b4bec6fb Merge pull request #25049 from NeQuissimus/openjdk_8_131
openjdk: 8u121-13 -> 8u131-11
2017-04-20 17:16:15 -04:00
Tim Steinbach 8b3907d153 Merge pull request #25051 from NeQuissimus/scala_2_11_11
scala: 2.11.10 -> 2.11.11
2017-04-20 17:15:58 -04:00
Tim Steinbach 2352e2a5ea Merge pull request #25050 from NeQuissimus/scala_2_12_2
scala: 2.12.1 -> 2.12.2
2017-04-20 17:15:46 -04:00
Vincent Laporte 0fcc6ca515 ocamlPackages.menhir: 20170101 -> 20170418 2017-04-20 20:16:35 +00:00
Vincent Laporte a76841e399 asymptote: 2.40 -> 2.41 2017-04-20 19:56:14 +00:00
Graham Christensen ce34caaa34 Merge pull request #25062 from Hodapp87/imager_fix
imager (r-modules): add pkgs.x11, unmark imager/ForestTools as broken
2017-04-20 14:22:13 -04:00
Chris Hodapp 80beb55cfc imager (r-modules): add pkgs.x11 to fix build, unmark imager/ForestTools as broken 2017-04-20 14:18:01 -04:00
Daiderd Jordan 8402585c39 Merge pull request #25044 from obsidiansystems/libiconv-bump
libiconv: 1.14 -> 1.15
2017-04-20 19:48:37 +02:00
Thomas Tuegel f8189e69bc
dropbox: 23.4.19 -> 24.4.16 2017-04-20 12:25:21 -05:00
Frederik Rietdijk 8e8aa0f27f Merge pull request #25008 from holidaycheck/nodejs-7.9.0
nodejs: 7.7.3 -> 7.9.0
2017-04-20 17:15:18 +02:00
Michael Raskin 38933324a6 Merge pull request #25059 from vcunat/p/kdiff3-git-mergetool
kdiff3: fix with git mergetool
2017-04-20 16:55:15 +02:00
Jörg Thalheim d15f26ec69
dino: init at unstable-2017-04-20 2017-04-20 15:16:55 +02:00
Vladimír Čunát be7ce1b0e9
kdiff3: fix with git mergetool
The quick patch has been submitted upstream.
2017-04-20 14:48:40 +02:00
Marius Bergmann 6572f5e81b keepalived service: init (#22755) 2017-04-20 12:50:59 +01:00
Jörg Thalheim f47921f3d4 Merge pull request #25036 from xNWDD/gitkraken/2.4.0
gitkraken: 2.3.3 -> 2.4.0
2017-04-20 13:11:30 +02:00
Jörg Thalheim b7984d3077 Merge pull request #25053 from Mesh33/buildtorrent-0.8
buildtorrent: init at 0.8
2017-04-20 13:08:53 +02:00
Jörg Thalheim 50f5e2bd3f Merge pull request #25046 from romildo/upd.tint2
tint2: 0.12.12 -> 0.14.1
2017-04-20 13:07:18 +02:00
Jörg Thalheim 67adf69a16
inetutils: fix service name 2017-04-20 10:33:42 +02:00
Michael Raskin 1aadcd712d Merge pull request #25042 from Mesh33/update-units
units: 2.13 -> 2.14
2017-04-20 08:34:37 +02:00
Michael Raskin 9c16f669b9 Merge pull request #24244 from mythmon/mercurial-upgrade
Upgrade mercrial and tortoisehg to 4.1.1
2017-04-20 08:34:16 +02:00
Jörg Thalheim b61e9f6d24
linuxPackages.broadcom-sta: patch file was not named correctly 2017-04-20 08:14:01 +02:00
Jörg Thalheim 95857676d6 Merge pull request #25031 from tsaeger/master
lib: trivial spelling fixes
2017-04-20 07:51:10 +02:00
Jörg Thalheim 080c799f38
jwhois: fix service name
after an update of iana-etc the service name of whois changed
2017-04-20 07:33:38 +02:00
Jörg Thalheim f0f9cad9f2
linuxPackages.broadcom-sta: add patch to repo
fetchPatch was unreliable and the checksum kept breaking all the time
2017-04-20 07:05:50 +02:00
Unknown 2f66670162 buildtorrent: init at 0.8 2017-04-20 03:42:49 +02:00
Tim Steinbach 2f026678d5
scala: 2.11.10 -> 2.11.11 2017-04-19 21:10:10 -04:00
Tim Steinbach 4b9ac70a87
scala: 2.12.1 -> 2.12.2 2017-04-19 21:06:02 -04:00
Tim Steinbach fabfec0512
openjdk: 8u121-13 -> 8u131-11 2017-04-19 21:03:55 -04:00
romildo 1fbbf4c169 tint2: 0.12.12 -> 0.14.1 2017-04-19 21:44:30 -03:00
Tom Saeger 5989515b94 lib: trivial spelling fixes 2017-04-19 19:37:55 -05:00
aszlig e662e035f9
nixos/systemd-boot-builder: Don't write .pyc files
This has surfaced since d990aa7163.

The "simpleUefiGummiboot" installer test fails since this commit,
because that commit introduced a small check to verify whether the store
was altered.

While installing NixOS for the first time, the store is usually in
/mnt/nix/store and without the read-only bind mount that's preventing
programs from altering the store.

So after nixos-install is done creating the system closure and setting
it as the active system profile, the bootloader is written from the
closure inside the chroot. The systemd-boot-builder is invoked during
this step, which adds .pyc files for various Python modules of the
Python 3 store path, which in turn invalidates the hash of the Python 3
store path itself.

At the time the system is booted up again, the nix-store is verified and
fails with something like this:

path /nix/store/zvm545rqc4d97caqq9h7344bnd06jhzb-python3-3.5.3 was
modified! expected hash
b2c975f4b8d197443fbb09690fb3f6545e165dd44c9309d7d6df2fce0579ebeb, got
bccca19f39c9d26d857ccf1fb72818b2b817967e6d497a25a1283e36ed0acf01

Running the interpreter with the -B argument prevents Python from
writing those byte code files:

https://docs.python.org/3/using/cmdline.html#cmdoption-B

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-04-20 00:37:02 +02:00
Joachim Fasting 0602b9d194
torbrowser: 6.5.1 -> 6.5.2 2017-04-20 00:21:43 +02:00
Joachim Fasting 9902d63e84
grsecurity: 4.9.22-201704120836 -> 4.9.23-201704181901 2017-04-20 00:21:41 +02:00
John Ericson 8bd1a6c0b2 libiconv: 1.14 -> 1.15 2017-04-19 18:13:39 -04:00
Mesh33 1675d54db3 units: 2.13 -> 2.14 2017-04-20 00:09:54 +02:00
NWDD 940a71faed gitkraken: 2.3.3 -> 2.4.0 2017-04-19 22:56:16 +02:00
John Ericson 124c4b10c4 Merge pull request #25032 from dmjio/patch-1
Disable parallel building
2017-04-19 16:23:00 -04:00
David Johnson d8e87fc0c4 Disable parallel building 2017-04-19 15:20:51 -05:00
Bjørn Forsman ff252c799d Fix typo in comment 2017-04-19 20:30:44 +02:00
Benno Fünfstück 042e268612 Revert "aspell: only set ASPELL_CONF from NIX_PROFILES in wrapper if unset"
This reverts commit 399065f226.

I am blind, this was already checked above. Thanks @bjornfor for noticing.
2017-04-19 20:21:36 +02:00
Benno Fünfstück 149656581d Merge pull request #24601 from pbogdan/unclutter
unclutter: Fix default value of $DISPLAY
2017-04-19 18:40:43 +02:00
Thomas Tuegel 12a3590cc7 Merge pull request #25019 from peterhoeg/f/db
dropbox: use wmctrl from nixpkgs
2017-04-19 10:25:51 -05:00
Tim Steinbach 553bf09ba9 Merge pull request #25011 from benley/oraclejdk
oraclejdk: 8u121 -> 8u131
2017-04-19 11:24:50 -04:00
Benno Fünfstück 399065f226 aspell: only set ASPELL_CONF from NIX_PROFILES in wrapper if unset 2017-04-19 17:14:51 +02:00
Benno Fünfstück 792135a218 Merge pull request #24425 from lpenz/aspellconf
Set aspell's data-dir through ASPELL_CONF in a wrapper
2017-04-19 17:11:53 +02:00
Peter Hoeg c4c33eaca1 dropbox: use wmctrl from nixpkgs 2017-04-19 20:56:18 +08:00
Jörg Thalheim 6bbc02589b Merge pull request #25003 from romildo/upd.greybird
greybird: 2017-02-26 -> 3.22.3
2017-04-19 14:01:50 +02:00
Jörg Thalheim 96260d6f09 Merge pull request #25017 from matthiasbeyer/update-mutt
mutt: 1.8.1 -> 1.8.2
2017-04-19 13:44:20 +02:00