Commit graph

3290 commits

Author SHA1 Message Date
Vladimír Čunát f94a806c4a properly fix the maintainer.matthewbauer problem
There was inconsisten usage of maintainers.matthewbauer and mbauer.
/cc @matthewbauer I chose the github identifier, as it's customary.
2016-05-27 15:58:41 +02:00
Vladimír Čunát e4832c7541 Merge branch 'staging'
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
Bjørn Forsman fc7c751515 Fix nixpkgs eval (caused by 'emscripten' expression)
Fixes this:

 $ nix-env -f . -qa '*' --meta --xml --drv-path --show-trace
 error: while evaluating ‘callPackageWith’ at .../lib/customisation.nix:93:35, called from .../pkgs/top-level/all-packages.nix:1411:24:
 while evaluating ‘makeOverridable’ at .../lib/customisation.nix:54:24, called from .../lib/customisation.nix:97:8:
 undefined variable ‘srcFC’ at .../pkgs/development/compilers/emscripten-fastcomp/default.nix:26:14

Also, "matthewbauer" is not defined in ./lib/maintainers.nix, comment
out.

Caused by f646b9295e and
d078fe1e9c.
2016-05-27 15:53:40 +02:00
Matthew Bauer f646b9295e Add myself as maintainer for emscripten, emscripten-fastcomp. 2016-05-26 19:05:13 -05:00
Matthew Bauer d078fe1e9c Fix hash issue in emscripten.
Just use "fetchFromGitHub" because that seems to be more
reliable. Still unclear what the actual issue was but
I'm thinking this will fix it. At least, this will
put it more in line with other packages.
2016-05-26 19:05:07 -05:00
Vladimír Čunát 81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Peter Simons 94b6127f8e ghc-8.0.1.nix: cosmetic 2016-05-25 16:26:26 +02:00
Joachim Schiele 5f42ed5125 Merge pull request #15684 from qknight/emscripten_1.36.4
emscripten: revision bump from 1.35.4 to 1.36.4, was tested with comp…
2016-05-25 12:24:33 +02:00
Joachim Schiele 4d261909b9 emscripten: revision bump from 1.35.4 to 1.36.4, was tested with compiling xml.js 2016-05-25 03:54:03 +02:00
Vladimír Čunát 0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Vladimír Čunát c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Vladimír Čunát 70cecb9cbd gcc: fix #15033: avoid lib64/ symlink to 32-bit lib/
This was caused by me in 90ee003240.
2016-05-22 12:03:12 +02:00
Joachim Fasting de3538c63e Merge pull request #15568 from NeQuissimus/kotlin102
kotlin: 1.0.1-2 -> 1.0.2
2016-05-20 15:40:41 +02:00
Joachim Fasting e071dab266 Merge pull request #15252 from acowley/llvm_38
llvm_38: update hashes and fix on darwin
2016-05-20 15:38:33 +02:00
Tim Steinbach 342dd50a1e kotlin: 1.0.1-2 -> 1.0.2 2016-05-20 02:35:00 +00:00
Vladimír Čunát c02f0ade90 fix evaluation on darwin, fixing tarball job fully 2016-05-19 10:04:43 +02:00
Vladimír Čunát 99e68e7c83 ghc-*: fix evaluation when using single-output gmp 2016-05-19 10:04:42 +02:00
Tuomas Tynkkynen e254750560 GCC: explicitly use some dev outputs 2016-05-19 10:04:41 +02:00
Tuomas Tynkkynen 7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen 2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +02:00
Tuomas Tynkkynen 99acb412ab treewide: Make explicit that 'dev' output of ncurses is used 2016-05-19 10:00:49 +02:00
Tuomas Tynkkynen 3f8b08f506 treewide: Make explicit that 'dev' output of mpfr is used 2016-05-19 10:00:49 +02:00
Tuomas Tynkkynen 5ecce6b94a treewide: Make explicit that 'dev' output of libffi is used 2016-05-19 10:00:41 +02:00
Tuomas Tynkkynen 47c45e2041 treewide: Make explicit that 'dev' output of gmp is used 2016-05-19 10:00:36 +02:00
Tuomas Tynkkynen 288912c2c4 treewide: Make explicit that 'dev' output of freetype is used 2016-05-19 10:00:34 +02:00
Tuomas Tynkkynen 825bd69b38 treewide: Make explicit that 'dev' output of boehmgc is used 2016-05-19 10:00:27 +02:00
Tuomas Tynkkynen 9f8a22fae5 treewide: Make explicit that 'dev' output of binutils is used 2016-05-19 10:00:26 +02:00
Nikolay Amiantov d3da0bd78f elm: add documentation on how to use update scripts and run them properly 2016-05-18 13:30:38 +03:00
Nikolay Amiantov c366ab933d haskell.packages.ghc801.ghc: upstream tarball updated 2016-05-18 13:25:48 +03:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Thomas Tuegel 9035827986 ats2: 0.2.6 -> 0.2.7 2016-05-16 08:08:50 -05:00
Franz Pletz 9e56f3a9b5 oraclejdk8: 8u91 -> 8u92 2016-05-13 17:27:00 +02:00
Franz Pletz d510563837 oraclejdk8: jmc is only available in jdk, not in jre 2016-05-13 17:27:00 +02:00
Vladimír Čunát 3e387c3e00 Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
Nikolay Amiantov 3098547ebc haskell.packages.ghc801: 8.0.0.20160421 -> 8.0.1 2016-05-12 19:47:51 +03:00
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Thomas Tuegel 3f74ac1f34 ats2: add ttuegel to maintainers 2016-05-11 10:02:09 -05:00
Thomas Tuegel d91e736de5 ats2: 0.2.4 -> 0.2.6 2016-05-11 10:01:59 -05:00
Stewart Mackenzie 6b9c67333f elm: 0.16.0 -> 0.17.0 (#15383) 2016-05-11 12:30:09 +01:00
Tobias Geerinckx-Rice dcf3fe2b78
dev86: 0.16.19 -> 0.16.21
Drop the ‘awful hackery’ that no longer seems needed (I can reproduce
the failure with .19, not with .21).
2016-05-10 23:30:37 +02:00
Anthony Cowley 43427da31e llvm_38: update hashes and fix on darwin
The hashes for libc++ and libc++abi were wrong.

There was also an incompatibility with nixpkgs on darwin which is now
weakly worked around: the "os_trace" macro changed definition in the OS
X development SDK since version 10.9 as used by nixpkgs. LLVM 3.8 uses
the new version, which I am temporarily replacing with a printf on
darwin as it is only used in one minor location.
2016-05-10 17:09:25 -04:00
Michael Raskin 99bab146a5 julia: 0.4.2 -> 0.4.5 2016-05-10 11:29:38 +02:00
Tomas Hlavaty 111110daee sbcl: 1.3.4 -> 1.3.5 2016-05-10 09:00:23 +02:00
Vladimír Čunát 65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Austin Seipp e3e27ecf4e nixpkgs: chez-scheme 9.4-20160501 -> 9.4-20160507
This allows us to remove a hack in the makefile, fixes a few bugs, and
also catches another edge case in the configure scripts.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-05-08 03:40:47 +00:00
Joachim Fasting 0a9b7b3159 Merge pull request #15155 from yawnt/java-source-files
jdk: keep source files for IDE support
2016-05-07 17:45:32 +02:00
Vladimír Čunát 72acb24c1f Merge #15084: gcc: add 6.1.0 2016-05-07 15:20:19 +02:00
Charles Strahan e965e42dc5 go: fix build on Darwin
The go tests get tripped up due to error messages along the lines of:

    ld: warning: /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation, ignoring unexpected dylib file

Which is due to us passing that along via $NIX_LDFLAGS in the `clang` wrapper.
To keep `go` from getting confused, I create a small `clang` wrapper that
filters out that warning.

Also, the strip.patch is no longer necessary, and only causes problems when
testing DWARF support:

    --- FAIL: TestDwarfAranges (0.59s)
        runtime-lldb_test.go:218: Missing aranges section
    FAIL
    FAIL    runtime 17.123s

Also, I disable the misc/cgo/errors test, as I suspect it is also due to similar
problems regarding `ld`:

    ##### ../misc/cgo/errors
    misc/cgo/errors/test.bash: BUG: expected error output to contain "err1.go:11:" but saw:
    # command-line-arguments
    cannot parse gcc output $WORK/command-line-arguments/_obj//_cgo_.o as ELF, Mach-O, PE object
    2016/05/07 02:07:58 Failed: exit status 1

Closes #14208
2016-05-06 22:34:16 -04:00
zimbatm 9e04279006 Merge branch 'pr/14743'
Closes #14743
2016-05-06 10:07:11 +01:00
ft 8ddddbfe43 added berkeley upc 2016-05-06 10:06:08 +01:00