Cillian de Róiste
2c5e423a77
calf: fix src URL (sourceforge->calf-studio-gear.org)
2015-08-30 19:02:09 +02:00
ts468
12d3de1caa
Merge pull request #9103 from ts468/upstream.nginx
...
reverse_proxy module: helper to run nginx as reverse proxy
2015-08-30 18:32:07 +02:00
Rommel M. Martinez
23a00d212f
doc/haskell: fix typos ( close #9561 )
2015-08-30 18:11:57 +02:00
Cillian de Róiste
e67a0119e2
kde4.digikam: update from 4.11.0 to 4.12.0
2015-08-30 17:38:03 +02:00
Cillian de Róiste
6e58e2307a
xf86_input_wacom: update from 0.30.0 to 0.31.0
2015-08-30 17:37:36 +02:00
Thomas Tuegel
875f660481
wrapFirefox: remove (broken) sed trick
...
This sed trick to set argv[0] is made obsolete by c234f37
2015-08-30 08:33:44 -05:00
Peter Simons
78f1720532
haskell-lib: make sdistTarball and buildStrictly functions fuzzier to cope with Hydra builds
...
In Hydra CI environments, the version strings we get from Hydra don't
necessarily match those hard-coded into the Cabal files. To make those builds
succeed anyway, we have to apply some pattern matching.
2015-08-30 15:20:21 +02:00
Thomas Tuegel
29ee3ec8c4
cantor: patch to fix filename string type
2015-08-30 07:23:44 -05:00
Peter Simons
b2c3c58476
cabal2nix: add myself as a maintainer
2015-08-30 12:49:45 +02:00
Aycan iRiCAN
523cd395c7
cabal2nix: fixed sha256 hash
2015-08-30 11:47:25 +03:00
Austin Seipp
16b47aff4b
nixpkgs: saw-tools 0.1-20150609 -> 0.1.1-20150731
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-30 02:58:47 -05:00
William A. Kennington III
cfabf80425
Merge pull request #9539 from benley/funwithgodeps
...
prometheus-*: fixes to deal with goPackages multiple-outputs changes
2015-08-30 00:53:33 -07:00
Benjamin Staffin
395c268ab7
prometheus-statsd-bridge: fold into go-packages.nix
2015-08-30 00:26:10 -07:00
Benjamin Staffin
d17a29a150
prometheus-pushgateway: fold into go-packages.nix
2015-08-30 00:22:09 -07:00
Benjamin Staffin
4c95e49593
prometheus-node-exporter: fold into go-packages.nix
2015-08-30 00:16:00 -07:00
Benjamin Staffin
6122488297
prometheus-nginx-exporter: fold into go-packages.nix
2015-08-30 00:12:09 -07:00
Benjamin Staffin
4f53847ca2
prometheus-mysqld-exporter: fold into go-packages.nix
2015-08-29 23:51:19 -07:00
Benjamin Staffin
52dd6ea9d9
prometheus-mesos-exporter: fold into go-packages.nix
2015-08-29 23:47:13 -07:00
Benjamin Staffin
9001ad4106
prometheus-haproxy-exporter: fold into go-packages.nix
2015-08-29 23:37:48 -07:00
Benjamin Staffin
c5b6f17e1c
prometheus-collectd-exporter: fold into go-packages.nix
2015-08-29 23:30:27 -07:00
Benjamin Staffin
fe5a2b0a39
prom2json: fold into go-packages.nix
2015-08-29 23:19:48 -07:00
Benjamin Staffin
853602fae5
prometheus-cli: fold into go-packages.nix
2015-08-29 23:17:13 -07:00
Benjamin Staffin
87655d9fe8
prometheus-alertmanager: fold into go-packages.nix
2015-08-29 22:55:22 -07:00
Benjamin Staffin
d74e65bd6f
prometheus: fold definition into go-packages.nix
2015-08-29 22:46:57 -07:00
Benjamin Staffin
ff03cf23c6
prometheus-*: trivial cleanup
2015-08-29 22:30:26 -07:00
Benjamin Staffin
e734ce05b8
prometheus-pushgateway: move go-bindata into nativeBuildInputs
...
Thereotically make life easier for a future cross-compilation path.
2015-08-29 22:13:51 -07:00
Benjamin Staffin
94407ad644
prometheus-alertmanager: streamline build, prune buildInputs
...
It turns out it's no longer necessary to run the protoc and
static-asset compile steps ourselves, as those are included in the
upstream repo now.
2015-08-29 22:13:51 -07:00
Benjamin Staffin
a480bd89dc
prometheus-*: fixes to deal with goPackages multiple-outputs changes
2015-08-29 22:13:51 -07:00
Benjamin Staffin
96882b14d5
prometheus: Include console templates and libraries
...
Also tweaked to work with the recent goPackages multiple-outputs stuff.
2015-08-29 22:13:51 -07:00
Nikolay Amiantov
1d78437848
wesnoth: 1.10.7 -> 1.12.4
2015-08-30 05:36:17 +03:00
William A. Kennington III
affead28cb
goPackages: Update core packages from golang
2015-08-29 19:11:11 -07:00
William A. Kennington III
043839368e
goPackages: Exclude commonly useless go packages from being built
2015-08-29 19:10:24 -07:00
William A. Kennington III
ba7335700a
nghttp2: 1.1.2 -> 1.2.1
2015-08-29 18:19:38 -07:00
Carter Charbonneau
ffc679460f
networkmanager: build with dnsmasq
...
Networkmanager requires dnsmasq for network sharing
2015-08-30 02:55:56 +02:00
Thomas Tuegel
e9a8c5a988
Merge pull request #9524 from bjornfor/qt5-mkspecs-libgl
...
qt5: embed path to mesa (libGL) in Qt mkspecs file
2015-08-29 18:11:15 -05:00
Thomas Tuegel
fc0baf0ebe
Merge pull request #9343 from akaWolf/qtcreator
...
qtcreator: refactor for using qt54; qt4SDK, qt5SDK: commented
2015-08-29 18:10:27 -05:00
Daniel Fox Franke
36ac761340
expect: fix Darwin linkage
...
expect's build system doesn't seem to provide the proper linker flags
for the expect programs to be able to find libexpect on Darwin. (Stuff
like this should really just use libtool. *sigh*). Setting
DYLD_LIBRARY_PATH is an inelegant hack, but it gets the job done
without risking affecting other platforms.
2015-08-30 00:50:48 +02:00
Thomas Tuegel
7c3d65ec41
qt5Full: build from Qt 5.4 with qtEnv
2015-08-29 17:48:03 -05:00
Thomas Tuegel
b873f5bd62
Add qtEnv
2015-08-29 17:47:49 -05:00
koral
da6b369029
xurls: 0.6.0 -> 0.7.0
2015-08-29 23:46:18 +02:00
ro6
3207b9f70f
urweb: 20150520 -> 20150819
2015-08-29 23:41:22 +02:00
Benjamin Staffin
04bb91bcce
consul: revert to stable 0.5.2 rather than a snapshot
...
Follup to #9515 : It appears that Prometheus doesn't actually require an
unreleased version of Consul.
2015-08-29 23:23:09 +02:00
Daniel Fox Franke
e69a162ced
pythonPackages.gevent: works just fine on Darwin
...
Closes #8569 , #7275 , and #5782 . Obviates #8730 . As asserted by
@lethalman and observed by @aflatter and @ecyrb, this package
is currently building just fine on Darwin.
2015-08-29 23:10:11 +02:00
William A. Kennington III
26f9ea6dd5
goPackages: Fix tools
2015-08-29 13:25:00 -07:00
Bjørn Forsman
06ed82677a
qt5: embed path to mesa (libGL) in Qt mkspecs file
...
Fixes this problem, when building apps in QtCreator:
...(compile output window)
g++ -Wl,-rpath,/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \
-o qt-test3 main.o mainwindow.o moc_mainwindow.o \
-L/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \
-lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread
/nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lGL
collect2: error: ld returned 1 exit status
mesa is already in the closure of Qt, so there is no size increase.
The patch is copied into both qt-5.3 and qt-5.4 directories, like other
patches are.
Note that programs still can _run_ against a different libGL (e.g. one
provided by nvidia) by configuring the dynamic linker. For instance,
NixOS sets the LD_LIBRARY_PATH environment variable to
/run/opengl-driver/lib/, meaning that whatever libGL is found there
will be used instead of the default (mesa).
2015-08-29 22:21:57 +02:00
Bjørn Forsman
16b5d3f70b
Fix eval
...
Fallout from 83cf8b0cf
2015-08-29 22:18:59 +02:00
Rok Garbas
07c4cbccf1
pythonPackages.pycdio: applied patch since driver_id can be also long type
2015-08-29 22:03:45 +02:00
William A. Kennington III
83cf8b0cf8
goPackages: Split into multiple derivations
...
This should reduce the closure size for end users who only need go
binaries as well as reduce the size of closures hydra builders consume.
2015-08-29 12:58:03 -07:00
Rok Garbas
0b4bcaad95
pythonPackages.gcutil: fix pinning of google_apputils version
...
also added some more metadata to the package
2015-08-29 21:39:35 +02:00
Rok Garbas
32dca6d3b2
pythonPackages.qscintilla: dont build on py3 and pypy
...
because qscintilla is not a standard python package ``buildPythonPackage`` is
not used and ``disabled`` does do anything.
diff --git a/pkgs/top-level/python-packages.nix
b/pkgs/top-level/python-packages.nix index 93d40c3..925ceb0 100644 ---
a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix
@@ -11823,35 +11823,36 @@ let }; };
- qscintilla = pkgs.stdenv.mkDerivation rec {
- # TODO: Qt5 support
- name = "qscintilla-${version}";
- version = pkgs.qscintilla.version;
- disabled = isPy3k || isPyPy;
-
- src = pkgs.qscintilla.src;
-
- buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ];
-
- preConfigure = ''
- mkdir -p $out
- lndir ${pkgs.pyqt4} $out
- cd Python
- ${python.executable} ./configure-old.py \
- --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
- --apidir $out/api/${python.libPrefix} \
- -n ${pkgs.qscintilla}/include \
- -o ${pkgs.qscintilla}/lib \
- --sipdir $out/share/sip
- '';
+ qscintilla = if isPy3k || isPyPy
+ then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}"
+ else pkgs.stdenv.mkDerivation rec {
+ # TODO: Qt5 support
+ name = "qscintilla-${version}";
+ version = pkgs.qscintilla.version;
+
+ src = pkgs.qscintilla.src;
+
+ buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ];
+
+ preConfigure = ''
+ mkdir -p $out
+ lndir ${pkgs.pyqt4} $out
+ cd Python
+ ${python.executable} ./configure-old.py \
+ --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
+ --apidir $out/api/${python.libPrefix} \
+ -n ${pkgs.qscintilla}/include \
+ -o ${pkgs.qscintilla}/lib \
+ --sipdir $out/share/sip
+ '';
- meta = with stdenv.lib; {
- description = "A Python binding to QScintilla, Qt based text editing control";
- license = licenses.lgpl21Plus;
- maintainers = [ "abcz2.uprola@gmail.com" ];
- platforms = platforms.linux;
+ meta = with stdenv.lib; {
+ description = "A Python binding to QScintilla, Qt based text editing control";
+ license = licenses.lgpl21Plus;
+ maintainers = [ "abcz2.uprola@gmail.com" ];
+ platforms = platforms.linux;
+ };
};
- };
qserve = buildPythonPackage rec {
2015-08-29 21:22:29 +02:00
