Commit Graph

39571 Commits

Author SHA1 Message Date
Frederik Rietdijk
71670376bc python.pkgs.yamllint: fix build 2017-09-07 09:28:04 +02:00
Frederik Rietdijk
a2b8f39d63 python.pkgs.ftfy: disable Python 2 2017-09-07 09:28:03 +02:00
Frederik Rietdijk
a4129e7b9e python.pkgs.passlib: 1.6.5 -> 1.7.1 2017-09-07 09:28:03 +02:00
Frederik Rietdijk
8d7e8a6720 python.pkgs.passlib: move to own file 2017-09-07 09:28:03 +02:00
Frederik Rietdijk
6d3f5cb409 python.pkgs.flask: disable tests 2017-09-07 09:28:03 +02:00
Frederik Rietdijk
b1504b444b conan: 0.21.2 -> 0.26.2, and fix build 2017-09-07 09:28:03 +02:00
Frederik Rietdijk
c4ec44e4d7 python.pkgs.pylint: use fetchPypi 2017-09-07 09:28:03 +02:00
Frederik Rietdijk
6bbc2e09da python.pkgs.astropy: fix build 2017-09-07 09:28:03 +02:00
Frederik Rietdijk
c7299ea37b python.pkgs.koji: fix build 2017-09-07 09:28:03 +02:00
Frederik Rietdijk
79257d28e8 python.pkgs.zetup: 0.2.42 -> 0.2.34
downgrade because the previous upgrade broke the package. The latest
version requires a setuptools bump which we won't do yet.
2017-09-07 09:28:03 +02:00
Jean-Philippe Bernardy
d51bd36646 cudnn: add 6.0 2017-09-07 09:28:03 +02:00
Jean-Philippe Bernardy
2489a0aca7 protobuf: add 3.3 2017-09-07 09:28:03 +02:00
Jean-Philippe Bernardy
70de5af18c pythonPackages.backports_weakref: init 1.0rc1 2017-09-07 09:28:03 +02:00
Lancelot SIX
2c3cc4e921 pythonPackages.django: 1.11.4 -> 1.11.5
Fixes CVE-2017-12794
See https://docs.djangoproject.com/en/1.11/releases/1.11.5/
2017-09-07 09:28:03 +02:00
Alex Brandt
637ccde435 python.pkgs.behave: init at 1.2.5 2017-09-07 09:28:03 +02:00
Alex Brandt
83dbb41aed pythonPackages.parse-type: init at 0.3.4 2017-09-07 09:28:03 +02:00
Alex Brandt
f06d7bd125 pythonPackages.pyhamcrest: init at 1.9.0 2017-09-07 09:28:03 +02:00
Alex Brandt
4934a4d553 pythonPackages.parse: init at 1.6.6 2017-09-07 09:28:03 +02:00
betaboon
7e7f91d23a pythonPackages.serpy: init at 0.1.1 2017-09-07 09:28:03 +02:00
betaboon
3836ee50e3 pythonPackages.sampledata: init at 0.3.7 2017-09-07 09:28:03 +02:00
betaboon
007313d044 pythonPackages.psd-tools: init at 1.4 2017-09-07 09:28:03 +02:00
betaboon
4b4e05c6ec pythonPackages.premailer: init at 3.0.1 2017-09-07 09:28:03 +02:00
betaboon
820aa5fef9 pythonPackages.marshmallow-sqlalchemy: init at 0.13.1 2017-09-07 09:28:02 +02:00
betaboon
7a33723155 pythonPackages.fn: init at 0.4.3 2017-09-07 09:28:02 +02:00
betaboon
b696d6c90d pythonPackages.marshmallow: init at 2.13.5 2017-09-07 09:28:02 +02:00
betaboon
d3fc82d81b pythonPackages.flask-marshmallow: init at 0.8.0 2017-09-07 09:28:02 +02:00
betaboon
63d57bf246 pythonPackages.flask-mail: init at 0.9.1 2017-09-07 09:28:02 +02:00
betaboon
3ac8eed5fd pythonPackages.djmail: init at 1.0.1 2017-09-07 09:28:02 +02:00
betaboon
d18f4dcba3 pythonPackages.django-sr: init at 0.0.4 2017-09-07 09:28:02 +02:00
betaboon
e55f5fe4bc pythonPackages.django-sites: init at 0.9 2017-09-07 09:28:02 +02:00
betaboon
f69a072f5b pythonPackages.django-sampledatahelper: init at 0.4.1 2017-09-07 09:28:02 +02:00
betaboon
48855344c4 pythonPackages.django-picklefield: init at 0.3.2 2017-09-07 09:28:02 +02:00
betaboon
28e186f429 pythonPackages.django-pglocks: init at 1.0.2 2017-09-07 09:28:02 +02:00
betaboon
b80cb36cde pythonPackages.django-jinja: init at 2.2.2 2017-09-07 09:28:02 +02:00
betaboon
0b2fc117c1 pythonPackages.easy-thumbnails: init at 2.4.1 2017-09-07 09:28:02 +02:00
betaboon
c7031704f5 pythonPackages.django-ipware: init at 1.1.6 2017-09-07 09:28:02 +02:00
betaboon
3909871991 pythonPackages.pyjwkest: init at 1.3.2 2017-09-07 09:28:02 +02:00
betaboon
4fe7f3e561 pythonPackages.pycryptodomex: init at 3.4.5 2017-09-07 09:28:02 +02:00
betaboon
6d9ec9efcf pythonPackages.diff-match-patch: init at 20121119 2017-09-07 09:28:02 +02:00
betaboon
f89fd55833 pythonPackages.asana: init at 0.6.2 2017-09-07 09:28:02 +02:00
betaboon
712942dea3 pythonPackages.aioamqp: init at 0.10.0 2017-09-07 09:28:02 +02:00
Matthieu Coudron
f31c6c150a python.pkgs.secretstorage: init at 2.3.1 2017-09-07 09:28:02 +02:00
mingchuan
ea0c1c1bfd pythonPackages.coveralls: Add missing dependencies to fix build 2017-09-07 09:28:02 +02:00
mingchuan
4c183f4b42 pythonPackages.urllib3: Fix buildInputs and meta.description 2017-09-07 09:28:02 +02:00
Daiderd Jordan
51eafbe028
ucl: only pass -stc=c90 when using gcc
Also remove -fPIC, it's included in the hardening flags by default.
2017-09-06 21:45:38 +02:00
Frederik Rietdijk
dcbf59d8a7 python.pkgs.pytest-warnings: fix homepage, fixes eval 2017-09-06 20:17:31 +02:00
Daiderd Jordan
57ef1a3564
go: fix darwin build 2017-09-06 19:45:10 +02:00
Peter Simons
a89d69a867 Merge pull request #28918 from cocreature/natural-transformations
haskell/natural-transformation: add dependency on semigroups for GHC 7.10
2017-09-06 19:42:19 +02:00
Joachim F
8eb195d0da Merge pull request #28852 from Balletie/fix/rtags-configure-prefix
rtags: Fix configure phase errors
2017-09-06 14:45:39 +00:00
Frederik Rietdijk
67651d80bc Merge pull request #28884 from FRidh/python-fixes
Python: several fixes
2017-09-06 13:54:10 +02:00
Michael Raskin
6f740953e6 silgraphite: drop graphite1 (which had version 2.x) 2017-09-06 13:46:16 +02:00
Michael Raskin
f20ccd4b5e pythonPackages.wptserve: make python2-only (upstream uses relative import in the latest release) 2017-09-06 13:46:16 +02:00
Michael Raskin
cca09d8067 pythonPackages.manifestparser: make python2-only 2017-09-06 13:46:16 +02:00
Peter Simons
89f5d52cf4 Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out"
This reverts commit dfb0f25484, reversing
changes made to 7f8ff02437. These changes broke
the ghcWithPackages wrapper:

    nix-shell -p "haskellPackages.ghcWithPackages (ps: [ps.mtl])" --run "ghc-pkg list mtl"
    /nix/store/szz84j5k1dy3jdashis6ws28d8l8zxxb-ghc-8.0.2-with-packages/lib/ghc-8.0.2/package.conf.d
        (no packages)
