Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit staging+systemd into closure-size | Vladimír Čunát | 2015-10-03 |
|\ | | | | | | | Many non-conflict problems weren't (fully) resolved in this commit yet. | ||
| * | Merge commit 'a6f6c0e' into master.upstream | William A. Kennington III | 2015-09-15 |
| |\ | | | | | | | | | | | | | This is a partial merge of staging where we have up to date binaries for all packages. | ||
| | * | bash4.3: p39 -> p42 | William A. Kennington III | 2015-08-31 |
| | | | |||
| | * | bash: Remove stale 4.1 patches | William A. Kennington III | 2015-08-31 |
| | | | |||
| * | | zsh: 5.1 -> 5.1.1 | Pascal Wittmann | 2015-09-12 |
| | | | |||
| * | | Merge pull request #9254 from FRidh/jupyter | Pascal Wittmann | 2015-09-08 |
| |\ \ | | | | | | | | | ipython: 3.2 -> 4.0 | ||
| | * | | python-packages ipython: 3.2 -> 4.0 | Frederik Rietdijk | 2015-08-29 |
| | |/ | |||
| * | | [zsh] disable tests again, they fail on hdyra | Pascal Wittmann | 2015-09-08 |
| | | | |||
| * | | zsh: enable tests | Pascal Wittmann | 2015-09-06 |
| | | | |||
| * | | zsh: update from 5.0.8 to 5.1 | Pascal Wittmann | 2015-09-06 |
| |/ | |||
| * | add binutils to bash build for `size` | Jude Taylor | 2015-08-12 |
| | | |||
| * | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-08-05 |
| |\ | |||
| | * | ipython: 3.1 -> 3.2.1 | Frederik Rietdijk | 2015-08-05 |
| | | | |||
| * | | More docs/manpages in separate outputs | Eelco Dolstra | 2015-07-27 |
| |/ | |||
| * | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-07-15 |
| |\ | |||
| | * | mksh 50d -> 51 | Tobias Geerinckx-Rice | 2015-07-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | R51 is a strongly recommended feature release. Changes: <https://www.mirbsd.org/mksh.htm#clog>. Release number changed to match Nix versioning rules ("R51" -> 51). cc maintainer @AndersonTorres | ||
| | * | fish: Fixed "Could not autoload item 'seq'..." | Maciek Starzyk | 2015-07-14 |
| | | | |||
| * | | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-07-13 |
| |\| | |||
| | * | Merge pull request #8774 from mstarzyk/fish-shell | lethalman | 2015-07-13 |
| | |\ | | | | | | | | | fish: 2.1.2 -> 2.2.0 | ||
| | | * | fish: 2.1.2 -> 2.2.0 | Maciek Starzyk | 2015-07-12 |
| | | | | |||
| | * | | xonsh: Don't use fetchurl on dynamically generated GitHub tarballs | Tuomas Tynkkynen | 2015-07-12 |
| | | | | | | | | | | | | | | | | Just use fetchFromGitHub instead. | ||
| * | | | Merge branch 'master' into staging | Thomas Tuegel | 2015-06-25 |
| |\| | | |||
| | * | | es: bugfix for man page install | Tommy M. McGuire | 2015-06-24 |
| | | | | | | | | | | | | | | | | See Issue #8487. | ||
| * | | | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-06-22 |
| |\| | | |||
| | * | | Add myself as maintainer | Jascha Geerds | 2015-06-22 |
| | |/ | |||
| * / | bash: Update to 4.3-p39 | Eelco Dolstra | 2015-06-22 |
| |/ | |||
| * | zsh: update from 5.0.7 to 5.0.8 | Pascal Wittmann | 2015-06-08 |
| | | | | | | | | add myself as maintainer | ||
| * | cygwin: bash updated to 4.3 for cygwin platform | Rok Garbas | 2015-05-29 |
| | | |||
| * | Don't use "with licenses;" for single licences | Tobias Geerinckx-Rice | 2015-05-28 |
| | | | | | | | | And don't use square brackets on such lines. | ||
| * | cygwin: add cygwin compatible bash version. | Marko Durkovic | 2015-05-28 |
| | | |||
| * | Merge pull request #7903 from joelmo/patch-3 | Mateusz Kowalczyk | 2015-05-26 |
| |\ | | | | | | | ipython: comments about deprecated pylab flag | ||
| | * | ipython: comments about deprecated pylab flag | Joel Moberg | 2015-05-19 |
| | | | | | | | | | The pylab flag is deprecated: http://mail.scipy.org/pipermail/ipython-dev/2014-March/013411.html | ||
| * | | fish: dont demand man-db on darwin since we cant build it | Eric Seidel | 2015-05-23 |
| |/ | |||
| * | pythonPackages.ipython: 2.3.1 -> 3.1.0 | Utku Demir | 2015-05-02 |
| | | |||
| * | mksh: clarify that it's Free | Tobias Geerinckx-Rice | 2015-04-30 |
| | | |||
* | | Merge staging into closure-size | Vladimír Čunát | 2015-05-05 |
|\| | |||
| * | meta.licenses -> license | Joachim Fasting | 2015-04-21 |
| | | |||
| * | meta.homePage -> homepage | Eelco Dolstra | 2015-04-20 |
| | | |||
| * | new package: es | Stewart Mackenzie | 2015-04-11 |
| | | |||
* | | Merge 'staging' into closure-size | Vladimír Čunát | 2015-04-18 |
|\| | | | | | | | | | | | | | | | - there were many easy merge conflicts - cc-wrapper needed nontrivial changes Many other problems might've been created by interaction of the branches, but stdenv and a few other packages build fine now. | ||
| * | xonsh: new package | Spencer Whitt | 2015-03-26 |
| | | |||
| * | Set some meta.platforms | Eelco Dolstra | 2015-03-20 |
| | | | | | | | | Also fix meta.platform -> meta.platforms in a few places. | ||
| * | fish: 2.1.1 -> 2.1.2 | koral | 2015-03-05 |
| | | |||
| * | Fish wants libiconv too, even though it won't admit it | Dan Peebles | 2015-02-18 |
| | | |||
| * | Merge pull request #6319 from sorokin/master | Peter Simons | 2015-02-12 |
| |\ | | | | | | | bash-completion: fix bad array subscript error. Closes #6117 | ||
| | * | bash-completion: fix bad array subscript error. Closes #6117 | Ivan Sorokin | 2015-02-12 |
| | | | |||
| * | | Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' | Shea Levy | 2015-02-02 |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix | ||
| | * | bash: Update to 4.3-p30 | Eelco Dolstra | 2015-01-26 |
| | | | |||
| * | | MKSH (version R50d): New Package | AndersonTorres | 2015-01-25 |
| |/ | | | | | | | MKSH is the MirBSD Korn Shell. | ||
| * | nixpkgs: remove redundant attribute `sip` | Vincent Laporte | 2014-12-23 |
| | | | | | | | | | | | | | | | | | | Because: 1. It is a mere alias of `pythonPackages.sip` 2. It is usually not needed since propagated by `pyqt4` 3. It makes it easy to have a packages depend on two different versions of sip |