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
Ole Jørgen Brønner
08f0ce1d0a
zsh-completions: init at version 0.18.0 ( #16512 )
...
"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."
2016-06-27 00:39:18 +02:00
Rahul Gopinath
ae3d492924
xonsh: Add XONSH_INTERACTIVE and remove replay test
2016-06-25 17:50:27 -07:00
Rahul Gopinath
f3fc9f1eb0
xonsh: 0.3.4 -> 0.4.1
...
* Disable windows tests that get erroneously executed
2016-06-25 09:27:18 -07:00
Arseniy Seroka
045cd10e77
Merge pull request #16329 from vrthra/elvish
...
elvish: init at 0.1
2016-06-25 13:40:47 +03:00
Michael Raskin
b3bcb59bd5
tcsh: import an Arch patch (merging the two patches into a single one) for fixing gcc5 optimisation
2016-06-23 11:01:21 +02:00
Michael Raskin
b300a8937e
Merge pull request #14583 from AndersonTorres/tcsh
...
tcsh: 6.18.01 -> 6.19.00
2016-06-23 08:47:20 +00:00
Rahul Gopinath
293d23abb4
elvish: init at 0.1
...
A novel unix shell written in go language.
2016-06-21 00:04:54 -07:00
Ricardo Ardissone
b81f3e4682
pythonPackages.prompt_toolkit: move pygments to propagatedBuildInputs
2016-06-20 13:41:05 +02:00
Ricardo Ardissone
5d80a0244b
xonsh: 0.3.2 -> 0.3.4
2016-06-20 13:41:05 +02:00
Joachim Fasting
b3832e6288
Merge pull request #16339 from NeQuissimus/ohmyzsh20160618
...
oh-my-zsh: 2016-04-20 -> 2016-06-18
2016-06-20 03:54:10 +02:00
Tim Steinbach
b2faec8adc
oh-my-zsh: 2016-04-20 -> 2016-06-18
2016-06-19 14:19:23 +00:00
zimbatm
7e578dc334
zsh: add shellPath passthru
2016-06-12 18:57:31 +01:00
zimbatm
a9f42f633b
xonsh: add shellPath passthru
2016-06-12 18:57:31 +01:00
zimbatm
53060e5bb8
tcsh: add shellPath passthru
2016-06-12 18:57:31 +01:00
zimbatm
2e22de1f58
rush: add shellPath passthru
2016-06-12 18:57:30 +01:00
zimbatm
27ef2eb695
pash: add shellPath passthru
2016-06-12 18:57:30 +01:00
zimbatm
7fcd50da4f
mksh: add shellPath passthru
2016-06-12 18:57:30 +01:00
zimbatm
b482036cbb
fish: add shellPath passthru
2016-06-12 18:57:29 +01:00
zimbatm
68865f51ef
es: add shellPath passthru
2016-06-12 18:57:29 +01:00
zimbatm
b5dad466d5
dash: add shellPath passthru
2016-06-12 18:57:29 +01:00
Kjetil Orbekk
3d7c8bd179
fish: fix completion from NIX_PROFILES
...
Load NIX_PROFILES at shell startup, not at build time.
This one was missed in #16039 .
2016-06-12 01:16:35 -04:00
Robin Gloster
8031cba2ab
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-06-10 09:27:04 +00:00
Kamil Chmielewski
7eb671ebcd
no more goPackages
2016-06-09 13:08:00 +02:00
Kamil Chmielewski
c7bf8afbfc
oh: extracted from goPackages
2016-06-09 11:21:30 +02:00
Kjetil Orbekk
027ca71156
fish: fix completions
...
Completion was broken because some variables were resolved at
installation time instead of being added to the script.
Closes #16039 .
2016-06-07 14:38:54 +02:00
Rok Garbas
66c73b3f36
xonsh: 0.2.7 -> 0.3.2
...
* pythonPackages.prompt_toolkit make it build for py35
2016-06-04 18:05:12 +02:00
Tuomas Tynkkynen
bac26e08db
Fix lots of fetchgit hashes (fallout from #15469 )
2016-06-03 17:17:08 +03:00
Robin Gloster
2d382f3d98
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-30 19:39:34 +00:00
rnhmjoj
17ec9368cd
fish: 2.2.0 -> 2.3.0
2016-05-26 00:10:22 +02:00
Vladimír Čunát
3472b61f37
fish: use a different alias man_db -> man-db
2016-05-24 10:07:29 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-05-18 17:10:02 +02:00
Rok Garbas
76222c10d5
zsh-prezto: update to latest and fetch submodules
2016-05-17 01:56:35 +02:00
Peter Simons
8e462995ba
Bring my stdenv.lib.maintainers user name in line with my github nick.
2016-05-16 22:49:55 +02:00
Alexei Robyn
0cebbc92f0
rssh: init at 2.3.4
2016-05-16 12:02:14 +10:00
Rok Garbas
770017d610
zsh-prezto: init at revision 7227c4f0b
2016-05-15 05:05:05 +02:00
Vladimír Čunát
6c2fbfbd77
Merge branch 'master' into staging
2016-05-12 04:53:38 +02:00
Ricardo Ardissone
5009d53d9a
xonsh: 0.1.3 -> 0.2.7
2016-05-11 13:19:58 -03:00
Tuomas Tynkkynen
aadaa91379
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Robin Gloster
c92bca56f8
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-02 22:58:02 +00:00
Tim Steinbach
e05ef5f94b
oh-my-zsh: 2016-04-06 -> 2016-04-20
2016-04-30 01:43:31 +00:00
Tuomas Tynkkynen
4ff8f377af
Merge remote-tracking branch 'upstream/master' into staging
2016-04-28 00:13:53 +03:00
Eric Seidel
7e92ae903e
fish: only use kbd on linux
2016-04-25 09:13:06 -07:00
Vladimír Čunát
c7377b0e4a
zlib, bash: mass-rebuild cleanup
2016-04-25 17:12:49 +02:00
Tuomas Tynkkynen
cfdef68ad2
fish: Reference correct output of glibc
2016-04-18 21:32:43 +03:00
Robin Gloster
d020caa5b2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-18 13:49:22 +00:00
AndersonTorres
974cbde58e
tcsh: 6.18.01 -> 6.19.00
2016-04-10 20:40:26 -03:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Tuomas Tynkkynen
03c6434756
Merge pull request #14526 from Profpatsch/fish-completions
...
fish: pick up completion files from other packages
2016-04-09 20:08:46 +03:00
Profpatsch
a011083cda
fish: pick up completion files from other packages
...
Some packages bring their own completions in
/share/fish/vendor_completions.d. Now they are picked up by fish from
every path in NIX_PROFILES.
2016-04-09 00:08:48 +02:00
Robin Gloster
3e68106afd
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-07 21:52:26 +00:00
Tim Steinbach
0d8b694a10
oh-my-zsh: 2016-03-31 -> 2016-04-06
2016-04-07 08:33:17 -04:00
Robin Gloster
812e25c86b
mksh: disable format hardening
2016-04-06 09:12:20 +00:00
Robin Gloster
696d85a62d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-03 11:01:57 +00:00
joachifm
e4874acae6
Merge pull request #14343 from mayflower/upstream-zsh-zprofile
...
zsh: fix configureFlags #14256
2016-04-01 14:44:38 +00:00
Tim Steinbach
d9798553c6
oh-my-zsh: 2016-03-24 -> 2016-03-31
2016-04-01 08:09:34 -04:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Christian Albrecht
9c6a69230d
zsh: fix configureFlags #14256
...
commit 97332d3
introduced non expanding $out/etc/zprofile in zshs compiled in PATH.
this commit reverts the change so that $out is expanded at configure time.
2016-03-31 16:57:30 +02:00
Robin Gloster
f60c9df0ba
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-28 15:16:29 +00:00
NeQuissimus
83f37b8d10
oh-my-zsh: 2016-03-19 -> 2016-03-24
2016-03-25 15:07:06 -04:00
Tim Steinbach
00db6a67f1
oh-my-zsh: 2016-03-11 -> 2016-03-19
2016-03-22 22:04:39 +00:00
Peter Hoeg
fa0c2c08a2
bash-completion: remove collision
...
nmcli is already provided by network-manager
2016-03-20 22:18:53 +08:00
Tim Steinbach
344f9672d0
oh-my-zsh: 2016-02-27 -> 2016-03-11
2016-03-15 10:34:10 -04:00
Robin Gloster
3f45f0948d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-15 01:44:24 +00:00
Christoph Hrdinka
c4ee8f5700
zsh: fix zsh.info* install location
2016-03-09 14:13:31 +01:00
Thomas Tuegel
da972b6cc4
ncurses: move runtime utilities to $out
...
All the programs provided by ncurses were being installed to the $dev
output, but several of them are intended for runtime use, e.g. to
operate on the running terminal. These user-facing programs are moved to
the $bin output.
Several packages referred to "${ncurses}/bin" or "${ncurses.dev}/bin" at
runtime; these paths are also updated to refer to "${ncurses.bin}/bin".
2016-03-08 11:35:24 -06:00
Tobias Geerinckx-Rice
efb76ae10b
mksh: 52 -> 52c
...
Changes: https://www.mirbsd.org/mksh.htm#clog
2016-03-08 18:07:00 +01:00
Vladimír Čunát
61ebdc192d
bash-interactive: better split doc stuff
...
... while avoiding mass rebuild ATM.
2016-03-08 09:59:24 +01:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
baee91ec60
cc-wrapper: Check if ld supports -z, fixes darwin
2016-03-07 21:40:20 +01:00
Sergiu Ivanov
7a31227573
oh-my-zsh-git: init at 2016-02-27
2016-03-07 19:42:26 +01:00
Franz Pletz
aff1f4ab94
Use general hardening flag toggle lists
...
The following parameters are now available:
* hardeningDisable
To disable specific hardening flags
* hardeningEnable
To enable specific hardening flags
Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.
cc-wrapper supports the following flags:
* fortify
* stackprotector
* pie (disabled by default)
* pic
* strictoverflow
* format
* relro
* bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
d47857c3d9
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-01 21:09:17 +00:00
zimbatm
57f7ff00fe
Merge pull request #13368 from nathan7/fish-ul
...
fish: fix hidden dependency on ul(1) on Linux
2016-02-28 22:09:32 +00:00
Nathan Zadoks
010271d47a
fish: fix hidden dependency on ${glibc}/bin/getent on Linux
2016-02-28 22:27:53 +01:00