Commit Graph

3906 Commits

Author SHA1 Message Date
dipinhora
ae4ef90fcb ponyc: 0.5.1 -> 0.6.0 2016-10-20 14:01:10 -04:00
Tim Steinbach
d2371e6084 Merge pull request #19457 from dipinhora/ponyc-update
ponyc: 2016-07-26 -> 0.5.1
2016-10-20 13:16:56 -04:00
Tim Steinbach
b922bedc46
oraclejdk: 8u101/102 -> 8u111/112 2016-10-19 19:57:13 -04:00
Daniel Brockman
afa3a20d3b solc: 0.4.1 -> 0.4.2 2016-10-19 19:38:07 +02:00
Daniel Brockman
7e78217f7c solc: 0.3.6 -> 0.4.1 2016-10-19 19:36:04 +02:00
Anthony Cowley
0f6ef7c41c llvm_39: fix on darwin 2016-10-19 01:53:13 -04:00
Frederik Rietdijk
284f22d19e lldb 3.7: use python2
just like llvm 3.7
2016-10-18 23:16:10 +02:00
Frederik Rietdijk
aa652d0df7 edk2: use python2
python 2 print statement
2016-10-18 23:16:04 +02:00
Frederik Rietdijk
adbaed0815 llvm 3.7: use python2 2016-10-18 23:16:03 +02:00
dipinhora
66113fb0fa ponyc: 2016-07-26 -> 0.5.1 2016-10-15 23:50:04 -04:00
obadz
540e3e8935 coreclr: 8c70800 -> 1.0.4 2016-10-15 12:15:35 +01:00
Alex Ivanov
a70dfe6ffb pakcs: add kkallio as maintainer 2016-10-15 05:24:42 +03:00
Vladimír Čunát
061758490f Merge branch 'master' into staging
... to get the openssl mass rebuild: 942dbf89c.
2016-10-14 13:16:11 +02:00
Frederik Rietdijk
ffa65afdcd edk2: use python env 2016-10-13 10:47:07 +02:00
Frederik Rietdijk
cffdffe1f6 Merge pull request #19309 from FRidh/outputs
Python: use separate output for tkinter
2016-10-13 10:40:14 +02:00
Alex Ivanov
1fa5aceda8 pakcs: fixed for darwin 2016-10-13 09:37:02 +03:00
Alex Ivanov
e9e69993b2 swiProlog: fixed for darwin 2016-10-13 09:36:49 +03:00
Daniel Peebles
77d1fb94f1 Merge pull request #19470 from copumpkin/fix-sierra
Fix Darwin stdenv to work on Sierra
2016-10-12 19:04:03 -04:00
Peter Simons
8c95f0ffaf ghcjs: revert "mark build as broken"
This reverts commit 8f07d4bd780a24dcf33be46d8cbfc6163fcdde0e. The build
failure blocking this package has been fixed in the meanwhile. Thanks to
@basvandijk for the heads-up.

(cherry picked from commit 56d033ac1b00a8b29bc29589312d2f5024656bd3)
2016-10-12 16:52:41 +02:00
Tim Steinbach
259dcac753 Merge pull request #19484 from peterhoeg/vala
vala: unify builders for various versions
2016-10-12 09:32:38 -04:00
Peter Hoeg
a6d1d06a95 vala: unify builders for various versions
We are currently carrying a number of vala versions where each version
is essentially just a copy of the earlier version.

This PR gets rid of a ton of duplication and uses a standard builder.

Secondly, we add a definition for the latest vala 0.34.1.

Lastly, we add a generic "vala" that refers to the latest stable
version.

I have tried changing the definitions for "simple-scan" and "valum" to use
the latest vala version and they at least compile OK so I'll try a
massive sed job to replace all the definitions later to simply use the
latest version through "vala" instead of specifying a version directly.

According to upstream:

"Well-maintained packages are expected to always build with the latest
stable Vala version."

Maybe this means that my generic builder is then no longer necessary. Oh well...

I added myself to the maintainer array for vala although I have no
interest in the language - this was purely a nix exercise for me but I
thought it was reasonable to be the one to clean up the mess if this has
side effects...

