Commit Graph

26126 Commits

Author SHA1 Message Date
Peter Simons
07542d12ea hoogle: use $NIX_BUILD_CORES to determine the proper level of parallelism for database creation 2015-09-02 16:28:01 +02:00
Eelco Dolstra
f0e67b927f Merge pull request #9602 from bjornfor/ffmpeg-full-name
ffmpeg-full: align pkgname with attrname
2015-09-02 16:11:31 +02:00
Peter Simons
90c163bde0 hackage-packages.nix: update to 23452bdddd with hackage2nix v20150824-65-g80afb21 2015-09-02 12:44:02 +02:00
Peter Simons
c456073e03 Disable test suites of Haskell packages RSA and kademlia.
Those test suites run for 2+ hours and thus fail with a timeout error.
2015-09-02 12:29:00 +02:00
Bjørn Forsman
6483cf1d91 ffmpeg-full: align pkgname with attrname
Without this, users are presented with this endless loop:

  $ ffplay
  The program ‘ffplay’ is currently not installed. You can install it by
  typing:
    nix-env -i ffmpeg
  $ nix-env -i ffmpeg
  $ ffplay
  The program ‘ffplay’ is currently not installed. You can install it by
  typing:
    nix-env -i ffmpeg
2015-09-02 12:14:40 +02:00
Bjørn Forsman
c54d939d6d freenect: cosmetic (2 space indents) 2015-09-02 10:28:16 +02:00
Thomas Strobel
616aa2bdda ocaml modules: fix some CamelCase and under_scores 2015-09-02 09:14:59 +02:00
Vladimír Čunát
2dccca399c libunwind: security fix for CVE-2015-3239
Thanks to the monitor. Low security and high rebuild impact, but still...
2015-09-02 05:23:55 +02:00
Bjørn Forsman
fe85ba5806 opencv3: unbreak build (set "-DWITH_IPP=OFF")
OpenCV tries to download IPP itself at build time. That doesn't work
well with nix.
2015-09-01 22:23:47 +02:00
Vladimír Čunát
0327ee3f8e libevent: remove unused vulnerable 1.4.x version 2015-09-01 21:37:40 +02:00
Peter Simons
2b71e4643e haskell-bloomfilter: patch to fix build on 32 bit platforms 2015-09-01 18:02:50 +02:00
Peter Simons
8c1c38ee27 haskell-bloomfilter: re-enable 32-bit builds to verify whether the issue has in fact been fixed upstream 2015-09-01 17:55:03 +02:00
Peter Simons
64629ec611 hackage-packages.nix: update to 53c766e346 with hackage2nix v20150824-62-gb54260a 2015-09-01 17:55:03 +02:00
Peter Simons
c30410e2dc hackage-packages.nix: update to e6301b9ed8 with hackage2nix v20150824-58-g80c45f8 2015-09-01 16:59:06 +02:00
Carles Pagès
b4ad13f667 opencv: add version 3.0
Adding as a separate expression, as it is not api compatible with 2.x.
2015-09-01 14:53:32 +02:00
Vladimír Čunát
5d5c053f68 libvdpau: security update 1.1 -> 1.1.1
CVE-2015-{5198,5199,5200}
2015-09-01 13:27:12 +02:00
Eelco Dolstra
6cadec8906 ant: Update to 1.9.6 2015-09-01 12:00:04 +02:00
William A. Kennington III
04fe1dfe3a accelio: 2015-07-28 -> 2015-08-30 2015-09-01 00:26:20 -07:00
Vincent Laporte
e94ddc290d ocaml-bitstring: fix typo in Makefile 2015-09-01 06:43:37 +02:00
Tobias Geerinckx-Rice
cfe12c7edd yodl: Sourceforge -> (fetchFrom)GitHub
Cosmetic tweaks; maintain.

CC@ pSub
2015-09-01 05:42:12 +02:00
Tobias Geerinckx-Rice
687d60ec73 icmake: Sourceforge -> (fetchFrom)GitHub
Also add myself as a maintainer.

