JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,734 Commits 2 Branches 0 Tags 12 GiB
6f33aa8465
Commit Graph

2417 Commits

Author SHA1 Message Date
Pascal Wittmann
e38c351f2b Merge pull request #5774 from j-keck/scala_2.11.5 
scala: update to 2.11.5
 2015-01-15 01:10:59 +01:00
j-keck
67fc5b509a scala: update to 2.11.5 2015-01-15 00:11:14 +01:00
Peter Simons
1912736a86 ghc-7.8.4: re-implement "fix build on Darwin" to avoid re-builds on Linux 
Originally, I thought that I can commit a "clean" patch -- even if it
triggers re-builds -- because those re-builds were triggered by the
ncurses patch to GHC anyway . That patch had to be reverted, though, so
now I'm rewriting this patch to avoid re-builds on Linux.

What a mess. :-(
 2015-01-15 00:06:06 +01:00
Peter Simons
df76eb1268 ghc: revert "propagate 'gmp' and 'ncurses' to ensure users can link the 'haskeline' library, etc." 
I thought that [1] could be fixed by ensuring that ncurses is available in the
environment (because ghc exports it as a propagateBuildInput), and indeed that
change fixed *some* build failures we've had before. However, the same error
still occurs with other packages, like hledger [2] and Agda [3]. Frankly, I
have no idea why those packages fail and others don't. But clearly the fix was
inadequate, so I'm reverting commit a8076c76.

[1] https://github.com/NixOS/nixpkgs/issues/5616
[2] http://hydra.cryp.to/build/372451/nixlog/1/raw
[2] http://hydra.cryp.to/build/373161/nixlog/1/raw
 2015-01-14 22:24:33 +01:00
Peter Simons
a8076c7654 ghc: propagate 'gmp' and 'ncurses' to ensure users can link the 'haskeline' library, etc. 
Fixes https://github.com/NixOS/nixpkgs/issues/5616.
 2015-01-14 11:24:59 +01:00
Eric Seidel
a92afcd34a ghc-7.8.4: fix build on Darwin 
https://github.com/NixOS/nixpkgs/pull/5746
 2015-01-14 11:24:59 +01:00
Peter Simons
c11f898e7e Merge pull request #4548 from echo-oddly/clash 
new package: clash
 2015-01-13 22:45:02 +01:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Peter Simons
ddf0804a87 ghc-7.8.3-binary: remove broken platforms 
The source tarballs URLs and hashes for everything but x86_64-darwin
were just copied from the 7.0.4 binaries. That's not going to work. :-(
 2015-01-13 21:25:14 +01:00
Vladimír Čunát
995c9db5e6 openjdk: add platforms on darwin to fix #5634 2015-01-13 16:42:32 +01:00
Peter Simons
e6bd78e8e5 Merge pull request #5718 from ryantrinkle/master 
Pull submodules of the ghcjs-boot repository recursively
 2015-01-12 10:20:10 +01:00
Michael Raskin
9a6afa95c1 Re-add SBCL 1.2.5 --- for StumpWM compatibility 2015-01-12 02:11:13 +03:00
Ryan Trinkle
363259acec Pull submodules of the ghcjs-boot repository recursively 
Without this, the result will not match the sha256 provided
 2015-01-11 18:03:45 -05:00
Michael Raskin
ff800b4270 Julia: update OpenBLAS dependency version 2015-01-12 01:46:57 +03:00
Michael Raskin
3452bc132f SBCL: 1.2.5 -> 1.2.7 2015-01-11 16:43:29 +03:00
Domen Kožar
44912c2ac1 Merge pull request #5598 from brendanlong/go-1.4 
go: Update to 1.4
 2015-01-11 07:46:58 +01:00
Jim Garrison
04729dd26a julia: 0.3.3 -> 0.3.5 2015-01-09 22:50:27 -08:00
Georges Dubus
74f15178b1 racer: updated to last git master 2015-01-09 14:16:04 +01:00
Peter Simons
c023a2778c Merge pull request #5641 from teh/master 
Fix elm-reactor.
 2015-01-08 15:18:54 +01:00
Tom Hunger
b32df8f6a7 Fix elm-reactor. 
The elm-reactor setup.hs file tries to build an elm file that's not
distributed in the cabal archive. The archive contains the
already-compiled js file so the step is unnecessary and I'm patching
it out.
 2015-01-08 14:12:20 +00:00
John Ericson
d47f443866 rustc: Cleanup HEAD and 0.12 derivations 
Hopefully they are now easier to maintain.
 2015-01-08 08:37:43 +00:00
John Ericson
f7092bb9d8 rustcMaster: Missing paren in error message 2015-01-08 08:22:56 +00:00
William A. Kennington III
3e931d40d7 openjdk-darwin: Add missing home passthru 2015-01-07 15:02:14 -08:00
Peter Simons
c1c0b4bbfd ghc: bump HEAD compiler to 7.10.1-rc1 2015-01-07 23:58:23 +01:00
William A. Kennington III
406fefdf83 icedtea_web: Cleanup java home 2015-01-07 14:55:41 -08:00
William A. Kennington III
238f4d1652 jdkPath: Remove in favor of jdk.home 2015-01-07 14:55:41 -08:00
William A. Kennington III
c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
William A. Kennington III
bbc4262514 java: Add home passthru 2015-01-07 14:55:41 -08:00
Ricardo M. Correia
e78763da0d rustcMaster: Rust's install script now installs the docs 2015-01-07 17:32:42 +01:00
Karn Kallio
691b047cfb mercury: Update to 14.01.1 2015-01-07 12:56:59 +01:00
Ricardo M. Correia
e43cde6a6c rustcMaster: Update from 0.13.0-pre-2763-g6366631 -> 0.13.0-pre-3497-g6539cb4 2015-01-07 05:50:40 +01:00
Brendan Long
8c3399f4d8 go: Update to 1.4 2015-01-06 13:31:02 -06:00
Karn Kallio
19cd862a6d pakcs: advance version 1.11.3 to 1.11.4, also fixing the build. 2015-01-06 11:15:48 +01:00
Domen Kožar
f2b01a662d fix tarball job, fixes #5559 2015-01-04 13:58:46 +01:00
aszlig
c08a49bffc
go: Remove explicitly adding libgcc_s.so. 
As of 65221567c1, it's no longer needed.

This is part of an attempt to fix nixpkgs tarball evaluation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-01-03 18:39:31 +01:00
John Wiegley
79b214ef95 ats, ats2: refine supported platforms to linux 2015-01-03 07:53:06 -05:00
Vincent Laporte
0ed2a253f1 Adds hop 2.5.1 
HOP is a multi-tier programming language for the Web 2.0 and the
so-called diffuse Web.

Homepage: http://hop.inria.fr/
 2015-01-02 00:01:40 +01:00
Vincent Laporte
5d36f5831c bigloo: propagate gmp build input 2015-01-01 23:55:30 +01:00
Peter Simons
735436c0c1 elm-make: re-generate with cabal2nix 2015-01-01 23:07:41 +01:00
Peter Simons
0a0965f2ac elm-reactor: mark broken 
http://hydra.cryp.to/build/297517/nixlog/2/raw
 2015-01-01 18:15:50 +01:00
Michael Raskin
3ee63790df Using the OpenJDK currency date patch for icedtea 2015-01-01 15:45:35 +01:00
Karn Kallio
330a4a28dd openjdk : Patch to extend valid currency change dates to 20 years. 2015-01-01 15:45:33 +01:00
William A. Kennington III
5fe743930a kerberos: Use default kerberos instead of krb5 2015-01-01 15:45:32 +01:00
Tobias Geerinckx-Rice
56692eec7c Fix user-facing typos (mainly in descriptions) 2015-01-01 15:45:32 +01:00
Ricardo M. Correia
24bb7dc46f rustcMaster: Update from 0.13.0-pre-2604-g2f3cff6 -> 0.13.0-pre-2763-g6366631 2015-01-01 15:45:31 +01:00
Tom Hunger
c53b959c0e Update elm to 0.14. 
Note that elm has a different package split: The old Elm 0.13 package
is now elm-compiler, elm-make and elm-package.

Instead of invoking "elm" one now has to use "elm-make".

I kept the 0.13 version of elm around in case someone depends
on it.
 2015-01-01 15:45:30 +01:00
Alexander Kjeldaas
f98df44ada Eradicate gzip -9 without -n 2015-01-01 15:45:30 +01:00
Charles Strahan
a0d62bf978 ghcjs: update to latest 2014-12-31 01:15:13 -05:00
Charles Strahan
df55381b65 ghcjs: restructure 2014-12-31 00:03:43 -05:00
Charles Strahan
a188373640 Merge branch 'master' of github.com:nixos/nixpkgs into ryghcjs 
Conflicts:
	pkgs/development/libraries/haskell/ghcjs-dom/default.nix
	pkgs/top-level/haskell-packages.nix
 2014-12-27 14:35:01 -05:00
Vladimír Čunát
becf038336 Merge branch 'staging' 2014-12-26 22:41:19 +01:00
Shea Levy
05edd656f6 Missed gcc refs 2014-12-26 12:28:15 -05:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc 
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
 2014-12-26 11:06:21 -06:00
Michael Raskin
dace8fe45f Merge pull request #5013 from doublec/aliceml 
Update aliceml to use git version of Alice ML
 2014-12-26 14:21:12 +03:00
Vladimír Čunát
b5bfacefa9 orc: maintenance update 
CC maintainer @fuuzetsu.
 2014-12-25 11:44:33 +01:00
Vladimír Čunát
47a9d03541 gcc: maintenance update 4.8.3 -> 4.8.4 2014-12-24 23:27:23 +01:00
Peter Simons
157e63c6e6 Update default Haskell compiler from GHC 7.8.3 to 7.8.4. 2014-12-24 09:56:31 +01:00
Peter Simons
8311973759 Add GHC 7.8.4 and create haskellPackages_ghc784 package set. 2014-12-23 20:44:49 +01:00
Ricardo M. Correia
6d1befb7b7 rustcMaster: Update from 0.13.0-pre-2600-g34d6800 -> 0.13.0-pre-2604-g2f3cff6 
The previous version had a serious bug.
 2014-12-22 23:47:43 +01:00
Ricardo M. Correia
3639bff381 rustcMaster: Update from 0.13.0-pre-1673-g3a325c6 -> 0.13.0-pre-2600-g34d6800 2014-12-22 19:30:01 +01:00
Pascal Wittmann
f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Peter Simons
f9580894f2 ghc-head: bump version to most recent snapshot 2014-12-18 19:03:28 +01:00
Peter Simons
c9cd0bc68c ghc-head: fix configure phase to make sure the compiler knows how to use gmp properly 
Start with version 7.9 of the compiler, the path to the gmp library must
now be passed to the top-level configure script.
 2014-12-18 19:03:28 +01:00
Vladimír Čunát
9cdd231ad3 gcc-4.6: bump to 4.6.4 
The dropped patch was applied upstream within the update.
 2014-12-14 16:24:31 +01:00
Mathijs Kwik
04f73ed2e4 ghc-head: upgrade to 2014-12-10 2014-12-13 21:17:14 +01:00
Domen Kožar
f4bde46b0f hhvm: use upstream patches to fix the build 
(cherry picked from commit b7894032b4708a8c9ccee99aca1b7d6166546d4d)
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-12-13 15:28:12 +01:00
Domen Kožar
b7eba773dc hhvm: 3.2.0 -> 3.3.0, fix build 
(cherry picked from commit 9d0d9ae9f7ea940ea63dfe019c2818edd6fc376a)
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-12-12 17:09:48 +01:00
Peter Simons
46b0c68ea2 Merge pull request #5282 from rickynils/java-truststore-env 
openjdk: Read SSL truststore from JAVAX_NET_SSL_TRUSTSTORE
 2014-12-12 09:22:15 +01:00
Rickard Nilsson
95fdc8cf29 openjdk: Introduce JAVAX_NET_SSL_TRUSTSTORE env 
This small patch makes it possible to control java's truststore path through
the environment. This lets you add (system- or session-wide) CAs that should
be allowed by Java. Java users can still use -Djavax.net.ssl.truststore to
override the truststore set by JAVAX_NET_SSL_TRUSTSTORE.

Something like this can be used to build the truststore (in this example just
using the standard pkgs.cacert CA-bundle):

{
  environment.variables.JAVAX_NET_SSL_TRUSTSTORE = "${
    pkgs.runCommand "cacerts" {} ''
      ${pkgs.perl}/bin/perl \
        ${pkgs.path}/pkgs/development/compilers/openjdk/generate-cacerts.pl \
        ${pkgs.jre}/bin/keytool \
        ${pkgs.cacert}/etc/ca-bundle.crt
      mv cacerts $out
    ''
  }";
}

