3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

105988 commits

Author SHA1 Message Date
Jörg Thalheim cccd8420c5
vimPlugins.vim-trailing-whitespace init at 2016-03-27 2017-04-23 21:42:49 +02:00
Jörg Thalheim e57a4f3827 Merge pull request #25142 from kevincox/etcd-3.1.6
etcd: 3.0.6 -> 3.1.6
2017-04-23 21:23:09 +02:00
Maximilian Bosch 0a12aafde4 zsh-syntax-highlighting: Add more configuration options and move to module (#25153)
* programs.zsh: factor zsh-syntax-highlighting out into its own module

* programs.zsh.syntax-highlighting: add `highlighters` option

* programs.zsh: document BC break introduced by moving zsh-syntax-completion into its own module
2017-04-23 21:17:31 +02:00
Vladimír Čunát 5a3e454db3
Revert "kdiff3: fixup patch hash after #25059"
This reverts commit b72d4e13c7.
The problem was fixed by the parent commit.
2017-04-23 20:53:34 +02:00
Tuomas Tynkkynen 814772e93e Revert "patchutils: 0.3.3 -> 0.3.4"
This reverts commit d550c90712.

This changes the output of filterpatch thus affects hashes of any
fetchpatch calls in nixpkgs:

https://github.com/NixOS/nixpkgs/issues/25154
2017-04-23 21:46:35 +03:00
Tuomas Tynkkynen f3b1d6925e Revert "patchutils: Drop patch applied upstream"
This reverts commit 1e1b68b4a0.
2017-04-23 21:46:29 +03:00
aszlig f84b8178aa
wine-staging: Fix SHA256 hash
In c6b3c66277, the unstable version has
been bumped to 2.6.

Unfortunately the staging source is re-using the version attribute from
the unstable source and thus has been bumped as well.

I have built wineStaging on x86_64-linux and it now succeeds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @FRidh
2017-04-23 20:37:53 +02:00
Jörg Thalheim c83a2f2601 Merge pull request #25119 from rlupton20/emacs-all-the-icons
emacs-all-the-icons-fonts: init at 2.5.0
2017-04-23 20:28:19 +02:00
John Ericson b59fdc4289 Merge pull request #25099 from obsidiansystems/cross-lib-foundation
Changes to nixpkgs infra to prepare to better package some pesky cross-compilers

No hashes (native or cross) should be changed
2017-04-23 14:12:42 -04:00
gnidorah 749d495cb3 rambox, franz: cleanup (#25020) 2017-04-23 19:10:35 +01:00
John Ericson 863d79b364 top-level: Introduce targetPackages and a "double link fold"
Each bootstrapping stage ought to just depend on the previous stage, but
poorly-written compilers break this elegence. This provides an easy-enough
way to depend on the next stage: targetPackages. PLEASE DO NOT USE IT
UNLESS YOU MUST!

I'm hoping someday in a pleasant future I can revert this commit :)
2017-04-23 14:01:12 -04:00
John Ericson d59e4fbb75 stage.nix: Better explain why buildPackages as null is valid arg 2017-04-23 14:01:12 -04:00
John Ericson af8f87a3a1 top-level: Do not splice pkgs, buildPackages or *Platform
- `pkgs` is self-similar, and thus already spliced
 - `buildPackages` is an ingredient of splicing and should be kept as is
 - The platforms are not packages or package sets and couldn't be spliced

There's probably other things that shouldn't be spliced too. The best long-
term solution is simply to stop splicing altogether.
2017-04-23 13:54:42 -04:00
Jörg Thalheim 4700da04ca Merge pull request #25150 from evujumenuk/zfs-ikv
zfs: Bump incompatibleKernelVersion to "4.11"
2017-04-23 19:30:13 +02:00
Bjørn Forsman ddb788b671 OVMF: get version number from edk2
OVMF is built from edk2 sources so that's where its version number comes
from (logically). The edk2 version number is 2014-12-10, so this change
only ensures the version numbers won't drift apart in the future. (There
is no hash change.)
2017-04-23 19:28:34 +02:00
aszlig dc87b5587e
nixos: Add a VM test for the SLiM display manager
This is currently our default display manager, so I'm adding this to the
"tested" job as well to ensure we don't ship broken revisions where X is
most likely not working.

The test uses a custom SLiM theme that's specifically tailored for good
OCR results (mainly white background and black fonts without anything
else), because our default NixOS theme has a very small contrast between
background and fonts in some places.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-04-23 19:25:27 +02:00
aszlig 83e1400e0c
nixos/slim: Implement logging to journal
The main change here is a patch of SLiM to tread a log file of
/dev/stderr specially in that it now uses std::cerr instead of a file
for logging.

This allows us to set the logfile to stderr in NixOS for the generated
SLiM configuration file and we now get logging to the systemd journal.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-04-23 19:25:23 +02:00
obadz dcc61da97c Merge pull request #25102 from obadz/python-pyspread
python2Packages.pyspread: init at 1.1 (and fix wxPython to inject required dependencies)
2017-04-23 17:55:29 +01:00
Matthias Beyer c44be81d38 Revert "ipfs: 0.4.6 -> 0.4.8" (#25149)
This reverts commit a309890044.
2017-04-23 17:37:30 +01:00
Thomas Tuegel 6565ef0ab9 Merge pull request #25147 from gnidorah/master
qtstyleplugins: 2016-12-01 -> 2017-03-11
2017-04-23 10:46:29 -05:00
Nikolay Amiantov 13162b9ddb fritzing: 0.9.0b -> 0.9.3b
Fixes #24943.
2017-04-23 17:53:11 +03:00
Nikolay Amiantov 5565728670 system-config-printer: 1.5.7 -> 1.5.9
Use gappsWrapHook.
2017-04-23 17:08:56 +03:00
evujumenuk aef776836d zfs: Bump incompatibleKernelVersion to "4.11"
https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5.9 attests compatibility with kernel versions up to 4.10.x.
2017-04-23 16:05:38 +02:00
Nikolay Amiantov a02b18998f firefox-bin: don't install .desktop file
It's handled by wrapFirefox.
2017-04-23 16:34:48 +03:00
Nikolay Amiantov 6df350ffc8 firefox-bin: use wrapGAppsHook 2017-04-23 16:34:24 +03:00
gnidorah 4204c47b5c qtstyleplugins: 2016-12-01 -> 2017-03-11 2017-04-23 16:06:55 +03:00
Nikolay Amiantov 9f6baaa89a Merge pull request #24961 from layus/thunderbird-default-mail-client
Thunderbird: Fix default mail client detection
2017-04-23 15:54:56 +03:00
Luca Bruno fa652cef22 Fix node2nix installation instructions in README 2017-04-23 13:47:59 +01:00
Graham Christensen 7ff2fde215 Merge pull request #25126 from grahamc/rt
RT: Improve Packaging
2017-04-23 08:30:24 -04:00
Volth 1931ad0e2c qemu: 2.8.1 -> 2.9.0 2017-04-23 14:20:48 +02:00
Nick Novitski 37b0be688d bundix: 2.0.8 -> 2.1.0 (#25129) 2017-04-23 13:13:50 +01:00
Jörg Thalheim f22d331279 Merge pull request #25144 from Lassulus/weechat
weechat: 1.7 -> 1.7.1
2017-04-23 14:03:38 +02:00
Benno Fünfstück c3e830f1a6 Merge pull request #25134 from MP2E/ripgrep_update
ripgrep: 0.5.0 -> 0.5.1
2017-04-23 13:59:27 +02:00
Maximilian Bosch 9ec64d2890 oh-my-zsh: add module (#25140)
* programs.zsh: add enableOhMyZsh option to automate setup of oh-my-zsh in global zshrc

* programs.zsh: make oh-my-zsh plugins configurable

* programs.zsh: add ohMyZshCustom option

* programs.zsh: add ohMyZshTheme option

* programs.zsh: applying minor fixes to evaluate expressions properly

* programs.zsh: fix ordering of oh-my-zsh config and execution

* programs.zsh: move all oh-my-zsh params into its own scope named programs.zsh.oh-my-zsh
2017-04-23 13:58:07 +02:00
lassulus 839b3ce5fe weechat: 1.7 -> 1.7.1 2017-04-23 13:51:34 +02:00
Joachim F f1bc5a3a83 Merge pull request #25111 from bachp/gitlab-runner-update
Gitlab runner update
2017-04-23 12:16:27 +01:00
Jörg Thalheim 44c3726dca
fcron: install systab
fixes #25072
2017-04-23 11:44:04 +02:00
Michael Raskin f45f2fb67a Merge pull request #24549 from volth/qemu-2.8.1
qemu: 2.8.0 -> 2.8.1
2017-04-23 11:07:44 +02:00
Michael Raskin 070985177f Merge pull request #25137 from taku0/firefox-53.0
firefox: 52.0.2 -> 53.0 [Critical security fixes]
2017-04-23 11:05:33 +02:00
Michael Raskin 8611d92954 Merge pull request #25136 from taku0/hunspell-1.6.1
hunspell: 1.3.3 -> 1.6.1
2017-04-23 11:04:27 +02:00
Joachim Fasting 2993d37ebc
mksh: 52c -> 55 2017-04-23 11:01:02 +02:00
Joachim Fasting eddf3fa309
mksh: simplify expression somewhat
Also add myself to maintainers.
2017-04-23 11:00:57 +02:00
Joachim Fasting 5a04a30653
runit: replace hardcoded /sbin/runit with in-store runit binary
runit-init calls the runit executable as /sbin/runit, which
obviously fails for us.

This should improve support for using runit as an init replacement.
2017-04-23 11:00:55 +02:00
Joachim Fasting 160b9ab43f
runit: explain what static actually does 2017-04-23 11:00:53 +02:00
Joachim Fasting 063ac40304
nixos: add a "hardened" profile
The idea is to provide a convenient way to enable most vanilla hardening
features in one go.  The hardened profile, then, will serve as a place for
features that enhance security but cannot be enabled for all deployments
because they interfere with legitimate use cases (e.g., using ptrace to
debug problems in an already running process).

Closes https://github.com/NixOS/nixpkgs/pull/24680
2017-04-23 11:00:52 +02:00
Joachim Fasting 1b3300bf01
nixos/tests/misc: check hidepid mount via /proc/mounts 2017-04-23 11:00:46 +02:00
Kevin Cox 32d649eb80
etcd: 3.0.6 -> 3.1.6
Upgrade etcd.

- Switches from their old dependency version system to their vendored packages.
- Fixes SSL support.
2017-04-23 09:26:57 +01:00
taku0 a68f95da17 firefox: 52.0.2 -> 53.0 2017-04-23 11:50:33 +09:00
taku0 5bcaeda4c8 hunspell: 1.3.3 -> 1.6.1 2017-04-23 11:42:59 +09:00
Rok Garbas 0feca1abb6 Merge pull request #25135 from garbas/update-asciinema
Update asciinema
2017-04-23 04:33:27 +02:00