Cc: @antono and @lethalman
2016-10-12 21:12:05 +08:00
Benjamin Saunders
d608456005 shaderc-git: init at 2016-09-08 2016-10-12 13:19:34 +01:00
Benjamin Saunders
e0e27c83ab vulkan-loader: 1.0.21.0 -> 1.0.26.0
Also added asserts to ensure everything stays in sync.
2016-10-12 13:19:34 +01:00
lummax
efc51ce52d glslang: 2016-07-27 -> 2016-07-16
`vulkan-loader` requires a specific version of `glslang` as specified in
`<vulkan-loader-repo>/glslang_revision`.
2016-10-12 13:19:34 +01:00
Joe Hermaszewski
e6cfc62063 glslang: init at 20160727 2016-10-12 13:18:27 +01:00
Dan Peebles
d8a0307a5d [darwin.stdenv] Fix to work on Sierra
This reinstates the libSystem selective symbol export machinery we used
to have, but locks it to the symbols that were present in 10.11 and skips
the actual compiled code we put into that library in favor of the system
initialization code. That should make it more stable and less likely to
do weird stuff than the last time we did this.
2016-10-12 00:08:13 -04:00
Peter Simons
2804067fc8 Merge pull request #19462 from dipinhora/pony-stable
pony-stable: init at 2016-10-10
2016-10-11 22:43:07 +02:00
Vladimír Čunát
56e9bbfe65 Merge #18130: llvmPackages_38: 3.8.0 -> 3.8.1 2016-10-11 22:29:59 +02:00
dipinhora
8a7cb597ae pony-stable: init at 2016-10-10 2016-10-11 16:07:55 -04:00
Tim Steinbach
b116f9b0cd
rust: 1.11.0 -> 1.12.0, cargo: 0.12.0 -> 0.13.0 2016-10-10 21:59:26 -04:00
Frederik Rietdijk
104c50dd1a Python: remove modules and pythonFull 2016-10-10 10:33:24 +02:00
Sheena Artrip
3e3a189cc6
go_1_7: make $out/bin a link to $GOROOT/share/go/bin 2016-10-10 00:10:05 -04:00
Will Dietz
5b3bf1fffa llvm-3.8: Fix clang build on non-darwin.
'set-xcode-analyzer' is only installed on APPLE.
2016-10-09 16:57:40 +02:00
Vincent Laporte
4168706d4f OCaml modules: make explicit some dependencies to ocamlbuild 2016-10-09 11:55:19 +02:00
Tim Steinbach
b4b9b0fa9d
kotlin: 1.0.3 -> 1.0.4 2016-10-08 18:32:00 +00:00
Nikolay Amiantov
a1791e8543 Merge pull request #19167 from abbradar/java-gui
jre8: minimize minimal build and add more GUI dependencies to the regular one
2016-10-07 14:12:33 +04:00
Michael Raskin
667c2fb025 obliv-c: init at 0.0pre20161001 2016-10-06 17:48:05 +02:00
Thomas Tuegel
2e255a2edd
Merge branch 'staging' 2016-10-06 09:51:02 -05:00
Joachim F
f7294c8df6 Merge pull request #19245 from gnidorah/master
pakcs: init at 1.14.0
2016-10-06 10:55:32 +02:00
Alex Ivanov
2aeb234f25 pakcs: update to 1.14.0 2016-10-05 21:20:58 +03:00
Vladimír Čunát
30f551d8b2 Merge branch 'master' into staging 2016-10-05 19:02:48 +02:00
Jörg Thalheim
1bd8d7710e Merge pull request #19125 from markus1189/bin-bash-cleanup
Bin bash cleanup
2016-10-05 17:16:00 +02:00
Peter Simons
2f0d0cd05a ghcjs: mark build as broken
(cherry picked from commit 8f07d4bd780a24dcf33be46d8cbfc6163fcdde0e)
2016-10-05 09:46:53 +02:00
Jörg Thalheim
d8f8983df4 Merge pull request #19208 from mstarzyk/nim
Nim & nimble upgrade
2016-10-05 09:10:52 +02:00
Alex Ivanov
cb79662bf3 pakcs: reborn 2016-10-04 22:49:07 +03:00
Peter Simons
98a750b4a8 Merge pull request #19228 from mboes/ghc-head-20160930
haskell.compiler.ghcHEAD: update to latest upstream (20160930).
2016-10-04 20:51:45 +02:00
Markus Hauck
aafbd40577 Replace hard coded /bin/bash occurrences 2016-10-04 20:15:37 +02:00
Mathieu Boespflug
4b34e4a7cb haskell.compiler.ghcHEAD: update to latest upstream (20160930).
Includes several fixes necessary for inline-java full functionality.
2016-10-04 17:51:37 +02:00
Maciek Starzyk
eda85e161f nim: 0.14.2 -> 0.15.0 2016-10-03 21:44:40 +02:00
Jörg Thalheim
888f6a1280 Merge pull request #19199 from wizeman/u/fix-help2man-hash
help2man: fix hash
2016-10-03 19:26:44 +02:00
Anthony Cowley
3989b8da43 rustc: fix build on darwin
The OS is identified as "10.4" rather than "osx". This commit removes
the 'rt' build script's hard coding of the "osx" suffix when building on
darwin since the cmake configuration falls back to building a 10.4
compatible libclang_rt.
2016-10-03 09:20:56 -04:00
Jörg Thalheim
54867a0400 Merge pull request #19131 from aneeshusa/remove-redundant-cmake-build-type-release-args-part2
llvm3.9: Remove -DCMAKE_BUILD_TYPE=Release flags
2016-10-03 14:43:40 +02:00
Nikolay Amiantov
9d7c9cc32e openjdk8: add a patch to use GTK when available by default 2016-10-02 23:57:10 +03:00
Nikolay Amiantov
a15c943337 openjdk8: rework dependencies
This makes several adjustments around what is linked into JRE.

* system giflib, libjpeg, zlib are now used unconditionally;
* libstdc++ is linked dynamically.

For full version:

* GTK+ and GNOME libraries are linked;
* Extra X11 libraries are linked;
* CUPS is linked;
* libmagic (file) is linked.

For minimal version:

* All X11 support is removed;
* Sound support is removed.
* Fonts and their support are not lined.

jre8_headless is added as a minimal build.

Overall this adds support for all things GUI into the default Java build and
removes them from the minimal build.
2016-10-02 23:57:02 +03:00
Tuomas Tynkkynen
19225bf5cc Merge remote-tracking branch 'upstream/master' into staging 2016-10-02 10:36:47 +03:00
Aneesh Agrawal
c04e46c87d llvm3.9: Remove -DCMAKE_BUILD_TYPE=Release flags
Since commit 183d05a in 2012, this is the default.
2016-10-01 13:55:42 -04:00
Aneesh Agrawal
fcee1d0b28
Remove redundant -DCMAKE_BUILD_TYPE=Release flags
Since commit 183d05a0 in 2012, this is the default.