Ideally, the dependency on pkgs.cacert should also be removed from pkgs.openjdk
to avoid rebuilding java each time the standard CA-bundle changes. Something
along the example above must then be added to NixOS (however, it would be
nice to not depend on ${pkgs.jre}/bin/keytool to generate that environment
variable).
 2014-12-12 01:14:09 +01:00
Michael Raskin
a199693cab Update/Fix OVMF 2014-12-11 08:46:13 +03:00
Mateusz Kowalczyk
691b2ac0ad haskell-Agda: update to 2.4.2.2 2014-12-10 09:48:11 +00:00
Domen Kožar
4aa3eec330 Merge branch 'master' into staging 
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
 2014-12-07 14:02:48 +01:00
Maciek Starzyk
c77ae0ced7 urweb: updated to version 20141206 2014-12-06 23:35:51 +01:00
Bas van Dijk
6fa969839a Merge branch 'master' of https://github.com/NixOS/nixpkgs into update 
Conflicts:
	pkgs/development/libraries/haskell/text-binary/default.nix
	pkgs/top-level/haskell-defaults.nix
	pkgs/top-level/haskell-packages.nix
 2014-12-05 07:54:48 +01:00
Georges Dubus
d3de398f34 rustSnapshot: upgraded to last master 2014-12-03 16:18:51 +01:00
Ricardo M. Correia
4dca8beea0 icedtea7: Fix patch 2014-12-03 06:05:43 +01:00
Ricardo M. Correia
fbd6f4d9b3 icedtea: Regenerate sources.nix 2014-12-03 05:42:34 +01:00
Ricardo M. Correia
31522e13c7 icedtea: Simplify update script 2014-12-03 05:41:51 +01:00
William A. Kennington III
d2488119cc icedtea7_web: 1.5.1 -> 1.5.2 2014-12-02 16:46:16 -08:00
William A. Kennington III
4dcd691fdf icedtea: 2.4.7 -> 2.5.3 2014-12-02 16:43:24 -08:00
William A. Kennington III
287db58750 icedtea: Fix updater to work with latest icedtea changes 2014-12-02 16:43:01 -08:00
Vladimír Čunát
4426d73ad8 gcc-4.9: maintenance update 2014-12-01 21:30:38 +01:00
Ricardo M. Correia
744dc4abdc rustcMaster: Install docs (into $out/share/doc) 2014-12-01 20:01:52 +01:00
Ryan Trinkle
21566e7c56 Remove outdated ghcjs nix expression 2014-12-01 08:09:35 -05:00
Bas van Dijk
f16e4508f4 Use optparse-applicative-0.11.0.1 in ghcjs 2014-11-30 18:08:28 +01:00
Bas van Dijk
9182824c6a Update ghcjs 2014-11-29 14:23:30 +01:00
muflax
5fd15e31b0 ccl: fix paths to coreutils 2014-11-29 06:14:53 +00:00
Ricardo M. Correia
d4b4bae307 Update my maintainership 2014-11-29 02:15:39 +01:00
Ricardo M. Correia
a83eb0f2a1 rustcMaster: Update from 0.12.0-pre-1336-g394269d -> 0.12.0-pre-1635-g29e928f 2014-11-29 02:04:55 +01:00
Vladimír Čunát
cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
muflax
856e5839e1 ccl: 1.8 -> 1.10 (reapply after false revert) 2014-11-27 22:48:07 +00:00
Arseniy Seroka
52ea3bb61f Revert "ccl: 1.8 -> 1.10" 2014-11-28 01:34:54 +03:00
muflax
3c7ac9db06 ccl: 1.8 -> 1.10 2014-11-27 22:33:21 +00:00
Vladimír Čunát
c52db08aa0 sdcc: fix build with glibc-2.20 (from upstream) 2014-11-27 00:51:35 +01:00
Vladimír Čunát
a68c1adc35 *: fix builds by disregarding warning from new glibc 
Says: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
CC: #4803. There will likely appear more of these errors on Hydra in time.
 2014-11-26 23:40:03 +01:00
