public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92920 from primeos/scons

Browse Source 
scons: 3.1.2 -> 4.0.0
This commit is contained in:
Michael Weiss 2020-07-18 13:36:29 +02:00 committed by GitHub
commit 5b14758d31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/jackmix/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, scons, qt4, lash, libjack2, jack ? libjack2 }: { stdenv, fetchurl, pkgconfig, sconsPackages, qt4, lash, libjack2, jack ? libjack2 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "jackmix-0.5.2"; name = "jackmix-0.5.2";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
patches = [ ./no_error.patch ]; patches = [ ./no_error.patch ];
nativeBuildInputs = [ scons.py2 pkgconfig ]; nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkgconfig ];
buildInputs = [ buildInputs = [
qt4 qt4
lash lash

4
pkgs/applications/audio/mixxx/default.nix
View File

@ -3,7 +3,7 @@
, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
, libGLU, libxcb, lilv, lv2, opusfile , libGLU, libxcb, lilv, lv2, opusfile
, pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg , pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg
, qtx11extras, rubberband, scons, sqlite, taglib, upower, vamp-plugin-sdk , qtx11extras, rubberband, sconsPackages, sqlite, taglib, upower, vamp-plugin-sdk
}: }:
let let
@ -28,7 +28,7 @@ mkDerivation rec {
sha256 = "1dj9li8av9b2kbm76jvvbdmihy1pyrw0s4xd7dd524wfhwr1llxr"; sha256 = "1dj9li8av9b2kbm76jvvbdmihy1pyrw0s4xd7dd524wfhwr1llxr";
}; };
nativeBuildInputs = [ scons.py2 ]; nativeBuildInputs = [ sconsPackages.scons_3_1_2 ];
buildInputs = [ buildInputs = [
chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout241 libsndfile chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout241 libsndfile
libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg

4
pkgs/applications/audio/rhvoice/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, pkgconfig, fetchFromGitHub, scons { stdenv, lib, pkgconfig, fetchFromGitHub, sconsPackages
, python, glibmm, libpulseaudio, libao }: , python, glibmm, libpulseaudio, libao }:
let let
@ -15,7 +15,7 @@ in stdenv.mkDerivation {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
scons.py2 pkgconfig sconsPackages.scons_3_1_2 pkgconfig
]; ];
buildInputs = [ buildInputs = [

4
pkgs/applications/graphics/fluxus/default.nix
View File

@ -18,7 +18,7 @@
, openal , openal
, openssl , openssl
, racket , racket
, scons , sconsPackages
, zlib , zlib
}: }:
let let
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
openssl.dev openssl.dev
racket racket
]; ];
nativeBuildInputs = [ scons.py2 ]; nativeBuildInputs = [ sconsPackages.scons_3_1_2 ];
patches = [ ./fix-build.patch ]; patches = [ ./fix-build.patch ];
sconsFlags = [ sconsFlags = [

4
pkgs/applications/networking/instant-messengers/swift-im/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, stdenv, fetchurl, pkgconfig, qttools, scons { mkDerivation, stdenv, fetchurl, pkgconfig, qttools, sconsPackages
, GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2 , GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2
, lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib , lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib
}: }:
@ -14,7 +14,7 @@ mkDerivation rec {
patches = [ ./qt-5.11.patch ./scons.patch ]; patches = [ ./qt-5.11.patch ./scons.patch ];
nativeBuildInputs = [ pkgconfig qttools scons.py2 ]; nativeBuildInputs = [ pkgconfig qttools sconsPackages.scons_3_1_2 ];
buildInputs = [ buildInputs = [
GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2 GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2

4
pkgs/development/libraries/serf/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos { stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos
, pkgconfig, libiconv }: , pkgconfig, libiconv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"; sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
}; };
nativeBuildInputs = [ pkgconfig scons.py2 ]; nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_1_2 ];
buildInputs = [ apr openssl aprutil zlib libiconv ] buildInputs = [ apr openssl aprutil zlib libiconv ]
++ stdenv.lib.optional (!stdenv.isCygwin) kerberos; ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos;

4
pkgs/development/libraries/swiften/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, python, fetchurl, openssl, boost, scons }: { stdenv, python, fetchurl, openssl, boost, sconsPackages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "swiften"; pname = "swiften";
version = "4.0.2"; version = "4.0.2";
nativeBuildInputs = [ scons.py2 ]; nativeBuildInputs = [ sconsPackages.scons_3_1_2 ];
buildInputs = [ python ]; buildInputs = [ python ];
propagatedBuildInputs = [ openssl boost ]; propagatedBuildInputs = [ openssl boost ];

10
pkgs/development/tools/build-managers/scons/common.nix
View File

@ -1,6 +1,6 @@
{ version, sha256 }: { version, sha256 }:
{ stdenv, fetchurl, python3Packages, python2Packages, scons }: { stdenv, fetchurl, python3Packages, lib }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "scons"; pname = "scons";
@ -13,7 +13,13 @@ python3Packages.buildPythonApplication rec {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
passthru.py2 = scons.override { python3Packages = python2Packages; }; postPatch = lib.optionalString (lib.versionAtLeast version "4.0.0") ''
substituteInPlace setup.cfg \
--replace "build/dist" "dist"
'';
# TODO: "Invalid SConscript usage - no parameters":
doCheck = lib.versionOlder version "4.0.0";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An improved, cross-platform substitute for Make"; description = "An improved, cross-platform substitute for Make";

6
pkgs/development/tools/build-managers/scons/default.nix
View File

@ -7,8 +7,12 @@ in {
version = "3.0.1"; version = "3.0.1";
sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4";
}).override { python3Packages = python2Packages; }; }).override { python3Packages = python2Packages; };
scons_latest = mkScons { scons_3_1_2 = (mkScons {
version = "3.1.2"; version = "3.1.2";
sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq";
}).override { python3Packages = python2Packages; };
scons_latest = mkScons {
version = "4.0.0";
sha256 = "1ikw5lh0h206xd74g39jdlrcicb18jj3j80hvm4nbrfgxv1hvibc";
}; };
} }

