3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

101635 commits

Author SHA1 Message Date
Graham Christensen 69a0e9ea11 Merge pull request #22985 from Kendos-Kenlen/master
idea.webstorm: 2016.3.2 -> 2016.3.3
2017-02-20 10:01:31 -05:00
Thomas Tuegel 7fa06b3cd2 Merge pull request #22991 from layus/deprecate-kde4-ktikz
qtikz: update to Qt5; remove ktikz
2017-02-20 08:37:47 -06:00
Peter Simons 8bc0ece0f1 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-12-gf83834c from Hackage revision
fbb2c029b0.
2017-02-20 15:28:45 +01:00
Peter Simons 5e3eea0cd3 LTS Haskell 8.2 2017-02-20 15:28:38 +01:00
Peter Simons d7f10f2828 python-osc: enable (install) bash completion 2017-02-20 15:02:30 +01:00
aszlig dc31a1ea29
systemd-boot: Unlink loader.conf if it exists
Since systemd version 232 the install subcommand of bootctl opens the
loader.conf with fopen() modes "wxe", where the "e" stands for
exclusive, so the call will fail if the file exists.

For installing the boot loader just once this is fine, but if we're
using NIXOS_INSTALL_BOOTLOADER on a systemd where the bootloader is
already present this will fail.

Exactly this is done within the simpleUefiGummiboot installer test,
where nixos-install is called twice and thus the bootloader is also
installed twice, resulting in an error during the fopen call:

Failed to open loader.conf for writing: File exists

Removing the file prior to calling bootctl should fix this.

I've tested this using the installer.simpleUefiGummiboot test and it now
succeeds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra, @shlevy, @mic92
Fixes: #22925
2017-02-20 14:54:48 +01:00
aszlig 4daccf208f
systemd-boot: Make sure /etc/machine-id exists
This leads to the following error when trying to install a new machine
where the machine ID wasn't yet initialized during boot:

Failed to get machine did: No such file or directory

In addition this was also detected by the simpleUefiGummiboot installer
test.

So let's generate a fallback machine ID by using
systemd-machine-id-setup before actually running bootctl.