Vladimír Čunát
b5ff06eda4 Merge branch 'master' into staging 2014-11-26 21:48:26 +01:00
Rene Donner
49561b8b65 julia -> 0.3.3 2014-11-25 20:57:36 +03:00
Pascal Wittmann
c73ce5fa1e lessc: add comment that versions > 2.x break twitter-bootstrap 2014-11-25 18:45:59 +01:00
Eelco Dolstra
e368ca20c9 Fix old Go versions 
http://hydra.nixos.org/build/17432147
http://hydra.nixos.org/build/17439772
 2014-11-25 00:53:06 +01:00
Vladimír Čunát
a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
Peter Simons
4f48c33b74 haskell-elm-get: jailbreak to fix build with recent http-client 2014-11-24 16:24:12 +01:00
Ricardo M. Correia
855241400c rustcMaster: Update from 0.12.0-pre-1166-g0047dbe -> 0.12.0-pre-1336-g394269d 
Fixes #5056
 2014-11-21 04:04:52 +01:00
Vladimír Čunát
e887fc72d3 nasm: add a do-not-update comment 2014-11-20 17:58:10 +01:00
David Virgilio
73b7bf6773 new package: clash-ghc 2014-11-20 08:38:09 -06:00
Vladimír Čunát
e3388aea6e nasm: downgrade again until syslinux gets fixed 
Syslinux won't compile with the new version http://hydra.nixos.org/build/17236670
We've already had one update+revert cycle before.
CC @psub.
 2014-11-20 11:33:25 +01:00
