cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
68156 commits 1 branch 0 tags 3.7 GiB
Commit graph

68156 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Daniel Fox Franke
dbf8feb815 openafs-client: 1.6.9 -> 1.6.14, fix build 
* Upgrade 1.6.9 -> 1.6.14
* Support all kernels
* Clean up nested smart-quotes that seemed to be causing a build failure
* Remove redundant `assert isLinux`: already checked by meta.platforms
 2015-08-29 23:34:56 -04: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 (goPackages: Split into multiple derivations).
 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
Rok Garbas
33cb16104c vimPlugins: adding css_color_5056, ctrlp-py-matcher, ctrlp-z, goyo, vim-signify, vim-webdevicons 2015-08-29 21:01:38 +02:00
Rok Garbas
c61ade7b52 vimPlugins: updated (and sorted alphabetically) 2015-08-29 21:01:28 +02:00
William A. Kennington III
3afc3494bb goPackages: Use parallel instead of forking in bash 2015-08-29 11:51:26 -07:00
Peter Simons
b9e999a595 Merge pull request #9526 from dfoxfranke/cvs-fast-export 
cvs-fast-export: don't link against librt
 2015-08-29 20:09:59 +02:00
Peter Simons
6b1bcc66ae haskell-MFlow: fix build 2015-08-29 20:01:49 +02:00
William A. Kennington III
4121c5064a parallel: Fix some needed dependencies 2015-08-29 10:49:23 -07:00
Jaka Hudoklin
be1d6923a8 Merge pull request #9528 from offlinehacker/nixos/openvswitch/startup_fix 
openvswitch service: fix ipsec startup order
 2015-08-29 19:19:56 +02:00
Jaka Hudoklin
eaaad0deea Merge pull request #9527 from offlinehacker/nixos/kube/options 
kubernetes service: add a few options
 2015-08-29 19:19:23 +02:00
Jaka Hudoklin
c65cdcf722 kubernetes service: add a few options 2015-08-29 19:18:38 +02:00
Jaka Hudoklin
8ceca44dbd Merge pull request #9363 from Havvy/iojs 
iojs: 3.0.0 -> 3.1.0
 2015-08-29 19:00:15 +02:00
Jaka Hudoklin
c7bb64cb97 Merge pull request #7344 from joachifm/apparmor-pam 
nixos: add AppArmor PAM support
 2015-08-29 18:59:53 +02:00
Jaka Hudoklin
ed63e18652 Merge pull request #9384 from jefdaj/bitcoinxt-twopackages 
Add BitcoinXT as a separate package
 2015-08-29 18:47:48 +02:00
Jaka Hudoklin
5c91812c79 Merge pull request #9351 from offlinehacker/pkgs/xca/update/1.3.0 
xca: Update to 1.3.0
 2015-08-29 18:44:56 +02:00
Jaka Hudoklin
256d2950b9 xca: 0.9.3 -> 1.3.0 2015-08-29 18:44:02 +02:00
Jaka Hudoklin
bb708a5dad Merge pull request #9531 from offlinehacker/pkgs/skydns/update_2.5.2b 
skydns: 2.5.0a -> 2.5.2b
 2015-08-29 18:34:04 +02:00
Jaka Hudoklin
03b564620b Merge pull request #9529 from offlinehacker/pkgs/qtpass/1.0.1 
qtpass: 0.8.4 -> 1.0.1
 2015-08-29 18:33:29 +02:00
Jaka Hudoklin
95e2403f86 Merge pull request #9530 from offlinehacker/pkgs/docker/fix_add_utillinux 
docker: add blkid from utillinux to path
 2015-08-29 18:32:52 +02:00
Jaka Hudoklin
e2f673e024 skydns: 2.5.0a -> 2.5.2b 2015-08-29 18:28:50 +02:00
Jaka Hudoklin
ff0575a2f1 docker: add blkid from utillinux to path 2015-08-29 18:25:39 +02:00
Jaka Hudoklin
367b0be7b4 qtpass: 0.8.4 -> 1.0.1 2015-08-29 18:23:08 +02:00
Jaka Hudoklin
29c0262708 openvswitch service: fix ipsec startup order 2015-08-29 18:21:43 +02:00
Daniel Fox Franke
07903b1617 cvs-fast-export: don't link against librt 
It's superfluous on Linux, and it breaks the build on Darwin.
 2015-08-29 12:05:52 -04:00
Bjørn Forsman
ab6af31ecb spyder: enable for all python interpreters 
Rope is not ported to python3 yet, so it is disabled (it's a
"recommended" dependency, not critical).
 2015-08-29 17:41:35 +02:00
Frederik Rietdijk
dbc7e0fea5 spyder: 2.2.5 -> 2.3.6 
Set environment variable to use setuptools (fixes build issue).

[Bjørn: split enabling spyder for python3 into separate commit.]
 2015-08-29 17:41:35 +02:00
Damien Cassou
de3a53f277 Merge pull request #9525 from DamienCassou/update-maintainer-email 
Change my email address
 2015-08-29 16:59:47 +02:00