Commit graph

91434 commits

Author SHA1 Message Date
Aneesh Agrawal
39b64b52ed mkDerivation: add overrideAttrs function
This is similar to `overrideDerivation`, but overrides the arguments to
`mkDerivation` instead of the underlying `derivation` call.

Also update `makeOverridable` so that uses of `overrideAttrs` can be
followed by `override` and `overrideDerivation`, i.e. they can be
mix-and-matched.
2016-10-02 11:08:34 -04:00
Joachim F
fbcb93852c Merge pull request #18047 from Nadrieril/ttrss
tt-rss service: Use nginx virtualhosts; improve config options
2016-09-15 13:37:20 +02:00
Joachim F
c571a7f221 Merge pull request #18500 from tvon/fix/gocd-server-options
gocd-server: add startupOptions, empty extraOptions
2016-09-15 13:24:48 +02:00
Joachim F
09646cc8a5 Merge pull request #18501 from tvon/update/gocd-server-16.9.0-4001
gocd-server: 16.7.0-3819 -> 16.9.0-4001
2016-09-15 13:17:17 +02:00
Joachim F
cbdad9b5e9 Merge pull request #18502 from tvon/update/gocd-agent-16.9.0-4001
gocd-agent: 16.7.0-3819 -> 16.9.0-4001
2016-09-15 13:17:06 +02:00
Sander van der Burg
4cbf2b88c2 Merge pull request #18591 from bendlas/update-androidenv
androidenv: update packages
2016-09-15 11:01:37 +02:00
Daiderd Jordan
fa507771ac Merge pull request #18577 from matthewbauer/mplayer-darwin
mplayer: fix on darwin
2016-09-15 09:32:03 +02:00
Sander van der Burg
36aad71e3c Merge pull request #18610 from siddharthist/emoj/init
emoj: init at 0.3.0
2016-09-15 09:26:21 +02:00
Peter Simons
fabd60a397 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0.1-10-gca03454 using the following inputs:

  - Hackage: 0aa5f8d505
  - LTS Haskell: b5ee848475
2016-09-15 09:12:08 +02:00
Peter Simons
9123a0452d haskell: drop obsolete LTS package set
The default 'haskellPackages' set now corresponds to the latest
available version of LTS 7.x.
2016-09-15 09:12:04 +02:00
Peter Simons
055a3e52c5 Switch the 'haskellPackages' attribute set to the latest version of LTS-7.x. 2016-09-15 09:12:04 +02:00
Peter Simons
f7133e4de6 haskell: define top-level attributes for LTS 6.x and 7.x
These attributes exist only for backwards compatibility with old
versions of Stack and will be removed altogether soon.
2016-09-15 09:12:04 +02:00
Peter Simons
6607b99168 haskell: port existing hardening overrides to use the new combinator 2016-09-15 09:12:03 +02:00
Peter Simons
97fd905823 haskell: add support for 'hardeningDisable' to the generic builder
We also have a new helper function 'disableHardening' to use in
overrides. Fixes https://github.com/NixOS/nixpkgs/issues/14820.
2016-09-15 09:12:03 +02:00
Peter Simons
aa1d424421 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0.1-9-g9d0fb31 using the following inputs:

  - Hackage: d68983aeb2
  - LTS Haskell: 36c0f4fa5e
  - Stackage Nightly: 8b258a761d
2016-09-15 09:12:02 +02:00
Peter Simons
af1d6e503e configuration-hackage2nix.yaml: make sure some old (but required) packages remain available
The switch to LTS 7.x has made many older versions obsolete and so they
are no longer included in our package set by default:

 - aeson-pretty 0.7.x
 - hoogle 4.x
 - persistent 2.2
 - persistent-sqlite 2.2
 - persistent-template 2.1