Mateusz Kowalczyk
1bded4188b scala: lib.licenses instead of a string 2014-11-19 18:54:58 +00:00
Mateusz Kowalczyk
03655c332a Add meta.branch to a bunch of packages 
Gives better results in the monitor
 2014-11-19 18:54:58 +00:00
Pascal Wittmann
885a29eefd nasm: update from 2.11.05 to 2.11.06 and adopt it 2014-11-19 08:47:41 +01:00
Moritz Ulrich
b46201250c gforth: Install gforth.el & add meta-data. 2014-11-18 14:45:28 +01:00
cillianderoiste
c1a0440bd3 Merge pull request #5022 from vbgl/roadsend 
Removes roadsend (broken)
 2014-11-18 10:17:45 +01:00
Vincent Laporte
1354bc0eba Updates (and fixes) opa 2014-11-18 07:26:16 +00:00
Vincent Laporte
15eec14f3a Removes roadsend (broken) 2014-11-17 22:42:21 +00:00
Ricardo M. Correia
2d3ec7d6f8 rustcMaster: Update from 0.12.0-pre-961-g93c85eb -> 0.12.0-pre-1166-g0047dbe 2014-11-17 20:39:40 +01:00
Mateusz Kowalczyk
9e79811eb6 AgdaStdlib: update to 0.9 
This should have really been updated with Agda itself.
 2014-11-17 16:48:10 +00:00
