| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | nix-exec: bump | Shea Levy | 2014-11-24 |
| | | |||
| * | nokogiri: use libiconvOrEmpty. assert libiconv is not used on linux | Domen Kožar | 2014-11-22 |
| | | |||
| * | nix-exec: bump | Shea Levy | 2014-11-21 |
| | | |||
| * | nix-exec: bump | Shea Levy | 2014-11-20 |
| | | |||
| * | ruby-2.1.1: fix patch numbering (and build) | Vladimír Čunát | 2014-11-20 |
| | | | | | | Wrong patch paths were ignored until recently by our stdenv. It's slightly unclear to me which patches were supposed to be used. | ||
| * | ruby-2.0: fix patch paths (and build) | Vladimír Čunát | 2014-11-20 |
| | | | | | Wrong patch paths were ignored until recently by our stdenv. | ||
| * | php: update from 5.4.34 to 5.4.35 (fixes CVE-2014-3710) | Pascal Wittmann | 2014-11-19 |
| | | |||
| * | nix-exec: bump | Shea Levy | 2014-11-16 |
| | | |||
| * | pypy: disable test_default_ciphers test | Domen Kožar | 2014-11-15 |
| | | |||
| * | Merge branch 'master' into staging | Vladimír Čunát | 2014-11-14 |
| |\ | | | | | | | | | Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh | ||
| | * | Merge pull request #4980 from henrytill/racket | Michael Raskin | 2014-11-13 |
| | |\ | | | | | | | racket: update to 6.1.1 | ||
| | | * | racket: update to 6.1.1 | Henry Till | 2014-11-13 |
| | | | | |||
| | * | | Merge branch 'python/docs' | Domen Kožar | 2014-11-13 |
| | |\ \ | | |/ | |/| | |||
| | | * | python: add python.interpreter attribute | Domen Kožar | 2014-11-13 |
| | | | | |||
| | * | | nix-exec: bump | Shea Levy | 2014-11-12 |
| | |/ | |||
| * | | Merge branch 'master' into staging | Luca Bruno | 2014-11-10 |
| |\| | |||
| | * | remove unused pythonLinkmeWrapper | Domen Kožar | 2014-11-08 |
| | | | |||
| * | | Revert "ruby: Fix build on systems with store optimisation. Closes #4273. ↵ | James Cook | 2014-11-06 |
| | | | | | | | | | | | | | | | | | | | #4266 promises a better fix." This reverts commit d2c0011c2fafa92624b30a2408123a15a1af390f. c04e49289871232ff3c2fd1239b64c2513f18fd1 gives a cleaner solution that's not specific to ruby. | ||
| * | | Merge remote-tracking branch 'origin/master' into staging | Eelco Dolstra | 2014-11-06 |
| |\| | | | | | | | | | Conflicts: pkgs/stdenv/generic/default.nix | ||
| | * | Turn more licenses into lib.licenses style | Mateusz Kowalczyk | 2014-11-06 |
| | | | | | | | | | | | | | Should eval cleanly, as far as -A tarball tells me. Relevant: issue #2999, issue #739 | ||
| * | | Merge recent master into staging | Vladimír Čunát | 2014-11-05 |
| |\| | | | | | | | | | | | | | | | | | | | | | Nixpkgs Hydra: ?compare=1157272 TODO: port e22889064f82be3 Conflicts: nixos/tests/gnome3_10.nix (auto-solved) pkgs/applications/video/aegisub/default.nix pkgs/development/libraries/boost/1.55.nix | ||
| | * | Disable parallel building of Guile for now | Michael Raskin | 2014-11-04 |
| | | | |||
| | * | php: update from 5.4.33 to 5.4.34, potentially fixes CVE-2014-3668, ↵ | Rob Vermaas | 2014-11-04 |
| | | | | | | | | | CVE-2014-3669, CVE-2014-3670 | ||
| | * | Update PicoLisp | Michael Raskin | 2014-11-04 |
| | | | |||
| | * | Merge pull request #4756 from iyzsong/guile-sdl | Arseniy Seroka | 2014-11-03 |
| | |\ | | | | | | | add guile-sdl and bump guile to 2.0.11 | ||
| | | * | guile: 2.0.9 -> 2.0.11 | 宋文武 | 2014-11-01 |
| | | | | |||
| | * | | Update Angelscript | Michael Raskin | 2014-11-02 |
| | | | | |||
| | * | | Update Regina interpreter | Michael Raskin | 2014-11-02 |
| | | | | |||
| * | | | Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging | Eelco Dolstra | 2014-11-04 |
| |\ \ \ | | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/editors/vim/macvim.nix | ||
| | * \ \ | Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv | Eelco Dolstra | 2014-10-09 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/tools/security/gnupg/default.nix | ||
| | * \ \ \ | Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging | Eelco Dolstra | 2014-09-23 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/development/interpreters/ruby/ruby-19.nix pkgs/development/libraries/libc++/default.nix pkgs/development/libraries/libc++abi/default.nix pkgs/tools/text/sgml/opensp/default.nix | ||
| | | * | | | | get rid of nasty CC stuff | Joel Taylor | 2014-09-09 |
| | | | | | | | |||
| | | * | | | | suitable clang stdenv | Joel Taylor | 2014-09-09 |
| | | | | | | | |||
| * | | | | | | Merge remote-tracking branch 'origin/master' into staging. | Peter Simons | 2014-11-02 |
| |\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||
| | * | | | | | python: 3.3.5 -> 3.3.6 | Domen Kožar | 2014-11-01 |
| | | | | | | | |||
| | * | | | | | python: 3.2.5 -> 3.2.6 | Domen Kožar | 2014-11-01 |
| | | |_|_|/ | |/| | | | |||
| * | | | | | Merge remote-tracking branch 'origin/master' into staging. | Peter Simons | 2014-10-31 |
| |\| | | | | |||
| | * | | | | Merge pull request #4701 from jirkamarsik/eff | cillianderoiste | 2014-10-28 |
| | |\ \ \ \ | | | | | | | | | | | | | Added eff-20140928 | ||
| | | * | | | | Added eff-20140928 | Jirka Marsik | 2014-10-28 |
| | | | | | | | |||
| | * | | | | | nix-exec: bump | Shea Levy | 2014-10-27 |
| | | | | | | | |||
| | * | | | | | Ruby: 2.1.3 and Fiddle support | Charles Strahan | 2014-10-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This packages Ruby 2.1.3, and adds Fiddle support for all 2.x versions. closes #4656 | ||
| | * | | | | | Merge pull request #4635 from asppsa/pure-0.63 | Aristid Breitkreuz | 2014-10-25 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Upgrade Pure to 0.63 | ||
| | | * | | | | | Upgrade Pure to 0.63 | Alastair Pharo | 2014-10-23 |
| | | | | | | | | |||
| | * | | | | | | ruby: Fix build on systems with store optimisation. Closes #4273. #4266 ↵ | James Cook | 2014-10-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | promises a better fix. (The build process attempted to copy file a overwriting file b, where a and b are hard-linked, which results in cp returning a non-zero exit code.) https://github.com/NixOS/nixpkgs/issues/4266 | ||
| | * | | | | | | nix-exec: bump | Shea Levy | 2014-10-24 |
| | | | | | | | | |||
| | * | | | | | | Merge pull request #4646 from geerds/python26-sqlite3 | Domen Kožar | 2014-10-24 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix python26Packages.sqlite3 | ||
| | | * | | | | | | Fix python26Packages.sqlite3 | Jascha Geerds | 2014-10-23 |
| | | |/ / / / / | |||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into staging | Eelco Dolstra | 2014-10-24 |
| |\| | | | | | | |||
| | * | | | | | | python: adding test/test_support.py module in all python versions | Rok Garbas | 2014-10-24 |
| | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - test/test_support.py module is used by many libraries which backport python 3.0 functionality to 2.6/2.7 - enable subprocess32 tests (now passing for python 2.6/2.7) | ||
| | * | | | | | Merge pull request #4479 from sjmackenzie/elixir-mix-fix | Mateusz Kowalczyk | 2014-10-24 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | Elixir's mix shouldn't be added to wrapProgram | ||