Commit Graph

43 Commits

Author SHA1 Message Date
Frederik Rietdijk
ee1b8e4c7b python2.pkgs.wxPython: fix build 2019-09-08 22:09:42 +02:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
tbenst
fd7ca9faec python: wxPython: init at 4.0.6 2019-08-18 13:42:46 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Frederik Rietdijk
0665223c49 python: wxPython: 4.0.4 -> 4.0.6 2019-06-15 08:44:06 +02:00
Frederik Rietdijk
1285d739d8 wxPython: fix build 2019-03-03 08:37:03 +01:00
Vladimír Čunát
05c62669b9
pythonPackages.wxPython: fixup build
I'm not sure why/when it started failing, but adding pkgconfig
shouldn't hurt anything.  I see no indication that
pythonPackages.pkgconfig was meant.
2019-02-02 13:56:38 +01:00
Frederik Rietdijk
00e7055e3e python: wxPython: 4.0.3 -> 4.0.4 2019-01-18 09:37:10 +01:00
Frederik Rietdijk
ae9932e431 php: get rid of composableDerivation
Some bugs may have creeped in during the conversion.
One flag I had trouble with and so removed was:

    "--enable-embedded-mysqli"
2018-07-26 11:49:56 +02:00
Bert Moens
7eb0b20918 wxPython: enable headers
Headers were disabled, probably because they caused a build error: the header files were being
copied to the store path of wxwidgets, but it failed with permission denied. With this commit,
the header files stay in the wxPython store path.
To point the builder of another derivation to the wxPython header files, some tweaking is
needed. E.g. for kicad: cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0" ]
2017-12-13 22:01:27 +01:00
adisbladis
d99378654f pythonPackages: Add version and pname attributes to packages 2017-11-23 17:49:43 +01:00
obadz
a5cb00e884 pythonPackages.wxPython: inject Cairo, Pango and GDK library paths 2017-04-21 23:51:39 +01:00
Dmitry Kalinkin
c2a5733654
wxPython: fix on darwin 2017-02-16 18:48:08 -05:00
Frederik Rietdijk
e67e4da8c7 pythonPackages.wxPython: don't pass in pythonPackages 2016-10-18 23:16:09 +02:00
Franz Pletz
0751027b31 wxPython: Disable format hardening 2016-08-02 17:54:42 +02:00
Frederik Rietdijk
253634c4ac pythonPackages.wxPython28: remove package 2016-05-27 21:37:09 +02:00
Frederik Rietdijk
9597ca718b pythonPackages.wxPython{28,30} : use buildPythonPackage 2016-05-27 21:25:48 +02:00
Ambroz Bizjak
e938fbbd10 wxPython: Fix runtime error due to library dependencies not in RUNPATH.
I think what's happening is that the linker automatically adds DT_NEEDED dependencies to some libraries because it finds these libraries are being used directly, but
because they're not linked explicitly with -lflags, the gcc wrapper does not add them to RUNPATH.
2016-03-16 13:13:20 +01:00
Domen Kožar
99a64da600 fix wxPython 2015-11-21 21:44:12 +01:00
Vincent Laporte
1fff5d7aa2 wxpython: remove redundant attribute openglSupport 2015-09-06 15:01:47 +02:00
Vincent Laporte
f6a875d5ae wxPython: refactor to generic 2015-09-05 16:36:36 +02:00
Vincent Laporte
9a0f8b5a4f wxPython-3: refactor 2015-09-05 11:11:19 +02:00
Vincent Laporte
eb42c82f6b wxPython: 3.0.0.0 -> 3.0.2.0 2015-09-05 11:11:19 +02:00
Domen Kožar
b598f6af59 pythonPackages.runsnakerun: add performance/memory GUI profiler for python 2014-11-04 18:19:27 +01:00
Domen Kožar
2632afa131 pypy: handle unsupported packages 2014-09-12 00:26:50 +02:00
ambrop7@gmail.com
93d313c0ed Add wxPython-3.0 with OpenGL support. 2014-03-25 22:35:25 +01:00
Yury G. Kudryashov
2ed828052e Remove wxPython26 since it is not used
svn path=/nixpkgs/trunk/; revision=29773
2011-10-11 19:46:31 +00:00
Eelco Dolstra
a3a15545f6 * wxPython updated to 2.8.12.0.
svn path=/nixpkgs/trunk/; revision=29395
2011-09-20 11:19:55 +00:00
Eelco Dolstra
345b9a75d5 * Move wxPython into python-packages.nix so that you can get wxPython
built for the appropriate Python version
  (e.g. python26Packages.wxPython).

svn path=/nixpkgs/trunk/; revision=27127
2011-05-04 08:41:50 +00:00
Eelco Dolstra
a7d4f19ab3 * wxPython updated to 2.8.12.0.
* wxPython builder: wrap the Python programs (such as pyshell) so that
  they actually work.

svn path=/nixpkgs/trunk/; revision=27122
2011-05-03 16:57:18 +00:00
Eelco Dolstra
e2a374799f * Reverted most of the recent Python refactorings, as discussed. It's
a worthy goal to move the Python packages that are currently in
  all-packages.nix into a single attribute set, but this doesn't
  require moving python-packages.nix or the other changes made to that
  file.  The Python packages in all-packages.nix should simply be
  moved to python-packages.nix, and ideally changed to use
  buildPythonPackage.

svn path=/nixpkgs/trunk/; revision=21196
2010-04-21 10:51:15 +00:00
Marc Weber
8c0b7e4ad2 - adding experimental python31 build
- cleanup python libraries:
 * moving all python libraries into a attr set into a directory
   so that expressions can be used for both: python 2.5 and 2.6 easily
 * disabling packages which don't build

svn path=/nixpkgs/trunk/; revision=21142
2010-04-17 18:28:25 +00:00
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra
607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/.
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
2007-08-27 13:01:33 +00:00
Eelco Dolstra
150b0712cd * Very subtle purity error: on NixOS, wxGTK wasn't being built with
Xinerama support.  It gets libXinerama as an explicit build input,
  but it checks for its existence in /usr/X11/include etc.  This
  caused Bittorrent to fail (NIXPKGS-61).  Backported the builder
  fixes from wxGTK 2.8.

svn path=/nixpkgs/trunk/; revision=8813
2007-05-31 14:02:16 +00:00
Eelco Dolstra
d16ae4efcf * Added wxGTK/wxPython 2.8. However this was quite pointless as
Bittorrent is even more broken with wxPython 2.8.

svn path=/nixpkgs/trunk/; revision=8812
2007-05-31 13:43:13 +00:00
Eelco Dolstra
9ea7038c51 * BitTorrent 5.0.3.
* wxPython 2.6.3.

svn path=/nixpkgs/trunk/; revision=7341
2006-12-13 20:30:09 +00:00
Eelco Dolstra
82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Eelco Dolstra
454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra
e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Eelco Dolstra
8776ba127c * Updated some more packages. However, bittorrent and vlc don't work
right now because wxGTK is broken (it depends on internal symbols in
  GTK which where made private in GTK 2.4).

svn path=/nixpkgs/trunk/; revision=907
2004-04-02 15:36:14 +00:00
Eelco Dolstra
12ae5363ea * Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
2004-03-29 17:23:01 +00:00
Eelco Dolstra
9261c1eaa5 * Added wxPython.
svn path=/nixpkgs/trunk/; revision=795
2004-02-17 19:19:26 +00:00