Commit graph

2416 commits

Author SHA1 Message Date
Pascal Wittmann d1a4873ae4 Merge pull request #16447 from vrthra/parallel
parallel: 20160422 -> 20160622
2016-06-23 17:41:07 +02:00
Rahul Gopinath b27ebfa4a7 datamash: 1.0.7 -> 1.1.0 2016-06-23 07:45:59 -07:00
Frederik Rietdijk 41ca3ba4a9 Merge pull request #16425 from mbakke/yubikey-neo-manager
yubikey-neo-manager: init at 1.4.0
2016-06-23 15:39:25 +02:00
Marius Bakke 8b5675da37 yubikey-neo-manager: init at 1.4.0 2016-06-23 13:48:10 +01:00
Vladimír Čunát 3c89351fcc Merge #16406: coreutils: use single-binary build 2016-06-23 12:12:52 +02:00
Vladimír Čunát 6b27ceb006 Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e.
2016-06-23 12:09:03 +02:00
Rahul Gopinath 6b25cba125 parallel: 20160422 -> 20160622 2016-06-23 00:51:20 -07:00
Rahul Gopinath 0dbbe57de3 units: 2.12 -> 2.13 2016-06-23 00:03:59 -07:00
Wout Mertens c26bbf0b87 coreutils: single binary build 2016-06-21 22:14:10 +02:00
Tristan Helmich 571c134613 graylog: 2.0.2 -> 2.0.3 2016-06-21 17:32:33 +02:00
Bjørn Forsman 6536804848 autorevision: init at 1.14
A shell script for extracting revision information useful in
release/build scripting from repositories.
2016-06-21 15:23:34 +02:00
wrb 22a7f3a849 youtube-dl: 2016.05.21.2 -> 2016.06.19.1 (#16338) 2016-06-21 13:12:36 +02:00
Peter Hoeg 31a88b4664 togglesg-download: 2016-02-08 -> 2016-05-31 2016-06-21 15:33:38 +08:00
Rahul Gopinath 64260e70f2 screen: 4.3.1 -> 4.4.0
Removed the patches which were specific to 4.3, and redundant configure flags
The darwin specific utmp patch seems to have been accepted too, with
`u->ut_time = now` the default.
2016-06-20 15:24:32 -07:00
Gabriel Ebner 14c038dd03 file: 5.25 -> 5.28 2016-06-20 18:23:39 +02:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Ruben Astudillo 4f985377ac hakuneko: 1.3.12 -> 1.4.1 2016-06-19 20:09:27 -04:00
Gabriel Ebner 8f91feb848 vdirsyncer: 0.11.0 -> 0.11.2 2016-06-19 16:49:14 +02:00
Bjørn Forsman b741df943f system-config-printer: unbreak dbus service (again)
The service file refers to /usr/bin/... instead of a Nix store path.
Fix it.

The original fix was wrongly removed in commit 03353ce6ff
("system-config-printer: 1.3.12 -> 1 5.7"). We can remove this fixup on
the _next_ upstream release.
2016-06-18 17:07:28 +02:00
Joachim Fasting 1265acc201 Merge pull request #16248 from leenaars/eotutils
eot-utilities: init -> 1.1
2016-06-16 10:57:06 +02:00
Michiel Leenaars bfec40d416 eot-utilities: init -> 1.1 2016-06-15 22:15:32 +02:00
David Craven 54f80775cb rust: Refactoring of rust and cargo packages 2016-06-15 12:47:13 +02:00
Luca Bruno 63b2bf108d Merge pull request #16224 from aneeshusa/enable-multiple-outputs-for-tmux
tmux: enable multiple outputs
2016-06-14 10:57:18 +02:00
Tobias Geerinckx-Rice ff04cf2522
gparted: 0.26.0 -> 0.26.1
Key changes include:
- Ensure boot loaders work on ext4 < 16 TiB by using 32bit feature
- Fix core dump crash in OperationDelete::get_partition_new()

More: https://sourceforge.net/projects/gparted/files/gparted/gparted-0.26.1/gparted-0.26.1-README.md/view
2016-06-13 19:35:24 +02:00
Aneesh Agrawal 94627e658b tmux: enable multiple outputs 2016-06-11 04:19:32 -04:00
Nikolay Amiantov 4a0ca7d92e grub4dos: enable only on Linux 2016-06-11 03:39:44 +03:00
Nikolay Amiantov 9a1d6fe701 fontforge: 20150824 -> 20160404 2016-06-11 02:43:44 +03:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Rickard Nilsson 656c48f141 opentsdb: 2.1.1 -> 2.2.0 2016-06-10 08:17:20 +00:00
Rok Garbas 5f34b5476b goaccess: 0.9.4 -> 1.0
also there is no need for local variables
2016-06-10 04:33:27 +02:00
Rickard Nilsson 9657844db2 fluentd: 0.12.6 -> 0.14.0 2016-06-10 01:35:39 +00:00
Kamil Chmielewski bbc37e0eb7 Moving from fetchgit generated by go2nix to fetchFromGitHub where rev is
a tag
2016-06-09 13:08:10 +02:00
Kamil Chmielewski 9683f5751f FIX: deis and gawp shas 2016-06-09 13:08:09 +02:00
Kamil Chmielewski 7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Kamil Chmielewski 8bfff0f5a6 i3cat: extracted from goPackages 2016-06-09 11:22:02 +02:00
Kamil Chmielewski 6909d0e456 vimPlugins: FIX fzf outside goPackages 2016-06-09 11:21:30 +02:00
Kamil Chmielewski d765026f99 go-upower-notify: extracted from goPackages 2016-06-09 11:21:30 +02:00
Kamil Chmielewski 387246080b mongodb-tools: extracted from goPackages 2016-06-09 11:21:30 +02:00
Kamil Chmielewski dbf48cd10b fzf: application extracted from goPackages 2016-06-09 11:21:30 +02:00
Kamil Chmielewski dfe1064b4e asciinema: top level pkgs extracted from goPackages 2016-06-09 11:21:30 +02:00
Kamil Chmielewski 81f3092e11 Reusing go libs in deis build 2016-06-09 11:21:30 +02:00
Kamil Chmielewski 5c2628a704 When using common deps include only specified packages, not all set 2016-06-09 11:21:30 +02:00
Kamil Chmielewski bfa32800c3 First programs extracted from go-packages: deis and gawp 2016-06-09 11:21:30 +02:00
Robert Helgesson 584020f181 cloc: 1.66 -> 1.68 2016-06-07 20:58:18 +02:00
Joachim Fasting 700ced7d3c Merge pull request #15870 from sirn/tmuxinator-081
tmuxinator: 0.6.9 -> 0.8.1
2016-06-07 14:45:07 +02:00
Tobias Geerinckx-Rice 2b0f12c073
debian-devscripts: 2.16.4 -> 2.16.5 2016-06-06 21:58:19 +02:00
Luca Bruno 5428a295e6 Merge pull request #15999 from womfoo/duc
duc: 1.3.3 -> 1.4.1
2016-06-06 10:18:31 +02:00
koral 92471cbc8f rmlint: 2.4.2 -> 2.4.4 2016-06-05 17:33:29 +02:00
koral 179f5e9500 moreutils: 0.58 -> 0.59 2016-06-05 17:14:38 +02:00
Kranium Gikos Mendoza 5016ad645f duc: 1.3.3 -> 1.4.1 2016-06-05 22:00:22 +08:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Joachim Fasting 47b1c5368e Merge pull request #15868 from mbakke/less-483
less: 481 -> 483
2016-06-03 15:50:21 +02:00
Bjørn Forsman fbde3a7452 sam-ba: init at 2.16
Programming tools for Atmel SAM3/7/9 ARM-based microcontrollers.

(I've only runtime tested the 64-bit binary, not the 32-bit one.)
2016-06-02 12:44:35 +02:00
Marius Bakke 1ce9da0aa9 less: support --with-secure 2016-05-31 21:02:45 +01:00
Kridsada Thanabulpong 7d9795a0f2 tmuxinator: 0.6.9 -> 0.8.1 2016-06-01 00:36:04 +07:00
Matthias Beyer 473e5a4251 less: 481 -> 483 2016-05-31 17:34:26 +01:00
Eelco Dolstra a00e564e04 gummiboot: Remove 2016-05-31 17:02:56 +02:00
Tristan Helmich cf0c9091c4 graylog: 2.0.1 -> 2.0.2 (#15836) 2016-05-31 16:13:10 +02:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Marius Bakke 8f7b525fc2 stow: 2.2.0 -> 2.2.2 2016-05-30 18:03:46 +02:00
Jude Taylor b950dd4c4f add fondu-060102 2016-05-28 13:51:50 -07:00
Joachim Fasting d140dee39a Merge pull request #15734 from wrb/master
youtube-dl: 2016.04.19 -> 2016.05.21.2
2016-05-27 19:30:57 +02:00
Vladimír Čunát e4832c7541 Merge branch 'staging'
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
Peter Hoeg 5404595b55 tmux module: set TMUX_TMPDIR via environment instead of wrapper 2016-05-27 17:29:19 +08:00
wrb c27eec296a youtube-dl: 2016.04.19 -> 2016.05.21.2 2016-05-26 23:33:33 +02:00
Vladimír Čunát 81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Frederik Rietdijk 67c97abe62 Merge pull request #15701 from DamienCassou/vdirsyncer-0.11
vdirsyncer: 0.10.0 -> 0.11.0
2016-05-26 10:13:13 +02:00
Damien Cassou 005e2148c3 vdirsyncer: 0.10.0 -> 0.11.0 2016-05-26 09:44:53 +02:00
Robert Helgesson 17e7596a07 multitail: mark as supporting unix platforms 2016-05-25 22:46:14 +02:00
Arseniy Seroka f010ce65ec Merge pull request #15649 from rycee/bump/dtach
dtach: 0.8 -> 0.9
2016-05-24 22:06:13 +03:00
Joachim Fasting a21df566e4 Merge pull request #15610 from sheenobu/xflux-gui
xflux-gui: init at 1.1.1
2016-05-24 10:41:09 +02:00
zimbatm 4d0a421f18 Merge pull request #15646 from vcunat/p/man-db
man-db: make it the default man provider
2016-05-24 09:25:10 +01:00
Nikolay Amiantov 5c68d2d1e6 tlp: revert back to makeWrapper for Perl scripts 2016-05-24 03:08:08 +03:00
Nikolay Amiantov 5b315e1598 tlp: use sed patching instead of makeWrapper
Fixes #15631
2016-05-24 03:01:06 +03:00
Robert Helgesson 3257ec39c3 dtach: 0.8 -> 0.9
Remove CVE patch that has been merged upstream.
2016-05-23 22:16:49 +02:00
Vladimír Čunát f8cc92fd6d man-db: clean the expression a bit
This solves the errors
> can't open the manpath configuration file /etc/man_db.conf
which were common e.g. for fish users.
2016-05-23 19:44:16 +02:00
Vladimír Čunát 0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Sheena Artrip 6b0bac3d7e
xflux-gui: init at 1.1.1 2016-05-22 20:32:31 -04:00
Joachim Fasting 25f07b12cf Merge pull request #15626 from nicknovitski/fzy
fzy: init at 0.4
2016-05-22 20:32:54 +02:00
Arseniy Seroka 16b83c238e Merge pull request #15621 from rycee/bump/cloc
cloc: 1.64 -> 1.66
2016-05-22 20:25:24 +03:00
Nick Novitski d7dda6cc11 fzy: init at 0.4 2016-05-22 16:58:19 +00:00
Desmond O. Chang 119b7c9863 yank: 0.6.0 -> 0.7.0 2016-05-22 17:43:32 +02:00
Robert Helgesson e03effb6d9 cloc: 1.64 -> 1.66
New upstream is at GitHub.
2016-05-22 17:07:34 +02:00
Robert Helgesson f16da199e4 trash-cli: add platforms field 2016-05-22 16:06:06 +02:00
Robert Helgesson 964ff5cc89 bibtool: add platforms field 2016-05-22 16:05:46 +02:00
Vladimír Čunát c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Joachim Fasting 36b4e612e4 Merge pull request #15551 from RubenAstudillo/hakuneko
hakuneko: init at 1.3.12
2016-05-20 18:58:18 +02:00
Ruben Astudillo 1bbda4989c hakuneko: init at 1.3.12 2016-05-20 12:47:01 -04:00
Joachim Schiele a021b6a617 youtube-dl: version bump to 2016.04.19 2016-05-20 14:04:50 +02:00
Joachim Fasting cf989b452d Merge pull request #15396 from acowley/rrdtool-darwin
rrdtool: darwin compatibility
2016-05-19 22:31:05 +02:00
Anthony Cowley daafa6514c rrdtool: darwin compatibility
I needed Tcl-8.5 to build on darwin. Not sure where it comes from on
Linux.
2016-05-19 11:00:23 -04:00
Tuomas Tynkkynen 5a8ad2d7a8 treewide: Make explicit that 'dev' output of slang is used 2016-05-19 10:03:35 +02:00
Tuomas Tynkkynen e0de3b1dc5 treewide: Make explicit that 'dev' output of qt5.qtbase is used 2016-05-19 10:03:31 +02:00
Tuomas Tynkkynen b5c6069def treewide: Make explicit that 'dev' output of libusb is used 2016-05-19 10:00:47 +02:00
Tuomas Tynkkynen d1937cf11a treewide: Make explicit that 'dev' output of gtk2 is used 2016-05-19 10:00:38 +02:00
Tuomas Tynkkynen 288912c2c4 treewide: Make explicit that 'dev' output of freetype is used 2016-05-19 10:00:34 +02:00
Pascal Wittmann 9f7bacc844 zsh-navigation-tools: 2.1.14 -> 2.1.16 2016-05-18 20:56:52 +02:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Peter Hoeg 60025e3524 tmux module: add additional variables for configuring tmux
Also wraps the tmux binary, so that sockets are stored under /run
2016-05-18 19:24:03 +08:00
Domen Kožar b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01: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
Pascal Wittmann f40accdb40 zsh-navigation-tools: 2.1.12 -> 2.1.14 2016-05-15 21:52:29 +02:00
Marc Scholten 6bbead5e12
fpp: init at 0.7.1
With fixups by joachifm

Closes #15468
2016-05-15 17:21:00 +02:00
Pascal Wittmann b638f18ce9 zsh-navigation-tools: 2.1.10 -> 2.1.12 2016-05-14 11:29:03 +02:00
Vladimír Čunát bb73e25cdc coreutils: disable checks when using non-standard storeDir
That should help with https://github.com/NixOS/nix/issues/512
2016-05-13 11:41:17 +02:00
Vladimír Čunát 3e387c3e00 Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
Pascal Wittmann 8db3b2a2ca parallel: 20160322 -> 20160422 2016-05-12 20:34:59 +02:00
Pascal Wittmann 2f334b9a0f zsh-navigation-tools: 2.1.9 -> 2.1.10 2016-05-12 20:33:46 +02:00
Pascal Wittmann c008bfff16 zsh-navigation-tools: 2.1.6 -> 2.1.9 2016-05-12 20:32:04 +02:00
Tristan Helmich f225e35a0b graylog: 2.0.0 -> 2.0.1 2016-05-12 16:01:39 +02:00
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Thomas Tuegel b4e28007da calamares: remove qtquick1 input
Qt Quick was removed from Qt 5.6.
2016-05-11 13:14:55 -05:00
Martijn Vermaat 3ada292a67 lesspipe: init at 1.82
lesspipe.sh is a preprocessor for less.
2016-05-10 22:21:42 +02:00
Robert Helgesson 53643f532a svtplay-dl: fix sha256 value 2016-05-10 19:33:08 +02:00
Bjørn Forsman 977cd5de36 moreutils: add meta.platforms (= all) 2016-05-09 20:34:45 +02:00
Arseniy Seroka c75efcba75 Merge pull request #15325 from psprint/master
zsh-navigation-tools: 2.0.7 -> 2.1.6
2016-05-09 21:09:52 +03:00
Sebastian Gniazdowski b7e99395f4 zsh-navigation-tools: 2.0.7 -> 2.1.6 2016-05-09 16:10:20 +00:00
Moritz Ulrich 4ab72c5397 yubikey-personalization: Fix typo 2016-05-09 14:16:58 +02:00
zimbatm 2aeb5598e3 yubikey-personalization: fixes udev rules
70-yubikey.rules depends on ConsoleKit which is not used by NixOS
anymore and has been superseeded by systemd

The ./configure flag also supports a --with-udevrulesdir flag but it
fails the detection and selects the wrong .rules file.
2016-05-09 14:13:26 +02:00
Robert Helgesson 658b8e98df svtplay-dl: 1.0 -> 1.1 2016-05-09 00:38:02 +02:00
Vladimír Čunát 65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Tobias Geerinckx-Rice ea9f28a46e
wakatime: init at 6.0.1
To hack together a working WakaTime under emacs on NixOS:

* Install both `wakatime` and `(emacsWithPackages [ wakatime-mode ])`
* Add the following to your initialisation file (default: ~/.emacs):
  (custom-set-variables
   ;; ...
   '(wakatime-api-key "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX")
   '(wakatime-cli-path "")					; sic
   '(wakatime-python-bin "/path/to/profile/bin/wakatime"))	; sic
* `M-x global-wakatime-mode` to test your settings.
2016-05-08 04:52:57 +02:00
Peter Simons a211eef81a heimdall: cosmetic 2016-05-07 10:46:52 +02:00
Peter Simons c083ef0c6d heimdall: update to version 1.4.1-34-g7ebee1e (current Git 'master') 2016-05-07 01:39:48 +02:00
Franz Pletz e478b63b27 Merge pull request #14835 from groxxda/libcap
libcap: 2.24 -> 2.25, replace old split with multi-output
2016-05-06 03:15:16 +02:00
zimbatm 8b554ccf8f Merge pull request #15187 from psprint/master
zsh-navigation-tools: 1.4 -> 2.0.7, install all files
2016-05-05 19:51:21 +01:00
zimbatm fb23979833 Merge pull request #15213 from zimbatm/autojump-share
autojump: include a way to find the share dir
2016-05-05 19:49:17 +01:00
Vladimír Čunát 1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Dan Peebles 4f7ea068b4 rpm-ostree: bump version of libglnx to fix environment passing bug
See https://github.com/projectatomic/rpm-ostree/issues/277 for more
details.
2016-05-04 19:04:03 +00:00
Robin Gloster 9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
zimbatm 5901a8c63b autojump: include a way to find the share dir
autojump-share is a new script that gives you the path to autojump's
shared directory. It can then be used in the various shell's rc files to
find and source the autojump integration. Eg:

    source "$(autojump-share)/autojump.bash"

Fixes #3239
2016-05-04 11:08:41 +01:00
Alexander Ried 5c295a4925 libcap: Replace occurences of libcap_progs with libcap.out 2016-05-03 19:52:53 +02:00
Sebastian Gniazdowski 7c0063bf15 zsh-navigation-tools: 1.4 -> 2.0.7 2016-05-03 14:46:43 +00:00
Franz Pletz 5ca8694095 debootstrap: 1.0.68 -> 1.0.80 2016-05-03 16:15:20 +02:00
Franz Pletz 9da6390bae ethtool: 4.0 -> 4.5 2016-05-03 16:15:20 +02:00
Franz Pletz 18964796e6 mc: 4.8.12 -> 4.8.16 2016-05-03 16:15:20 +02:00
Franz Pletz 117920233f flashrom: 0.9.7 -> 0.9.9 2016-05-03 16:15:20 +02:00
Sebastian Gniazdowski 8ebae7fc3c zsh-navigation-tools: install all files 2016-05-03 13:44:36 +00:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Nikolay Amiantov 87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03:00
Dan Peebles 6af34124a4 libhif, rpm-ostree: fix broken meta
Forgot to add stdenv.lib to scope!
2016-04-30 16:23:53 +00:00
Dan Peebles befc866714 rpm-ostree: add meta and add myself as a maintainer 2016-04-30 16:06:17 +00:00
Nikolay Amiantov 05ea80af1f sdl-jstest: 20150806 -> 2016-03-29 2016-04-30 03:12:34 +03:00
Nikolay Amiantov 626b1c4101 grub4dos: 0.4.6a-2015-12-31 -> 0.4.6a-2016-04-26 2016-04-30 03:12:34 +03:00
Nikolay Amiantov 938d64f1f3 quote URLs in my packages to ease opening them from urxvt 2016-04-30 03:12:32 +03:00
Joachim Fasting 4fb9b060c3 Merge pull request #15063 from mayflower/upstream/graylog
Add graylog package and service
2016-04-29 15:32:53 +02:00
Dan Peebles 203fee0618 rpm-ostree: init at 2016.1 2016-04-29 03:20:04 +00:00
Tristan Helmich 49b947635f graylog: init at 2.0.0 2016-04-28 22:11:16 +02:00
Alexander Ried 2e320a58b3 diffoscope: 49 -> 52 2016-04-28 16:21:23 +02:00
Tuomas Tynkkynen d27caa486b filebench: Init at 1.4.9.1 2016-04-28 03:33:39 +03:00
Tuomas Tynkkynen d5a7032042 fsmark: Init at 3.3 2016-04-28 03:33:39 +03:00
Joachim Fasting 4c0f379fc9 Merge pull request #14990 from cstrahan/dbusmap
dbus-map: init 2015-05-28
2016-04-27 19:40:00 +02:00
Tobias Geerinckx-Rice ed9e0b960e
gparted: 0.25.0 -> 0.26.0
Key changes include:
- Implement read-only LUKS support
- Add progress bars to NTFS, XFS, and EXT2/3/4 file system copy methods
- Fix operations sometimes fail with: No such file or directory

More: https://sourceforge.net/projects/gparted/files/gparted/gparted-0.26.0/gparted-0.26.0-README.md/view
2016-04-27 16:55:36 +02:00
Vladimír Čunát 99b91020d6 xvfb-run: fix missing tools
- it was failing to find awk and mktemp
- use `makeBinPath` for better robustness wrt. multiple outputs
2016-04-27 12:31:01 +02:00
Alexander Ried 272c87fbdf antimicro 2.18 -> 2.18.2
The original repo was deleted by it's author. I took the one with
the most recent releases I could find.
See:
https://github.com/Ryochan7/antimicro-packaging/issues/1#issuecomment-205949365
2016-04-26 10:58:33 +02:00
Dan Peebles 3a542c7374 ostree: v2015.3 -> v2016.5 2016-04-26 00:50:31 +00:00
Charles Strahan d8faa585b0 dbus-map: init 2015-05-28 2016-04-25 17:52:24 -04:00
Rafał Łasocha bea31c31f2 pws: Init at 1.0.6 2016-04-25 01:55:07 +02:00
Tobias Geerinckx-Rice fe5f52599b
debian-devscripts: 2.16.3 -> 2.16.4 2016-04-24 22:03:55 +02:00
Frederik Rietdijk 92e87894c6 Merge pull request #14940 from DamienCassou/vdirsyncher-0.10
vdirsyncer: 0.9.3 -> 0.10.0
2016-04-23 23:03:23 +02:00
Damien Cassou c397348538 vdirsyncer: 0.9.3 -> 0.10.0
lxml is not needed anymore. I added myself to the maintainers. I didn't
check why pypi is providing this complicated URL now.
2016-04-23 22:54:28 +02:00
Tuomas Tynkkynen bd18cc3cdc Merge pull request #14888 from dezgeg/pr-kill-module-init-tools
Delete all usages of module_init_tools and remove the package
2016-04-23 14:29:41 +03:00
Pascal Wittmann b56dc1c4b0 entr: 3.4 -> 3.5 2016-04-22 21:05:38 +02:00
Tobias Geerinckx-Rice 8db6b7615a
debian-devscripts: 2.16.2 -> 2.16.3 2016-04-22 17:11:20 +02:00
Vladimír Čunát e9379f7416 Merge branch 'staging'
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Tuomas Tynkkynen 01854a850a treewide: Replace module_init_tools -> kmod
The former is deprecated and doesn't handle compressed kernel modules,
so all current usages of it are broken.
2016-04-22 10:40:57 +03:00
Nikolay Amiantov 8ab48c32e7 yubikey-personalization-gui: move to qmake4Hook 2016-04-20 18:55:56 +03:00
Nikolay Amiantov ea56bb7331 rockbox-utility: move to qmake4Hook 2016-04-20 18:55:56 +03:00
Tadas Barzdzius 94280ecf90 exa: 2016-04-11 -> 2016-04-20 2016-04-20 12:41:37 +03:00
Tadas Barzdzius 0649edd432 Heatseeker: 1.3.0 -> 1.4.0 2016-04-20 12:40:59 +03:00
zimbatm 961ad19660 Merge pull request #14408 from retrry/rustc-update
rustc: 1.6.0 -> 1.7.0. Enable Darwin platform.
2016-04-18 20:09:44 +01:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Tuomas Tynkkynen 87cb1b0ca1 treewide: Mass replace 'libxslt}/bin' to refer to the correct outputs 2016-04-14 08:32:20 +03:00
Nikolay Amiantov 8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Tadas Barzdzius 1f3e2ced4a exa: 2016-03-22 -> 2016-04-11 2016-04-13 18:11:52 +03:00
Vladimír Čunát 39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Maarten Hoogendoorn ec098aad41 mcrl2: 2009.01 -> 2014.09 2016-04-12 22:16:30 +02:00
Franz Pletz 23ae6a10a9 wv: 1.2.4 -> 1.2.9 2016-04-12 04:28:50 +02:00
Franz Pletz e32ed2f78e tmux: 2.1 -> 2.2 2016-04-12 04:26:24 +02:00
joachifm 9bd758ab42 Merge pull request #14558 from joachifm/youtube-dl
youtube-dl: 2016.02.13 -> 2016.04.06
2016-04-10 12:48:15 +02: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
Joachim Fasting aec8daed86 duc: fix meta.license 2016-04-09 21:35:29 +02:00
Luca Bruno 73bf336934 duc: init at 1.3.3 2016-04-09 20:08:38 +02:00
Joachim Fasting 6111d5b480 youtube-dl: 2016.02.13 -> 2016.04.06 2016-04-09 19:47:42 +02:00
Al Zohali 85129e6c60 dumptorrent: init at 1.2 2016-04-09 19:31:56 +03:00
Robin Gloster 3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00:00
Vladimír Čunát d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Tobias Geerinckx-Rice eec040009d
tldr: 1.1.0 -> 1.2.0 2016-04-06 19:49:19 +02:00
Robin Gloster 8d4443a89a recutils: disable format hardening 2016-04-06 09:36:58 +00:00
Robin Gloster 0086c6d401 lrzsz: disable format hardening 2016-04-06 08:54:48 +00:00
Robin Gloster d8d6f0bfcb grub4dos: disable stackprotector hardening 2016-04-05 16:29:55 +00:00
Robin Gloster bbbaccfa68 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-04 15:24:52 +00:00
Robert Helgesson b375260add svtplay-dl: 0.30.2016.02.08 -> 1.0 2016-04-03 16:39:30 +02:00
Robin Gloster 696d85a62d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-03 11:01:57 +00:00
Tobias Geerinckx-Rice 838217332b bandwidth: 1.1b -> 1.2.0 2016-04-02 02:55:23 +02:00
Patrick Mahoney fc1f5d2cf1 set target for darwin binary compat in skarnet.org packages
skalibs:
execline:
s6-dns:
s6-networking:
s6-portable-utils:
s6-rc:
s6:

The above software uses the target triplet from `cc -dumpmachine` as a
binary compatibility check. However, on darwin, the output includes the
darwin version number, which leads to build failures against a binary
skalibs package built a different version of darwin than the current
system.

Explicitly setting target ensures code can be compiled against a skalibs
binary built on a different version of darwin.

See http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
2016-04-01 10:39:37 -05:00
Patrick Mahoney e0c225857f update skarnet.org packages
skalibs:           2.4.7.0 -> 2.3.9.0
execline:          2.1.4.0 -> 2.1.4.5
s6:                2.2.1.0 -> 2.2.4.3
s6-rc:             0.0.1.0 -> 0.0.2.1
s6-portable-utils: 2.0.5.2 -> 2.0.5.3
s6-linux-utils:    2.0.2.0 -> 2.0.2.3
s6-dns:            2.0.0.4 -> 2.0.0.7
s6-networking:     2.1.0.1 -> 2.1.0.4
2016-04-01 10:38:58 -05: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
Franz Pletz 2e08d8234e Merge remote-tracking branch 'origin/master' 2016-03-31 10:06:30 +02:00
Domen Kožar 96be420e44 move growpart out of nixos into cloud-init package 2016-03-30 14:40:24 +01:00
Robin Gloster f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Thomas Tuegel 4d7e3be8bb calamares: mark broken
(cherry picked from commit b8db5897c757a9a828e4bc64786ac508e8a950bb)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-03-27 21:44:21 +01:00
zimbatm ea7068f44c direnv: 2.7.0 -> 2.8.0 2016-03-27 15:37:07 +01:00
Domen Kožar b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Peter Hoeg 6911785c03 togglesg-download: init at 2016-02-08 2016-03-27 15:08:23 +08:00
Joachim Fasting cb896a1e7f yad: ad-hoc patching to fix undefined reference errors 2016-03-26 16:55:00 +01:00
Joachim Fasting 0b060bdf68 yad: fix gcc5 build
https://hydra.nixos.org/build/33612450/nixlog/1/raw
2016-03-26 16:55:00 +01:00
Pascal Wittmann 0bce9599e7 cpuminer: 2.4.3 -> 2.4.4 2016-03-25 17:22:11 +01:00
Marius Bakke b8dc71ef8a scanmem: 0.15.2 -> 0.15.6 2016-03-25 03:05:17 +00:00
Arseniy Seroka 167ef887f7 Merge pull request #14179 from DamienCassou/vdirsyncer-0.9.3
vdirsyncer: 0.9.2 -> 0.9.3
2016-03-24 23:12:46 +03:00
Damien Cassou f965c8f207 vdirsyncer: 0.9.2 -> 0.9.3
Regarding homepage update, changelog says "Moved to pimutils
organization on GitHub. Old links should redirect, but be aware of
client software that doesn't properly handle redirects."
2016-03-24 18:50:35 +01:00
Pascal Wittmann f942b09bf9 abduco: 0.5 -> 0.6 2016-03-24 15:52:35 +01:00
Pascal Wittmann 92d59b37cb parallel: 20160222 -> 20160322 2016-03-24 00:07:40 +01:00
Michael Fellinger 6da0a54d2b zsh-navigation-tools: include znt-* functions 2016-03-23 10:05:52 +01:00
Nikolay Amiantov ad1f158111 Merge pull request #14088 from jgillich/rust-head
Rust updates
2016-03-23 00:10:07 +04:00
Jakob Gillich 74ef06dab6 exa: 2016-02-15 -> 2016-03-22 2016-03-22 15:54:23 -04:00
Marius Bakke 23befca742 yubikey-personalization-gui: 3.1.21 -> 3.1.24 2016-03-20 18:49:05 +00:00
Marius Bakke 451a7ec4a9 yubikey-personalization: 1.17.2 -> 1.17.3 2016-03-20 18:48:49 +00:00
Marius Bakke 1489af2153 yubico-piv-tool: 1.0.2 -> 1.3.0 2016-03-20 18:42:23 +00:00
Pascal Wittmann 88a62b3aea datamash: 1.0.6 -> 1.0.7 2016-03-20 13:23:31 +01:00
Pascal Wittmann 6ea546e3b9 entr: 3.2 -> 3.4 2016-03-20 13:23:31 +01:00
Tobias Geerinckx-Rice ec8484734b debian-devscripts: 2.16.1 -> 2.16.2 2016-03-20 01:22:13 +01:00
Peter Hoeg c6a717d212 dynamic-colors: 2013-12-28 -> 0.2.1 2016-03-19 23:45:28 +00:00
Joachim Fasting 8dfb8d06f0 ipxe: fix gcc5 build
gcc5 enables additional warnings, causing the build to fail with
-Werror.  The build could be fixed by specifically disabling errors
for `discarded-array-qualifiers` and `logical-not-parentheses` warnings,
but simply passing -Wno-error is more future proof.

See https://hydra.nixos.org/build/33274006/nixlog/1/raw
2016-03-19 19:52:47 +01:00
Robin Gloster 420bc33efa Merge pull request #13984 from regnat/moreutils
moreutils : 0.57 -> 0.58
2016-03-17 12:19:28 +01:00
Théophane Hufschmitt 93856f36a2 moreutils : 0.57 -> 0.58 2016-03-17 08:54:36 +01:00
Tobias Geerinckx-Rice df0f4baec4 hddtemp: correct licence: gpl2 -> gpl2Plus 2016-03-16 21:10:20 +01:00
joachifm 4369f06ab5 Merge pull request #13934 from jraygauthier/jrg/update_plantuml_from_8012_to_8037
plantuml: 8012 -> 8037
2016-03-16 00:20:09 +00:00
Raymond Gauthier 5e9a344e62 plantuml: 8012 -> 8037
Updated to latest stable version.
2016-03-15 09:10:20 -04:00
Robin Gloster 3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Damien Cassou 32dcc5a31b vdirsyncer: 0.9.0 -> 0.9.2
Also activate the automated testing
2016-03-14 09:59:27 +01:00
宋文武 93feb5d115 drop my maintainership (close #13881) 2016-03-13 18:39:01 +01:00
Thomas Tuegel d2dc8cc47f kde5.colord-kde: init at 0.5.0.20160224 2016-03-11 08:45:41 -06:00
Nikolay Amiantov 08893956fb Merge pull request #13823 from abbradar/colord
colord color management daemon
2016-03-11 13:50:12 +03:00
Nikolay Amiantov 4ebc7f74f7 colord-kde: fix build 2016-03-11 02:31:47 +03:00
Nikolay Amiantov cf9ddb27d6 colord: fix udev rules, add sane support 2016-03-11 01:58:40 +03:00
Nikolay Amiantov 776845bbeb xiccd: init at 0.2.2 2016-03-11 01:26:56 +03: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
Thomas Tuegel 394ffcb3e5 staruml: fix evaluation on closure-size 2016-03-08 11:34:52 -06: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 e9fc4e7db6 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-07 22:08:27 +01:00
Robert Helgesson 9206abe642 mimeo: init at 2016.2 2016-03-06 20:44:09 +01:00
Maxwell 65dd28c569 xdo from 0.3 -> 0.5
This incorporates a number of bugfixes, as well as adding the
`below` and `above` actions

Also moved package from fetchurl to fetchFromGitHub
2016-03-06 08:45:23 -05:00
Tuomas Tynkkynen ad47355786 Merge remote-tracking branch 'upstream/master' into staging 2016-03-06 11:48:57 +02:00
Tobias Geerinckx-Rice 225edbd9b5 ms-sys: 2.5.2 -> 2.5.3 2016-03-06 01:09:12 +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
Franz Pletz a2e449e43e coreutils: Skip some tests (filenames too long) 2016-03-05 18:55:26 +01:00
Tristan Helmich c3096a4160 memtest86+: disable pic/stackprotector hardening 2016-03-04 14:56:58 +01:00
Robin Gloster 2f7e9f26d8 gummiboot: disable stackprotector hardening 2016-03-01 22:21:21 +00:00
Robin Gloster d47857c3d9 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 21:09:17 +00:00
Eelco Dolstra e9b408936c findutils: Disable tests on Darwin
The strftime test fails with:

NZST-12NZDT,M9.5.0,M4.1.0/3: expected "1970-01-01 13:00:00 +1300 (NZDT)", got "1970-01-01 12:00:00 +1200 (NZST)"

The source in fact marks this test as "ahistorical", so the result on
Darwin might not be incorrect.

http://hydra.nixos.org/build/32578562/nixlog/1/raw
2016-03-01 16:14:58 +01:00
Pascal Wittmann 5a0dbaabad parallel: 20160122 -> 20160222 2016-02-29 23:35:32 +01:00
Robin Gloster 3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
rnhmjoj 838379f117 bdf2psf: 1.134 -> 1.137 2016-02-28 02:56:22 +01:00
Eelco Dolstra 015c7afffa findutils: 4.4.2 -> 4.6.0
The first findutils update in six years! Changes:

https://lists.gnu.org/archive/html/info-gnu/2015-12/msg00014.html
2016-02-27 23:18:50 +01:00
zimbatm 17348dc094 Remove all dots at end of descriptions
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
Robin Gloster 3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
zimbatm 35ab3d301f Merge remote-tracking branch 'upstream/staging' 2016-02-26 22:37:04 +00:00
Tristan Helmich 3234ca49d1 gti: init at 2015-05-21 (edaac79) 2016-02-25 18:52:19 +01:00
Vladimír Čunát 93f6af1071 Merge branch 'master' into staging 2016-02-25 09:01:48 +01:00
Robin Gloster d9b4391717 grub: disable stackprotector hardening 2016-02-24 22:54:34 +00:00
Robin Gloster e7f9e8a26f trustedGrub: disable stackprotector/pic hardening 2016-02-24 16:54:49 +00:00
Frederik Rietdijk 40ca841c5c Merge pull request #13124 from FRidh/buildPythonApplication
buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
Robin Gloster 402d57ee8e bootstrap env: disable stackprotector hardening until gcc >=4.9 2016-02-22 18:32:53 +00:00
Franz Pletz 06e37e9008 youtube-dl: 2016.01.01 -> 2016.02.13 2016-02-22 04:55:22 +01:00
Robin Gloster bb2639aafc Merge branch 'curl-7.15-fixup' of https://github.com/zimbatm/nixpkgs into hardened-stdenv 2016-02-22 01:14:22 +00:00
Robin Gloster 828b408f7f ipxe: turn off pic/stackprotector hardening 2016-02-22 00:44:58 +00:00
Eugene Akentyev f0b072abaa staruml: init at 2.6.0 2016-02-21 21:42:43 +03:00
Robin Gloster 58c377b9aa kde5.calamares: 1.0 -> 1.1.4.2
fixes build and removes obsolete PIC handling
2016-02-21 10:06:49 +00:00
Charles Strahan 11bf7888fb Merge pull request #13041 from Baughn/mprime
mprime: Init at 28.7
2016-02-20 20:45:56 -05:00
Tuomas Tynkkynen 6820d7fc5b Merge pull request #13157 from dezgeg/pr-diffoscope-2
diffoscope: 45 -> 49
2016-02-21 01:34:38 +02:00
Tuomas Tynkkynen 2a3d8fc70c diffoscope: 45 -> 49
We have a new tool dependency for cd-iccdump which comes from the colord
package - put this in the bloat category.
2016-02-21 01:21:12 +02:00
Robin Gloster 00c53f31c2 xfstests: turn off format hardening 2016-02-20 21:58:30 +00:00
Tuomas Tynkkynen 8bfc5d7e72 coreutils: Remove ARM patch (coreutils-tail-inotify-race.patch)
The patch no longer applies as it's applied in the 8.25 release.

While at it don't use FORCE_UNSAFE_CONFIGURE on ARM as I don't see why
it's needed and it works for me without it.

Build-tested GNU hello on ARMv7 and verified that this affect its hash
on i686.
2016-02-20 19:36:21 +02:00
Robin Gloster bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00:00
Frederik Rietdijk 4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Damien Cassou dda9f0ba23 Merge pull request #13098 from DamienCassou/vdirsyncer-0.9.0
vdirsyncer: 0.8.1 -> 0.9.0
2016-02-19 12:48:27 +01:00
Damien Cassou 38f0628928 vdirsyncer: 0.8.1 -> 0.9.0 2016-02-19 12:44:49 +01:00
Eelco Dolstra 854c27c69c coreutils: 8.24 -> 8.25 2016-02-18 21:59:11 +01:00
Rob Vermaas 1ecb2a8782 Fix xclip hash, make revision explicit, in stead of depending on HEAD.
(cherry picked from commit c9ef3b51a3e910f3850ab10378c8b58f0d2d97e8)
2016-02-17 12:00:20 +00:00
Vladimír Čunát e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
Franz Pletz 0884b63e53 Merge pull request #13039 from rycee/bump/svtplay-dl
svtplay-dl: 0.30.2016.01.10 -> 0.30.2016.02.08
2016-02-17 04:52:43 +01:00
Ricardo M. Correia 957ed2c08c Merge pull request #13015 from ehegnes/exa
exa: init at git 2016-02-15
2016-02-16 18:11:42 +01:00
Svein Ove Aas 6efcbd8950 mprime: Init at 28.7 2016-02-16 16:37:45 +00:00
Robert Helgesson b60ceea903 svtplay-dl: 0.30.2016.01.10 -> 0.30.2016.02.08 2016-02-16 17:06:48 +01:00
Arseniy Seroka c98602d281 Merge pull request #13031 from matthiasbeyer/update-packages
Update packages
2016-02-16 19:02:58 +03:00
Eric Hegnes 23ab6bf6b2 exa: init at git 2016-02-15 2016-02-16 11:02:38 -05:00
Matthias Beyer acd75605a2 vdirsyncer: 0.8.1 -> 0.9.0 2016-02-16 14:13:53 +01:00
Franz Pletz 41698c9efa Merge branch 'master' into hardened-stdenv 2016-02-15 20:05:29 +01:00
Tobias Geerinckx-Rice 6b9ae8bada debian_devscripts: 2.15.10 -> 2.16.1
Changes:
http://metadata.ftp-master.debian.org/changelogs/main/d/devscripts/devscripts_2.16.1_changelog
2016-02-15 03:33:44 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Robin Gloster 37cd2e6e21 pal: turn off format hardening 2016-02-12 13:53:04 +00:00
Robin Gloster bc30a0ee71 gbdfed: turn off format hardening 2016-02-11 00:25:47 +00:00
Robin Gloster 667518fc3b detox: turn off format hardening 2016-02-10 23:27:39 +00:00
Eelco Dolstra e2eca0c24c Fix misspelled meta.maintainers attributes 2016-02-10 23:27:34 +00:00
Pascal Wittmann d98f0ea720 progress: 0.12.1 -> 0.13 2016-02-10 23:27:28 +00:00
Eelco Dolstra aea262f654 Fix misspelled meta.maintainers attributes 2016-02-10 14:59:50 +01:00
Pascal Wittmann ee90c703be progress: 0.12.1 -> 0.13 2016-02-09 21:51:41 +01:00
Robin Gloster dda7a039b7 ddccontrol: turn off format hardening 2016-02-09 01:32:47 +00:00
Robin Gloster 8057e7e47e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-08 10:11:43 +00:00