Tuomas Tynkkynen
e00c61fd36
gnused: Fix cross build after upgrade to 4.3.0
...
Fixes:
````
GEN doc/sed.1
help2man: can't get `--help' info from sed/sed
make[2]: *** [Makefile:5775: doc/sed.1] Error 126
make[2]: Leaving directory '/tmp/nix-build-gnused-4.3-arm-linux-gnueabihf.drv-0/sed-4.3'
make[1]: *** [Makefile:3024: all-recursive] Error 1
make[1]: Leaving directory '/tmp/nix-build-gnused-4.3-arm-linux-gnueabihf.drv-0/sed-4.3'
make: *** [Makefile:2156: all] Error 2
````
http://hydra.nixos.org/build/46051086/nixlog/11/raw
2017-01-14 06:36:44 +02:00
Jörg Thalheim
4008370992
Merge pull request #21863 from rycee/bump/google-talk-plugin
...
google-talk-plugin: 5.41.0.0 -> 5.41.3.0
2017-01-14 01:16:03 +01:00
Jörg Thalheim
d7dbbf5365
Merge pull request #21867 from rlupton20/kubernetes-helm-v2.1.3
...
kubernetes-helm: 2.1.2 -> 2.1.3
2017-01-14 01:15:10 +01:00
Richard Lupton
0a3bd81648
kubernetes-helm: 2.1.2 -> 2.1.3
2017-01-13 22:48:36 +00:00
Pascal Wittmann
89dfe67f81
Merge pull request #21819 from AtnNn/isabelle
...
isabelle: 2016 -> 2016-1
2017-01-13 21:58:57 +01:00
Pascal Wittmann
d760d9cccc
Merge pull request #21836 from kierdavis/ckb
...
ckb: init at 0.2.6
2017-01-13 21:44:21 +01:00
Robert Helgesson
782e2fa807
google-talk-plugin: 5.41.0.0 -> 5.41.3.0
2017-01-13 20:24:24 +01:00
John Ericson
0b8e389870
Merge pull request #21415 from Ericson2314/normalize-boot
...
Normalize bootstrapping
2017-01-13 13:49:22 -05:00
John Ericson
abaf790ea9
stdenv/booter.nix: Add longer note explaining indexing
2017-01-13 13:47:17 -05:00
John Ericson
ff35560460
linux stdenv: Inline stage funs to conform to new convention
...
Code is just moved around
2017-01-13 13:23:26 -05:00
John Ericson
b10f415c21
linux stdenv: Remove stray use of stage0 to bootstrap more elegantly
2017-01-13 13:23:26 -05:00
John Ericson
6a45e911c4
linux stdenv: Utilize overrides and prevStage better
...
`gcc-unwrapped` basically replaces `gccPlain`. It may seem like an ugly
polution to stick it in all-packages, but a future PR will enshrine this
`*-unwrapped` pattern. In any event, the long term goal is stdenvs might
need to tweak how compilers are booted and wrapped, but the code to build
the unwrapped compilers themselves should be generic.
2017-01-13 13:23:25 -05:00
John Ericson
67ebd3161b
top-level: Inherit system
and platform
in stage.nix not all-packages.nix
...
These are not packages, and so its more elegant to do this outside of
all-packages.nix.
2017-01-13 13:23:25 -05:00
David Grayson
0f33b9f7f1
top-level: Do stdenvOverrides in stage.nix even if crossSystem exists.
...
Instead, the cross stdenv will patch up the override field -- the complexity
is now confined to the one place it matters.
2017-01-13 13:23:25 -05:00
John Ericson
3e197f7d81
top-level: Normalize stdenv booting
...
Introduce new abstraction, `stdenv/booter.nix` for composing bootstraping
stages, and use it everywhere for consistency. See that file for more doc.
Stdenvs besides Linux and Darwin are completely refactored to utilize this.
Those two, due to their size and complexity, are minimally edited for
easier reviewing.
No hashes should be changed.
2017-01-13 13:23:23 -05:00
Vladimír Čunát
a652099c46
fetchurl: change to grep -E to fix #8561
...
Close #21861 .
2017-01-13 19:07:07 +01:00
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
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