Luca Bruno
9631274f77 Add vala 0.26. Will be needed for gnome-terminal 3.14 2014-11-17 14:57:21 +01:00
Chris Double
eaf74a6b77 Update aliceml to use git version of Alice ML 
This allows 64 bit builds of Alice ML and removes the need for old
versions of gcc to build.

The license is changed to 'mit' from the 'bsd' that it was previously
as the COPYING files in the alice and seam repositories appear to be
the modern style MIT variant (also known as the ICU variant).

Added myself as the maintainer.
 2014-11-18 01:05:42 +13:00
Ryan Trinkle
ed6bfa2318 Update ghcjs 2014-11-17 01:08:11 -05:00
Eelco Dolstra
a0f3faf34e Merge remote-tracking branch 'origin/glibc-2.20' into staging 2014-11-16 22:17:36 +01:00
Aristid Breitkreuz
7bb0ff509c remove gcc 3.3 and snx ("SSL Network Extender"), the only package that depends on it 2014-11-16 14:57:42 +01:00
Rene Donner
60eeaf355c update julia, make it portable accross cpu architectures 2014-11-14 16:05:33 +01:00
Eelco Dolstra
ca441636f1 Merge branch 'staging' 2014-11-14 16:00:23 +01:00
Vladimír Čunát
b4af993c3f Merge branch 'master' into staging 
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
 2014-11-14 14:28:23 +01:00
