Commit graph

387 commits

Author SHA1 Message Date
Vladimír Čunát
8b565d6478
Merge #20081: update alsa lib, plugins and utils 2016-11-17 11:26:00 +01:00
Lancelot SIX
39297fa36b rush: 1.7 -> 1.8 (#20424) 2016-11-15 13:33:56 +00:00
Tim Steinbach
6a7e6cdd66
oh-my-zsh: 2016-10-25 -> 2016-11-03 2016-11-09 19:57:32 -05:00
Tim Steinbach
4c9d8538dd
oh-my-zsh: 2016-10-08 -> 2016-10-25 2016-10-25 14:29:36 -04:00
Tim Steinbach
276086c540
oh-my-zsh: 2016-09-24 -> 2016-10-08 2016-10-08 18:32:37 -04:00
Graham Christensen
822d484b68 oh-my-zsh: Fix oh-my-zsh's loading of ~/.oh-my-zsh 2016-10-07 17:18:17 -04:00
Thomas Tuegel
2e255a2edd
Merge branch 'staging' 2016-10-06 09:51:02 -05:00
Jörg Thalheim
2d84b44918 Merge pull request #19259 from periklis/topic_zsh-syntax-highlighting
zsh-syntax-highlighting: enable build for darwin
2016-10-06 09:58:02 +02:00
Vladimír Čunát
30f551d8b2 Merge branch 'master' into staging 2016-10-05 19:02:48 +02:00
Periklis Tsirakidis
c55937fab4 zsh-syntax-highlighting: enable build for darwin 2016-10-05 16:43:53 +02:00
Markus Hauck
aafbd40577 Replace hard coded /bin/bash occurrences 2016-10-04 20:15:37 +02:00
Jörg Thalheim
888f6a1280 Merge pull request #19199 from wizeman/u/fix-help2man-hash
help2man: fix hash
2016-10-03 19:26:44 +02:00
Ignat Loskutov
9f34b5595e
zsh-syntax-highlighting: init at 0.4.1
fixes #19179
2016-10-03 17:49:04 +02:00
Eelco Dolstra
518340624d Merge remote-tracking branch 'origin/master' into staging 2016-09-29 13:06:14 +02:00
Robert Helgesson
dbe350f5d0
bash-completion: 2.1 -> 2.4 2016-09-28 17:45:45 +02:00
Vladimír Čunát
77604964b6 Merge branch 'master' into staging 2016-09-28 17:13:59 +02:00
Tim Steinbach
e10d6cad6d
oh-my-zsh: 2016-08-01 -> 2016-09-24 2016-09-27 08:19:25 -04:00
Vladimír Čunát
f37566d396 bash 4.4: split headers into .dev 2016-09-17 10:51:32 +02:00
Vladimír Čunát
40a6918af3 bash: bring back 4.3 for the non-interactive version
... until someone looks better at the outputs. The size has grown in 4.4,
and it seems like installing binary plugins, headers, etc.
2016-09-17 10:49:28 +02:00
Vladimír Čunát
bbadb1da2a readline70: init at 7.0p0
Also switch bash-4.4 to it, as it's unable to link with older readline
versions (only bashInteractive is affected).
2016-09-17 01:16:24 +02:00
Vladimír Čunát
02163da708 bash: fixup the patch-list paths 2016-09-17 00:43:13 +02:00
Matthias Beyer
3689be00d8 Add bash-4.4-patches.nix 2016-09-16 22:06:55 +02:00
Matthias Beyer
4a674282e5 bash: 4.3 -> 4.4 2016-09-16 22:05:18 +02:00
Kamil Chmielewski
914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
2016-09-16 00:04:55 +01:00
obadz
3de6e5be50 Merge branch 'master' into staging
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
2016-08-27 23:54:54 +01:00
Joachim F
c30792ed43 Merge pull request #17947 from RamKromberg/init/rc
rc: init at 1.7.4
2016-08-26 18:34:32 +02:00
Franz Pletz
098680e78e
Revert "Revert "bash: 4.3-p42 -> 4.3-p46""
This reverts commit 36e75a2285.

Sorry, had bash reverted temporarily to test the build of the
sqlite bump and forgot to remove that commit.
2016-08-26 17:08:58 +02:00
Franz Pletz
36e75a2285
Revert "bash: 4.3-p42 -> 4.3-p46"
This reverts commit e39a3237e6.
2016-08-26 17:06:45 +02:00
Eelco Dolstra
e39a3237e6 bash: 4.3-p42 -> 4.3-p46 2016-08-26 16:36:07 +02:00
Ram Kromberg
4c72c81e08 rc: init at 1.7.4 2016-08-26 16:24:43 +03:00
Michael Raskin
693be25cc3 tcsh: take patch from Debian and edit it to fix handling of glibc-2.24 union wait removal 2016-08-26 14:59:39 +02:00
Franz Pletz
bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Kamil Chmielewski
da3ddd48e4 buildGoPackage: remove Go deps file libs.json
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`.
2016-08-11 23:07:09 +02:00
Tim Steinbach
43fd03a6df oh-my-zsh: 2016-07-15 -> 2016-08-01 2016-08-05 09:53:48 -04:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
16d48b8280 Re-enable bunch of packages on Darwin
Prior to 1bf5ded193 these contained
`hydraPlatforms = platforms.linux`, which was apparently misleading.
2016-08-03 00:55:42 +03:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
1bf5ded193 treewide: Lots of meta.hydraPlatforms -> meta.platforms
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.
2016-08-02 21:17:44 +03:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Rahul Gopinath
fbf85ce15a pash: 2015-11-06 -> 2016-07-06 2016-07-28 17:16:37 -07:00
Robin Gloster
1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Rok Garbas
d9871f52b4 xonsh: 0.4.1 -> 0.4.3 2016-07-21 01:01:57 +02:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Tim Steinbach
1e510fd87c oh-my-zsh: 2016-07-05 -> 2016-07-15 2016-07-18 10:55:02 -04:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Tim Steinbach
71ad2ed226 oh-my-zsh: 2016-06-18 -> 2016-07-05 (#16874) 2016-07-12 09:55:17 +02:00
Louis Taylor
5ee480bce5 fish: 2.3.0 -> 2.3.1 2016-07-11 05:43:47 +01:00
Joachim Fasting
3ac882ad44 Merge pull request #16589 from vrthra/elvish
elvish: disable darwin
2016-07-02 15:35:49 +02:00
Rahul Gopinath
8c7a32a670 elvish: disable darwin 2016-06-28 21:13:33 -07:00