2016-09-15 09:11:04 +02:00
Benjamin Staffin
7bcbdb7885 Merge pull request #18620 from benley/openssh-gssapi-patch-once-again
openssh: update gssapi patch, fix the build
2016-09-15 01:03:54 -04:00
Benjamin Staffin
43dcb662e7 openssh: update gssapi patch, fix the build 2016-09-14 23:35:26 -04:00
Chris Martin
56904d7c42 Update libtiff URLs (#18611)
* libtiff: remove dead source url

* libgeotiff: update url
2016-09-15 00:31:32 +01:00
Langston Barrett
a1b7d21318 emoj: init at 0.3.0 2016-09-14 23:19:17 +00:00
Thomas Tuegel
7b65daaab4 Merge pull request #18602 from bendlas/update-emacs-packages
emacs-modes: add upstream tramp
2016-09-14 16:10:59 -05:00
Herwig Hochleitner
a4cbd69ef0 emacs-modes: add upstream tramp
this fixes http://emacs.stackexchange.com/questions/21026/tramp-recreates-dev-null-as-a-regular-file
2016-09-14 21:39:02 +02:00
Daiderd Jordan
5ea6d5fa72 Merge pull request #18546 from LnL7/darwin-go-1.7
go: fix darwin build
2016-09-14 21:07:58 +02:00
Daiderd Jordan
db7adbf69c
go: fix darwin build 2016-09-14 21:00:13 +02:00
Daiderd Jordan
4d25b23d26 Merge pull request #18516 from offlinehacker/pkgs/go/1.7.1
go_1_7: 1.7 -> 1.7.1
2016-09-14 20:54:40 +02:00
Matthew Bauer
85f2c3ebc9
mplayer: fix on darwin 2016-09-14 12:51:47 -05:00
Rushmore Mushambi
3ed019123e Merge pull request #18595 from rushmorem/lizardfs-update
lizardfs: 3.10.0 -> 3.10.2
2016-09-14 19:48:08 +02:00
Matthew O'Gorman
6a01fc2b7c mosquitto: add websockets support. 2016-09-14 19:34:14 +02:00
Vladimír Čunát
92f0d709e9 libmaxminddb: init at 1.2.0 2016-09-14 19:25:29 +02:00
rushmorem
c34d83eb36 lizardfs: 3.10.0 -> 3.10.2 2016-09-14 19:24:33 +02:00
Thomas Tuegel
314cc36d47 Merge pull request #18588 from bendlas/update-dropbox-master
dropbox: 9.4.49 -> 10.4.25 [master]
2016-09-14 12:20:58 -05:00
Vincent Laporte
38c143abe2 ocaml-qtest: 2.0.1 -> 2.2 2016-09-14 19:04:58 +02:00
Frederik Rietdijk
8f2629aab6 Merge pull request #18587 from bendlas/update-pypy
pypy: 5.4.0 -> 5.4.1
2016-09-14 19:01:48 +02:00
Herwig Hochleitner
685786b7d7 androidenv: update packages
build-tools      25.1.7 -> 25.2.2
sdk-tools        23.0.1 -> 24.0.2
platform-tools   24 -> 24.0.2
2016-09-14 18:31:22 +02:00
Herwig Hochleitner
85fdf8665f dropbox: 9.4.49 -> 10.4.25 2016-09-14 18:18:45 +02:00
Herwig Hochleitner
1172c6be9b pypy: 5.4.0 -> 5.4.1 2016-09-14 18:11:17 +02:00
Joachim F
068106cf6a Merge pull request #18571 from peterhoeg/wp-cli
wp-cli: 0.23.1 -> 0.24.1
2016-09-14 17:56:03 +02:00
Lancelot SIX
28d286ac4b Merge pull request #18562 from taku0/flashplayer-11.2.202.635
flashplayer: 11.2.202.632 -> 11.2.202.635
2016-09-14 17:19:08 +02:00
Eelco Dolstra
32d00f50ec Merge pull request #18573 from peterhoeg/systemd_user_cfg
systemd: support setting defaults for user instances
2016-09-14 13:39:57 +02:00
Bjørn Forsman
1010271c63 nixos/pam: clean up generated files (no functional change) (#18580)
The generated files in /etc/pam.d/ typically have a lot of empty lines
in them, due to how the generated Nix strings are joined together;
optional elements that are excluded still produce a newline. This patch
changes how the files are generated to create more compact,
human-friendly output files.

The change is basically this, repeated:

-  ''
-    ${optionalString use_ldap
-        "account sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
-  ''
+  optionalString use_ldap ''
+    account sufficient ${pam_ldap}/lib/security/pam_ldap.so
+  ''
2016-09-14 11:56:07 +01:00
Peter Simons
642a42875f Merge pull request #18541 from RamKromberg/fix/groff
groff: add missing depedencies for optional postscript and html outputs
2016-09-14 09:54:41 +02:00
Franz Pletz
ee4c4768a4
curl3: remove vulnerable curl version 2016-09-14 09:03:23 +02:00
Franz Pletz
296c671454
gsb: remove, depends on vulnerable curl3 2016-09-14 09:03:23 +02:00
aszlig
1781e95577
Merge pull request #18567 (VirtualBox 5.1.6)
This introduces VirtualBox version 5.1.6 along with a few refactored
stuff, notably:

  * Kernel modules and user space applications are now separate
    derivations.
  * If config.pulseaudio doesn't exist in nixpkgs config, the default is
    now to build with PulseAudio modules.
  * A new updater to keep VirtualBox up to date.

All subtests in nixos/tests/virtualbox.nix succeed on my machine and
VirtualBox was reported to be working by @DamienCassou (although with
unrelated audio problems for another fix/branch) and @calbrecht.
2016-09-14 02:20:16 +02:00
aszlig
f7563efa6e
nixos/tests/vbox: Add destroyVM for all subtests
One reason why it took me so long for debugging the test failure with
systemd-detect-virt was that simple-cli has succeeded while the former
has not.

This now makes sure we have consistency accross all the subtests and if
problems like the one in the previos commit ever show up again, we will
have just the headless test succeeding and it's more obvious where the
actual problem resides.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-09-14 02:12:16 +02:00
Vladimír Čunát
3efebb1680 xorg.xf86-input-libinput: 0.19.0 -> 0.19.1
It fixes a typo in API (!).
https://lists.x.org/archives/xorg-announce/2016-September/002705.html
2016-09-14 00:05:12 +02:00
Nikolay Amiantov
ad8916cbdc Merge pull request #18567 from aske/gtk-fix
Fix breakage caused by #18498
2016-09-14 01:46:15 +04:00
aszlig
80c2cc350c
nixos/tests/vbox: Disable audio for VBox guests
We don't have (simulated) sound hardware within the qemu VM, neither do
we have it available within VirtualBox that's running within the qemu
VMs.

With sound hardware the VirtualBox UI displays an error dialog, which in
turn causes the VM process to hang on unregister. This in turn has
caused the tests to fail because of the following error:

Cannot unregister the machine '...' while it is locked

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-09-13 23:17:47 +02:00
Sander van der Burg
2b144fcfb0 nodePackages: regenerate with node2nix-1.1.0. The new node2nix supports postInstall hooks that have been used to fix npm2nix 2016-09-13 20:56:05 +00:00
Reno Reckling
8ea8659f29 Remove tomcat vm test timing issues
(cherry picked from commit 090f1f0722)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-13 22:46:46 +02:00