3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

147891 commits

Author SHA1 Message Date
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
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
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
leenaars 2b75a7266c ipgrep: init at 1.0 (#43887) 2018-08-01 15:40:57 +02:00
Yarny0 bdf6f8528e plasma-nm: fix path to mobile broadband provider file (#44302)
When creating a new mobile broadband connection
with the plasma network manager connection editor,
it tries to find a file containing provider
information somewhere in /usr/share/... .
The build recipe contains a patch to fix the lookup path
such that it finds the file in the corresponding package,
probably added due to
https://github.com/NixOS/nixpkgs/issues/9389 .
The actual lookup path is injected into
the patch file with substituteAll.

With commit a31d98f312 ,
the variable name used in subsituteAll changed from
mobile_broadband_provider_info to mobile-broadband-provider-info
(underscores in package names turned into dashes).
Apparently, substituteAll can't handle dashes in variable names.
Consequently, the variable name was no longer resolved.
plasma-nm failed to create new mobile broadband connections;
the connection creator silently exited and logged the error
> plasma-nm: Error opening providers file "@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml"

This commit keeps the dashes in package names, but it
restores the underscores in the variable used by substituteAll,
thereby ensuring the variable gets resolved properly.
2018-08-01 15:23:28 +02:00
Matthew Harm Bekkema 4f505d7267 ffmpeg: 3.4.3 -> 3.4.4 (bugfix) (#44267)
Fixes #44256
2018-08-01 15:22:20 +02:00
Chloe Kever 1bb4fd794c jenkins: 2.107.3 -> 2.121.2 (#43936) 2018-08-01 15:20:21 +02:00
Mario Rodas 1b6190e005 1password: 0.4.1 -> 0.5.1 (#43981) 2018-08-01 15:19:07 +02:00
Mario Rodas 4cc3a18fcd brakeman: init at 4.3.1 (#44294) 2018-08-01 15:15:29 +02:00
Mario Rodas dc4abdfd86 ia-writer-duospace: init at 20180721 (#43937) 2018-08-01 15:13:50 +02:00
Daniël de Kok 186cf1c4d6 cargo-asm: init at 0.1.16 (#44182) 2018-08-01 15:03:03 +02:00
markuskowa 34f6b0cc0e halide: init at 2018_02_15 (#44207) 2018-08-01 14:57:51 +02:00
Jan Tojnar be066d0b27
Merge pull request #44278 from jtojnar/gnome-update
Gnome update
2018-08-01 14:38:45 +02:00
Jörg Thalheim 3ea0322f63
Merge pull request #44197 from etu/php-kill-56-and-70
php: drop 5.6 and 7.0
2018-08-01 12:49:56 +01:00
Jörg Thalheim d9cea0e6f1
Merge pull request #44155 from Assassinkin/slackclient
pythonPackages.slackclient:1.0.0 -> 1.2.1 | refactor
2018-08-01 12:46:57 +01:00
Jörg Thalheim 69a94a01c6
Merge pull request #44264 from eonpatapon/kubelet-cgroup-stats
nixos/kubernetes: fix kubelet cgroup stats
2018-08-01 12:08:13 +01:00
Assassinkin f3b60eb0a4 pythonPackages.slackclient:1.0.0 -> 1.2.1 | refactor 2018-08-01 12:05:32 +01:00
Jörg Thalheim ff75efc953
Merge pull request #44289 from vbgl/ocaml-core_kernel-0.11.1
ocamlPackages.core_kernel: 0.11.0 -> 0.11.1
2018-08-01 11:54:07 +01:00
xeji 299db53476
Merge pull request #43637 from qolii/hardkernel_update_and_defconfig
linux-hardkernel: 4.14.47-139 -> 4.14.55-146. Additionally, use vendo…
2018-08-01 12:18:27 +02:00
xeji c7c3c1663f
Merge pull request #44298 from Izorkin/fix-build
Fix build packages edk2 and bazaar
2018-08-01 11:53:47 +02:00
Jörg Thalheim 12c71a8cbc
Merge pull request #44261 from dotlambda/python-jose-3.0.0
python.pkgs.python-jose: 2.0.2 -> 3.0.0
2018-08-01 10:51:39 +01:00