| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | Merge branch 'master' into staging | obadz | 2016-08-27 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/misc/navit/default.nix pkgs/applications/networking/mailreaders/alpine/default.nix pkgs/applications/networking/mailreaders/realpine/default.nix pkgs/development/compilers/ghc/head.nix pkgs/development/libraries/openssl/default.nix pkgs/games/liquidwar/default.nix pkgs/games/spring/springlobby.nix pkgs/os-specific/linux/kernel/perf.nix pkgs/servers/sip/freeswitch/default.nix pkgs/tools/archivers/cromfs/default.nix pkgs/tools/graphics/plotutils/default.nix | |||
| | * | Merge pull request #17947 from RamKromberg/init/rc | Joachim F | 2016-08-26 | |
| | |\ | | | | | | | rc: init at 1.7.4 | |||
| | | * | rc: init at 1.7.4 | Ram Kromberg | 2016-08-26 | |
| | | | | ||||
| | * | | tcsh: take patch from Debian and edit it to fix handling of glibc-2.24 union ↵ | Michael Raskin | 2016-08-26 | |
| | |/ | | | | | | | wait removal | |||
| * | | Revert "Revert "bash: 4.3-p42 -> 4.3-p46"" | Franz Pletz | 2016-08-26 | |
| | | | | | | | | | | | | | | | This reverts commit 36e75a2285feaff2e0c00e457e2a308e74a553c9. Sorry, had bash reverted temporarily to test the build of the sqlite bump and forgot to remove that commit. | |||
| * | | Revert "bash: 4.3-p42 -> 4.3-p46" | Franz Pletz | 2016-08-26 | |
| | | | | | | | | | This reverts commit e39a3237e6a24047304184e3d2da813683992e78. | |||
| * | | bash: 4.3-p42 -> 4.3-p46 | Eelco Dolstra | 2016-08-26 | |
| | | | ||||
| * | | Merge branch 'master' into hardened-stdenv | Franz Pletz | 2016-08-13 | |
| |\| | ||||
| | * | buildGoPackage: remove Go deps file `libs.json` | Kamil Chmielewski | 2016-08-11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After #16017 there were a lot of comments saying that `nix` would be better than `JSON` for Go packages dependency sets. As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046 > Because of the content-addressable store, if two programs have the > same dependency it will already result in the same derivation in > the > store. Git also has compression in the pack files so it won't make > much difference to duplicate the dependencies on disk. And finally > most users will just use the binary builds so it won't make any > differences to them. This PR removes `libs.json` file and puts all package dependencies in theirs `deps.json`. | |||
| * | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-08-12 | |
| |\| | ||||
| | * | oh-my-zsh: 2016-07-15 -> 2016-08-01 | Tim Steinbach | 2016-08-05 | |
| | | | ||||
| * | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-08-03 | |
| |\| | ||||
| | * | Re-enable bunch of packages on Darwin | Tuomas Tynkkynen | 2016-08-03 | |
| | | | | | | | | | | | Prior to 1bf5ded1933b18af9a95dc263063756ed9d383ba these contained `hydraPlatforms = platforms.linux`, which was apparently misleading. | |||
| | * | treewide: Add lots of meta.platforms | Tuomas Tynkkynen | 2016-08-02 | |
| | | | | | | | | | Build-tested on x86_64 Linux & Mac. | |||
| | * | treewide: Lots of meta.hydraPlatforms -> meta.platforms | Tuomas Tynkkynen | 2016-08-02 | |
| | | | | | | | | | | | | | In all of these files, there is no meta.platforms but only meta.hydraPlatforms, which doesn't seem to have any purpose except being inconsistent. | |||
| * | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-31 | |
| |\| | ||||
| | * | pash: 2015-11-06 -> 2016-07-06 | Rahul Gopinath | 2016-07-28 | |
| | | | ||||
| * | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-21 | |
| |\| | ||||
| | * | xonsh: 0.4.1 -> 0.4.3 | Rok Garbas | 2016-07-21 | |
| | | | ||||
| * | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-19 | |
| |\| | ||||
| | * | oh-my-zsh: 2016-07-05 -> 2016-07-15 | Tim Steinbach | 2016-07-18 | |
| | | | ||||
| * | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-07-15 | |
| |\| | ||||
| | * | oh-my-zsh: 2016-06-18 -> 2016-07-05 (#16874) | Tim Steinbach | 2016-07-12 | |
| | | | ||||
| | * | fish: 2.3.0 -> 2.3.1 | Louis Taylor | 2016-07-11 | |
| | | | ||||
| | * | Merge pull request #16589 from vrthra/elvish | Joachim Fasting | 2016-07-02 | |
| | |\ | | | | | | | elvish: disable darwin | |||
| | | * | elvish: disable darwin | Rahul Gopinath | 2016-06-28 | |
| | | | | ||||
| | * | | zsh-completions: init at version 0.18.0 (#16512) | Ole Jørgen Brønner | 2016-06-27 | |
| | | | | | | | | | | | | | | | | "This projects aims at gathering/developing new completion scripts that are not available in Zsh yet. The scripts are meant to be contributed to the Zsh project when stable enough." | |||
| | * | | xonsh: Add XONSH_INTERACTIVE and remove replay test | Rahul Gopinath | 2016-06-25 | |
| | | | | ||||
| | * | | xonsh: 0.3.4 -> 0.4.1 | Rahul Gopinath | 2016-06-25 | |
| | | | | | | | | | | | | | * Disable windows tests that get erroneously executed | |||
| | * | | Merge pull request #16329 from vrthra/elvish | Arseniy Seroka | 2016-06-25 | |
| | |\| | | | | | | | elvish: init at 0.1 | |||
| | | * | elvish: init at 0.1 | Rahul Gopinath | 2016-06-21 | |
| | | | | | | | | | | | | | A novel unix shell written in go language. | |||
| | * | | tcsh: import an Arch patch (merging the two patches into a single one) for ↵ | Michael Raskin | 2016-06-23 | |
| | | | | | | | | | | | | | fixing gcc5 optimisation | |||
| | * | | Merge pull request #14583 from AndersonTorres/tcsh | Michael Raskin | 2016-06-23 | |
| | |\ \ | | | | | | | | | tcsh: 6.18.01 -> 6.19.00 | |||
| | | * | | tcsh: 6.18.01 -> 6.19.00 | AndersonTorres | 2016-04-10 | |
| | | | | | ||||
| | * | | | pythonPackages.prompt_toolkit: move pygments to propagatedBuildInputs | Ricardo Ardissone | 2016-06-20 | |
| | | | | | ||||
| | * | | | xonsh: 0.3.2 -> 0.3.4 | Ricardo Ardissone | 2016-06-20 | |
| | | | | | ||||
| | * | | | Merge pull request #16339 from NeQuissimus/ohmyzsh20160618 | Joachim Fasting | 2016-06-20 | |
| | |\ \ \ | | | | | | | | | | | oh-my-zsh: 2016-04-20 -> 2016-06-18 | |||
| | | * | | | oh-my-zsh: 2016-04-20 -> 2016-06-18 | Tim Steinbach | 2016-06-19 | |
| | | | |/ | | |/| | ||||
| | * | | | zsh: add shellPath passthru | zimbatm | 2016-06-12 | |
| | | | | | ||||
| | * | | | xonsh: add shellPath passthru | zimbatm | 2016-06-12 | |
| | | | | | ||||
| | * | | | tcsh: add shellPath passthru | zimbatm | 2016-06-12 | |
| | | | | | ||||
| | * | | | rush: add shellPath passthru | zimbatm | 2016-06-12 | |
| | | | | | ||||
| | * | | | pash: add shellPath passthru | zimbatm | 2016-06-12 | |
| | | | | | ||||
| | * | | | mksh: add shellPath passthru | zimbatm | 2016-06-12 | |
| | | | | | ||||
| | * | | | fish: add shellPath passthru | zimbatm | 2016-06-12 | |
| | | | | | ||||
| | * | | | es: add shellPath passthru | zimbatm | 2016-06-12 | |
| | | | | | ||||
| | * | | | dash: add shellPath passthru | zimbatm | 2016-06-12 | |
| | |/ / | ||||
| | * | | fish: fix completion from NIX_PROFILES | Kjetil Orbekk | 2016-06-12 | |
| | | | | | | | | | | | | | | | | Load NIX_PROFILES at shell startup, not at build time. This one was missed in #16039. | |||
| * | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenv | Robin Gloster | 2016-06-10 | |
| |\| | | ||||
| | * | | no more goPackages | Kamil Chmielewski | 2016-06-09 | |
| | | | | ||||