Commit Graph

98808 Commits

Author SHA1 Message Date
Michael Raskin
fbe3a9c229 Merge pull request #21827 from srp/nvi
nvi: link against libncurses as there is no libcurses
2017-01-13 10:44:47 +00:00
Michael Raskin
aa5fe24540 Merge pull request #21831 from lsix/update_python_channels
Update python channels
2017-01-13 10:44:04 +00:00
Michael Raskin
740d857b5c Merge pull request #21839 from kierdavis/i3blocks-sysconfdir
i3blocks: search for config in correct system directory
2017-01-13 10:41:59 +00:00
Michael Raskin
ee966005a7 Merge pull request #21842 from johbo/darwin-xournal-quartz
xournal: Support gtk with quartz or x11 backend
2017-01-13 10:38:56 +00:00
Eelco Dolstra
96b6968950
nix: 1.11.5 -> 1.11.6 2017-01-13 11:38:09 +01:00
Michael Raskin
c5ebc057fd Merge pull request #21848 from league/yuicompressor-bin
yuicompressor: add bin wrapper for jar
2017-01-13 10:34:20 +00:00
Michael Raskin
65b397bf8c Merge pull request #21852 from lheckemann/remove-syncthing-go-dep
syncthing: remove runtime dependency on go
2017-01-13 10:31:37 +00:00
Michael Raskin
77f2ebd47d Merge pull request #21849 from aneeshusa/update-rr-to-4.4.0
rr: 4.3.0 -> 4.4.0
2017-01-13 10:28:40 +00:00
Linus Heckemann
b91fa0f477 syncthing: remove runtime dependency on go
The hack used here is shamelessly stolen from buildGoPackage. If it is
going to be applied to more expressions, it may make sense to factor it
out so it can be shared.
2017-01-13 09:54:48 +00:00
Aneesh Agrawal
80ea1c0631 rr: 4.3.0 -> 4.4.0 2017-01-13 00:44:30 -05:00
Christopher League
ea0f8fbd53 yuicompressor: add bin wrapper for jar
yuicompressor is a JavaScript and CSS minifier, distributed as a jar
file. This change uses `makeWrapper` to create a corresponding bin
script, adding `jre` as a dependency.
2017-01-12 23:08:55 -05:00
Jörg Thalheim
b8b7832219 Merge pull request #21847 from magnetophon/clipster
clipster: 2016-12-08 -> 2017-01-12
2017-01-13 02:26:33 +01:00
Bart Brouns
07dfecdc99 clipster: 2016-12-08 -> 2017-01-12 2017-01-13 01:53:47 +01:00
Jörg Thalheim
fa51c2c110 Merge pull request #21844 from johbo/tweak-editorconfig
Do not trim trailing whitespace in patch files
2017-01-13 00:28:27 +01:00
Jörg Thalheim
4b24ec524d Merge pull request #21835 from volth/miredo-no-checkconf
miredo: do not run miredo-checkconf
2017-01-13 00:25:30 +01:00
Johannes Bornhold
da563e5773 Do not trim trailing whitespace in patch files 2017-01-12 23:44:26 +01:00
Johannes Bornhold
71aad4c494 xournal: Support gtk backend quartz on darwin 2017-01-12 22:55:23 +01:00
Vincent Laporte
befc29454b coqPackages.dpdgraph: 0.5 -> 0.6{,.1} 2017-01-12 21:23:18 +00:00
Jörg Thalheim
717faa7fbe Merge pull request #21841 from kierdavis/docs-unmatched-parens
docs: fix a couple of unmatched parentheses
2017-01-12 22:12:53 +01:00
Kier Davis
cb4ebb6749
docs: fix a couple of unmatched parentheses 2017-01-12 21:04:20 +00:00
Kier Davis
90b3648f9c
i3blocks: search for config in correct system directory
The SYSCONFDIR variable used in the Makefile servers two purposes:

1) During buildPhase, it is hardcoded into the executable as one of
   the locations that will be searched for the i3blocks.conf config
   file. We want this set to "/etc", so that "/etc/i3blocks.conf"
   will be automatically loaded if it exists, as specified in the
   manpage.

2) During installPhase, it specifies the location that the sample
   i3blocks.conf should be installed to. We want this to be "$out/etc".

Case 2 was already handled correctly, but case 1 was not. This resulted
in i3blocks instead searching for i3blocks.conf in the default value of
SYSCONFDIR, which is "/usr/local/etc", a directory which generally does
not exist on NixOS. This commit remedies this problem by setting
SYSCONFDIR=/etc during buildPhase.