4
pkgs/development/tools/nsis/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchzip, scons, zlib }: { stdenv, fetchurl, fetchzip, sconsPackages, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nsis"; pname = "nsis";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
chmod -R u+w $out/share/nsis chmod -R u+w $out/share/nsis
''; '';
nativeBuildInputs = [ scons.py2 ]; nativeBuildInputs = [ sconsPackages.scons_3_1_2 ];
buildInputs = [ zlib ]; buildInputs = [ zlib ];
sconsFlags = [ sconsFlags = [

4
pkgs/games/tdm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, binutils-unwrapped, scons, gnum4, p7zip, glibc_multi, mesa { stdenv, fetchurl, binutils-unwrapped, sconsPackages, gnum4, p7zip, glibc_multi, mesa
, xorg, libGLU, libGL, openal , xorg, libGLU, libGL, openal
, lib, makeWrapper, makeDesktopItem }: , lib, makeWrapper, makeDesktopItem }:
@ -24,7 +24,7 @@ in stdenv.mkDerivation {
sha256 = "17wdpip8zvm2njz0xrf7xcxl73hnsc6i83zj18kn8rnjkpy50dd6"; sha256 = "17wdpip8zvm2njz0xrf7xcxl73hnsc6i83zj18kn8rnjkpy50dd6";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
p7zip scons.py2 gnum4 makeWrapper p7zip sconsPackages.scons_3_1_2 gnum4 makeWrapper
]; ];
buildInputs = [ buildInputs = [
glibc_multi mesa.dev xorg.libX11.dev openal glibc_multi mesa.dev xorg.libX11.dev openal

4
pkgs/games/vdrift/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, libGLU, libGL, SDL2, SDL2_image { stdenv, fetchFromGitHub, fetchsvn, pkgconfig, sconsPackages, libGLU, libGL, SDL2, SDL2_image
, libvorbis, bullet, curl, gettext, writeTextFile , libvorbis, bullet, curl, gettext, writeTextFile
, data ? fetchsvn { , data ? fetchsvn {
@ -20,7 +20,7 @@ let
sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg"; sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg";
}; };
nativeBuildInputs = [ pkgconfig scons.py2 ]; nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_1_2 ];
buildInputs = [ libGLU libGL SDL2 SDL2_image libvorbis bullet curl gettext ]; buildInputs = [ libGLU libGL SDL2 SDL2_image libvorbis bullet curl gettext ];
patches = [ ./0001-Ignore-missing-data-for-installation.patch ]; patches = [ ./0001-Ignore-missing-data-for-installation.patch ];

4
pkgs/misc/drivers/xboxdrv/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, scons, libX11, pkgconfig { stdenv, fetchurl, sconsPackages, libX11, pkgconfig
, libusb1, boost, glib, dbus-glib }: , libusb1, boost, glib, dbus-glib }:
let let
@ -13,7 +13,7 @@ in stdenv.mkDerivation {
}; };
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];
nativeBuildInputs = [ pkgconfig scons.py2 ]; nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_1_2 ];
buildInputs = [ libX11 libusb1 boost glib dbus-glib ]; buildInputs = [ libX11 libusb1 boost glib dbus-glib ];
dontUseSconsInstall = true; dontUseSconsInstall = true;