Tested this by running the installer.simpleUefiGummiboot test, it still
fails but not because of the machine ID.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra, @shlevy, @mic92
Fixes: #22561
2017-02-20 14:54:44 +01:00
Lorenzo Manacorda 2c4d9c9228
manual: Add link to config section (#22994)
Add link to "Configuration" chapter from "Changing the Configuration" section.

Also, fix grammar error.
(cherry picked from commit a585f987fa)
2017-02-20 14:32:49 +01:00
Tuomas Tynkkynen fee43308ed platforms.nix: Remove unnecessary kernelExtraConfig for ARMv7
AHCI_IMX is already enabled in multi_v7_defconfig since kernel 4.9.
2017-02-20 15:22:14 +02:00
Nikolay Amiantov d8fb60d1d4 Merge pull request #23014 from zraexy/zraexy-bumblebee-pmmethod
bumblebee service: Fix pmMethod bbswitch check
2017-02-20 16:18:45 +03:00
Robin Gloster 12b4556642 Merge pull request #22882 from bjornfor/wireshark
nixos: add programs.wireshark option
2017-02-20 14:03:30 +01:00
Nikolay Amiantov ec2c9d57b5 Merge pull request #22568 from abbradar/chromium-updates
Chromium updates
2017-02-20 15:49:04 +03:00
Shea Levy f454297a7d linux 4.10 2017-02-20 07:32:46 -05:00
Shea Levy b191ac0d89 Revert "linux 4.10"
Somehow the tarball was actually linux 4.4.10

This reverts commit fea71f84d0.
2017-02-20 07:29:47 -05:00
Robin Gloster dcba6eae1b Merge pull request #22116 from LnL7/darwin-cmus
cmus: fix darwin
2017-02-20 13:02:30 +01:00
Robin Gloster 464529c603
simp_le: 2016-12-16 -> 0.1.1 2017-02-20 12:48:42 +01:00
Shea Levy fea71f84d0 linux 4.10 2017-02-20 06:47:49 -05:00
Peter Simons 31759274f1 python-suseapi: 'requests' isn't needed at build-time, but it's needed at run-time 2017-02-20 12:21:59 +01:00
Peter Simons f0de1dc89d python-suseapi: add package at version 0.24-5-g9937e3b 2017-02-20 12:11:29 +01:00
Michael Alan Dorman dc19ba7bc6 beets: enable gstreamer support
So this was suggested as [long ago as October, 2015](https://github.com/NixOS/nixpkgs/issues/10376#issuecomment-147734898).

Despite being fairly ignorant of the nix Python support, I decided
that I really wanted this; this change brings in what I believe are
the necessary components---I have, at least, successfully run `beet
replaygain` and `beet bpd`---but it may not do it in the best way; I'm
happy to consider input on that front.

I can at least state that all three changes are necessary---leave any
one of them out and gstreamer support doesn't work.
2017-02-20 11:44:48 +01:00
Frederik Rietdijk c79371b823 kdeconnect: 1.0 -> 1.0.3 2017-02-20 11:44:14 +01:00
Frederik Rietdijk ffe6935ea8 kile: 2016-10-24 -> 2017-02-09 2017-02-20 11:44:14 +01:00
Frederik Rietdijk 9d48d3774e Merge pull request #22713 from richardlarocque/antfs-cli
antfs-cli and openant: init at unstable-2017-02-11
2017-02-20 09:06:02 +01:00
zraexy 5abca15f21 bumblebee service: Fix pmMethod bbswitch check
Made useBbswitch work when pmMethod is "auto" and removed invalid pmMethod option "nouveau".
2017-02-19 22:46:47 -09:00
florianjacob c23c2c50de munin service: listen on IPv6 loopback as well (#23012)
munin service: listen on IPv6 loopback as well
2017-02-20 06:13:48 +01:00
Arian van Putten 252fbbf2d2 mattermost sevice: JoinsNamespaceOf for local pgsql (#22899) 2017-02-20 04:43:04 +01:00
Franz Pletz 60555c7c0a Merge pull request #22969 from symphorien/extrainitrd
grub module: add extraInitrd option
2017-02-20 04:32:48 +01:00
Daniel Fullmer a8c738713b gnupg21: Fix scdaemon for usb smartcards (#22891)
The use of smartcard functionality for yubikeys (and presumably other
usb smartcards) was broken in gnupg 2.1.18.  This has apparently already
been fixed in gnupg master, and debian backports the included patches
for 2.1.18.

See also:
https://bugs.gnupg.org/gnupg/issue2933
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852702
https://github.com/NixOS/nixpkgs/pull/21991
2017-02-20 04:30:01 +01:00
aszlig c5b2714bc7
dbus: Put DTDs into $out instead of $doc
First of all, these "documents" are not really documentation, so it
really doesn't make much sense to put it into $doc.

The main point however is that the installer tests are failing since
this was introduced in ac0cdc1952.

One way to circumvent this is putting dbus.doc into
system.extraDependencies of the installer tests, but given the first
point this sounds a bit odd to me.

So I went for the second way of putting it into $out, because it's now
basically necessary to build a NixOS system.

With this the NixOS installer tests should now work again, although I
have only tested this with the installer.simple test.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar
2017-02-20 03:24:38 +01:00
aszlig fc6684054d
make-dbus-conf: Use libxslt.bin instead of .dev
The problem with using libxslt as buildInputs is that the dev output is
used for building the dbus config.

This is one of the reasons why the installer tests are failing since
ac0cdc1952, because the tests do not have
libxslt.dev in their closure and really shouldn't.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar
2017-02-20 03:24:34 +01:00
aszlig edce2b759c
make-dbus-conf: Don't try to access network
This is the output of the builder:

building path(s) `/nix/store/khkcfb8433i9mabb6wnb8ik6p9skg644-dbus-1'
error : connection refused
error : connection refused

However, even when using --nonet we'd still get this:

I/O error : Attempt to load network entity
http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd

So in order to avoid this, we now provide an XML catalog file, mapping
the public URLs to the local DTD paths inside the store instead of using
--path (which doesn't seem to work with xsltproc).

Tested this by comparing the SHA256 (nix-hash --type sha256) of the
output path generated by:

nix-build -E '(import ./. {}).makeDBusConf {
  suidHelper = "SUIDHELPER";
  serviceDirectories = [ "SERVICEDIR1" "SERVICEDIR1" ];
}'

... with the SHA256 of the generated output path prior to this commit
and they have the same hash:

6f3f9594b12fddbff9407b85252b6f649da11f56b7fd514f761966c11399a7ab

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar
2017-02-20 03:24:26 +01:00
Richard Larocque 13884d6de1 antfs-cli: init at unstable-2017-02-11 2017-02-19 16:22:21 -08:00
Richard Larocque 59d2eeff84 openant: init at unstable-2017-02-11 2017-02-19 16:22:20 -08:00
Peter Hoeg 68f01b3b8c Merge pull request #23010 from peterhoeg/f/gpg
gnupg: include systemd user units in output
2017-02-20 08:16:15 +08:00
Peter Hoeg 9ca3caeb09 gnupg: include systemd user units in output 2017-02-20 08:09:44 +08:00
aszlig 7c9f4ee032
lua-packages/luasocket: Fix wrong platforms value
This has surfaced due to 505d7bea3a and
the fixup commit 77f5a50c40.

The individial platform attributes are a list rather than single
elements, so in this case we got:

with platforms; [darwin linux freebsd illumos]

Which results in:

[ ["x86_64-darwin"]
  ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux"
   "armv7l-linux" "aarch64-linux" "mips64el-linux"]
  ["i686-freebsd" "x86_64-freebsd"]
  ["x86_64-solaris"]
]

So if you don't have allowBroken set in nixpkgs config, you end up with
an evaluation error because meta.platforms is expected to be a list
instead of a list of lists which we got here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @mornfall, @vcunat
2017-02-20 00:05:18 +01:00
Eelco Dolstra 4b833facf1 Add ca-central-1 AMIs 2017-02-19 23:46:08 +01:00
Benjamin Saunders bfdfd6c3df vulkan-loader: fix search paths in suid processes
Fixes #22990
2017-02-20 01:39:48 +03:00
Eelco Dolstra a2b8ceb83a Create AMIs for ca-central-1 (Canada) 2017-02-19 23:19:07 +01:00
Arseniy Seroka 40da17902b Merge pull request #23005 from Mic92/clang_complete
vimPlugins.clang_complete: init at 2017-02-16
2017-02-19 23:43:23 +03:00
Jörg Thalheim f2b1d6e5dc
vimPlugins.clang_complete: init at 2017-02-16 2017-02-19 21:33:18 +01:00
Rene Treffer 055d6399ef coredns: 001 -> 005 2017-02-19 21:26:10 +01:00
Domen Kožar 5fc89a6778
language-ecmascript: jailbreak 2017-02-19 20:30:13 +01:00
Tuomas Tynkkynen 00fd031d2c Merge pull request #22998 from romildo/upd.lxqt
LXQt: update several packages
2017-02-19 21:25:13 +02:00
Peter Simons 7734d159d1 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.0.4-12-gf83834c from Hackage revision
cc52bff6e8.
2017-02-19 20:12:44 +01:00
Nikolay Amiantov aefb01a945 haskellPackages.lambdabot: maintain 2017-02-19 20:12:44 +01:00
Pradeep Chhetri 07b301529c wuzz: 0.1.0 -> 0.2.0 (#23002) 2017-02-19 19:11:00 +00:00
Peter Simons 7422bb0ceb Merge pull request #22995 from rvl/lentil
haskellPackages.lentil: no longer needs overrides
2017-02-19 20:06:30 +01:00
Marius Bergmann 7bcb58ad71 keepalived: 1.3.2 -> 1.3.4 2017-02-19 19:50:21 +01:00
Graham Christensen a21455d989 firefox-bin: Add gpg verification to updater (#22270) 2017-02-19 18:33:31 +00:00