Peter Simons
99312f4a51 haskell-Agda: update to version 2.4.2.1 2014-11-14 14:13:40 +01:00
Vladimír Čunát
961ed7c8b4 dmd: fix 32-bit build and some nitpicks 
CC #4976.
 2014-11-14 14:12:32 +01:00
Vladimír Čunát
b4214da14e gcc_multi: sync the change to 4.6 and 4.9 as well 2014-11-13 22:38:57 +01:00
Vladimír Čunát
457850397a gcc_multi: prevent overwritten libs after 51f1b4ec48 2014-11-13 22:30:32 +01:00
BlackEdder
959f706ace rdmd: update to new version 
Source of old version was not available anymore. Update also depends on
newer version of dmd.
 2014-11-13 20:51:32 +00:00
BlackEdder
fbd2330aff dmd: update to 2.066.1 2014-11-13 14:57:58 +00:00
Mateusz Kowalczyk
12379b27c8 mozart: use longDescription field 2014-11-13 13:50:49 +00:00
Michael Raskin
1fd3e9116b Fix software-version function in SBCL by changing uname location from /bin/ 2014-11-13 13:11:24 +03:00
Eelco Dolstra
f33fa1b66b Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/boost/generic.nix
 2014-11-11 23:48:08 +01:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Michael Raskin
6c39bbde6d Set correct current platform support for Mozart binary 2014-11-11 13:57:00 +03:00
Domen Kožar
eba10b008f fix tarball eval 2014-11-11 07:21:43 +01:00
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Michael Raskin
b6203b804b Mark binary distribution of Mozart/Oz 2.0 as such 2014-11-09 19:26:55 +03:00
stewart
076677d0bf removed shebang in builder.sh 2014-11-09 19:26:55 +03:00
stewart
a5756e79f2 depricate mozart-1.4 for mozart-2 2014-11-09 19:26:55 +03:00
Ricardo M. Correia
12a19684c7 rustcMaster: Fix test failure under grsec kernels 2014-11-09 04:59:31 +01:00
Ricardo M. Correia
4fc73a7873 rustcMaster: Update to newer rev 2014-11-09 04:59:31 +01:00
Maciek Starzyk
f72c460abf ocaml: 4.02.0 -> 4.02.1 2014-11-08 23:15:53 +01:00
Luca Bruno
83221f3886 Merge branch 'master' into staging 
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
 2014-11-08 15:56:40 +01:00
Peter Simons
484b26569a ghc-head: update to version 7.9.20141106 2014-11-07 23:22:27 +01:00
Michael Raskin
689f1af563 Refactor Lazarus build a bit and build it with all the components by default 2014-11-07 11:41:12 +03:00
Vincent Laporte
3d049938c8 Adds some “branch” meta-data 2014-11-06 19:40:50 +00:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style 
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
 2014-11-06 00:48:16 +00:00
Vladimír Čunát
52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging 
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
 2014-11-04 14:30:43 +01:00
karsten gebbert
9cbbd93c74 add elm-reactor to the package list 2014-11-04 11:47:32 +01:00