CC@ pSub
2015-09-01 05:28:53 +02:00
Tobias Geerinckx-Rice
7e4675cb00 bobcat: 3.25.02 -> 4.00.00 2015-09-01 05:28:53 +02:00
Tobias Geerinckx-Rice
f4193da388 flexc++: 2.02.00 -> 2.03.00
Good-bye Sourceforge, hello (fetchFrom)GitHub. Please stay nice.
2015-09-01 03:28:19 +02:00
Tobias Geerinckx-Rice
328f68cb7e libpsl: list 2015-08-07 -> 2015-08-27
Use fetchFromGitHub for both list and library, removing fetchurl.
2015-08-31 23:59:16 +02:00
Peter Simons
4a8797d827 haskell-generic-builder: stop pre-pending "haskell-" to package names
A derivation of the Hackage package "foo" is called "haskell-foo" if it is a
library, but only "foo" if it is an executable (without a library). This
distinction used to be fine when Haskell packages where visible to operations
like "nix-env -qa" or "nix-env -i", but after our switch to Haskell NG it has
no more purpose. Consequently, this patch removes the name prefix from all
Haskell packages -- every Haskell package is now called exactly like it's
called on Hackage.

Closes https://github.com/NixOS/nixpkgs/pull/9538.
2015-08-31 16:50:12 +02:00
Peter Simons
dea5d87e42 ghc-7.10.2: enable documentation builds by passing the required XML/XSLT toolchain
Closes https://github.com/NixOS/nixpkgs/issues/9265.

Also, pass a hscolour binary to get source code links in the generated Haddock
documentation: closes https://github.com/NixOS/nixpkgs/issues/2985.
2015-08-31 16:49:37 +02:00
Peter Simons
de2c043d5f ghc: install bash completion shipped in version 7.10.x and later
Addresses one half of https://github.com/NixOS/nixpkgs/issues/9265.
2015-08-31 16:49:00 +02:00
Peter Simons
c7a9fa11c0 haskell-DSA fails its test suite. 2015-08-31 16:46:39 +02:00
Peter Simons
d7055b15b7 ghc: drop obsolete version 7.10.1
The new 7.10.2 version works fine.
2015-08-31 16:46:39 +02:00
Peter Simons
34687b53e6 haskell-amazonka-core: test suite build failure has been fixed upstream 2015-08-31 16:46:39 +02:00
Peter Simons
0059984294 haskell-MFlow: build fixed upstream 2015-08-31 16:46:39 +02:00
Peter Simons
82160f77a3 hackage-packages.nix: update to 9ef9917fdb with hackage2nix v20150824-49-gbeb4fa1 2015-08-31 16:46:36 +02:00
Mateusz Kowalczyk
b263ca0208 Merge pull request #9513 from andrewrk/ffmpeg-2.7.2
ffmpeg: 2.7.1 -> 2.7.2
2015-08-31 14:07:27 +01:00
Austin Seipp
23b16c8d19 nixpkgs: mono 4.0.2.5 -> 4.0.3.20
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-31 03:17:17 -05:00
Peter Simons
5a961f4e84 Merge pull request #9568 from dfoxfranke/haskell-lucid
haskell-lucid: disable tests
2015-08-31 10:16:51 +02:00
Daniel Fox Franke
76a497c95e haskell-comonad: re-enable tests
https://github.com/ekmett/comonad/issues/25 is fixed now and they
work again.
2015-08-30 22:19:36 -04:00
Daniel Fox Franke
cf3e2a5f5b haskell-lucid: disable tests
They buggily make assumptions about the order in which strings appear
in a hash table and thereby fail on i686-linux. See
http://hydra.nixos.org/build/25132604/log/raw and
https://github.com/chrisdone/lucid/issues/25
2015-08-30 21:46:09 -04:00
Domen Kožar
83b5a75d94 nettle27: remove uneeded package superseeded by 3.x
(cherry picked from commit b4b6b914c45061b403e1d0db2858f44d7776e65e)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-08-31 00:07:55 +02:00
Thomas Tuegel
5d57d8244a Merge pull request #9427 from henrytill/racket-6.2.1
racket: 6.2 -> 6.2.1
2015-08-30 13:56:54 -05:00
William A. Kennington III
b3d5a11b5b lmbd: 0.9.15 -> 0.9.16 2015-08-30 10:57:16 -07:00
William A. Kennington III
d4fc051c06 jemalloc: 3.6.0 -> 4.0.0 2015-08-30 10:57:16 -07:00
Peter Simons
78f1720532 haskell-lib: make sdistTarball and buildStrictly functions fuzzier to cope with Hydra builds
In Hydra CI environments, the version strings we get from Hydra don't
necessarily match those hard-coded into the Cabal files. To make those builds
succeed anyway, we have to apply some pattern matching.
2015-08-30 15:20:21 +02:00
Peter Simons
b2c3c58476 cabal2nix: add myself as a maintainer 2015-08-30 12:49:45 +02:00
Aycan iRiCAN
523cd395c7 cabal2nix: fixed sha256 hash 2015-08-30 11:47:25 +03:00
William A. Kennington III
043839368e goPackages: Exclude commonly useless go packages from being built 2015-08-29 19:10:24 -07:00
William A. Kennington III
ba7335700a nghttp2: 1.1.2 -> 1.2.1 2015-08-29 18:19:38 -07:00
Thomas Tuegel
e9a8c5a988 Merge pull request #9524 from bjornfor/qt5-mkspecs-libgl
qt5: embed path to mesa (libGL) in Qt mkspecs file
2015-08-29 18:11:15 -05:00
Thomas Tuegel
fc0baf0ebe Merge pull request #9343 from akaWolf/qtcreator
qtcreator: refactor for using qt54; qt4SDK, qt5SDK: commented
2015-08-29 18:10:27 -05:00
Thomas Tuegel
b873f5bd62 Add qtEnv 2015-08-29 17:47:49 -05:00
ro6
3207b9f70f urweb: 20150520 -> 20150819 2015-08-29 23:41:22 +02:00
William A. Kennington III
26f9ea6dd5 goPackages: Fix tools 2015-08-29 13:25:00 -07:00
Bjørn Forsman
06ed82677a qt5: embed path to mesa (libGL) in Qt mkspecs file
Fixes this problem, when building apps in QtCreator:

  ...(compile output window)
  g++ -Wl,-rpath,/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \
      -o qt-test3 main.o mainwindow.o moc_mainwindow.o \
      -L/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \
      -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread
  /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lGL
  collect2: error: ld returned 1 exit status