A minor stylistic fix (correcting a usage of "makeFlags" to "buildFlags"
in the expression) has also been applied in this commit.
2017-01-12 20:15:15 +00:00
Bjørn Forsman
05bb3fe22e avidemux: 2.6.16 -> 2.6.18 2017-01-12 20:13:12 +01:00
Tim Steinbach
558d13b255 Merge pull request #21838 from volth/scala-fix-version
scala: fix versions and $PATH
2017-01-12 13:43:15 -05:00
Vladimír Čunát
cb6f49a61f
man-pages: 4.08 -> 4.09
Includes about a dozen new pages.
2017-01-12 19:16:54 +01:00
Volth
9c489165af scala: fix versions and $PATH 2017-01-12 17:56:45 +00:00
Pascal Wittmann
dd3c287642 Merge pull request #20318 from vdemeester/add-vndr
vndr: init at 20161110-cf8678f
2017-01-12 18:40:16 +01:00
Domen Kožar
e5dcce837a
nixos: fix terminal-server, fixes #21834 2017-01-12 16:41:33 +01:00
Domen Kožar
45a677b978
haskell.packages.ghc802: dontCheck vector-algorithms 2017-01-12 16:35:08 +01:00
Volth
ac0b6b9a2c miredo: do not run miredo-checkconf 2017-01-12 14:30:58 +00:00
Daiderd Jordan
e91840cfb6 rustc: enable codegen units and parallel building (#21742) 2017-01-12 14:25:20 +01:00
Thomas Tuegel
ce26a4d3d4 Merge pull request #21826 from mdorman/emacs-updates
Automated emacs package updates
2017-01-12 06:48:36 -06:00
Graham Christensen
193d206b17 Merge pull request #21804 from exi/include-rust-beta-nightly
rust: make rust beta and nightly be build by hydra
2017-01-12 07:33:26 -05:00
Graham Christensen
f855f4a9e2 Merge pull request #21824 from peterhoeg/u/dropbox
dropbox: 16.4.30 -> 17.4.33
2017-01-12 07:29:45 -05:00
Ignat Loskutov
c94c2666bb tdesktop: 0.10.19 -> 1.0.0
abbradar: add vdpau to fix the build, use qt56 explicitly

Closes #21821.
2017-01-12 15:27:24 +03:00
Domen Kožar
60435691f7
haskellPackages.servant-auth: fix build 2017-01-12 11:47:14 +01:00
Franz Pletz
44efd447b6 Merge pull request #21816 from NeQuissimus/linux_4_8_removal
linux: Remove 4.8
2017-01-12 10:22:29 +01:00
Lancelot SIX
8b8bba90b7
pythonPackages.channels: 0.17.3 -> 1.0.1 2017-01-12 10:17:55 +01:00
Lancelot SIX
eeda593de4
pythonPackages.daphne: 0.15.0 -> 1.0.1 2017-01-12 10:17:46 +01:00
Vincent Laporte
086fbfa308 ocamlPackages.owee: init at 0.2
Owee is an experimental library to work with DWARF format.

Homepage: https://github.com/let-def/owee
2017-01-12 09:12:52 +00:00
Peter Simons
b4fcbf4095 callHackage: update database to current version 2017-01-12 10:00:22 +01:00
Peter Simons
2fd0a9f3c7 bind: update to 9.10.4-P5 (CVE-2016-9131, CVE-2016-9147, CVE-2016-9444, CVE-2016-9778) 2017-01-12 10:00:22 +01:00
Aaron Bull Schaefer
715ff285b6 terraform: 0.8.2 -> 0.8.4 2017-01-12 07:29:17 +01:00
Scott R. Parish
4c1703786c nvi: fix linking with ncurses 2017-01-11 19:21:18 -08:00
Michael Alan Dorman
ac393d299c melpa-packages: 2017-01-11
removals:
 - ctags: repository no longer available
 - latest-clojure-libraries: removed from melpa
 - slamhound: removed from melpa
2017-01-11 20:49:26 -05:00
Michael Alan Dorman
2c4ee516d5 melpa-stable-package: 2017-01-11
removals:
 - ctags: repository no longer available
 - ctags-update: version tags lost when moved to new repository
 - slamhound: removed from melpa
2017-01-11 20:48:21 -05:00
Michael Alan Dorman
adbc201147 elpa-packages: 2017-01-11 2017-01-11 20:46:20 -05:00
Tim Steinbach
575b0352b9 Merge pull request #21818 from NeQuissimus/rkt_1_22_0
rkt: 1.21.0 -> 1.22.0
2017-01-11 20:21:37 -05:00
Tim Steinbach
2c0f888f7e Merge pull request #21817 from NeQuissimus/atom_1_13_0
atom: 1.12.9 -> 1.13.0
2017-01-11 20:21:26 -05:00
Tim Steinbach
fb0e159a97 Merge pull request #21823 from NeQuissimus/minecraft_1_11_2
minecraft-server: 1.11.1 -> 1.11.2
2017-01-11 20:21:14 -05:00
Tim Steinbach
4fce3aa442
minecraft-server: 1.11.1 -> 1.11.2 2017-01-11 20:18:38 -05:00