Commit Graph

99928 Commits

Author SHA1 Message Date
Frederik Rietdijk
d0dab8a330 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-02 11:10:52 +02:00
Unai Zalakain
3ff173ffde jrnl: support journal encryption by default 2017-09-02 11:03:49 +02:00
Jörg Thalheim
1c0a5671a1 Merge pull request #28863 from mguentner/pybitmessage
pybitmessage dependency fixes & pytools 2016.2.1 -> 2017.4
2017-09-02 08:36:18 +01:00
Jörg Thalheim
34f1024a83 Merge pull request #28872 from disassembler/freewheeling
freewheeling: UNSTABLE -> 0.6.2
2017-09-02 08:28:14 +01:00
Jörg Thalheim
7b20952c04 Merge pull request #28726 from vyp/interception-tools
interception-tools: init at 0.1.1
2017-09-02 08:24:57 +01:00
Jörg Thalheim
a020ca5f35 Merge pull request #28880 from disassembler/glmark2
glmark2: 2016-05-11 -> 2017-09-01
2017-09-02 08:24:20 +01:00
Jörg Thalheim
aa01bed489 Merge pull request #28879 from romildo/vertex-theme
theme-vertex: do not explicitly indicate the gnome version
2017-09-02 08:20:22 +01:00
Jörg Thalheim
16df841ac4 Merge pull request #28881 from romildo/arc-theme
arc-theme: 2016-11-25 -> 2017-05-12
2017-09-02 07:58:35 +01:00
Jörg Thalheim
0cdb1fe055 Merge pull request #28877 from WilliButz/update-freeradius
freeradius: 3.0.14 -> 3.0.15
2017-09-02 07:54:45 +01:00
xd1le
e0b44a09b8 interception-tools: init at 0.1.1
The latest release of libyamlcpp in nixpkgs does not build because it
uses an older version of boost than the one in nixpkgs and therefore
expects a particular header file which does not exist in the latest
boost anymore. For this reason, a later (git) version of libyamlcpp is
used here (which actually doesn't even require boost).

The substituteInPlace in the prePatch phase is needed because libevdev
places its headers in non-standard places, meaning Nix cannot normally
find them. The `cut` command removes the first two "-I" characters from
the output of `pkg-config`. This needs to be in the prePatch phase
because otherwise Nix will patch these lines to `/var/empty`, meaning
you would have less specific replacement (in case other lines are also
patched to `/var/empty`).

I wrote the patch. (I believe it is NixOS specific.)
2017-09-02 16:17:53 +10:00
aszlig
ca1ea69972
python/pyocr: 0.4.6 -> 0.4.7
Upstream changes:

  * Tesseract 4.00.00alpha:
    * Version parsing: Ignore suffix (so '4.00.00alpha' == (4, 0, 0))
    * Libtesseract: Load libtesseract.so.4 instead of libtesseract.so.3
      if available
  * Support for Tesseract 3.05.00:
    * Builders: Split field 'tess_conf' into 'tess_flags' and 'tess_conf'
    * Libtesseract: If available, use
                    TessBaseAPIDetectOrientationScript() instead of
                    TessBaseAPIDetectOS
  * Libtesseract:
    * Workaround: Prevents possible segfault in image_to_string() when
                  the target language is not available

Full upstream change log can be found at:

https://github.com/openpaperwork/pyocr/blob/b006123d1d002711b9/ChangeLog

The tesseract.patch for supporting Tesseract version 3.05.00 has been
applied upstream and we can safely drop it.

We now use substituteInPlace in conjunction with a patch to insert the
relevant store paths instead of sed, so it's less fragile whenever we
have upstream changes in handling of these paths.

I've tested this by reverting 48a941e29f and applying a build
fix patch of Cuneiform 1.1.0 from Arch Linux, because right now
Cuneiform is an experimental version that can't be fixed on behalf of
pyocr (the reason is that pyocr needs to get a list of languages, which
doesn't work in that version anymore).

In addition to that I've successfully built paperwork-backend which by
now is the one package which depends on pyocr. However, I didn't do
runtime tests of Paperwork.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @7c6f434c
2017-09-02 05:31:22 +02:00
romildo
6c84bda496 arc-theme: 2016-11-25 -> 2017-05-12 2017-09-01 23:16:55 -03:00
Samuel Leathers
917a0e3e77 glmark2: 2016-05-11 -> 2017-09-01 2017-09-01 22:01:24 -04:00
romildo
7ef6d3ced9 theme-vertex: do not explicitly indicate the gnome version 2017-09-01 22:54:58 -03:00
aszlig
3086fc7f83
python/pyocr: Move package into python-modules
We already have a patch feeling lonely inside the python-modules
directory and to have everything at one place let's actually move pyocr
into its own dedicated directory so it's easier to patch it up (which
we're going to).

Right now, the package fails to build because of a few test failures, so
I haven't tested this apart from evaluating.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-09-02 03:45:13 +02:00
aszlig
40b76c8809
beets: Run tests for external plugins
In order to run the tests for the external plugins of beets, we need to
have beets itself as a dependency. So in order to do that, we now pass
beets without plugins and tests to the nativeBuildInputs of the plugins
so that we can run them.

As soon as the plugins are built they become part of the final beets,
which also has tests enabled, so disabling the tests for beets
derivation that is used for external plugin tests is a non-issue here
because they're going to be executed anyway.

Enabling tests for the alternatives plugin is pretty straightforward,
but in order to run tests for the copyartifacts plugin, we need to bump
the source code to the latest Git master.

The reason for this is that the version that was in use until now
required to have the beets source directory alongside of the
copyartifacts source code, but we already have beets available as a
normal dependency.

Updating copyartifacts to latest master largely consists of unit test
changes and a few Python 3 compatibility changes. However, one change
has the biggest stat, which is
sbarakat/beets-copyartifacts@1a0c281da0.

Fortunately, the last change is just moving the implementation to a
newer API from upstream beets and by the looks of the implementation it
seems to break support for moving files. However, reverting this commit
also reveals that moving files was already broken before, so it wouldn't
matter much whether we have this version bump or not.

Tested with the following command:

nix-build -E '(import ./. {}).beets.override {
  enableAlternatives = true;
  enableCopyArtifacts = true;
}'

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @domenkozar, @pjones, @Profpatsch, @michalrus
2017-09-02 02:36:32 +02:00
aszlig
bd2aeb4883
beets-alternatives: Disable test suite for now
Regression introduced by 94351197cd.

Running the tests results in the following traceback:
  ...
  File ".../unittest/loader.py", line 91, in loadTestsFromName
    module = __import__('.'.join(parts_copy))
  File ".../test/regrtest.py", line 184, in <module>
    for module in sys.modules.itervalues():
RuntimeError: dictionary changed size during iteration

The reason for this is that the test directory itself is called "test"
and the package including regrtest.py is also called "test", so the
loader tries to load tests from its own implementation.

We could fix this by changing PYTHONPATH and/or making the test
directory a proper package, but we'd still have failing tests because
beets itself is required to run the tests.

However for now I'm just removing the unit_tests kwarg in setup.py so
that we have the same behaviour as before the initially mentioned
commit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-09-02 02:36:28 +02:00
WilliButz
11e92ecca7
freeradius: 3.0.14 -> 3.0.15 2017-09-02 01:13:29 +02:00
Samuel Leathers
232c6a00ce freewheeling: UNSTABLE -> 0.6.2 2017-09-01 17:21:42 -04:00
Michael Raskin
cc44675dfc Merge pull request #28855 from danielfullmer/john-compile-fix
john: workaroud for build failure
2017-09-01 21:55:28 +02:00
Jörg Thalheim
82c493d37c Merge pull request #28860 from dtzWill/fix/clang_34_hardening
clang 3.4: Disable hardening bits (#28543)
2017-09-01 19:36:24 +01:00
Joachim F
189797c795 Merge pull request #28840 from romildo/upd.uget
uget: 2.0.8 -> 2.0.10
2017-09-01 18:20:00 +00:00
Maximilian Güntner
235b63d96c
pybitmessage: add numpy + pyopencl to propagatedBuildInputs 2017-09-01 20:10:50 +02:00
Maximilian Güntner
10e8214b93
pytools: 2016.2.1 -> 2017.4 2017-09-01 20:10:44 +02:00
Jörg Thalheim
e4bc14f6b7 python2Packages.jedi: fix tests 2017-09-01 19:06:49 +01:00
Jörg Thalheim
4a6295e6fb turses: fix build 2017-09-01 18:56:04 +01:00
Jörg Thalheim
8f932af263 python.pkgs.requests-oauthlib: fix source hash
Was accidentally broken during merge.
2017-09-01 18:22:52 +01:00
Will Dietz
cc45a96aea clang_34: Disable hardening bits (#28543) 2017-09-01 12:08:25 -05:00
wisut hantanong
86587ea95b nodePackages.live-server : init at 1.2.0
fixes #28813
2017-09-01 16:47:11 +01:00
aszlig
7f99876f50
conky: Don't enable nvidiaSupport by default
This has been introduced in 6a6fb6d31c.

Relying on non-free software by default is probably a bad idea. Apart
from the fact that (sane) people usually don't want to have it sitting
on their system even people who don't care will have to set
"allowUnfree" to true in order to install conky.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @canndrew, @Mic92
2017-09-01 17:35:17 +02:00
Jörg Thalheim
6443915b07 Merge pull request #28853 from disassembler/espeak
Espeak gcc6 build fixes
2017-09-01 16:14:43 +01:00
Daniel Fullmer
28b1170f49 john: workaroud for build failure 2017-09-01 11:05:01 -04:00
zimbatm
101ccc0629 terraform: providers list (#28818)
* terraform: move plugin index

* terraform: introduce update script for plugins

* terraform: update provider list
2017-09-01 15:49:24 +01:00
Samuel Leathers
b2fd2a8100 espeakedit: fix build with gcc6 2017-09-01 10:47:04 -04:00
Samuel Leathers
6c1364712a espeak-classic: fix build with gcc6 2017-09-01 10:46:48 -04:00
Peter Simons
88bb678bab Merge pull request #28827 from mpickering/ghc-head-updates
ghcHEAD updates
2017-09-01 16:26:08 +02:00
romildo
1f48ad8699 uget: 2.0.8 -> 2.0.10
- Update to version 2.0.10
- Use wrapGAppsHook to wrap binaries
- Use gstreamer-1.0
- Add dependence on libappindicator
2017-09-01 11:22:28 -03:00
Matthew Pickering
d1ce5b69c0 ghcHEAD: Add new boot packages to configuration file 2017-09-01 13:49:56 +00:00
Matthew Pickering
d13f7c54e3 Use older version of jailbreak-cabal with ghcHEAD
See https://github.com/peti/jailbreak-cabal/issues/13
2017-09-01 13:49:56 +00:00
Jörg Thalheim
b2e7e231ec Merge pull request #28825 from disassembler/crrcsim
crrcsim: build with gcc6
2017-09-01 14:13:21 +01:00
Jörg Thalheim
e316930b77 Merge pull request #28824 from mguentner/pybitmessage
pybitmessage: 0.4.4 -> 0.6.2
2017-09-01 14:12:19 +01:00
Samuel Leathers
6bc775cdf6 crrcsim: build with gcc6 2017-09-01 08:56:30 -04:00
Maximilian Güntner
e9203772f2
pybitmessage: replace find_library() calls with paths
fixes requested changes in #26616
2017-09-01 14:51:48 +02:00
shak-mar
e3d7c4ca19
pybitmessage: 0.4.4 -> 0.6.2
squashed hashes:
3ee20b2de7c02761aeb7389821f31bbfb6626301
b9a3a3b6a25b998893a1d861849890792b9e664b

(details -> #26616)
2017-09-01 14:49:56 +02:00
Jörg Thalheim
4ae12f099d Merge pull request #28823 from disassembler/crda
crda: fix build with gcc6
2017-09-01 13:48:54 +01:00
Samuel Leathers
e92f5b54fb crda: fix build with gcc6 2017-09-01 08:37:50 -04:00
Roman Volosatovs
94649061c8
mopidy-iris: 3.2.0 -> 3.3.3 2017-09-01 14:22:31 +02:00
Gabriel Ebner
52eb0e0fbd gnome3.dconf-editor: include gsettings_desktop_schemas 2017-09-01 13:07:39 +02:00
Vladimír Čunát
017561209e
chromium: try to hack around Hydra problems
Discussion: https://github.com/NixOS/nixpkgs/commit/e8f1ddcbd1d
2017-09-01 12:24:47 +02:00
Jörg Thalheim
7b6251b4dc Merge pull request #28814 from loskutov/grml-zsh-unix
grml-zsh-config: generalize support to unix systems
2017-09-01 10:44:08 +01:00