fixes #18000
2016-10-01 16:13:41 +02:00
Tomas Hlavaty
4c3a232bbd sbcl: 1.3.9 -> 1.3.10 2016-10-01 12:40:46 +02:00
Graham Christensen
38c5876b2d
oraclejdk7: remove due to end of life 2016-09-28 16:39:12 -04:00
Vladimír Čunát
77604964b6 Merge branch 'master' into staging 2016-09-28 17:13:59 +02:00
Eelco Dolstra
483aa6b903 Merge pull request #18975 from mayflower/fix/remove-jdk6
jdkdistro: remove oraclejdk6, not maintained anymore
2016-09-27 11:54:49 +02:00
Joachim F
a5580c9951 Merge pull request #18765 from aske/ocaml-move
Reorganize ocaml packages
2016-09-26 23:17:53 +02:00
Joachim F
67baa48161 Merge pull request #18930 from acowley/mlton-darwin-bootstrap
mlton: darwin bootstrap fixes
2016-09-26 23:06:40 +02:00
Franz Pletz
0ccb59b562
jdkdistro: remove oraclejdk6, not maintained anymore 2016-09-26 13:40:20 +02:00
Anthony Cowley
3835a1917f mlton: darwin bootstrap fixes
Allow mlton to compile in a more barren sandbox. The bootstrapping
binaries for darwin have dynamic linking dependencies outside of the nix
store. This patch shifts them to point to the appropriate library within
the nix store.
2016-09-25 20:47:16 -04:00
Kirill Boltaev
ea171c39d7 metaocaml_3_09: mark as broken 2016-09-26 02:36:49 +03:00
Kirill Boltaev
3fbc40b377 ber_metaocaml_003: mark as broken 2016-09-26 02:36:49 +03:00
Kirill Boltaev
e61663a233 treewide: move to ocaml-ng system 2016-09-26 02:36:49 +03:00
Tomas Hlavaty
af8bfbd91d sbcl: 1.3.8 -> 1.3.9 2016-09-24 22:02:07 +02:00
Vladimír Čunát
fffc7638cd Merge branch 'master' into staging 2016-09-24 18:54:31 +02:00
Vladimír Čunát
d2965a7d85 llvm-3.9: move shared libLLVM to a separate output
Fixes #18840: too large closure of mesa_drivers.

Tested atop 16.09:
 - clang compiles a hello-world app;
 - mesa seems to link OK;
 - ispc builds.

Size comparison:
 - 80 MB of full llvm-3.7 on 16.03;
 - 200 MB of full llvm-3.9 on 16.09 before this patch;
 - 50 MB of libLLVM after this commit.
2016-09-24 18:32:45 +02:00
Vladimír Čunát
9eb91323bd Merge #18566: ghdl: add support for llvm backend 2016-09-24 14:14:13 +02:00
Aneesh Agrawal
9f7d9def4c as31: Apply Debian patch for CVE-2012-0808 (#18904) 2016-09-24 03:54:52 +02:00
Graham Christensen
f388b0dda2 Merge pull request #18875 from NeQuissimus/openjdk_1_7_111_b01
openjdk7: 1.7.0-91 -> 1.7.0-111
2016-09-23 19:58:05 -04:00
Théophane Hufschmitt
acc608d88e ocaml_4_02 : Fix src
#08b85f5f9917cad7 introduced a wrong src url for ocaml 4.02 (and thus
  broke a lot of stuff),
  This restores the correct url.