4
pkgs/os-specific/linux/ffado/default.nix
View File

@ -13,7 +13,7 @@
, libxmlxx3 , libxmlxx3
, pkgconfig , pkgconfig
, python3 , python3
, scons , sconsPackages
, which , which
, wrapQtAppsHook , wrapQtAppsHook
}: }:
@ -45,7 +45,7 @@ mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
desktop-file-utils desktop-file-utils
scons.py2 sconsPackages.scons_3_1_2
pkgconfig pkgconfig
which which
python python

4
pkgs/servers/gpsd/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, scons, pkgconfig, dbus, dbus-glib { fetchurl, stdenv, sconsPackages, pkgconfig, dbus, dbus-glib
, ncurses, libX11, libXt, libXpm, libXaw, libXext , ncurses, libX11, libXt, libXpm, libXaw, libXext
, libusb1, docbook_xml_dtd_412, docbook_xsl, bc , libusb1, docbook_xml_dtd_412, docbook_xsl, bc
, libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout" , libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout"
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
scons.py2 pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc sconsPackages.scons_3_1_2 pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc
python2Packages.python python2Packages.python
python2Packages.wrapPython python2Packages.wrapPython
]; ];

4
pkgs/servers/nosql/mongodb/mongodb.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, scons, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp { stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp
, sasl, openssl, libpcap, python27, curl, Security, CoreFoundation, cctools }: , sasl, openssl, libpcap, python27, curl, Security, CoreFoundation, cctools }:
# Note: # Note:
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
inherit sha256; inherit sha256;
}; };
nativeBuildInputs = [ scons.py2 ]; nativeBuildInputs = [ sconsPackages.scons_3_1_2 ];
buildInputs = [ buildInputs = [
boost boost
curl curl

4
pkgs/tools/misc/gringo/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, { stdenv, fetchurl,
bison, re2c, scons, bison, re2c, sconsPackages,
libcxx libcxx
}: }:
@ -16,7 +16,7 @@ stdenv.mkDerivation {
sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41"; sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41";
}; };
buildInputs = [ bison re2c scons.py2 ]; buildInputs = [ bison re2c sconsPackages.scons_3_1_2 ];
patches = [ patches = [
./gringo-4.5.4-cmath.patch ./gringo-4.5.4-cmath.patch