mesa is already in the closure of Qt, so there is no size increase.
The patch is copied into both qt-5.3 and qt-5.4 directories, like other
patches are.

Note that programs still can _run_ against a different libGL (e.g. one
provided by nvidia) by configuring the dynamic linker. For instance,
NixOS sets the LD_LIBRARY_PATH environment variable to
/run/opengl-driver/lib/, meaning that whatever libGL is found there
will be used instead of the default (mesa).
2015-08-29 22:21:57 +02:00
William A. Kennington III
83cf8b0cf8 goPackages: Split into multiple derivations
This should reduce the closure size for end users who only need go
binaries as well as reduce the size of closures hydra builders consume.
2015-08-29 12:58:03 -07:00
William A. Kennington III
3afc3494bb goPackages: Use parallel instead of forking in bash 2015-08-29 11:51:26 -07:00
Peter Simons
6b1bcc66ae haskell-MFlow: fix build 2015-08-29 20:01:49 +02:00
Jaka Hudoklin
8ceca44dbd Merge pull request #9363 from Havvy/iojs
iojs: 3.0.0 -> 3.1.0
2015-08-29 19:00:15 +02:00
Peter Simons
c95f642260 Merge pull request #9508 from dfoxfranke/haskell-tar
haskellPackages.tar: disable tests
2015-08-29 16:09:21 +02:00
Vincent Laporte
1a2d05a840 getdata: 0.8.8 -> 0.8.9 2015-08-29 11:57:10 +02:00
Andrew Kelley
9dd6f4f6ce ffmpeg: 2.7.1 -> 2.7.2 2015-08-28 22:08:43 -07:00
Daniel Fox Franke
17667cd6ac haskellPackages.tar: disable tests
They fail on i686-linux: http://hydra.nixos.org/build/25088435/nixlog/2
2015-08-28 22:41:56 -04:00
William A. Kennington III
d2dce19793 uid_wrapper: 1.1.0 -> 1.1.1 2015-08-28 17:53:48 -07:00
William A. Kennington III
3e6092fe6b libraw: 0.16.0 -> 0.17.0 2015-08-28 17:50:55 -07:00
William A. Kennington III
645709eaa5 go1.5: Remove the bootstrap as it is unneeded 2015-08-28 16:29:22 -07:00
William A. Kennington III
500f871d45 go1.5: Fix references to go1.4 2015-08-28 16:17:47 -07:00
Peter Simons
d34f7ded49 ghc-head: update to current HEAD 2015-08-28 22:28:06 +02:00
Peter Simons
97c5f0577d haskell-llvm-general: the new version still doesn't support LLVM 3.5 2015-08-28 22:28:06 +02:00
Peter Simons
67fcedd517 haskell-harp has been fixed upstream. 2015-08-28 22:28:06 +02:00
Peter Simons
12dcb664d6 haskell-amazonka-core can't compile its test suite. 2015-08-28 22:28:06 +02:00
Peter Simons
c375b224b0 haskell-concurrent-extra fails its test suite. 2015-08-28 22:28:06 +02:00
Peter Simons
b45e3290c9 haskell-wx: new versions require wkGTK 3.0 2015-08-28 22:28:06 +02:00
Peter Simons
2bcad47a90 hackage-packages.nix: update to ca23e76c2e with hackage2nix v20150824-45-g9a3a80d 2015-08-28 22:28:02 +02:00
Kosyrev Serge
18926d981c ghcNokinds: 2015-07-18 -> 2015-08-26 2015-08-28 19:50:18 +03:00
Eelco Dolstra
4e41b64511 valgrind: Separate doc output 2015-08-27 19:07:44 +02:00
Domen Kožar
e5b6de902f setuptools: 18.0.1 -> 18.2
(cherry picked from commit 43b3f6e59d5e948adeab1ffd74a09ec252b372fd)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-08-27 18:46:10 +02:00
Peter Simons
93a3ba3909 haskell-github-types: test suite tries to access the network 2015-08-27 12:45:20 +02:00
Peter Simons
a9ec286d99 haskell-regex-tdfa-text has been fixed upstream. 2015-08-27 12:45:20 +02:00
Peter Simons
d9baa13d2a hackage-packages.nix: update to 33d64f7231 with hackage2nix v20150824-28-g88e95d3 2015-08-27 12:45:15 +02:00
Luca Bruno
c91d360cec pidginsipe: add nss and nspr (ZHF) 2015-08-27 12:29:45 +02:00
Bjørn Forsman
ac613f0748 opencv: remove duplicated -DCMAKE_BUILD_TYPE=Release flag
The standard builder already does this.
2015-08-27 10:54:10 +02:00
William A. Kennington III
d0880a27dd go-modules: Fix the application of reference removal on packages like mongo-tools 2015-08-27 01:02:20 -07:00
William A. Kennington III
2c4186b045 Fix go-tools to include cover/vet for 1.4 but not 1.5 onward 2015-08-27 01:02:00 -07:00
ts468
b1db014f40 Merge pull request #9462 from ts468/upstream.linphone
linphone: update linphone with dependencies
2015-08-26 22:33:56 +02:00
Thomas Strobel
74ce1df8f5 openh264: fix license 2015-08-26 22:24:05 +02:00
Thomas Strobel
e8aa031d69 mediastreamer-openh264: init at 1.0.0 2015-08-26 22:16:28 +02:00
Thomas Strobel
dbd3584590 mediastreamer: introduce environment variable to set plugins directory 2015-08-26 22:15:31 +02:00
Bjørn Forsman
3c67f86211 openocd: enable support for CMSIS-DAP debuggers
I.e., add 'hidapi' to buildInputs. Build tested.
2015-08-26 22:06:08 +02:00
Bjørn Forsman
1a13d28151 openocd: 0.8.0 -> 0.9.0
Build tested.
2015-08-26 22:01:07 +02:00
William A. Kennington III
c2ae91a413 buildGoPackage: Fix parallel test pid computation 2015-08-26 11:17:56 -07:00
Thomas Tuegel
2ed4284917 Merge branch 'pypy' 2015-08-26 12:26:42 -05:00
Luca Bruno
1dc71534b4 rocksdb: disable on i686 (ZHF) 2015-08-26 18:48:51 +02:00
Thomas Strobel
444b8484d7 openh246: init at 1.4.0 2015-08-26 17:42:13 +02:00
Benno Fünfstück
8ee58a2aa3 haskell: fix freenect and hcwiid 2015-08-26 17:36:26 +02:00
Benno Fünfstück
0d6d5c907e cwiid: new package 2015-08-26 17:36:25 +02:00
Benno Fünfstück
271926d00d haskell: fix build of SDL-* libraries 2015-08-26 17:36:25 +02:00
Benno Fünfstück
a5e28d5319 freenect: add version 0.5.2 2015-08-26 17:35:32 +02:00
Thomas Strobel
c35309ff0b ortp: 0.24.2 -> 0.24.2 2015-08-26 17:19:19 +02:00
Thomas Strobel
1d2632f820 mediastreamer: 2.11.1 -> 2.11.2 2015-08-26 17:18:53 +02:00
Thomas Strobel
46de943ec7 belle-sip: 1.4.0 -> 1.4.1 2015-08-26 17:18:28 +02:00
Peter Simons
4bd9f78949 haskell-cabal-helper: downgrade to version 0.5.1.0
0.5.2.0 has been deprecated.
2015-08-26 16:53:59 +02:00
Michael Alan Dorman
90144c684b haskell-ekg: un-jailBreak
The referenced commit is long since released, and the package builds
correctly with ghc 7.6 -> 7.10.
2015-08-26 16:53:59 +02:00
Michael Alan Dorman
416840c480 haskell-ekg-core: un-jailBreak
The referenced commit has long since been released to hackage, and the
package has been verified to build properly under ghc 7.6 -> 7.10.
2015-08-26 16:53:59 +02:00
Michael Alan Dorman
9274aa93b5 haskell-wizards: un-jailBreak
The original bug is long since closed, and I verified it compiles on ghc
7.6 -> 7.10.
2015-08-26 16:53:59 +02:00
Michael Alan Dorman
e7aff313da haskell-record: re-enable haddock generation
The bug's been closed for a while, and I manually verified that the
haddock gets rendered to HTML in all versions from 7.6 -> 7.10.
2015-08-26 16:53:59 +02:00
Michael Alan Dorman
a206c227cc haskell-types-compat: Re-enable haddock generation
The "real" issue (https://github.com/philopon/types-compat/issues/1) has
been closed for a while, and I manually confirmed that the documentation
builds correctly under 7.10.2 and 7.8.4.  The package itself doesn't
build older versions because of missing dependencies.
2015-08-26 16:53:58 +02:00
Peter Simons
4b32ac2ffe hackage-packages.nix: update to ba6c1396e1 with hackage2nix v20150824 2015-08-26 16:53:58 +02:00
Bjørn Forsman
d61c46c1bd libqglviewer: rename attrname and pkgname from libQGLViewer
Ref. http://nixos.org/nixpkgs/manual/#sec-package-naming
2015-08-26 16:50:55 +02:00
Bjørn Forsman
b4d8bb5626 libqglviewer: update meta attributes (and add platforms) 2015-08-26 16:50:55 +02:00
Bjørn Forsman
f3fb580f65 libqglviewer: 2.3.4 -> 2.6.3
It seems upstream no longer provides old downloads. So this unbreaks the
build.
2015-08-26 16:50:55 +02:00
Thomas Tuegel
ce79122119 pypy: wrap original, not symlink 2015-08-26 09:35:48 -05:00
vbgl
70f2952ca6 Merge pull request #8491 from vbgl/compcert-2.5
compcert: 2.4 -> 2.5
2015-08-26 16:16:58 +02:00
Edward Tjörnhammar
274f7bc117 catch: 1.1-3 -> 1.2.1 2015-08-26 12:59:57 +02:00
Luca Bruno
08a6b7aa46 Revert "goPackages: disable parallel builds"
This reverts commit 75ed15e174.

Turns out it was just a missing &

cc @wkennington
2015-08-26 12:13:57 +02:00
Luca Bruno
75ed15e174 goPackages: disable parallel builds
It breaks cascadia tests. If a process terminates before wait,
the PID is non-existant and wait fails.
Using & and wait in bash is just broken and shouldn't be used.
We shall probably use GNU parallel for this job.

cc @wkennington
2015-08-26 12:11:27 +02:00
lethalman
46105f7d18 Merge pull request #9237 from NixOS/remove-unreferenced-files
Remove unreferenced files
2015-08-26 11:06:00 +02:00
Daniel Fox Franke
617a158e3c libb2: init at 0.97 2015-08-25 14:25:05 -04:00
Peter Simons
b106fbfb4f cabal2nix: update to version 20150824 2015-08-25 17:15:41 +02:00
Peter Simons
d08a483bda haskell-ed25519 is broken 2015-08-25 17:15:41 +02:00
Michael Alan Dorman
3f6074713b haskell-hxt: re-enable haddock generation
The bug's been closed for a while, and I manually verified that the
haddock gets rendered to HTML in all versions from 7.6 -> 7.10.
2015-08-25 17:15:41 +02:00
Peter Simons
4ce6d653bb haskell-fsnotify: disable failing test suite 2015-08-25 17:15:41 +02:00
Peter Simons
412062eb48 haskell-semigroupoids: doctests have been fixed upstream 2015-08-25 17:15:41 +02:00
Michael Alan Dorman
1e578fa36b haskell-cabal-helper: (temporary) testing issues 2015-08-25 17:15:41 +02:00
Peter Simons
6dd889144d haskell-deepdeq: update version used for pre 7.4.x GHC versions 2015-08-25 17:15:41 +02:00
Peter Simons
2e1a49b35a hackage-packages.nix: update to 6e3963284c with hackage2nix v20150807-65-g1cc6394 2015-08-25 17:15:35 +02:00
Domen Kožar
e4644a5b58 Merge branch 'staging' 2015-08-25 14:14:54 +02:00
Tobias Geerinckx-Rice
e8a55a43cf ccache: update 3.2.2 -> 3.2.3 2015-08-25 05:03:05 +02:00
Kosyrev Serge
301bf5018d ghcNokinds: add myself as maintainer 2015-08-24 22:55:04 +03:00
Thomas Tuegel
33f287380b Merge pull request #9294 from dezgeg/pr-pixman-arm
pixman: Enable '--disable-arm-iwmmxt' on ARM
2015-08-24 14:39:13 -05:00
Kosyrev Serge
d8b3c4c49c openwsman init at 2.6.0 2015-08-24 22:34:15 +03:00
Kosyrev Serge
90f40408c8 sblim-sfcc init at 2.2.9 2015-08-24 22:34:07 +03:00
Henry Till
94abba931d racket: 6.2 -> 6.2.1 2015-08-24 14:54:05 -04:00
Artjom Vejsel
9c206b6cf7 qtcreator: refactor for using qt54 2015-08-24 11:34:28 +03:00
devhell
fee4fe1b5e {lib}mediainfo{-gui}: 0.7.75 -> 0.7.76
From the changelog:
```
Version 0.7.76, 2015-08-06

+ XML output: line breaks and indents in between attributes for readability
+ Trace feature: XML trace update, only if compiled with trace feature
+ Amazon S3 support (REST API v2), CLI/DLL only and if compiled with
  libcurl support
+ FFV1: improved slice analysis (currently activated only with trace
  feature and for 1st frame)
x MXF: optimization of the parsing, reading a lot less data (e.g. can be
  reduced from 1 GB to 10 MB with some UHD files)
x MXF: wrong frame count with files not having the video stream as the
  first stream
x Dolby E in MPEG-TS: "SMPTE ST 302" information was accidentally removed
x MPEG-TS: avoid filling delay from file name, not applicable on MPEG-TS
x MXF: better handling of huge padding blocks, better handling of
  descriptors without link to a TrackID
x IMX: streams claiming that they are IMX are actually pure MPEG Video,
  probing both IMX and MPEG Video

```
2015-08-24 07:29:49 +02:00
Ian Duncan
4bdcf1fa95 mongoc: init at 1.1.10
[Bjørn: Minor coding style cleanup.]
2015-08-24 07:25:18 +02:00
Ian Duncan
fd7144e455 libbson: init at 1.1.10
[Bjørn: Remove trailing dot in description and unneeded parenthesis
around mkDerivation arguments.]
2015-08-24 07:14:24 +02:00
Thomas Tuegel
b5b78eaf44 qt54: create share/ in setupHook 2015-08-23 14:29:09 -05:00
Thomas Tuegel
4098e79378 qt54: set documentation path in setupHook 2015-08-23 13:47:24 -05:00
Thomas Tuegel
90a72bd177 Merge branch 'master' into staging 2015-08-23 10:29:12 -05:00
Thomas Tuegel
06717667cc Revert "autogen: don't write temp files outside build dir"
This reverts commit 1ea4ea1375.
2015-08-23 10:28:48 -05:00
Thomas Tuegel
1ea4ea1375 autogen: don't write temp files outside build dir 2015-08-23 10:26:29 -05:00
Thomas Tuegel
e40579d91e qt54: set runtime env vars during build for makeWrapper
Set QT_PLUGIN_PATH, QML_IMPORT_PATH, and QML2_IMPORT_PATH during build
so that Qt programs may easily be wrapped for use outside NixOS. The
paths are set appropriately for the dependencies of the package.
2015-08-23 10:16:21 -05:00
Desmond O. Chang
ef721079ca gradle: 2.2.1 -> 2.6 2015-08-23 12:07:16 +02:00
Bjørn Forsman
019a23db3e qt5: specify docdir
Due to a bug somewhere, the qt documentation is by default placed in
$out/share/doc although "qmake -query" reports $out/doc. That
discrepancy causes qtcreator withDocumentation builds to fail. This
fixes it.
2015-08-23 09:56:09 +02:00
Bjørn Forsman
c2a8e5e609 qt53: sync plugin/import/qml dirs with qt54
It seems like a sensible thing to keep these in sync.
2015-08-23 09:56:09 +02:00
Peter Simons
75cf3a2767 Merge pull request #9377 from teh/master
haskell-purescript: Disable tests.
2015-08-22 20:50:14 +02:00
Vladimír Čunát
c250748a54 mesa: maintenance update 10.6.4 -> 10.6.5
Currently we have lots of failures on the branch,
most of them look unreproducible, and Hydra is idling.
2015-08-22 15:12:22 +02:00
Aycan iRiCAN
afe6f05310 cabal2nix: fixed sha256 hash
I was getting below error:
output path ‘/nix/store/i73iz0id6ap6qg1p6jaqadl053h2cgfz-cabal2nix-9f58996’ should have r:sha256 hash ‘1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d’, instead has ‘0vy18gmyrw72m98psz7hz51aqj66b98h1pdv98hf3k1hrdva3ncv’
2015-08-22 11:04:09 +03:00
William A. Kennington III
64cd711f5c Merge branch 'master.upstream' into staging.upstream 2015-08-21 15:17:26 -07:00
Jude Taylor
ba57bbf8dc go-1.4: fix a few more possibly impure tests 2015-08-21 13:25:49 -07:00
Jude Taylor
65dd349574 update mysteriously varying git hashes 2015-08-21 12:00:35 -07:00
Moritz Ulrich
ff162a70c6 chicken: 4.9.0.1 -> 4.10.0 2015-08-21 15:43:52 +02:00