summary refs log tree commit diff
Commit message (Expand)AuthorAge
...
* | | | | | | Merge pull request #6413 from benley/posix-all-the-thingsWout Mertens2015-02-18
|\ \ \ \ \ \ \
| * | | | | | | update-channel-branches: fix to work with posix /bin/shBenjamin Staffin2015-02-17
* | | | | | | | Apply upstream fix for Nix on XFSEelco Dolstra2015-02-18
* | | | | | | | nixUnstable: UpdateEelco Dolstra2015-02-18
* | | | | | | | Merge pull request #6421 from Havvy/patch-1Wout Mertens2015-02-18
|\ \ \ \ \ \ \ \
| * | | | | | | | Update Node stable to v.0.12.0Ryan Scheel2015-02-17
* | | | | | | | | Rearrange llvm dependencies slightly to avoid unnecessary dependencies on dar...Dan Peebles2015-02-18
|/ / / / / / / /
* | | | | | | | Merge pull request #6420 from DamienCassou/deactivate-simpleparse-on-python3Damien Cassou2015-02-18
|\ \ \ \ \ \ \ \
| * | | | | | | | Disable simpleparse on python3 and pypyDamien Cassou2015-02-18
* | | | | | | | | Merge pull request #6404 from codyopel/rtmpdumpWilliam A. Kennington III2015-02-17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rtmpdump: refactor & bump commitcodyopel2015-02-17
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6386 from codyopel/xvidcoreWilliam A. Kennington III2015-02-17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | xvidcore: refactor & 1.3.2 -> 1.3.3codyopel2015-02-17
* | | | | | | | | | Merge pull request #6417 from benley/haproxyWilliam A. Kennington III2015-02-17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | haproxy: update to 1.5.11Benjamin Staffin2015-02-17
* | | | | | | | | | | This doesn't hurt the current darwin stdenv and doesn't affect anything else,...Dan Peebles2015-02-18
* | | | | | | | | | | Fish wants libiconv too, even though it won't admit itDan Peebles2015-02-18
* | | | | | | | | | | wget wants libiconv but doesn't say soDan Peebles2015-02-18
* | | | | | | | | | | Bootstrap tools for the upcoming new darwin stdenv (not working yet in this s...Dan Peebles2015-02-18
* | | | | | | | | | | Flip cctools and cctools crossDan Peebles2015-02-18
* | | | | | | | | | | Merge pull request #6250 from gridaphobe/emacs-melpaEric Seidel2015-02-17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | reorganize emacs packages and add some meta infoEric Seidel2015-02-17
| * | | | | | | | | | | emacs: add ac-haskell-process and update auto-completeEric Seidel2015-02-17
| * | | | | | | | | | | add hi2 haskell-indentation modeEric Seidel2015-02-17
| * | | | | | | | | | | fix auto-completeEric Seidel2015-02-17
| * | | | | | | | | | | pull package-build.el from githubEric Seidel2015-02-17
| * | | | | | | | | | | add package.el-based emacs package builderEric Seidel2015-02-17
* | | | | | | | | | | | Merge pull request #6418 from gridaphobe/masterEric Seidel2015-02-17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix travis evaluation by providing explicit libiconv for the rare casesEric Seidel2015-02-17
* | | | | | | | | | | | | It doesn't appear to be necessary to force the libc++abi rpath in libc++, and...Dan Peebles2015-02-17
|/ / / / / / / / / / / /
* | | | | | | | | | | | Minor fixes for git on darwin (libiconv and Security dependencies)Dan Peebles2015-02-17
* | | | | | | | | | | | Minor fix for broken ruby evaluation and libiconvDan Peebles2015-02-17
* | | | | | | | | | | | Temporarily fix build of x509-system on Darwin.Joel Taylor2015-02-17
| |_|_|_|_|/ / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #6406 from bstrik/masterPeter Simons2015-02-17
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add myself to the maintainersbstrik2015-02-17
* | | | | | | | | | | nixos/wpa_supplicant: fix conflicting documentationMathijs Kwik2015-02-17
* | | | | | | | | | | Merge pull request #6402 from codyopel/xavsArseniy Seroka2015-02-17
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | xavs: add packagecodyopel2015-02-17
* | | | | | | | | | | speedtest-cli: drop the "python2.7-" name prefixBjørn Forsman2015-02-17
* | | | | | | | | | | speedtest-cli: align attrname with pkgnameBjørn Forsman2015-02-17
* | | | | | | | | | | Merge remote-tracking branch 'origin/staging'Shea Levy2015-02-17
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge pull request #5855 from peti/dont-use-special-gmp-variant-for-haskellPeter Simons2015-02-13
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Enable static libraries in "gmp" to allow static linking of Haskell programs.Peter Simons2015-02-13
| |/ / / / / / / / / /
| * | | | | | | | | | Merge remote-tracking branch 'master' into staging.Peter Simons2015-02-13
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cc-wrapper-improvements' of git://github.com/copumpkin/nixpkgs ...Shea Levy2015-02-11
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Some cc-wrapper changes to better support darwin and clang:Dan Peebles2015-02-08
| * | | | | | | | | | | | Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into stagingShea Levy2015-02-11
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | dont need -liconvEric Seidel2015-02-07
| | * | | | | | | | | | | | kill libiconvOr*Eric Seidel2015-02-07
* | | | | | | | | | | | | | Merge pull request #6394 from codyopel/libwebplethalman2015-02-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \