Commit Graph

55 Commits

Author SHA1 Message Date
Michael Weiss
0950324466 scons: Add passthru.py2 for backward compatibility
Not all packages build with Python 3, see #75877. The goal is to get rid
of Python 2 but this approach ensures a smoother transition.
2020-03-27 10:49:52 -07:00
Michael Weiss
4ca37400ac scons: Switch to Python 3
Reasons:

Python 2.7 will EOL very soon [0]:
DEPRECATION: Python 2.7 will reach the end of its life on January 1st,
2020. Please upgrade your Python as Python 2.7 won't be maintained after
that date. A future version of pip will drop support for Python 2.7.
More details about Python 2 support in pip, can be found at
https://pip.pypa.io/en/latest/development/release-process/#python-2-support

SCons 4.0.0 will drop Python 2.7 Support [1]:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.1.2/src/CHANGES.txt

[0]: From the SCons build output previous to this commit (i.e. with Python 2.7).
[1]: https://raw.githubusercontent.com/SConsProject/scons/rel_3.1.2/src/CHANGES.txt
2020-03-27 10:49:52 -07:00
Michael Weiss
832cf092c7
scons: 3.1.1 -> 3.1.2
Announcement:
https://scons.org/scons-312-is-available.html

Changelog:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.1.2/src/CHANGES.txt
2019-12-18 16:10:11 +01:00
John Ericson
b7f4bda282 treewide: *Phase(s)? variables are optional
If these aren't defined, the stdenv defaults are used in the `*Phase`
case, or no extra phases are done, in the `*Phases` case.
2019-11-01 14:44:44 -04:00
John Ericson
1290e532ea treewide: Make more dont* variables OK to be undefined in setup hooks 2019-11-01 14:44:44 -04:00
Michael Weiss
63ad67cbbb
scons: 3.1.0 -> 3.1.1
Announcement:
https://scons.org/scons-311-is-available.html

Changelog:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.1.1/src/CHANGES.txt
2019-08-10 13:53:10 +02:00
Michael Weiss
51dc2cdd58
scons: 3.0.5 -> 3.1.0
Announcement:
https://scons.org/scons-310-is-available.html

Changelog:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.1.0/src/CHANGES.txt
2019-07-30 18:50:56 +02:00
Michael Weiss
8939a5da89
scons: 3.0.4 -> 3.0.5
Announcement:
https://scons.org/scons-305-is-available.html

Changelog:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.0.5/src/CHANGES.txt
2019-03-27 11:12:30 +01:00
Michael Weiss
f561acc48e
scons.src: Update the hash (tarball was modified)
Unfortunately the tarball was modified for the official release and
"nix-store -r --check $(nix-instantiate -A scons.src)" did not catch
this (not sure why ATM).

Thanks @pbogdan for noticing this :)
2019-01-23 21:21:46 +01:00
Michael Weiss
32e7f391fc
scons: 3.0.3 -> 3.0.4
Announcement:
https://scons.org/scons-304-is-available.html

Changelog:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.0.4/src/CHANGES.txt

There where no regressions and no deprecations in this release (at least
it does not break any additional builds in nixpkgs).
2019-01-23 18:46:53 +01:00
Michael Weiss
768d876394
scons: Remove version 2.5.1 2019-01-12 10:44:33 +01:00
Will Dietz
e69d494033 scons: 3.0.2 -> 3.0.3
https://scons.org/scons-303-is-available.html

cc e1d9854816
2019-01-08 21:34:55 -06:00
Michael Weiss
a684ae6e53
scons: Remove version 3.0.0 2019-01-06 20:31:16 +01:00
Michael Weiss
d376ffe767
scons: Add version 3.0.2
"SCons release 3.0.2 now available from the download page at
SourceForge. This release should be used instead of 3.0.1. This release
fixes several issues. This release supports Python versions 2.7.* as
well as 3.5+." [0]

Details can be found in the changelog [1].

I'll update the default after running additional tests.

[0]: https://scons.org/scons-302-is-available.html
[1]: https://raw.githubusercontent.com/SConsProject/scons/rel_3.0.2/src/CHANGES.txt
2019-01-06 20:31:16 +01:00
Matthew Bauer
b6fce7201e xboxdrv: add dontUseSconsInstall flag
xboxdrv doesn’t use scons for installing, but instead using a
makefile! Everything else is in scons so we have to keep that. I’ve
added a dontUseSconsInstall flag to the scons setup-hook to skip the
automatic overwrite of default “make install” call.
2018-11-14 13:57:41 -06:00
Matthew Bauer
1ba9fd335d scons: add setup hook
The scons build system is python-based and has a binary named scons. Unlike CMake, it cannot generate makefiles so we end up having to override the build, install, and check phases. I have added the setupHook to the scons package so that integration requires no unique steps - just putting scons in nativeBuildInputs should be enough. sconsFlags controls the flags specifically passed to scons while buildFlags, installFlags, and checkFlags should still be usable. Some packages use different names for the prefix flag. In those cases you will have to set "prefixKey" to something like "PREFIX=" as there are multiple names for the "prefix" used in scons.
2018-11-13 19:13:50 -06:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Michael Weiss
a5b611defc scons: 3.0.0 -> 3.0.1
"This release should be used instead of 3.0.1. This release fixes
several issues." - http://scons.org/scons-301-is-available.html

More than 90% of the 346 rebuilds succeed without any problems (I've
tested it against aeff3080d0). As far as I
can tell most of the problematic packages either failed before the
upgrade or for a reason that is unrelated to this SCons update. But it
is possible that this'll cause a few regressions, I'll try to watch out
for build failures on Hydra.

The attribute sconsPackages.scons_3_0_0 is still available in case this
breaks anything.
2017-11-15 23:22:38 +01:00
Vladimír Čunát
1d317bd84a
scons: fix meta eval 2017-10-20 23:50:27 +02:00
Michael Weiss
e40233e136 scons: 2.5.1 -> 3.0.0
"SCons release 3.0.0 now available from the download page at
SourceForge. This release should be used instead of 2.5.1. This release
fixes several issues.  TThis will be the first release to support Python
versions earlier than 2.7 as well as 3.5+."

"NOTE: This is a major release.  You should expect that some targets may
rebuild when upgrading.  Significant changes in some python action
signatures. Also switching between PY 2.7 and PY 3.5, 3.6 will cause
rebuilds."
2017-10-20 16:32:26 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Michael Raskin
31106095e1 scons: 2.5.0 -> 2.5.1 2017-01-02 20:18:52 +01:00
Frederik Rietdijk
f42a7068da scons: use python2 and refactor expression 2016-10-18 23:14:32 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Michael Raskin
238cb743bc scons: 2.4.1 -> 2.5.0 2016-04-13 14:47:04 +02:00
Michael Raskin
1dba4b4e6a scons: 2.3.6 -> 2.4.1 2016-01-01 12:30:17 +03:00
koral
bfe09b88fc scons: 2.3.5 -> 2.3.6 2015-09-03 17:37:56 +00:00
Michael Raskin
b280d6cbc7 scons: update 2.3.4 -> 2.3.5 2015-07-05 00:32:53 +03:00
Michael Raskin
d04db3bf41 Update SCons 2014-10-06 02:43:58 +04:00
Michael Raskin
1bfcc7b477 Update SCons 2014-08-31 18:20:07 +04:00
Michael Raskin
4c176fd76e Update Scons build manager 2014-08-03 22:29:41 +04:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Peter Simons
bc3008846d scons: update from 2.3.0 to 2.3.1 2014-03-03 11:10:26 +01:00
Peter Simons
c6be3dbf1d scons: add pythonPath attribute to ensure that the python-wrapper recognizes this package as providing a python library 2014-01-20 13:29:36 +01:00
Michael Raskin
a3843455c5 Re-add HTTP/HTTPS support back to Subversion by adding serf. Tested. 2013-12-30 23:33:22 +04:00
Peter Simons
e49110e221 scons: updated to version 2.1.0
svn path=/nixpkgs/trunk/; revision=33030
2012-03-13 08:29:18 +00:00
Peter Simons
baa9150130 pkgs/development/tools/build-managers/scons: cosmetic build improvements
- The flag "--mandir" has no effect with setup.py. Instead, "--install-data"
   must be used.

 - Don't generate wrappers for trivial symlink aliases in bin.

 - Prefer symlinks over hard-links.

 - The dependencies of this expression don't need to be propagated.

svn path=/nixpkgs/trunk/; revision=25021
2010-12-07 11:41:25 +00:00
Peter Simons
1e1610b37e pkgs/development/tools/build-managers/scons: move --mandir and --infodir to standard locations
svn path=/nixpkgs/trunk/; revision=25009
2010-12-06 18:01:28 +00:00
Russell O'Connor
9bcb9bcea1 Patching scons to give an absolute path to python rather than using ".../bin/env python"
When users install scons, users no longer need to also install python in their environment.


svn path=/nixpkgs/trunk/; revision=24425
2010-10-22 19:10:02 +00:00
Eelco Dolstra
a9da4153c4 * Fix an infinite recursion in scons.
svn path=/nixpkgs/trunk/; revision=23464
2010-08-26 13:30:25 +00:00
Peter Simons
25308dd098 pkgs/development/tools/build-managers/scons: updated to version 2.0.1
svn path=/nixpkgs/trunk/; revision=23457
2010-08-26 12:24:16 +00:00
Peter Simons
fd8c6ae43d Moved 'maintainers' attribute into the meta section of the expression.
I've also set the 'platforms' attribute to ensure that Hydra actually
builds these packages. Thanks to Lluís Batlle i Rossell for pointing out
these mistakes.

svn path=/nixpkgs/trunk/; revision=21688
2010-05-09 16:01:44 +00:00
Peter Simons
69857a11c7 pkgs/development/tools/build-managers/scons: bumped to version 1.3.0
svn path=/nixpkgs/trunk/; revision=21025
2010-04-12 11:21:22 +00:00
Peter Simons
2ec77fdc7e scons: don't overwrite a pre-existing PYTHONPATH in the wrapper
svn path=/nixpkgs/trunk/; revision=16342
2009-07-13 20:08:44 +00:00
Peter Simons
afa04f4576 Updated scons to version 1.2.0.
svn path=/nixpkgs/trunk/; revision=16111
2009-06-30 18:51:01 +00:00
Peter Simons
85546a8e31 Updated scons and twisted; added buildbot.
* Updated scons to version 1.0.0. Also added appropriate makeWrapper calls to
   ensure that the python binary finds its library files.

 * Updated Twisted from 2.5 to 8.1.

 * Added an expression for buildbot.

svn path=/nixpkgs/trunk/; revision=12782
2008-09-01 15:11:09 +00:00
Peter Simons
a16eebd0a6 Cosmetic, no functional change intended.
This patch moves curly braces to the end of the line, i.e.

  foo = { 
    ...
  };

instead of the previously used style:

  foo = 
  { 
    ...
  };

I commit this change hoping that my contributions to this project now conform
to the rules described in maintainers/docs/coding-conventions.txt so that the
self-appointed indention sheriff of the NixOS community can finally get off my
back and rest assured knowing that all i's are dotted and all t's are crossed.

svn path=/nixpkgs/trunk/; revision=12386
2008-07-18 20:11:25 +00:00
Peter Simons
4842708ca1 scons: install library files in python's site-package directory
svn path=/nixpkgs/trunk/; revision=12179
2008-06-23 22:24:12 +00:00
Michael Raskin
8b90ef4690 Python must be propagatedBuildInputs now that they are using env
svn path=/nixpkgs/trunk/; revision=12158
2008-06-19 07:24:43 +00:00
Peter Simons
bc4f5932ad scons: updated to version 0.95.5 and added selectVersion dispatcher
Scons is not only a tool, it's also a python library. However, the
modules are installed in ~/.nix-profile/lib/scons-${version} -- not in
python's "site-packages" directory -- so python won't find the library
without further help. Maybe there should be a symlink in nix-profile? I
guess there should, but I didn't know how to write that into the
expression.

svn path=/nixpkgs/trunk/; revision=12157
2008-06-18 22:48:54 +00:00