JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,977 Commits 2 Branches 0 Tags 12 GiB
06ed82677a
Commit Graph

58726 Commits

Author SHA1 Message Date
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
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
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
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
Peter Simons
c95f642260 Merge pull request #9508 from dfoxfranke/haskell-tar 
haskellPackages.tar: disable tests
 2015-08-29 16:09:21 +02:00
Bjørn Forsman
f6135c9fba calibre: 2.35.0 -> 2.36.0 
Unbreaks build, as the 2.35.0 source URL returns HTTP error 404.
 2015-08-29 15:58:42 +02:00
Peter Simons
69b648ea95 Revert "Added K Framework package." 
This reverts commit de02110903. The package doesn't
compile: https://github.com/NixOS/nixpkgs/pull/7419#issuecomment-135972366.
 2015-08-29 15:38:33 +02:00
Domen Kožar
fe0d91a0eb petrifoo: fix build 
(cherry picked from commit dc8e1c199c074319be63fba8a0301b3332262927)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-08-29 14:12:36 +02:00
Domen Kožar
cbb7bc92b6 Merge pull request #9320 from kamilchm/vimPlugins-molokai 
vimPlugins: add molokai
 2015-08-29 14:09:51 +02:00
Domen Kožar
0c8b638b57 Merge pull request #9514 from dfoxfranke/glob2 
glob2: fix build failure
 2015-08-29 14:05:48 +02:00
Domen Kožar
806b679b6d Merge pull request #9515 from benley/prometheus-0.15.1 
Prometheus: update to 0.15.1
 2015-08-29 14:04:43 +02:00
Domen Kožar
d9cb4f92b5 pythonPackages.protobuf: disable on pypy 
(cherry picked from commit 172d2793b9819eb6fa87f88806aaf6c7587e3a2c)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-08-29 13:17:33 +02:00
Domen Kožar
df045923b4 Merge pull request #9491 from FRidh/importlib 
importlib: disable for Python>2.6 and PyPy
 2015-08-29 13:13:03 +02:00
Vincent Laporte
1a2d05a840 getdata: 0.8.8 -> 0.8.9 2015-08-29 11:57:10 +02:00
Frederik Rietdijk
50aed1ee10 importlib: disable for Python>2.6 and PyPy 
importlib is part of the standard library for Python > 2.6 and PyPy.

Tested with nix-shell for all *Packages.importlib versions.
 2015-08-29 10:43:42 +02:00
Benjamin Staffin
86eca38b0c prometheus: 0.14.0 -> 0.15.1 2015-08-29 00:19:22 -07:00
Benjamin Staffin
49f9aba5dd goPackages: update various Prometheus dependencies 
Improving style and adding dates along the dependency tree.
 2015-08-29 00:19:16 -07:00
Tuomas Tynkkynen
6b866a37fc xrdb: Use mcpp as the preprocessor 
Close #9501, fixes #9480.

By default, xrdb uses GCC as the preprocessor at runtime for X resource files.
However, gcc is a large dependency, so replace it with mcpp, a much smaller
preprocessor (currently under a megabyte on i686).

Arch Linux already does this as well, so this should be relatively safe:
https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/xorg-xrdb
 2015-08-29 08:29:59 +02:00
Daniel Fox Franke
7f26d95dcf glob2: fix build failure 
The same issue was reported here to Debian:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746854

Apparently this failure only cropped up with g++-4.9, but looking at
the code I have no idea how it ever worked without this patch.
 2015-08-29 01:09:24 -04:00
Daniel Fox Franke
17667cd6ac haskellPackages.tar: disable tests 
They fail on i686-linux: http://hydra.nixos.org/build/25088435/nixlog/2
 2015-08-28 22:41:56 -04:00
William A. Kennington III
d2dce19793 uid_wrapper: 1.1.0 -> 1.1.1 2015-08-28 17:53:48 -07:00
William A. Kennington III
3e6092fe6b libraw: 0.16.0 -> 0.17.0 2015-08-28 17:50:55 -07:00
William A. Kennington III
b409331a5a ipset: 6.24 -> 6.26 2015-08-28 17:49:15 -07:00
William A. Kennington III
6d83b13734 ceph: 0.94.2 -> 0.94.3 2015-08-28 17:49:03 -07:00
William A. Kennington III
2d16959bb8 goPackages: gcloud-golang don't mark broken as this breaks anything depending on metadata 2015-08-28 16:29:48 -07:00
William A. Kennington III
645709eaa5 go1.5: Remove the bootstrap as it is unneeded 2015-08-28 16:29:22 -07:00
William A. Kennington III
500f871d45 go1.5: Fix references to go1.4 2015-08-28 16:17:47 -07:00
William A. Kennington III
5a303519fa kernel: 3.12.46 -> 3.12.47 2015-08-28 15:46:34 -07:00
William A. Kennington III
c5e2beab9f Revert mongodb-tools: use Go 1.4 
Unneeded as it works fine with Go 1.5 now
 2015-08-28 15:44:50 -07:00