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

148085 commits

Author SHA1 Message Date
Edmund Wu 6f62bf31c1
opencollada: include pcre.h (KhronosGroup/OpenCOLLADA#570) 2018-08-01 22:02:41 -04:00
Matthew Bauer 8fe1620513
Merge pull request #43080 from mnacamura/cdda
cataclysm-dda{,-git}: move common attributes to common.nix
2018-08-01 21:45:26 -04:00
Matthew Bauer 7ee610fd6c
Merge pull request #43604 from udono/update_tryton_4_8
Minor upstream update Tryton 4 8
2018-08-01 21:29:40 -04:00
Moritz Angermann acaa6c92fb coreutils: unix-only
Windows is not supported & we currently define "all" to be "unix" + "windows".
2018-08-01 21:18:41 -04:00
aszlig 29e89248bf
beets: Fix building plugins with Python 3
Since the switch to using python3Packages in commit
72934aa94e, the plugins no longer build
because they end up with a mix of Python 2 and Python 3 packages.

The reason for this is that the Beets package itself uses callPackage to
reference the plugins, however the overrides are not applied there and
thus the plugins end up getting pythonPackages from the top-level which
is Python 2 and beets with Python 3 dependencies.

Unfortunately this is not the only reason for the builds to fail,
because both plugins did not actually support Python 3.

For the copyartifacts plugin, the fix is rather easy because we only
need to advance to two more recent commits from upstream, which already
contain fixes for Python 3.

The alternatives plugin on the other hand is not maintained anymore, but
there is a fork at https://github.com/wisp3rwind/beets-alternatives
which has a bunch of fixes. In 2e4aded366
I already backported one of these fixes to the version from
https://github.com/geigerzaehler/beets-alternatives, but for Python 3
support it's a bit more complicated than just one little fix.

So instead of adding another series of patches which replicate the code
base of the fork and become a maintenance burden, I opted to directly
switch to the fork and remove the patch on our side.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @domenkozar, @pjones, @Profpatsch
2018-08-02 01:41:36 +02:00
Jörg Thalheim 90e0428d5d
Merge pull request #44248 from LnL7/doc-darwin-installcheck
doc: add darwin installCheckTarget example
2018-08-01 23:39:13 +01:00
Jörg Thalheim 422065c194 pwndbg: 2018-04-06 -> 2018.07.29 2018-08-01 23:35:08 +01:00
Jan Tojnar 0a12371dfb
https://gitlab.gnome.org/GNOME/gnome-keyring/issues/1 2018-08-02 00:32:51 +02:00
Serge Bazanski 7826a3155a icestorm: 2018.05.03 -> 2018.08.01 (#44321) 2018-08-01 23:20:38 +02:00
volth ee23bd7046 xfce4-13.xfce4-whiskermenu-plugin: init at 2.2.0 (#44317) 2018-08-01 22:48:21 +02:00
volth b129cd165a xfce4-13.xfce4-cpufreq-plugin: init at 1.2.0 (#44316) 2018-08-01 22:47:15 +02:00
volth 63c295caef xfce4-13.xfce4-netload-plugin: init at 1.3.1 (#44315) 2018-08-01 22:46:08 +02:00
volth 781428a849 xfce4-13.xfce4-pulseaudio-plugin: init at 0.4.1 (#44314) 2018-08-01 22:45:32 +02:00
Franz Pletz 9820531cb5
freeradius module: add to modules-list.nix
This was somehow never added and was thus never available. It works.
2018-08-01 22:24:47 +02:00
Franz Pletz b5477ab37b
freeradius: add rest module and multiple outputs 2018-08-01 22:24:47 +02:00
Will Dietz b0003a1680 proselint: 0.9.0 -> 0.10.0 (#44313) 2018-08-01 22:15:54 +02:00
Jamey Sharp f2434d1208 gnome-builder: fix whitespace 2018-08-01 13:12:54 -07:00
Justin Bedő 51fc0ef8d2 somatic-sniper: init 1.0.5.0 (#43403) 2018-08-01 22:11:13 +02:00
Uli Baum 3835786896 gitter: fix eval
gnome3.gconf was dropped
2018-08-01 21:55:14 +02:00
Maximilian Bosch cd5e01edd9 ocserv: init at 0.12.1 (#42871)
`ocserv` is a VPN server which follows the openconnect protocol
(https://github.com/openconnect/protocol). The packaging is slightly
inspired by the AUR version
(https://aur.archlinux.org/packages/ocserv/).

This patch initializes the package written in C, the man pages and a
module for a simple systemd unit to run the VPN server. The package
supports the following authentication methods for the server:

* `plain` (mostly username/password)
* `pam`

The third method (`radius`) is currently not supported since `nixpkgs`
misses a packaged client.

The module can be used like this:

``` nix
{
  services.ocserv = {
    enable = true;
    config = ''
      ...
    '';
  };
}
```

The option `services.ocserv.config` is required on purpose to
ensure that nobody just enables the service and experiences unexpected
side-effects on the system. For a full reference, please refer to the
man pages, the online docs or the example value.

The docs recommend to simply use `nobody` as user, so no extra user has
been added to the internal user list. Instead a configuration like
this can be used:

```
run-as-user = nobody
run-as-group = nogroup
```

/cc @tenten8401
Fixes #42594
2018-08-01 21:39:09 +02:00
Jaka Hudoklin e4ca48c224 confluent: init at 4.1.1-2.11 (#43137) 2018-08-01 21:35:42 +02:00
Yuri Aisaka 9caf7ec5a4 pybind11: init at 2.2.2 (#35027)
* pybind11: init at 2.2.2

* fix license

* remove test dependencies
2018-08-01 21:14:51 +02:00
Daiderd Jordan 61a1b20d23
doc: add darwin installCheckTarget example 2018-08-01 20:58:45 +02:00
Ivan Malison e090fb2967 gitter: init at 4.1.0 (#43505) 2018-08-01 20:51:17 +02:00
Jan Tojnar 62e665e1ec
nixos/gnome3: warn against sessionPath 2018-08-01 20:36:25 +02:00
Daiderd Jordan 64e550c31f
jq: disable strptime test on darwin
This seems to fail depending on the machine's configuration, probably
something locale or timezone related.
2018-08-01 20:33:44 +02:00
Michael Weiss 8aa04df600
Merge pull request #44310 from primeos/android-studio-improvements
Android Studio improvements
2018-08-01 20:24:03 +02:00
Andreas Rammhold 7feba330da
nixos/manual: added missing xml tags 2018-08-01 20:21:28 +02:00
Michael Weiss 8caeec1ba7 androidStudioPackages: Use recurseIntoAttrs
IMO it makes sense that the other channels show up in nix-env as well.
2018-08-01 19:47:36 +02:00
Michael Weiss 88bfbf6c7d android-studio-preview: Print a deprecation warning
Hope this is ok... :)
2018-08-01 19:47:36 +02:00
Michael Weiss d8b44edd8f androidStudioPackages: Use more intuitive names for the derivations 2018-08-01 19:47:36 +02:00
Michael Weiss 31583d7cb6 androidStudioPackages: Refactor the code 2018-08-01 19:47:36 +02:00
Tor Hedin Brønner 9cd6342008
nixos/gnome3: Add back debug 2018-08-01 19:14:33 +02:00
Tor Hedin Brønner ee34f2537a
nixos/gnome3: Add back sessionPath
Implement through `services.xserver.displayManager.sessionCommands`.
2018-08-01 19:14:33 +02:00
Tor Hedin Brønner e8e0edd95c
nixos/tests/gnome3: Explicitly set default desktopManager
Sessions from `extraSessionFilePackages` isn't picked automatically as the
default session.
2018-08-01 19:14:33 +02:00
Tor Hedin Brønner efa27d33cf
nixos/desktopManager: Only trace if the default session isn't found
The default session might be found in `extraSessionFilePackages`, but it's not
viable to detect at evaluation time, so emit a warning.

In LightDM instead of checking `defaultSessionName` against
`displayManager.session.names` we rely on the assertions in
`desktopManager` and `windowMananger` and just check that there's at least one
default set. The second assertion could never actually be triggered.
2018-08-01 19:14:32 +02:00
Tor Hedin Brønner 9fad9fb869
nixos/displayManager: Create a common environment wrapper for all dms
This makes it easier to support a wider variety of .desktop session files. In
particular this makes it possible to use both the «legacy» sessions and upstream
session files.

We separate `xsession` into two parts, `xsessionWrapper` and `xsession`.
`xsessionWrapper` sets up the correct environment and then lauches the session's
Exec command (from the .desktop file), falling back to launching the default
window/desktopManager through the `xsession` script (required by at least some
nixos tests).

`xsession` then _only_ handles launching desktop-managers/window-managers defined
through `services.xserver.desktopManager.session`.
2018-08-01 19:14:32 +02:00
Jan Tojnar adbe4e1c68
gnome3.gnome-session: use absolute paths
TryExec needs absolute path too, otherwise the desktop file will be ignored
unless gnome-session is in PATH, in which case, we would not need to patch
Exec.
2018-08-01 19:14:31 +02:00
Jan Tojnar e6056c72d1
nixos/gnome3: use upstream session file
Pass gnome-session to extraSessionFilePackages, remove unnecessary environment variables, move the rest out of old session option, and then drop the option.
2018-08-01 19:14:31 +02:00
Jan Tojnar eb65e5ce56
nixos/gnome3: remove session path
Global environment variables are not very Nix-y.
2018-08-01 19:14:31 +02:00
Jan Tojnar f63d94eba3
gnome3.gpaste: hard-code paths
GPaste GNOME Shell extension uses GPaste library generated via introspection. Previously, we added the gpaste package to services.xserver.desktopManager.gnome3.sessionPath option, which
added its typelib directory to GI_TYPELIB_PATH environment variable globally, in order for GNOME Shell to be able to find it. This is not very Nix-y, though, so we have decided to patch the code to
append the path to the GI repository search path.

Additionally, the code relies on GPaste’s GSettings schemas, so we had to hard-code the paths to them as well. We ignored the GNOME Shell’s schemas, since they will already be available for the
extension inside GNOME Shell program.
2018-08-01 19:14:30 +02:00
Jan Tojnar 0e1c01451f
nixos/gnome3: rely on xdg autostart for xdg-user-dirs 2018-08-01 19:14:30 +02:00
Jan Tojnar cc6d77c83f
gnome3.gdm: add upstream xsession 2018-08-01 19:14:30 +02:00
Jan Tojnar 83fc9a9825
nixos/display-manager.default: add extraSessionFilePackages option 2018-08-01 19:14:30 +02:00
Jan Tojnar a8c6489fd4
nixos/services.xserver.displayManager: move X sessions to a subdirectory
Previously, the mkDesktops function produced a flat package containing
session files in the top level. As a preparation for introduction of
Wayland sessions, the files will now be placed to $out/share/xsessions.
2018-08-01 19:14:29 +02:00
Andreas Rammhold 17ee0a8662
Merge pull request #44190 from andir/nixos/default-enable-sandboxing
nixos/nix-daemon: default `nix.useSandbox` to `true`.
2018-08-01 19:10:45 +02:00
Tuomas Tynkkynen e94fcbcd01 pkgs/tests: Add test for LD_LIBRARY_PATH
The latest binutils upgrade silently broke this until it was fixed by
https://github.com/NixOS/nixpkgs/pull/43531.

So add a test.
2018-08-01 19:02:21 +03:00
kiloreux 954489df24 ffmpeg-full: add AV1 encoder with libaom (#43789) 2018-08-01 17:03:44 +02:00
Peter Hoeg 2428f5dda1 scummvm: fix compilation 2018-08-01 22:32:51 +08:00
Maximilian Bosch 134c5cc8db termite: factor wrapper out into its own file (#43691)
Until now it's impossible to override the attrs of the actual build
instruction for the `termite` package like this:

```
termite.overrideAttrs (_: {
  # ...
})
```

This issue occurs since the `termite/default.nix` expressions returns
the `symlinkJoin` expression when I override termite (e.g. to provide a
config file).

I recently patched termite and wanted to apply this patch to my local
termite installation in my system config which is impossible this, so
splitting the wrapper and the build instruction into their own files
makes this way easier to maintian.
2018-08-01 16:09:55 +02:00