Vladimír Čunát
2b67ba2ad2
pkgconfig: post-merge fixup
2015-10-03 14:08:48 +02:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát
33373d939a
Merge: staging with systemd
2015-10-02 10:24:41 +02:00
Eelco Dolstra
b23038dd80
Merge remote-tracking branch 'origin/master' into systemd-219
2015-10-01 14:17:46 +02:00
William A. Kennington III
e7bb9e1023
Merge branch 'master.upstream' into staging.upstream
2015-09-30 13:26:04 -07:00
Bjørn Forsman
f35de8ea64
jenkins: 1.594 -> 1.631
2015-09-30 17:25:39 +02:00
William A. Kennington III
5c7ba8c971
pkgconfig: 0.28 -> 0.29
2015-09-29 16:12:06 -07:00
William A. Kennington III
271972de0a
Merge branch 'master.upstream' into staging.upstream
2015-09-29 15:54:33 -07:00
vbgl
b02c07641b
Merge pull request #10014 from vbgl/camlp5-6.13
...
camlp5: 6.12 → 6.14
2015-09-29 19:43:15 +02:00
Jude Taylor
48a791d270
darwin purity: doxygen
2015-09-28 18:32:41 -07:00
Tobias Geerinckx-Rice
8ce79e0ef0
d-feet: remove unused arguments
2015-09-29 03:21:34 +02:00
Edward Tjörnhammar
c351c22db5
ihaskell: make sure the wrapped binaries pick up the python path
2015-09-28 21:26:17 +02:00
Eelco Dolstra
5b52b3589c
valgrind: Update to 3.11.0
2015-09-28 15:52:31 +02:00
Thomas Tuegel
2e0589b4ca
kde414: build with kdelibs-4.14.12
...
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
Lancelot SIX
a4158cbe94
autoconf-archive: 2015.02.24 -> 2015.09.25
...
See https://lists.gnu.org/archive/html/info-gnu/2015-09/msg00007.html
for announcement
2015-09-27 08:41:01 +00:00
Bjørn Forsman
3f27be8e5d
dbench: move loadfiles from $out/share/ to $out/share/loadfiles/
...
Seems cleaner.
Hm, there are also loadfiles in $out/share/doc/dbench/loadfiles/
(installed by the upstream build system), but there is no iscsi/
directory in there.
2015-09-26 15:26:17 +02:00
Bjørn Forsman
dc06278641
dbench: expression clean-up
...
Whitespace, ordering, add meta attributes.
2015-09-26 15:08:50 +02:00
Bjørn Forsman
8e7ce3de00
dbench: 20101121 -> 2013-01-01 (latest)
...
This fixes the build (the old version has wrong hash now).
2015-09-26 15:01:39 +02:00
Robin Gloster
4ed66c9f02
rustfmt: fix build
...
rustfmt now needs to have llvm in its buildInputs since rust does not bundle it
and rustfmt needs to link to it.
2015-09-24 09:00:55 +00:00
Robin Gloster
2d3537fbf2
racer: git-2015-05-18 -> 1.0.0
2015-09-24 08:58:43 +00:00
William A. Kennington III
d5395b0506
Merge pull request #10024 from mayflower/update-rust
...
Update rust and dependants
2015-09-23 22:43:25 -07:00
William A. Kennington III
5cfe893cc4
Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
...
This is a partial commit from staging in an attempt to make merges
smaller.
2015-09-23 14:35:36 -07:00
Robin Gloster
760be9cf70
rustfmt: git-2015-09-05 -> git-2015-09-23
2015-09-23 21:16:16 +00:00
Robin Gloster
feda2925f7
cargo: 0.3.0 -> 0.5.0
2015-09-23 21:16:16 +00:00
Vincent Laporte
399a9da2ae
camlp5: 6.12 -> 6.14
2015-09-23 19:05:02 +02:00
Peter Simons
5c1afdd5f6
cabal2nix: update to version 20150922
2015-09-23 15:08:19 +02:00
Vladimír Čunát
76ef7a93e3
Merge: xlibs and x11 attribute cleanup
...
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Eelco Dolstra
e7631452e9
texinfo: Disable tests
...
These appear to fail randomly:
http://hydra.nixos.org/build/26194907/nixlog/325/raw
2015-09-22 12:46:58 +02:00
Eelco Dolstra
fbaaa9cccc
swig2: Enable on Darwin
2015-09-22 11:59:39 +02:00
Jaka Hudoklin
0d32d4cd84
kibana: 4.2.0 -> 4.1.2
...
Kibana needs to be downgraded, so it works with current stable elasticsearch
2015-09-22 00:30:19 +02:00
William A. Kennington III
7040350f34
swig: 3.0.6 -> 3.0.7
2015-09-21 14:38:49 -07:00
Tobias Geerinckx-Rice
ee7df6a566
dub: 0.9.23 -> 0.9.24
...
Use fetchFromGitHub, and drop a seemingly spurious 'unzip' dependency
(I can find no reference to it in either the source or the resulting
binary).
2015-09-21 19:22:14 +02:00
William A. Kennington III
3fcbd5a829
Merge branch 'master.upstream' into staging.upstream
2015-09-20 14:54:53 -07:00
William A. Kennington III
5ba050a1a3
cmake: 3.3.1 -> 3.3.2
2015-09-20 14:08:22 -07:00
William A. Kennington III
222f5454a0
Merge pull request #9892 from benley/swig3-darwin
...
swig3: re-enable darwin builds
2015-09-19 16:30:26 -07:00
William A. Kennington III
6e09223627
Merge branch 'master.upstream' into staging.upstream
2015-09-18 17:16:27 -07:00
Jaka Hudoklin
5baac1e962
kibana: 3.1.1 -> 4.2.0
2015-09-19 00:33:35 +02:00
Tobias Geerinckx-Rice
7cfa918aac
lemon: init at 1.0
2015-09-18 03:46:06 +02:00
Vladimír Čunát
a418096d6a
Merge branch 'master' into staging
2015-09-17 20:07:20 +02:00
Lancelot SIX
bed1eb3260
autogen: 5.18.5 -> 5.18.6 ( close #9885 )
...
See http://lists.gnu.org/archive/html/info-gnu/2015-09/msg00006.html for
announcement
2015-09-17 19:55:34 +02:00
Eelco Dolstra
f81982e779
gdb: Update to 7.10
2015-09-17 15:56:42 +02:00
Eelco Dolstra
e636e0a532
gdb: Look for debug info in /run/current-system/sw/lib/debug
...
The previous default was $out/lib/debug, which wasn't very useful.
This ensures that you can do
environment.systemPackages = [ pkgs.hello.debug ];
to install debug info.
2015-09-17 15:56:37 +02:00
Benjamin Staffin
cc1af6640c
swig3: re-enable darwin builds
2015-09-16 16:28:13 -04:00
Andreas Wagner
937741c9f3
teensy-loader-cli: consistent naming, version bump
2015-09-16 19:14:01 +02:00
Pascal Wittmann
c748c0fb41
global: 6.5 -> 6.5.1
2015-09-15 23:47:18 +02:00
William A. Kennington III
773b4deb7c
Merge commit 'a6f6c0e' into master.upstream
...
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07:00
William A. Kennington III
8dc7073546
Merge branch 'master.upstream' into staging.upstream
2015-09-15 12:04:41 -07:00
Vladimír Čunát
88c9f8b574
xlibs: replace occurrences by xorg
...
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Peter Simons
e1bbc6f35c
cabal2nix: fix version number 20180903 to 20150903
...
Thanks to @drvink for pointing this out.
2015-09-14 13:46:16 -07:00
goibhniu
529fad3fcf
Merge pull request #9691 from samuelrivas/update-argyllcms
...
Update argyllcms
2015-09-14 10:01:36 +02:00