2017-09-06 10:19:18 +02:00
Peter Simons
f2a76b6c29 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.5-6-g83a4cb0 from Hackage revision
6bd6c397f5.
2017-09-06 10:19:12 +02:00
Peter Simons
e1a67915f8 haskell-happy: use 1.19.7 version (despite lts-9) to fix test suite failure 2017-09-06 10:17:46 +02:00
Peter Simons
b2bff7e8ae LTS Haskell 9.3 2017-09-06 09:58:46 +02:00
Jörg Thalheim
8e37e744d2 Merge pull request #29036 from andir/update-rustup1.3.0
rustup: 1.2.0 -> 1.3.0
2017-09-06 00:23:31 +01:00
Daiderd Jordan
d0d905668c
haskell-hscolour: fix darwin build 2017-09-05 22:56:09 +02:00
Charles Strahan
3189b01647
go: init 1.9 (and set as default) 2017-09-05 16:44:13 -04:00
Andreas Rammhold
14c3ce919b
rustup: 1.2.0 -> 1.3.0 2017-09-05 22:27:30 +02:00
Daiderd Jordan
0adb83e2a2 Merge pull request #28998 from LnL7/libstdcxx-hook
libstdc++: add setup-hook
2017-09-05 21:40:31 +02:00
Daiderd Jordan
907222098a
clang-stdenv: use libstdcxxHook when targeting linux 2017-09-05 21:37:06 +02:00
Samuel Leathers
402e6ac089
libfpx: fix build with gcc6 2017-09-05 21:29:10 +02:00
Franz Pletz
1bed4773f5
postgresql92: remove last references 2017-09-05 18:20:56 +02:00
Jörg Thalheim
2df594e044 Merge pull request #28971 from disassembler/libctemplate
libctemplate: remove 2.2
2017-09-05 16:44:17 +01:00
Jörg Thalheim
4fd3afa80b Merge pull request #29021 from frontsideair/flow-49-54
flow: 0.49.1 -> 0.54.0
2017-09-05 15:06:35 +01:00
Samuel Leathers
4151e2f579 herqq: 1.0.0 -> 2.1.0 2017-09-05 15:15:48 +02:00
Fatih Altinok
ec39670290 flow: 0.49.1 -> 0.54.0 2017-09-05 16:03:37 +03:00
Robin Gloster
8502d94b31
jenkins: 2.73 -> 2.77 2017-09-05 14:42:46 +02:00
Laure Tavard
bf491f8794 cdo: init at 1.7.2 (#22496) 2017-09-05 13:40:20 +01:00
Franz Pletz
85cffcfce0
ffmpeg_2_8: 2.8.11 -> 2.8.13 2017-09-05 14:24:59 +02:00
Franz Pletz
b1e9eff33e
libav_12: 12 -> 12.1 2017-09-05 14:24:59 +02:00
Franz Pletz
3352cfc597
capnproto: 0.6.0 -> 0.6.1 2017-09-05 14:24:59 +02:00
Franz Pletz
c6e5fc0b36
babeltrace: 1.2.4 -> 1.5.3 2017-09-05 14:24:58 +02:00
Franz Pletz
0c08a18f19
avro-cpp: 1.8.1 -> 1.8.2 2017-09-05 14:24:58 +02:00
Franz Pletz
1c4d28539f
autoconf-archive: 2016.09.16 -> 2017.03.21 2017-09-05 14:24:57 +02:00
Peter Hoeg
a147306cc3 Merge pull request #28828 from peterhoeg/u/kt5
ktorrent: 5.0.1 -> 5.1.0
2017-09-05 18:40:16 +08:00
Peter Hoeg
82e0b910e7 libktorrent: 2.0.1 -> 2.1 2017-09-05 18:26:43 +08:00
Peter Simons
1357268b90 Merge pull request #28478 from obsidiansystems/haskell-custom-stdenv
haskell infra: Make sure packages get custom stdenv
2017-09-05 11:14:57 +02:00
Kamil Chmielewski
b80c3646c2 ponyc: 0.18.1 -> 0.19.0
https://github.com/ponylang/ponyc/issues/2209
2017-09-05 10:49:24 +02:00
Jörg Thalheim
598d6481d8 Merge pull request #28953 from knedlsepp/add-geopandas
pythonPackages.geopandas: init at 0.3.0
2017-09-05 08:45:23 +01:00
Jörg Thalheim
e1eb89e3e1 python.pkgs.cligj: enable tests 2017-09-05 08:42:53 +01:00
Jörg Thalheim
85011d7084 python.pkgs.shapely: fix library extension
there was one dot too much
2017-09-05 08:38:02 +01:00
Jörg Thalheim
1dbe68a5e8 python.pkgs.geopandas: fix tests 2017-09-05 08:20:30 +01:00
Peter Simons
dfb0f25484 Merge pull request #27209 from nc6/nc/haskell-multiple-out
Enable multiple outputs for haskell packages.
2017-09-05 09:11:19 +02:00
Michele Catalano
e783c2b39c nexus: 2.12.0-01 -> 3.5.1-02
Update Nexus to version 3.5.1-02 and fix startup stript to run in nix
environment.
2017-09-04 22:32:02 +02:00
Josef Kemetmueller
05ac3f9520 pythonPackages.geopandas: init at 0.3.0 2017-09-04 22:23:41 +02:00
Josef Kemetmueller
aad9a691ab pythonPackages.fiona: init at 1.7.9 2017-09-04 22:23:40 +02:00
Josef Kemetmueller
f039bb6b4e pythonPackages.descartes: init at 1.1.0 2017-09-04 22:23:40 +02:00
Josef Kemetmueller
4d70d53618 pythonPackages.cligq: init at 0.4.0 2017-09-04 22:23:39 +02:00
Josef Kemetmueller
d25edeb3ee pythonPackages.click-plugins: init at 1.0.3 2017-09-04 22:23:39 +02:00
Michael Raskin
f01f86c5ca lispPackages.query-fs: Kill build-with-lisp.sh reference 2017-09-04 21:39:07 +02:00
Michael Raskin
674c3c6bdd lispPackages: add clsql-postgresql* 2017-09-04 21:39:07 +02:00
Michael Raskin
e0771b0a04 quicklisp-to-nix: make it possible to run with Nix sandboxing enabled 2017-09-04 21:39:07 +02:00
Daiderd Jordan
0ea92a3c24
libstdc++: add setup-hook 2017-09-04 21:07:05 +02:00
Piotr Bogdan
fc391e7ecd mps: 1.115.0 -> 1.116.0
1.115.0 doesn't build with gcc6
2017-09-04 20:14:57 +03:00
Samuel Leathers
896f0daa1a libctemplate: remove 2.2 2017-09-04 09:14:57 -04:00
Samuel Leathers
e11c7399a0 webkitgtk-2.17: init at 2.17.91 2017-09-04 08:25:08 -04:00
Nicholas Clarke
eb99d3a670 Fix git-annex. 2017-09-04 12:35:58 +01:00
Nicholas Clarke
be90e9aa31 Fix broken rebase. 2017-09-04 12:35:58 +01:00
Nicholas Clarke
414a557904 Add specific overrides for a number of failing packages.
Finish overriding bin output for broken packages.

Put stack bash completions in $bin.
2017-09-04 12:35:58 +01:00
Nicholas Clarke
77cfb96fb1 Fix hastache build error.
`hastache` has no binary output but for `mkReadme`, so disable the
separate bin output and keep removing the `mkReadme`.
2017-09-04 12:35:57 +01:00
Nicholas Clarke
330d874ee3 Disable separate etc output for hscolour.
This is not needed, since `hscolour` has no output to `/etc`, and it
breaks certain old builds (see https://hydra.nixos.org/build/57925511)
because the older cabal used does not understand this flag.
2017-09-04 12:35:57 +01:00
Nicholas Clarke
a1d78fa5bc Don't build separate bin output for alex.
It has files in /usr/share which reference the bin output.
2017-09-04 12:35:57 +01:00
Nicholas Clarke
8c642d5937 Provide hscolour, happy, alex bin to buildInputs.
Use stdenv.lib.getBin instead of `.bin`
2017-09-04 12:35:57 +01:00
Nicholas Clarke
676362494d Enable multiple outputs for Haskell packages. 2017-09-04 12:35:57 +01:00
Michael Raskin
8f154c139a Merge pull request #28949 from pbogdan/allegro-fix-build
allegro: fix sandboxed build with nixUnstable
2017-09-04 07:39:37 +02:00
Vincent Laporte
ebce795c5c coqPackages: remove duplication in mkCoqPackages 2017-09-04 02:39:49 +00:00
Vladimír Čunát
b41d33319c
Merge #28946: nixos doc: update glibc locales link 2017-09-03 23:03:16 +02:00
John Wiegley
14d915e395 Merge pull request #28902 from vbgl/quickchick
coqPackages.QuickChick: fix
2017-09-03 13:51:39 -07:00
Daiderd Jordan
86696e07c7 Merge pull request #28868 from matthewbauer/xcbuild-fix-sdk
xcbuild: fix sdk dir name issue
2017-09-03 21:34:46 +02:00
Piotr Bogdan
e22a77217d allegro: fix sandboxed build with nixUnstable
In Nix 1.12 sandboxed builds are performed in /build/ directory which conflicts
with the regex in docs/CMakeLists.txt, and generated documentation ends up in
wrong directory -> https://hydra.nixos.org/build/53914969/nixlog/1 -> CTRL-F
abi.txt
2017-09-03 19:32:35 +01:00
Orivej Desh
7803d69b78 nixos: update glibc locales link 2017-09-03 18:00:35 +00:00
jamtrott
c8c0cd4d6c petsc: init at 3.7.6 (#28368)
* petsc: init at 3.7.6

* petsc: use configureFlagsArray

* petsc: Remove unneeded binaries
2017-09-03 17:11:16 +01:00
Michael Alan Dorman
2bbab078fb haskell-taggy: include upstream patch to fix build 2017-09-03 16:29:56 +02:00
Peter Simons
813d907b1d haskell-filelock: disable test suite to fix build 2017-09-03 16:29:45 +02:00
Peter Simons
b9edab7a17 haskell-sbv: fix build 2017-09-03 16:29:37 +02:00
Peter Simons
2a71b5c313 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.5-4-ge5c3d07 from Hackage revision
4a71559e57.
2017-09-03 16:29:32 +02:00
Franz Pletz
2f48144d0e
gitlab: 9.4.5 -> 9.5.2 2017-09-03 15:50:52 +02:00
Jaakko Luttinen
67b3f4bc4b pythonPackages.bayespy: init at 0.5.10 (#28919)
* pythonPackages.bayespy: init at 0.5.10

* python.pkgs.bayespy: fix more tests by using unicode locale
2017-09-03 10:37:50 +01:00
Vladimír Čunát
53998f5036
treewide: purge explicit usage of gcc6
It's now the default. /cc #19456
This makes a real build simplification, because in our current
bootstrapping+aliases, `gcc6` attribute is not the default compiler
but a derivation *built by* the default compiler.

nix-exec didn't build before this commit already
2017-09-03 09:57:20 +02:00
Vincent Laporte
4ee717d2d3 libvirt: fix build on darwin 2017-09-03 07:24:49 +00:00
Vincent Laporte
3c5436921e ocamlPackages.ptmap: 2.0.1 -> 2.0.2 2017-09-03 06:45:34 +00:00
Moritz Kiefer
243952d9d4 haskell/natural-transformation: add dependency on semigroups for GHC 7.10 2017-09-03 07:50:40 +02:00
Shea Levy
35f89413e2 fwupd: bump 2017-09-02 20:00:20 -04:00
Robin Gloster
0156db2da5
Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-02 23:29:04 +02:00
Robin Gloster
891a1662aa
bundler: 1.15.3 -> 1.14.6
bundler 1.15 breaks gitlab
2017-09-02 23:24:16 +02:00
Michael Raskin
7bba4a169e Merge pull request #28908 from tohl/master
sbcl updated, tested on nixos x86_64
2017-09-02 23:05:34 +02:00
Michael Raskin
7da8192959 : 2.2.0 -> 2.3.0 2017-09-02 22:51:57 +02:00
Tomas Hlavaty
fd7aa385e1 sbcl: 1.3.20 -> 1.3.21 2017-09-02 22:46:43 +02:00
Joachim Fasting
004463152a
tinycc: 0.9.27pre-20170710 -> 0.9.27pre-20170821 2017-09-02 22:38:06 +02:00
Michael Raskin
a13734d666 Merge pull request #28901 from womfoo/fix/libpt-and-opal
fix gcc6 builds for libpt and opal
2017-09-02 20:25:24 +02:00
Kranium Gikos Mendoza
776d149c76 opal: fix gcc6 build 2017-09-03 04:05:57 +10:00
Kranium Gikos Mendoza
377b42a8ad ptlib: use fetchpatch 2017-09-03 04:05:57 +10:00
Kranium Gikos Mendoza
32d4a3dec8 ptlib: fix gcc6 build 2017-09-03 03:51:44 +10:00
Tim Steinbach
aa59865333
sbt: 1.0.0 -> 1.0.1 2017-09-02 12:54:50 -04:00
Michael Raskin
522a03cde6 Merge pull request #28810 from bradleyjensen/update-quicklisp
Overhaul quicklisp-to-nix
2017-09-02 18:23:34 +02:00
Vincent Laporte
9b9d3743ce coqPackages.QuickChick: fix
Use the most recent versions of branches coq8.4pl6 and coq8.5-legacy
with the corresponding versions of Coq.

Use a two month old version with Coq-8.6 to avoid issue #45:
https://github.com/QuickChick/QuickChick/issues/45
2017-09-02 15:33:16 +00:00
Tim Steinbach
440bf7e06f Merge pull request #28780 from NeQuissimus/openjdk_8_144_01
openjdk: 8u152-04 -> 8u144-01
2017-09-02 11:07:41 -04:00
Bjørn Forsman
2cf1b94b82 pythonPackages.pyrtlsdr: unbreak build
pyrtlsdr needs pandoc at build time. Fixes the build since commit
f6eb190e70
("python.pkgs.pyrtlsdr: disable tests to fix build"). (That commit
bumped the package to a new version.)
2017-09-02 16:47:57 +02:00
Joachim Fasting
b3f9b0d0cc
libgcrypt: fix typo in meta.description 2017-09-02 15:56:51 +02:00
Domen Kožar
991654fa4a haskell: add combinator to enable DWARF debugging
Tested using:

$ cat test-strip.nix
with (import ./. {});
with haskell.lib;

haskell.packages.ghc802.override {
  overrides = self: super: {
    microlens = enableDWARFDebugging super.microlens;
  };
}

$ nix-build -A microlens test-strip.nix
$ objdump -t <path-to-so-file>
2017-09-02 11:25:50 +01:00
Austin Seipp
54ae0aa1b0 z3_opt: remove and replace with z3
Z3 has supported optimization features since the 4.4.x release, so this can be
removed.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-09-02 04:19:11 -05:00
Austin Seipp
cd7b2ec77a yosys: 2016.11.25 -> 2017.09.01
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-09-02 04:19:11 -05:00
Austin Seipp
32297e1baf arachne-pnr: 2016.08.18 -> 2017.06.29, license switch
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-09-02 04:19:11 -05:00
Austin Seipp
e3bc5171df icestorm: 2016.11.01 -> 2017.08.31
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-09-02 04:19:11 -05: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
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
Matthew Bauer
f8f3384638
xcbuild: fix sdk dir name issue
Previously, this error was coming up in xcbuild:

ld: malformed 32-bit x.y.z version number: 1068638

It’s an interesting error because it only happens with certain hashes for the
nixpkgs sdk. For instance, on latest nixpkgs unstable channel, the hash for the
xcbuild sdk is:

/nix/store/w6mwbdaz9calyii0fyxspl51f1068638-nix.nixpkgs.sdk

that is an issue we pass -isysroot ${sdk} to clang where it will interpret that
hanging "1068638". It would probably go away as soon as the hash changes but
this hacky fix will solve the problem.
2017-09-01 15:11:12 -05:00