Commit Graph
99512 Commits
Author SHA1 Message Date
Michael Raskin bc2e81f610 i3blocks: fix platforms 2017-01-13 19:09:28 +01:00
Michael Raskin 94b0ad124e Merge pull request #21846 from peterhoeg/f/nim
nim: include all supporting tools
2017-01-13 17:49:25 +00:00
Michael Raskin f30a854844 Merge pull request #21858 from MindTooth/tweak_i3blocks
i3blocks: specify supported platforms
2017-01-13 16:34:51 +00:00
Niclas Thall 15d36c1f0e spotify: 1.0.45 -> 1.0.47 (#21856) 2017-01-13 17:26:26 +01:00
Birger J. Nordølum 32f991f094 i3blocks: specify supported platforms 2017-01-13 17:09:42 +01:00
Maarten Hoogendoorn af299d94eb minikube: disable shell autocompletion; causes impurities.
Apparently the the generation of auto completion files depends on a
network connection. My `nix-build --pure` failed because of this.
Disabled autocompletion for now, given that minikube prints out lots of
documentaton if you provide partial commands.
2017-01-13 17:08:32 +01:00
Maarten Hoogendoorn 3cbc64d5bb minikube: 0.13.1 -> 0.15.0 2017-01-13 17:08:32 +01:00
John Ericson 0ef8b69d12 top-level: Modernize stdenv.overrides giving it self and super
Document breaking change in 17.03 release notes
2017-01-13 10:36:11 -05:00
Robin Gloster a6cd5cdc15 prometheus-cli: remove due to pkg being obsolete 2017-01-13 14:24:35 +01:00
Robin Gloster 74846b2c71 prometheus-blackbox-exporter: 0.3.0 -> 0.4.0 2017-01-13 14:24:33 +01:00
Robin Gloster e2be232c65 perlPackages.CompressRawBzip2: 2.064 -> 2.070 2017-01-13 14:02:57 +01:00
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
Vincent Laporte 720c8e457c jackline: fix after uutf and notty updates 2017-01-13 06:56:58 +00:00
Vincent Laporte 34d78bc312 ocamlPackages.markup: 0.7.3 -> 0.7.4 2017-01-13 06:38:12 +00:00
Vincent Laporte 6f48e4d99d ocamlPackages.eliom: 5.0.0 -> 6.0.0 2017-01-13 06:38:11 +00:00
Vincent Laporte 6b546f2543 ocamlPackages.reactivedata: 0.2 -> 0.2.1 2017-01-13 06:38:11 +00:00
Vincent Laporte 5d309cc834 ocamlPackages.notty: 0.1.1 -> 0.1.1a (53f5946) 2017-01-13 06:38:10 +00:00
Vincent Laporte 6636dfa845 ocamlPackages.ocb-stubblr: init at 0.1.0 2017-01-13 06:38:10 +00:00
Vincent Laporte 67a245356d ocsigen-server: 2.7 -> 2.8 2017-01-13 06:38:10 +00:00
Vincent Laporte 7a31f234e1 js_of_ocaml: 2.7 -> 2.8.3 2017-01-13 06:38:09 +00:00
Vincent Laporte 33c2805324 ocamlPackages.tyxml: 3.6.0 -> 4.0.1 2017-01-13 06:38:09 +00:00
Vincent Laporte 5dc59fbf38 ocamlPackages.vg: 0.8.1 -> 0.9.0 2017-01-13 06:38:09 +00:00
Vincent Laporte 110a0fb028 ocamlPackages.markup: 0.7.2 -> 0.7.3 2017-01-13 06:38:08 +00:00
Vincent Laporte bf1723a89b ocamlPackages.otfm: 0.2.0 -> 0.3.0 2017-01-13 06:38:08 +00:00
Vincent Laporte 221f20413d ocamlPackages.jsonm: 0.9.1 -> 1.0.0 2017-01-13 06:38:08 +00:00
Vincent Laporte 190cc67310 ocamlPackages.uuseg: 0.9.0 -> 1.0.0 2017-01-13 06:38:07 +00:00
Vincent Laporte 7565673f71 ocamlPackages.uucp: 1.1.0 -> 2.0.0 2017-01-13 06:38:07 +00:00
Vincent Laporte 8990a6c116 ocamlPackages.uunf: 0.9.3 -> 2.0.0 2017-01-13 06:38:07 +00:00
Vincent Laporte 7ebe29a56c ocamlPackages.uutf: 0.9.4 -> 1.0.0 2017-01-13 06:38:06 +00:00
Vincent Laporte c4a2bd4668 ocamlPackages.topkg: 0.7.8 -> 0.8.1 2017-01-13 06:38:06 +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