Vladimír Čunát
1dc36904d8
Merge #14920 : windows improvements, mainly mingw
2016-05-05 08:30:19 +02:00
Vladimír Čunát
75f1cc61b8
Merge #14982 : gnum4: disable tests
2016-05-05 08:29:36 +02:00
Vladimír Čunát
7a005601d4
Merge branch 'master' to resolve conflicts
2016-05-05 08:25:38 +02:00
Tuomas Tynkkynen
367b2aa1e4
dbus-glibc: Set --exec-prefix to fix pkgconfig file
...
Without this notify-osd fails to find dbus-binding-tool, since the
pkgconfig file would contain e.g.:
````
prefix=/nix/store/hxsbjbjn7g1j1cf60n228yi9wnzrl4yk-dbus-glib-0.104
exec_prefix=${prefix}
````
... and notify-osd is using `exec_prefix` to locate the binaries.
Set it to $dev to match the location of installed binaries (we have
`outputBin = "dev";`).
Issue #15074 .
2016-05-05 05:37:38 +03:00
Tobias Geerinckx-Rice
e58cd82e87
dpkg: 1.18.5 -> 1.18.6
2016-05-05 02:16:56 +02:00
Tobias Geerinckx-Rice
750d58f439
eid-mw: 4.1.16 -> 4.1.17
2016-05-05 02:15:14 +02:00
Tobias Pflug
953bb5e7ca
python-gui: init at 1.0.2, fixes #14958
2016-05-05 00:49:39 +02:00
Tobias Pflug
b42d6718b0
python-neovim: 0.0.38 -> 0.1.7
...
Disable for python3
2016-05-05 00:43:38 +02:00
Rok Garbas
2eac1070ad
Merge pull request #15229 from DamienCassou/notmuch-0.22
...
notmuch: 0.21 -> 0.22
2016-05-05 00:16:04 +02:00
aszlig
3f7735fe65
chromium+chrome: Don't import update.nix directly
...
Regression introduced by f28b71023c
.
Let's now expose and use the upstream-info attribute via the main
Chromium derivation, so that other packages like the google-chrome
package doesn't need to rely on internals of the Chromium
implementation.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-05-04 23:12:33 +02:00
aszlig
f28b71023c
chromium/updater: Don't import <nixpkgs> again
...
This effectively resets the attributes given at the point the main
<nixpkgs> is imported and thus for example is also reading in stuff like
~/.nixpkgs/config.nix again, which might lead to unexpected results.
We now only import <nixpkgs> now if the updater is auto-called (like in
update.sh), otherwise the required attributes are passed by callPackage
within the Chromium scope.
I remember noting about this a while ago either on IRC or on GitHub, but
I can't find it right now, so thanks to @obadz for reminding me about
this in #15225 .
Tested this by running the updater and also using:
NIXPKGS_CONFIG=$(pwd)/broken.nix nix-instantiate --arg config {} -A chromium
The contents of broken.nix were:
EVALERR{
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes : #15225
2016-05-04 22:35:24 +02:00
Damien Cassou
d122556a2f
notmuch: 0.21 -> 0.22
2016-05-04 21:49:08 +02:00
zimbatm
0bc713f817
Merge pull request #15135 from gpyh/asciidoctor
...
asciidoctor: Init at 1.5.4
2016-05-04 20:42:26 +01: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
Joachim Fasting
35efc53274
Merge pull request #15214 from taku0/lp_solve_isnan
...
lp_solve: fixed build error due to defining isnan
2016-05-04 20:55:51 +02:00
Arseniy Seroka
9cb8abe846
Merge pull request #15208 from taku0/firefox-bin-46.0.1
...
firefox-bin: 45.0.2 -> 46.0.1
2016-05-04 21:38:47 +03:00
Arseniy Seroka
3e92cbd86e
Merge pull request #15215 from romildo/upd.xfce4-cpufreq-plugin
...
xfce4-cpufreq-plugin: 1.1.1 -> 1.1.3
2016-05-04 21:37:33 +03:00
Arseniy Seroka
bf0484c613
Merge pull request #15221 from schneefux/master
...
caddy: v0.8.2 -> v0.8.3
2016-05-04 21:37:06 +03:00
Joachim Fasting
6acf41f9bf
Merge pull request #15223 from romildo/new.xfce4-weather-plugin
...
xfce4-weather-plugin: init at 0.8.7
2016-05-04 20:10:43 +02:00
Joachim Fasting
066949cc35
Merge pull request #15217 from LumiGuide/fix-mdadm-sendmail
...
mdadm: call /var/setuid-wrappers/sendmail instead of /usr/sbin/sendmail
2016-05-04 20:09:02 +02:00
vbgl
2c021bdbba
ocaml-oasis: 0.4.5 -> 0.4.6 ( #15209 )
2016-05-04 19:12:20 +02:00
José Romildo Malaquias
7e09858d6e
xfce4-weather-plugin: init at 0.8.7
2016-05-04 14:02:13 -03:00
Dan Peebles
1eab39cdce
makeself: fix patch to find the makeself header properly
2016-05-04 16:39:24 +00:00
Eelco Dolstra
1f84e43239
Do some large, concurrency-capable builds on dedicated machines
2016-05-04 18:16:27 +02:00
Eelco Dolstra
f2d24b9840
chromium: Disable Hydra builds of -dev and -beta
...
It's not the job of Nixpkgs to distribute beta versions of upstream
packages. More importantly, building these delays channel updates by
several hours, which is bad for our security fix turnaround time.
2016-05-04 18:16:27 +02:00
schneefux
f44fb5656c
caddy: v0.8.2 -> v0.8.3
2016-05-04 18:08:37 +02:00
Michael Raskin
942db2e9ac
imagemagick: libwebp just has to be a propagated input
2016-05-04 17:55:09 +02:00
Nikolay Amiantov
97a523d053
Merge pull request #15219 from ali-abrar/rxvt_unicode-9.22
...
rxvt_unicode: 9.21 -> 9.22
2016-05-04 19:05:16 +04:00
Nikolay Amiantov
ce61bfac64
Merge pull request #15211 from romildo/upd.enlightenment
...
enlightenment: 0.20.6 -> 0.20.7
2016-05-04 18:51:00 +04:00
Ali Abrar
5423c48148
rxvt_unicode: 9.21 -> 9.22
2016-05-04 10:38:47 -04:00
Bas van Dijk
a941c7e27b
mdadm: call /var/setuid-wrappers/sendmail instead of /usr/sbin/sendmail
2016-05-04 15:27:53 +02:00
taku0
f2bab58b3e
lp_solve: change source URL to mirror
2016-05-04 22:17:56 +09:00
Joachim Fasting
0f1293a488
Merge pull request #15210 from taku0/amarok_pcre
...
amarok: add pcre as a dependency to fix failing build
2016-05-04 15:13:45 +02:00
taku0
3fa49d5ac4
lp_solve: updated description
2016-05-04 22:03:22 +09:00
Vladimír Čunát
2cbb7bf9d1
cc-wrapper: add -B flag with cc.lib
...
This fixes `gcc --print-file-name=libstdc++.so`
and thus it should fix #14967 .
2016-05-04 14:23:54 +02:00
José Romildo Malaquias
3bcaf22dec
xfce4-cpufreq-plugin: 1.1.1 -> 1.1.3
2016-05-04 09:11:34 -03:00
Peter Simons
397c75aeb4
Revert "Just strip everything by default"
...
This reverts commit 2362891dc8
. The patch
is broken. :-(
2016-05-04 13:40:53 +02:00
Yacine Hmito
d3421435e0
asciidoctor: Init at 1.5.4
2016-05-04 13:23:22 +02:00
Peter Simons
6179aaece6
Merge pull request #15167 from deepfire/haskell-ghc8-configuration-updates
...
Haskell GHC 8.0.1-rc4 configuration updates
2016-05-04 13:06:35 +02:00
Michael Raskin
9dfaf885c6
zbar: pass libwebp WebP image format library
2016-05-04 13:06:17 +02:00
taku0
725c85c720
lp_solve: fixed build error due to defining isnan
2016-05-04 19:58:05 +09:00
Robin Gloster
30ef92e0ff
jbidwatcher: fixup to last commit
2016-05-04 10:37:40 +00:00
Kosyrev Serge
0438192122
ghc8 | config: turtle: jailbreak
2016-05-04 13:31:28 +03:00
Kosyrev Serge
2e72002012
ghc8 | config: trifecta: jailbreak
2016-05-04 13:31:28 +03:00
Kosyrev Serge
c9553d7b6d
ghc8 | config: th-reify-many -> 0.1.4.1
2016-05-04 13:31:28 +03:00
Kosyrev Serge
81f12377e4
ghc8 | config: th-desugar -> git
2016-05-04 13:31:28 +03:00
Kosyrev Serge
c03af86d39
ghc8 | config: stm-conduit -> git
2016-05-04 13:31:28 +03:00
Kosyrev Serge
49a9213760
ghc8 | config: singletons -> git
2016-05-04 13:31:28 +03:00
Kosyrev Serge
6ce39b317e
ghc8 | config: servant*: jailbreak, disable tests
2016-05-04 13:28:26 +03:00
Kosyrev Serge
d27186a9ca
ghc8 | config: sdl2: jailbreak
2016-05-04 13:28:26 +03:00