1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 09:31:01 +00:00
Commit graph

10681 commits

Author SHA1 Message Date
Will Fancher f0957b9477 sd-image: Fix cross compiling 2018-08-21 14:05:23 +03:00
Will Fancher 47d2f92a05 make-ext4-fs: Fix cross compiling 2018-08-21 14:05:23 +03:00
Joachim F 69d3bdfa16
Merge pull request #44631 from dasJ/terraria
nixos/terraria: Wait for daemon to stop
2018-08-20 20:23:34 +00:00
Janne Heß 943786eccf nixos/terraria: Wait for daemon to stop 2018-08-20 21:41:29 +02:00
John Ericson 7d85ade0cc treewide: Purge stdenv.platform and top-level platform
Progress towards #27069
2018-08-20 15:22:46 -04:00
John Ericson f0d6e22b7f
Merge pull request #45397 from volth/patch-233
$toplevel/system: buildPlatform.system -> hostPlatform.system
2018-08-20 14:36:13 -04:00
volth 72f5078beb
top-level.nix: stdenv.platform -> stdenv.hostPlatform.platform
because stdenv.platform is stdenv.buildPlatform.platform
2018-08-20 18:20:57 +00:00
volth 6efaa88fcc
$toplevel/system: buildPlatform.system -> hostPlatform.system 2018-08-20 18:12:13 +00:00
Jake Woods 64223a2c1b nixos/thermald: add manual config file
thermald has two modes: zero-config and manual. Sometimes it is useful
to manually configure thermald to achieve better thermal results or to give
thermald a hand when detecting possible cooling options.
2018-08-19 15:54:42 +10:00
Silvan Mosberger eacaaa2161
Merge pull request #44880 from srghma/build-max-jobs-auto
nixos/nix-daemon: build-max-jobs, add support to auto
2018-08-18 16:46:08 +02:00
srghma 37e2ebdfbc nixos/nix-daemon: build-max-jobs, add support to auto 2018-08-18 14:45:12 +03:00
Vladimír Čunát cbabebcc2e
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
Tuomas Tynkkynen 58dc26180f nixos: Fix iso_graphical evaluation
I broke it:
in job ‘nixos.iso_graphical.x86_64-linux’:
The option `services.udisks2.enable' has conflicting definitions, in `/nix/store/bwcjw1ddj94q83vbbnq1nnrs5aisaw59-source/nixos/modules/profiles/installation-device.nix' and `/nix/store/bwcjw1ddj94q83vbbnq1nnrs5aisaw59-source/nixos/modules/services/x11/desktop-managers/plasma5.nix'.
2018-08-17 07:43:58 +03:00
Tuomas Tynkkynen 571fb74f44 installer: Disable udisks
Due to whoever-knows-what, udisks nowadays pulls in GTK+ et al. But it
shouldn't be needed anyway in the installer, so disable it.
2018-08-17 06:56:51 +03:00
Silvan Mosberger be34fdfa89
Merge pull request #45078 from Izorkin/syslog-ng-reload-fix
syslog-ng: fix reload service
2018-08-16 18:11:52 +02:00
Izorkin e4f4589186 syslog-ng: fix reload service 2018-08-16 18:23:58 +03:00
Jan Tojnar 6f8fe25ccf
Merge pull request #45107 from mnacamura/lightdm-accountsservice
lightdm: enable the accounts daemon to find dbus interface
2018-08-16 17:15:05 +02:00
Silvan Mosberger ed2148b5af
Merge pull request #44238 from jfrankenau/samba-conf-override
nixos/samba: allow dummy conf file to be overridden
2018-08-16 16:56:24 +02:00
Silvan Mosberger d3c5a9bf17
Merge pull request #40747 from WhittlesJr/synergy-fix
services.synergy: Use graphical target (fixes #9468)
2018-08-16 16:55:38 +02:00
Jan Tojnar 7bfb3e163e
Merge pull request #45095 from worldofpeace/zeitgeist-service
nixos/zeitgeist: init
2018-08-16 15:02:06 +02:00
Alex Whitt 9a63f51454 nixos/synergy: Use graphical target (fixes #9468) 2018-08-16 08:53:45 -04:00
Mitsuhiro Nakamura 7fbdd7fcf4 lightdm: enable the accounts daemon to find dbus interface 2018-08-16 21:52:25 +09:00
Mitsuhiro Nakamura 6c84945099 lightdm: fix typos 2018-08-16 21:52:25 +09:00
Sarah Brofeldt 78fb4bd644 nixos/qemu-vm: Don't explicitly mknod /dev/vda*
And don't need to source the uevent files anymore either since $MAJOR
or $MINOR aren't used elsewhere.

[dezgeg: The reason these are no longer needed is that 0d27df280f
switched /tmp to a devtmpfs which automatically creates such device
nodes]
2018-08-16 14:19:41 +03:00
Jörg Thalheim 3d36e7c1fa
Merge pull request #44233 from jfrankenau/networkd-fix-options
nixos/networkd: add missing options
2018-08-16 11:18:18 +02:00
Mitsuhiro Nakamura 7952b51461 accountsservice: fix a bug 2018-08-16 18:00:58 +09:00
Johannes Frankenau b2f1790070 nixos/networkd: add missing options 2018-08-16 10:27:34 +02:00
Johannes Frankenau 51169880bd nixos/samba: allow dummy conf file to be overridden
This allows configuring samba clients on systems without a samba server.
2018-08-16 10:24:09 +02:00
Jörg Thalheim 5bf43e47d3
Merge pull request #45098 from Chiiruno/dev/hydron
Fix hydron service, update hydron and meguca
2018-08-16 10:10:27 +02:00
Okina Matara aba87b85ef nixos/hydron: Various tweaks
Make timer persistent
Start timer after hydron
Change interval from hourly to weekly
2018-08-15 22:00:13 -05:00
worldofpeace 48a765e641 nixos/zeitgeist: init 2018-08-15 20:05:00 -04:00
Izorkin 300fe1cc9a syslog-ng: fix reload service 2018-08-16 00:05:35 +03:00
Samuel Leathers 67b1cbb39d
Merge pull request #40399 from rvl/datadog-agent
DataDog Agent v6
2018-08-15 15:53:03 -04:00
Jörg Thalheim 34c7d06db8
Merge pull request #45073 from Izorkin/syslog-ng
syslog-ng: enable reload service
2018-08-15 19:31:19 +02:00
zimbatm 9976f37c77
Merge pull request #44896 from cdepillabout/vbox-extpack
add derivation for the virtualbox oracle extension pack
2018-08-15 18:05:07 +01:00
Izorkin c2b24892b0 syslog-ng: enable reload service 2018-08-15 19:46:47 +03:00
(cdep)illabout e04e92d38b
Merge remote-tracking branch 'origin/master' into vbox-extpack 2018-08-16 00:40:09 +09:00
Profpatsch d817452e29 lib/recursiveUpdateUntil: add a test & release note for fix 2018-08-15 17:16:56 +02:00
(cdep)illabout 2ae9907cc4
virtualbox: Add tests for the VirtualBox Extension Pack. 2018-08-15 10:09:15 +09:00
Jan Tojnar fe51bf322c
Merge pull request #44820 from michaelpj/fix/redshift-geoclue-agents
redshift/geoclue/localtime: progress in fixing agent confusion
2018-08-14 17:13:09 +02:00
Michael Peyton Jones 80d4fa725b
localtime: simplify module a little 2018-08-14 15:55:05 +01:00
Michael Peyton Jones 316669327c
geoclue2 service: add option to run demo agent 2018-08-14 15:55:04 +01:00
Michael Peyton Jones a1762065c3
redshift: install desktop files, and use absolute paths in them to avoid confusing geoclue agent 2018-08-14 15:53:39 +01:00
Jörg Thalheim 93f9b7069a
Merge pull request #45012 from Mic92/zfs
linuxPackages.zfsUnstable: 2018-05-22 -> 2018-08-13
2018-08-14 14:39:04 +02:00
Jörg Thalheim 4360a87c45 linuxPackages.zfsUnstable: 2018-05-22 -> 2018-08-13
spl was merged into zfs master
2018-08-14 14:12:07 +02:00
lewo f2cab31ae9
Merge pull request #44841 from Ma27/bump-hydra
hydra: 2017-11-21 -> 2018-08-07
2018-08-14 09:55:11 +02:00
Maximilian Bosch 7682c2fd61
hydra: 2017-11-21 -> 2018-08-07
This bumps Hydra to the latest revision available. As Hydra doesn't have
a release model (and therefore no tags) ATM, the derivation will pin
against the actual git revision and the date of the commit in the
derivation name.

Additionally the following changes have been made:

* Dropped `postUnpack` phase. It is useful when working with the Hydra
  source (and no dirty changes shall be used in `release.nix`, but is has
  no use in `nixpkgs`).

* Added myself as maintainer to have more folks available in case of
  future breakage.

* Implemented support for Nix 2.0 and `unstable` (currently 2.1):

  Since 1672bcd230447f1ce0c3291950bdd9a662cee974 in NixOS/nix the
  evaluator differentiates between `settings` and `evalSettings`.
  Previously `restrictEval` in `hydra-eval-jobs.cc` has been set in
  `settings`, this doesn't work anymore in Nix 2.1 and is therefore
  incompatible to Nix 2.0 on an API level.

  To resolve this, the flag `isGreaterNix20` parses the version string
  of `pkgs.nix` and applies a patch if nix.version<=2.0.

  Furthermore the Hydra build with Nix 2.1 requires `boost` as build input
  which is not needed for Nix 2.0. To avoid unnecessary increase in the
  closure size this library will only used as build input for
  nix.version>2.0.

* Fixed the NixOS test for `hydra`:
  disabled binary cache to allow sandbox builds (otherwise it would
  query `cache.nixos.org` during the Hydra build inside the test).

  Additionally the trivial.nix jobset required simplification (as done
  in NixOS/hydra, e.g. tests/api-test.nix) as bash is not available in
  the build sandbox as builder (even when adding pkgs.bash to
  systemPackages).

  The easiest workaround to confirm a the functionality of a jobset
  without importing nixpkgs is to use the default shell /bin/sh which
  is mounted from `pkgs.busybox` into the build env
  (https://github.com/NixOS/nixpkgs/pull/44841#discussion_r209751972) in the
  VM and a named pipe to create $out.

Closes #44044
2018-08-13 22:56:27 +02:00
Franz Pletz 0371570807
Merge pull request #44524 from vincentbernat/fix/dhcpcd-systemd
dhcpcd service: order before network target
2018-08-13 20:24:22 +00:00
Vladimír Čunát 5b0398dc36
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
Jörg Thalheim 43595c7884 zfsLegacyCrypto: remove
This package was only mandatory for migration for people on zfsUnstable
in nixos unstable.
2018-08-13 19:53:50 +02:00