2016-09-23 21:47:42 +02:00
Joachim F
a8d4f747a4 Merge pull request #18864 from acowley/mlton-clang
mlton: fix build with clang (darwin)
2016-09-23 20:18:24 +02:00
Joachim F
ac8206e31d Merge pull request #17147 from regnat/ocamlUpdates
ocamlPackages : update some packages
2016-09-23 19:55:10 +02:00
Tim Steinbach
83a893c38a
openjdk7: 1.7.0-91 -> 1.7.0-111 2016-09-23 08:45:38 -04:00
Anthony Cowley
7181d20a4f mlton: fix build with clang (darwin)
A minor tweak is necessary to avoid raising an error when building with
clang. This gets mlton building on darwin.
2016-09-22 23:02:03 -04:00
Eelco Dolstra
7a4209c356 Merge remote-tracking branch 'origin/master' into staging 2016-09-20 17:46:09 +02:00
Eelco Dolstra
ad8f31df7f gcc_multi: Move $out/lib64/* to $lib/lib64
This prevents VirtualBox from having a copy of gcc in its closure.
2016-09-20 16:42:30 +02:00
timor
d5ffca8829 ghdl: use fetchFromGitHub
for some reason the sha256 changed...
2016-09-20 14:15:52 +02:00
timor
ecbf44485b ghdl: add support for llvm backend
Make the existing ghdl recipe more flexible, and introduce "ghdl_llvm"
as a package in addition to "ghdl_mcode".  This seems to specifically
require llvm 3.5, though.  The flavour is also encoded in the package name.

cc @viric
2016-09-20 14:15:52 +02:00
Vladimír Čunát
06839f5a40 fix some evaluation problems after 8610a34474
/cc #18327.
2016-09-17 02:26:49 +02:00
Eelco Dolstra
5ade8fff79 cudatoolkit: Fix building dependent packages
- Set a cmake flag to allow cmake to find CUDA automatically.

- Pass -D_FORCE_INLINES to work around

    /nix/store/8sl4jfs3nq0pkq4gg655s3axrxdx7z29-glibc-2.24-dev/include/string.h: In function 'void* __mempcpy_inline(void*, const void*, size_t)':
    /nix/store/8sl4jfs3nq0pkq4gg655s3axrxdx7z29-glibc-2.24-dev/include/string.h:650:42: error: 'memcpy' was not declared in this scope

  https://github.com/BVLC/caffe/issues/4046

This fixes OpenSubdiv and Blender.
2016-09-17 00:40:41 +02:00
Vladimír Čunát
0fc5900665 Merge #18585: pcre2: 10.21 -> 10.22 2016-09-17 00:34:29 +02:00
Vladimír Čunát
7a0b3c64ee Merge #18327: gcc darwin fixes 2016-09-17 00:32:03 +02:00
Vladimír Čunát
52e1a198cf Merge branch 'master' into staging 2016-09-17 00:31:34 +02:00
Tuomas Tynkkynen
e1d05ffb6a dtc: 1.4.1 -> 1.4.2 2016-09-17 00:54:07 +03:00
Vladimír Čunát
5de2857a54 gcc*: use stdenv.cc.libc instead of stdenv.libc
The latter doesn't exist on Linux.
2016-09-16 23:23:33 +02:00
Peter Simons
d1b34967fe ghc-8.0.1: Revert "cosmetic fix to the Nix expression to unbreak syntax highlighting"
This reverts commit 29a53017a4, which broke filterdiff according to
https://github.com/NixOS/nixpkgs/issues/18665#issuecomment-247626588.
2016-09-16 20:45:09 +02:00
Peter Simons
b26f956d84 Merge pull request #18668 from AtnNn/swipl
swiProlog: 6.6.6 -> 7.2.3
2016-09-16 20:44:16 +02:00
Matthew Bauer
8610a34474
gcc: use special native system headers for darwin
Darwin systems need to be able to find CoreFoundation headers as well as
libc headers. Somehow, gcc doesn't accept any "framework" parameters
that would normally be used to include CoreFoundation in this
situation.

HACK: Instead, this adds a derivation that combines the two. The result
works but probably not a good long term solution.

ALTERNATIVES: Maybe sending patches in to GCC to allow
"native-system-framework" configure flag to get this found.
2016-09-15 17:58:09 -05:00
Matthew Bauer
c7e0fbcbc8
gcc4.6: remove from tree
This isn't available from all-packages, so I think it's okay to
remove. It's unclear how to keep this updated with the changes.
2016-09-15 17:58:08 -05:00
Matthew Bauer
f760e980f0
gcc4.5: allow empty libc-ldflags 2016-09-15 17:56:51 -05:00
Matthew Bauer
cf004ae56e
gcc: add --with-native-system-header-dir for clang
gcc needs to be able find system headers. Without this, gcc fails to build because
/usr/include is not available.

Note: stdenv.libc should be available for all stdenv's, I think.
2016-09-15 17:56:50 -05:00
Matthew Bauer
f2e753a90c
gcc: fix gmp, mpfr includes
This should get gcc48, gcc5, and gcc6 working again.

Also: use makeLibraryPath, and makeSearchPathOutput for LIBRARY_PATH and
CPATH. This is a refactor but it also fixes an issue with zlib.
2016-09-15 17:56:50 -05:00
Matthew Bauer
45cd1ea620
gcc: --enable-bootstrap on Darwin
This seems to be working now. ISL needs to be disable for it to build
completely though.
2016-09-15 17:54:01 -05:00
Etienne Laurin
ff9208c37a swiProlog: 6.6.6 -> 7.2.3 2016-09-15 00:31:23 -04:00
Daiderd Jordan
db7adbf69c
go: fix darwin build 2016-09-14 21:00:13 +02:00
Daiderd Jordan
4d25b23d26 Merge pull request #18516 from offlinehacker/pkgs/go/1.7.1
go_1_7: 1.7 -> 1.7.1
2016-09-14 20:54:40 +02:00
Ram Kromberg
652e3488f9 julia: pcre2 -> pcre2.dev + pcre2 output fix 2016-09-14 21:35:44 +03:00
Kirill Boltaev
0f37287df5 treewide: explicitly specify gtk version 2016-09-13 21:09:24 +03:00
Domen Kožar
01895ff5ea fstar: disable tests https://github.com/FStarLang/FStar/issues/676
(cherry picked from commit feef017564c292e088de69e97db4071bf08c2853)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-13 16:13:05 +02:00
Nikolay Amiantov
4748709926 Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs 2016-09-13 12:51:34 +03:00
Franz Pletz
fb9117efa6 Merge pull request #18488 from chris-martin/md5-2
Miscellaneous packages: Use sha256 instead of md5 (part 2)
2016-09-13 07:11:43 +02:00
Christian Gerbrandt
eabecc19e0 hhvm: 3.12.1 -> 3.15.0 (#18508) 2016-09-13 07:04:41 +02:00
Aristid Breitkreuz
7e273d9209 ispc: attempt to make build more robust and hydra-compatible 2016-09-12 22:45:47 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Dan Peebles
7b9d3f8605 stdenv-darwin: upgrade a few more things
It's a long build and generally painful to split into smaller commits,
so I apologize for lumping many changes into one commit but this is far
easier.

There are still several outdated parts of the darwin stdenv but these
changes should bring us closer to the goal.

Fixes #18461
2016-09-12 01:46:44 -04:00
Jaka Hudoklin
272c59a75b go_1_7: 1.7 -> 1.7.1 2016-09-11 20:22:17 +02:00
Vladimír Čunát
a49cb9dcbe llvmPackages: generalize "3.9.0" string occurrences
Discussed:
https://github.com/NixOS/nixpkgs/commit/15af9082eb#commitcomment-18903919
2016-09-11 10:13:34 +02:00
Tuomas Tynkkynen
0dbfb0fc48 Merge commit 'bd6e40c' from staging into master
Major changes being pulled in:

- mesa: maintenance 12.0.1 -> 12.0.2
- texlive: 2015 -> 2016
2016-09-10 23:23:44 +03:00
Chris Martin
6f32f2cc25 ocaml 3.08.0: md5->sha256 2016-09-10 13:56:04 -04:00
Frederik Rietdijk
3c42ff35ce julia-git: mark as broken for i686 2016-09-10 18:59:30 +02:00
Frederik Rietdijk
f6c2afc423 julia: mark as broken for i686 2016-09-10 18:59:30 +02:00
Vladimír Čunát
f5a157fa3e orc: bug-fix 0.4.25 -> 0.4.26 2016-09-10 11:32:05 +02:00
Vladimír Čunát
001bde3df0 gcc45, gnat, ghdl: fix up the builds
Some parts are slightly puzzling, but it seems to work and it didn't
seem economical to put more effort into it.
2016-09-10 00:32:13 +02:00
Peter Simons
0777d26038 jhc: 32 bit builds are broken in "vector"
http://hydra.nixos.org/build/40060997/nixlog/1/raw
2016-09-09 13:55:39 +02:00
Dan Peebles
c1d3c10607 smlnj-bootstrap: 110.76 -> 110.80 2016-09-08 23:12:22 -04:00
Nikolay Amiantov
e063c66353 mono44: 4.4.1.0 -> 4.4.2.11 2016-09-08 03:59:06 +03:00
Eelco Dolstra
587348743c go: Remove unused version 2016-09-07 17:41:53 +02:00
Rahul Gopinath
3ddf76c00a mono: init at 4.6 2016-09-07 12:42:48 +02:00
Dan Peebles
9a05352488 souffle: work around hardening bug on linux 2016-09-06 23:11:33 +00:00
Dan Peebles
247c54e374 souffle: init at 1.0.0 2016-09-06 17:45:13 -04:00
Alexander Ried
3beacc4dbe fstar: remove workaround (#18331)
As the comment indicates this was a workaround that has since been fixed
upstream.
2016-09-06 00:09:11 +02:00
Tomas Hlavaty
5f8b6b2e1d ecl: add gcc into wrapper PATH
otherwise the native gcc based compiler does not work
2016-09-05 20:07:24 +02:00
Aristid Breitkreuz
2f33b06119 ispc: extend test suite 2016-09-04 17:03:49 +02:00
Aristid Breitkreuz
f4443bb9ef ispc: detect test failures, restrict platforms 2016-09-04 15:56:22 +02:00
Aristid Breitkreuz
c4b0d80cba ispc: 20151128 -> 1.9.1, fix build 2016-09-04 14:08:40 +02:00
Vladimír Čunát
4e5ba34d81 Merge #18007: add llvmPackages_39
Direct merge to master, too, without switching any package.
2016-09-04 12:38:31 +02:00
Domen Kožar
1f7dfda8b8 ghcjs: fix eval /cc @svanderburg
(cherry picked from commit ad771764743d9645084ac21730bb5a6cc11ce672)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-04 11:31:02 +02:00
Frederik Rietdijk
57d1edbfc1 julia: 0.4.5 -> 0.4.6 2016-09-03 11:42:55 +02:00
Tuomas Tynkkynen
1ed1ed210a terra: Broken on i686 (and Darwin)
Never built successfully:

http://hydra.nixos.org/build/39402139
http://hydra.nixos.org/build/39393534
2016-09-03 03:24:25 +03:00
Vladimír Čunát
f5c3115063 llvmPackages_39: rc -> 3.9.0 2016-09-02 20:15:11 +02:00
reltuk
3e695874e2 openjdk: Keep {include,man} in $out/lib/opendjk. (#18140)
* openjdk: Keep {include,man} in $out/lib/opendjk.

This is a standard layout that some JDK consumers expect.

* openjdk/8: Improve clarity of some symlink commands with terminating slash.
2016-09-01 21:00:41 +02:00
Tim Steinbach
8a7afae58b openjdk: Fix #17603 2016-09-01 20:47:19 +02:00
Peter Simons
b9b5fcccc5 Merge pull request #18196 from ttuegel/ghc-madv-free
ghc801: disable MADV_FREE
2016-09-01 20:37:10 +02:00
Tuomas Tynkkynen
3364230d56 Disable bunch of non-compiling packages on Darwin
These ones have a "Last successful build" timestamp in the 2014s or
2015s. Presumably no one will notice if we now stop building them.

softether_4_18              2015-09-20  http://hydra.nixos.org/build/39418483
lensfun                     2014-09-30  http://hydra.nixos.org/build/39394104
net_snmp                    2015-09-20  http://hydra.nixos.org/build/39410553
djview                      2015-08-11  http://hydra.nixos.org/build/39413233
libmusicbrainz2             2015-09-20  http://hydra.nixos.org/build/39410106
fox_1_6                     2014-05-07  http://hydra.nixos.org/build/39410858
libofx                      2015-09-24  http://hydra.nixos.org/build/39423507
yacas                       2014-09-30  http://hydra.nixos.org/build/39393150
iomelt                      2014-09-30  http://hydra.nixos.org/build/39408486
softether                   2015-09-20  http://hydra.nixos.org/build/39425800
mp4v2                       2014-09-30  http://hydra.nixos.org/build/39421899
virtuoso7                   2014-09-21  http://hydra.nixos.org/build/39415206
man_db                      2015-04-23  http://hydra.nixos.org/build/39404236
libdiscid                   2014-09-30  http://hydra.nixos.org/build/39412202
zabbix22.agent              2014-09-21  http://hydra.nixos.org/build/39412149
vidalia                     2015-08-06  http://hydra.nixos.org/build/39411500
libmtp                      2015-09-20  http://hydra.nixos.org/build/39419199
wxGTK29                     2015-09-20  http://hydra.nixos.org/build/39415296
ncmpcpp                     2015-11-06  http://hydra.nixos.org/build/39404455
libtorrent                  2014-09-21  http://hydra.nixos.org/build/39394646
shishi                      2014-03-21  http://hydra.nixos.org/build/39418874
ocaml_3_12_1                2014-09-30  http://hydra.nixos.org/build/39392996
djview4                     2015-08-11  http://hydra.nixos.org/build/39427799
vimNox                      2014-05-23  http://hydra.nixos.org/build/39397012
ttfautohint                 2015-08-06  http://hydra.nixos.org/build/39398330
libraw                      2015-09-24  http://hydra.nixos.org/build/39402271
wxGTK30                     2015-09-20  http://hydra.nixos.org/build/39401871
sbcl_1_2_5                  2015-09-20  http://hydra.nixos.org/build/39426091
prover9                     2014-09-30  http://hydra.nixos.org/build/39406476
rcs                         2015-08-25  http://hydra.nixos.org/build/39392037
gpac                        2015-09-24  http://hydra.nixos.org/build/39399470
virtuoso6                   2014-09-30  http://hydra.nixos.org/build/39398651
xlslib                      2015-09-24  http://hydra.nixos.org/build/39410387
ucommon                     2015-03-27  http://hydra.nixos.org/build/39414040
commoncpp2                  2014-09-30  http://hydra.nixos.org/build/39420117
virtuoso                    2014-09-21  http://hydra.nixos.org/build/39399978
miniHttpd                   2014-09-30  http://hydra.nixos.org/build/39392925
mpack                       2014-09-26  http://hydra.nixos.org/build/39399535
nbd                         2014-09-26  http://hydra.nixos.org/build/39401367
newsbeuter-dev              2014-07-29  http://hydra.nixos.org/build/39406259
gimp_2_8                    2015-09-20  http://hydra.nixos.org/build/39436271
gimp                        2015-09-20  http://hydra.nixos.org/build/39435976
zabbix20.agent              2014-09-30  http://hydra.nixos.org/build/39393242
gst_all_1.gst-plugins-good  2015-09-20  http://hydra.nixos.org/build/39408506
ocaml_4_00_1                2014-09-30  http://hydra.nixos.org/build/39399526
inadyn                      2014-09-30  http://hydra.nixos.org/build/39426389
gst_all_1.gst-plugins-bad   2015-09-20  http://hydra.nixos.org/build/39392970
zabbix.agent                2014-09-30  http://hydra.nixos.org/build/39421412
cmake-2_8                   2015-09-24  http://hydra.nixos.org/build/39399443
liblastfm                   2015-08-06  http://hydra.nixos.org/build/39421812
newsbeuter                  2014-07-29  http://hydra.nixos.org/build/39396605
sdcv                        2014-09-26  http://hydra.nixos.org/build/39412928
2016-09-01 20:39:33 +03:00
Thomas Tuegel
54125b4af4
ghc801: disable MADV_FREE 2016-09-01 12:07:36 -05:00
Peter Simons
29a53017a4 ghc-8.0.1: cosmetic fix to the Nix expression to unbreak syntax highlighting 2016-09-01 15:05:01 +02:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Luca Bruno
24f36cce50 Merge pull request #18102 from sjmackenzie/cargo-hash-fix
Cargo has incorrect hash
2016-08-31 11:04:59 +00:00
Gabriel Ebner
15af9082eb llvmPackages_39: init at 3.9.0rc3 2016-08-31 07:13:35 +02:00
Tuomas Tynkkynen
c46869f13b neko: Use dev outputs when building an include path 2016-08-30 23:16:34 +03:00
Tuomas Tynkkynen
0cfb79afac gcc6: Unify some differences with gcc5
In particular, fixes build with the new shuffled outputs.
2016-08-30 23:00:13 +03:00
Will Dietz
bffa7de808 llvm: 3.8 -> 3.8.1 2016-08-30 14:34:23 -05:00
Will Dietz
464888c28c llvm-3.8: Fix lldb build failure due to insecure format use. 2016-08-30 14:32:58 -05:00
Moritz Ulrich
70f55f9930 rust{Beta,Unstable}: Remove outdated comment. 2016-08-30 12:05:45 +02:00
Tuomas Tynkkynen
d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
Stewart Mackenzie
33d6e5acd5 Cargo has incorrect hash 2016-08-30 05:53:03 +08:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Robin Gloster
f81b2da3d4
go_1_4: rename to go_bootstrap and remove refs
This has cgo disabled, so only use this for bootstrapping.
2016-08-29 01:48:55 +00:00
Robin Gloster
df935b01e7
go_1_5: remove 2016-08-29 01:44:55 +00:00
Franz Pletz
675848419e
go_1_5: set CGO_ENABLED=0 to cope with binutils 2.27 version bump
See 6eb4014874 and
https://github.com/golang/go/issues/16906.

cc @obadz @cstrahan @edolstra @lancelotsix @globin
2016-08-29 03:01:49 +02:00
Robin Gloster
e17bc25943
Merge remote-tracking branch 'upstream/master' into staging 2016-08-29 00:24:47 +00:00
Domen Kožar
5793a14c36 release.nix: tiny improvements on top of #18059 2016-08-28 18:18:44 +02:00
Franz Pletz
ed0eb59cb5
go: remove unused expressions for 1.1, 1.2, 1.3 2016-08-28 16:08:03 +02:00
Robin Gloster
f86c5bc6fa ghcHEAD: remove included patch 2016-08-28 14:03:12 +00:00
obadz
6eb4014874 go_1_4: set CGO_ENABLED=0 to cope with binutils 2.27 version bump
See also https://github.com/golang/go/issues/16906
cc @cstrahan @edolstra @lancelotsix @globin @fpletz
2016-08-28 13:29:44 +01:00
obadz
3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Peter Simons
44289f81e9 Merge pull request #18022 from mboes/ghcHEAD
haskell.compiler.ghcHEAD: update to latest upstream (20160826).
2016-08-27 12:34:14 +02:00
Moritz Ulrich
8cd3e1e2ba rustc: 1.10.0 -> 1.11.0 and beta/unstable updates.
Give cargo the right name.

Fix versioning.

rustBeta: -> 2016-08-17

Looks like rustUnstable.rustc needs *exactly* this version.
2016-08-27 08:24:16 +02:00
Mathieu Boespflug
5f8891153b haskell.compiler.ghcHEAD: update to latest upstream (20160826). 2016-08-26 21:15:04 +02:00
Robin Gloster
e0deed0110
ghc: add comment to relocation patch 2016-08-26 15:19:37 +00:00
Robin Gloster
77473cda6b
ghc: add relocation patch for all versions 2016-08-26 14:57:46 +00:00
Michael Stone
b9a4da47c0 go: fix on darwin, make go-1.7 build with clang-3.8. (#18001)
The darwin stdenv currently provides clang-3.7; however,

  a) go-1.7 currently expects a compiler that supports "-fdebug-prefix-map"
     arguments (which clang-3.8 supports but clang-3.7 does not) and

  b) even with clang-3.8, go-1.7 misinterprets the result of its runtime probes
     for support for the "-no-pie" flag, thereby failing to build runtime/cgo.

This patch resolves (a) by building go-1.7 with clang-3.8 and resolves (b) by
teaching go how to correctly probe "-no-pie" error messages from clang.
2016-08-26 07:36:06 +00:00
Robin Gloster
5bbe7881a4
hhvm: 3.12.1 -> 3.14.5 2016-08-25 23:27:55 +00:00
Robin Gloster
ddcf70482c
gcc6: 6.1.0 -> 6.2.0 2016-08-25 00:00:48 +00:00
Franz Pletz
bd0b68f59a go_1_7: disable all hardening 2016-08-24 16:52:56 +02:00
obadz
78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
zimbatm
4d4980d9f8 Merge pull request #17805 from avnik/update/golang-1.7
go: add 1.7 compiler
2016-08-24 11:28:25 +01:00
obadz
8da8aa7ddb Merge branch 'hardened-stdenv' into staging 2016-08-23 18:50:10 +01:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Franz Pletz
17234ca073 ccl: fix hash 2016-08-23 18:28:38 +02:00
Tuomas Tynkkynen
07491d68c3 treewide: Fix output references to ncurses 2016-08-23 04:53:24 +03:00
Tuomas Tynkkynen
dcbd607682 opa: Use makeBinPath 2016-08-23 03:54:23 +03:00
Tuomas Tynkkynen
984e04d733 treewide: Make explicit that 'dev' output of mpfr is used 2016-08-23 03:52:07 +03:00
Tuomas Tynkkynen
c08364b887 treewide: Make explicit that 'dev' output of gmp is used 2016-08-23 03:52:05 +03:00
Tuomas Tynkkynen
501da21acc julia: Reference correct output of curl 2016-08-23 03:20:21 +03:00
Tuomas Tynkkynen
9765f40a39 opendylan: Use correct output of boehmgc 2016-08-23 03:20:21 +03:00
Tuomas Tynkkynen
f064bfe803 treewide: Use more makeLibraryPath 2016-08-23 02:56:12 +03:00
Tuomas Tynkkynen
74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
Tuomas Tynkkynen
51ad423716 treewide: Use makeLibraryPath in 'patchelf --set-rpath' calls 2016-08-23 00:04:39 +03:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
obadz
ba50fd7170 Merge branch 'master' into staging 2016-08-22 01:18:11 +01:00
Alexander V. Nikolaev
800775e221 go: add 1.7 compiler 2016-08-21 21:20:07 +03:00
Ram Kromberg
aa163eb8d8 vala: default.nix -> 0.23.nix & add vala_0_23 2016-08-21 20:02:04 +03:00
obadz
68936edfb3 Merge branch 'master' into staging 2016-08-21 12:03:41 +01:00
Vladimír Čunát
d515cd8cdd Merge #17868: treewide: switch sourceforge to mirror:// 2016-08-20 18:10:55 +02:00
Vladimír Čunát
cdb44a4ada Merge branch 'master' into staging 2016-08-20 18:01:36 +02:00
Vladimír Čunát
f616c0f1f0 openjdk7: fix build with glibc-2.24
I tested this patch for both versions but I forgot to push
and 8 got fixed in the meantime 44dc95ef5.
2016-08-20 18:00:10 +02:00
obadz
8856b9e905 openjdk: 8u102b04 -> 8u122b00 2016-08-20 16:32:08 +01:00
obadz
44dc95ef53 openjdk8: add compiler flag to cope with glibc 2.24 2016-08-20 16:32:08 +01:00
J Phani Mahesh
c4a746af68 mozart: switch sf downloads to mirror://
This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
2016-08-20 19:14:30 +05:30
J Phani Mahesh
cb4a888206 fpc: switch sf downloads to mirror://
This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
2016-08-20 19:14:30 +05:30
J Phani Mahesh
8e3eae86d6 mlton: switch sf downloads to mirror://
This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
2016-08-20 19:14:30 +05:30
Ram Kromberg
ff7eda555b vala: 0.32.0 -> 0.32.1 2016-08-20 16:37:59 +03:00
Joachim Fasting
ba0f9cfa49
Revert "Merge pull request #16980 from phanimahesh/sf-use-mirrors"
This reverts commit 217594fd1d, reversing
changes made to 8e8a89d8a8.

Turns out it wasn't ready afterall ...
2016-08-20 15:14:23 +02:00
J Phani Mahesh
bf5d09fda9 mozart: switch sf downloads to mirror:// 2016-08-20 17:30:07 +05:30
J Phani Mahesh
879a94436f fpc: switch sf downloads to mirror:// 2016-08-20 17:27:57 +05:30
J Phani Mahesh
c8964601e0 mlton: switch sf downloads to mirror:// 2016-08-20 17:24:53 +05:30
Théophane Hufschmitt
08b85f5f99 ocaml : add 4.03 compiler 2016-08-19 19:07:30 +02:00
Peter Simons
0c341c206e Merge pull request #17730 from obadz/ghc8-fix-12130
ghc8: apply patches to fix https://ghc.haskell.org/trac/ghc/ticket/12130
2016-08-19 10:15:28 +02:00
Austin Seipp
0678263b05 nixpkgs: arachne-pnr 2016.05.21 -> 2016.08.18
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-08-19 01:55:13 +00:00
Austin Seipp
535219895d nixpkgs: yosys 2016.05.21 -> 2016.08.18
Also amend the fetched name 'abc' to 'yosys-abc', so that the
derivation name looks distinctly different from any other abc install
at a glance.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-08-19 01:55:13 +00:00
Joachim F
a4bbb2d9a3 Merge pull request #17688 from nexusdev/solc
Add Solidity (Ethereum compiler)
2016-08-17 23:45:34 +02:00
Daniel Brockman
6999aad158 solc: add maintainer @dbrock 2016-08-17 23:31:20 +02:00
Franz Pletz
b4cc9bd63a Merge remote-tracking branch 'origin/master' into hardened-stdenv
Fixes #17801 and #17802.
2016-08-17 19:43:43 +02:00
Anthony Cowley
29572c28a3 llvm-3.8: build shared library on darwin (#17671)
- Enable the shared library build on darwin by default to match other
  platforms.

- Fix the dylib file's name in the store

- Symlink a versioned name as some tooling expects this.
2016-08-17 13:43:57 +02:00
obadz
537b746bbd ghc8: apply patches to fix https://ghc.haskell.org/trac/ghc/ticket/12130
Namely:

https://git.haskell.org/ghc.git/commitdiff/4d71cc89b4e9648f3fbb29c8fcd25d725616e265
https://git.haskell.org/ghc.git/commitdiff/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd
2016-08-14 13:43:01 +01:00
Robin Gloster
99cb230b47 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-14 09:09:20 +00:00
Austin Seipp
f277185b48 nixpkgs: compcert 2.6 -> 2.7.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-08-13 23:07:01 +00:00
Daniel Brockman
058ab3bf70 solc: init at 0.3.6 2016-08-12 12:23:00 +02:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Michael Raskin
5ea4e54b74 sbcl: 1.3.7 -> 1.3.8 2016-08-11 17:57:35 +02:00
Domen Kožar
18c0be1b3a go: 1.6.2 -> 1.6.3 2016-08-11 16:34:34 +02:00
Daiderd Jordan
53b60c8873 Merge pull request #17316 from the-kenny/rustc-beta-1.11.0
rustcBeta: Fix build
2016-08-11 12:22:17 +02:00
obadz
1cd9c58834 Merge pull request #17461 from rasendubi/powerpc
cross-compilation: fixes for powerpc-linux-uclibc
2016-08-11 00:51:51 +01:00
Vladimír Čunát
947abb08ac Merge branch 'staging' 2016-08-10 22:09:38 +02:00
Moritz Ulrich
02608c6a3c rustc: Disable failing linker-output-utf8 test. 2016-08-10 21:25:53 +02:00
Moritz Ulrich
3324123eb7 rustc-bootstrap: Use optionalString. 2016-08-10 21:16:48 +02:00
Moritz Ulrich
86326cbf54 rustc: Re-enable doCheck on Darwin. 2016-08-10 21:16:48 +02:00
Daiderd Jordan
2b806e9b71 rustc: Set TMPDIR on Darwin to fix build. 2016-08-10 21:16:48 +02:00
Moritz Ulrich
3dc73927fe rustHead.cargo: cargo -> 2016-07-25. 2016-08-10 21:16:48 +02:00
Moritz Ulrich
c8f878436e rustBeta.cargo: cargo -> 2016-07-25. 2016-08-10 21:16:48 +02:00
Moritz Ulrich
57a690fbe4 cargo: Force usage of pkgs.cacert. 2016-08-10 21:16:48 +02:00
Moritz Ulrich
6fd0591674 rustc: Disable doCheck on Darwin. 2016-08-10 21:16:37 +02:00
Moritz Ulrich
d5569064c3 rustcUnstable: Add note about when to drop the patch. 2016-08-10 21:16:37 +02:00
Moritz Ulrich
899d026426 rustUnstable.rustc: Fix tests by disabling lowering thread-count. 2016-08-10 21:16:37 +02:00
Moritz Ulrich
12fe154953 rust-bootstrap: Don't run patchelf on darwin. 2016-08-10 21:16:37 +02:00
Moritz Ulrich
0f25add68d rustUnstable.rustc: master-1.11.0 -> master-1.12.0
Note that tests are failing for this commit.
2016-08-10 21:16:37 +02:00
Moritz Ulrich
755be0e1ce rustBeta.cargo: Fix build. 2016-08-10 21:16:37 +02:00
Moritz Ulrich
4115e94c87 rustBeta.rustc: beta-1.10.10 -> 1.11.0, rustBeta.cargo: 0.10.0 -> 0.12.0. 2016-08-10 21:16:37 +02:00
Dan Peebles
4c43ac2db5 jsonnet: 0.8.7 -> 0.8.9 2016-08-09 19:39:46 +00:00
Vladimír Čunát
950feb70b2 treewide: fixup various mysql ocurrences after re-split 2016-08-07 20:46:37 +02:00
Vladimír Čunát
dddf84ff61 Merge #17512: gcc49: 4.9.3 -> 4.9.4 2016-08-06 21:10:51 +02:00
Tuomas Tynkkynen
9c0a090afe colm: Broken on i686
http://hydra.nixos.org/build/38072668
2016-08-06 17:06:45 +03:00
Lancelot SIX
8420753239
gcc49: 4.9.3 -> 4.9.4
Bugfix release of the 4.9 branch. See
http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00001.html for
announcement
2016-08-05 00:01:15 +02:00
Brad Ediger
f0f9172017 elm: Constrain aeson-pretty to <0.8 (#17511)
https://github.com/elm-lang/elm-compiler/pull/1431
2016-08-04 18:08:32 +02:00
Joe Hermaszewski
c7281d14f7 clang-3.5: fix build
Make Obj public in llvm's IntrusiveRefCntPtr

This fixes NixOs/nixpkgs#15974

It's not a nice fix, as it's really clang's problem. The proper fix
should modify clang's usage of IntrusiveRefCntPtr.
2016-08-03 19:00:39 +01:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Alexey Shmalko
a9bc2d530b
gcc: disable libsanitizer for uclibc
libsanitizer requires header files which are not present in uclibc.

Also, libsanitizer is disabled with uclibc for buildroot[1] and
openwrt[2].

[1]: https://git.busybox.net/buildroot/commit/?id=554e29e267e6b36a0fd78c82cbad2c82d939eb7f
[2]: 5f372a8ca0
2016-08-03 03:32:30 +03:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
1bf5ded193 treewide: Lots of meta.hydraPlatforms -> meta.platforms
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
2016-08-02 21:17:44 +03:00
Robin Gloster
1be4907ca2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-02 13:46:36 +00:00
Ricardo M. Correia
0a417845ef ponyc: 0.2.1 -> 2016-07-26 2016-08-02 07:37:17 +02:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Profpatsch
632411c2b6 openjdk7: replace vulnerable cups version (#17214)
Fixes #7407.
Also uses the nixpkgs version of cups, not a static one that is never
maintained.
2016-07-28 03:23:21 +02:00