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

boost: Reduce the number of supported versions

Browse Source
This commit is contained in:
William A. Kennington III 2015-09-17 15:40:32 -07:00
parent f8e7cee32e
commit 1bc98b2e36
7 changed files with 16 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/kde-apps-15.04/default.nix
View File

@ -177,7 +177,7 @@ let
strigi taglib udev xlibs xplanet xscreensaver xz; strigi taglib udev xlibs xplanet xscreensaver xz;
alsa = alsaLib; alsa = alsaLib;
assuan = libassuan; assuan = libassuan;
boost = boost156; boost = boost155;
canberra = libcanberra; canberra = libcanberra;
eigen3 = eigen; eigen3 = eigen;
epub = ebook_tools; epub = ebook_tools;

2
pkgs/desktops/plasma-5.3/default.nix
View File

@ -129,7 +129,7 @@ let
modemmanager openconnect openexr pam pango qt4 samba modemmanager openconnect openexr pam pango qt4 samba
socat substituteAll taglib utillinux wayland xapian socat substituteAll taglib utillinux wayland xapian
xkeyboard_config xlibs xorg; xkeyboard_config xlibs xorg;
boost = boost156; boost = boost155;
canberra = libcanberra; canberra = libcanberra;
epub = ebook_tools; epub = ebook_tools;
fontforge_executable = fontforge; fontforge_executable = fontforge;

10
pkgs/development/libraries/boost/1.56.nix
View File

@ -1,10 +0,0 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.56.0";
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_56_0.tar.bz2";
sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk";
};
})

40
pkgs/development/libraries/boost/1.57.nix
View File

@ -1,40 +0,0 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.57.0";
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_57_0.tar.bz2";
sha256 = "0rs94vdmg34bwwj23fllva6mhrml2i7mvmlb11zyrk1k5818q34i";
};
patches = if stdenv.isCygwin then [
./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch
./cygwin-fedora-boost-1.50.0-pool.patch
./cygwin-fedora-boost-1.57.0-mpl-print.patch
./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch
./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch
./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch
./cygwin-fedora-boost-1.57.0-pool-test_linking.patch
./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch
./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch
./cygwin-fedora-boost-1.57.0-uuid-comparison.patch
./cygwin-fedora-boost-1.57.0-move-is_class.patch
./cygwin-1.40.0-cstdint-cygwin.patch
./cygwin-1.57.0-asio-cygwin.patch
./cygwin-1.55.0-asio-MSG_EOR.patch
./cygwin-1.57.0-config-cygwin.patch
./cygwin-1.57.0-context-cygwin.patch
./cygwin-1.57.0-filesystem-cygwin.patch
./cygwin-1.55.0-interlocked-cygwin.patch
./cygwin-1.40.0-iostreams-cygwin.patch
./cygwin-1.57.0-locale-cygwin.patch
./cygwin-1.57.0-log-cygwin.patch
./cygwin-1.40.0-python-cygwin.patch
./cygwin-1.40.0-regex-cygwin.patch
./cygwin-1.57.0-smart_ptr-cygwin.patch
./cygwin-1.57.0-system-cygwin.patch
./cygwin-1.45.0-jam-cygwin.patch
./cygwin-1.50.0-jam-pep3149.patch
] else null;
})

2
pkgs/development/libraries/kde-frameworks-5.10/default.nix
View File

@ -117,7 +117,7 @@ let
inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme
libgcrypt libgit2 modemmanager networkmanager perl libgcrypt libgit2 modemmanager networkmanager perl
perlPackages qimageblitz xlibs zlib; perlPackages qimageblitz xlibs zlib;
boost = boost156; boost = boost155;
gif = giflib; gif = giflib;
glib2 = glib; glib2 = glib;
jpeg = libjpeg; jpeg = libjpeg;

2
pkgs/development/libraries/kde-frameworks-5.12/default.nix
View File

@ -117,7 +117,7 @@ let
inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme
libgcrypt libgit2 modemmanager networkmanager perl libgcrypt libgit2 modemmanager networkmanager perl
perlPackages qimageblitz xlibs zlib; perlPackages qimageblitz xlibs zlib;
boost = boost156; boost = boost155;
gif = giflib; gif = giflib;
glib2 = glib; glib2 = glib;
jpeg = libjpeg; jpeg = libjpeg;

26
pkgs/top-level/all-packages.nix
View File

@ -1053,7 +1053,7 @@ let
cksfv = callPackage ../tools/networking/cksfv { }; cksfv = callPackage ../tools/networking/cksfv { };
clementine = callPackage ../applications/audio/clementine { clementine = callPackage ../applications/audio/clementine {
boost = boost156; boost = boost155;
gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ]; gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ];
}; };
@ -5766,7 +5766,7 @@ let
texi2html = callPackage ../development/tools/misc/texi2html { }; texi2html = callPackage ../development/tools/misc/texi2html { };
uhd = callPackage ../development/tools/misc/uhd { uhd = callPackage ../development/tools/misc/uhd {
boost = boost157; boost = boost155;
}; };
uisp = callPackage ../development/tools/misc/uisp { }; uisp = callPackage ../development/tools/misc/uisp { };
@ -5896,8 +5896,6 @@ let
boolstuff = callPackage ../development/libraries/boolstuff { }; boolstuff = callPackage ../development/libraries/boolstuff { };
boost155 = callPackage ../development/libraries/boost/1.55.nix { }; boost155 = callPackage ../development/libraries/boost/1.55.nix { };
boost156 = callPackage ../development/libraries/boost/1.56.nix { };
boost157 = callPackage ../development/libraries/boost/1.57.nix { };
boost159 = callPackage ../development/libraries/boost/1.59.nix { }; boost159 = callPackage ../development/libraries/boost/1.59.nix { };
boost = boost159; boost = boost159;
@ -6376,7 +6374,7 @@ let
qt_gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {}; qt_gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {};
qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost156;}; qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155;};
gnet = callPackage ../development/libraries/gnet { }; gnet = callPackage ../development/libraries/gnet { };
@ -8504,7 +8502,7 @@ let
lucene = callPackage ../development/libraries/java/lucene { }; lucene = callPackage ../development/libraries/java/lucene { };
lucenepp = callPackage ../development/libraries/lucene++ { lucenepp = callPackage ../development/libraries/lucene++ {
boost = boost157; boost = boost155;
}; };
mockobjects = callPackage ../development/libraries/java/mockobjects { }; mockobjects = callPackage ../development/libraries/java/mockobjects { };
@ -9113,7 +9111,7 @@ let
rethinkdb = callPackage ../servers/nosql/rethinkdb { }; rethinkdb = callPackage ../servers/nosql/rethinkdb { };
rippled = callPackage ../servers/rippled { rippled = callPackage ../servers/rippled {
boost = boost157; boost = boost155;
}; };
ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { }; ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { };
@ -10628,7 +10626,7 @@ let
schismtracker = callPackage ../applications/audio/schismtracker { }; schismtracker = callPackage ../applications/audio/schismtracker { };
altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins {
callPackage = newScope { boost = boost157; }; callPackage = newScope { boost = boost155; };
} ); } );
bitcoin = altcoins.bitcoin; bitcoin = altcoins.bitcoin;
bitcoin-xt = altcoins.bitcoin-xt; bitcoin-xt = altcoins.bitcoin-xt;
@ -11352,7 +11350,7 @@ let
fomp = callPackage ../applications/audio/fomp { }; fomp = callPackage ../applications/audio/fomp { };
freecad = callPackage ../applications/graphics/freecad { freecad = callPackage ../applications/graphics/freecad {
boost = boost156; boost = boost155;
opencascade = opencascade_6_5; opencascade = opencascade_6_5;
inherit (pythonPackages) matplotlib pycollada; inherit (pythonPackages) matplotlib pycollada;
}; };
@ -11375,7 +11373,7 @@ let
}; };
freicoin = callPackage ../applications/misc/freicoin { freicoin = callPackage ../applications/misc/freicoin {
boost = boost157; boost = boost155;
}; };
fuze = callPackage ../applications/networking/instant-messengers/fuze {}; fuze = callPackage ../applications/networking/instant-messengers/fuze {};
@ -11827,7 +11825,7 @@ let
ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { }; ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { };
ledger3 = callPackage ../applications/office/ledger { ledger3 = callPackage ../applications/office/ledger {
boost = boost157; boost = boost155;
}; };
ledger = ledger3; ledger = ledger3;
@ -13841,7 +13839,7 @@ let
{ {
libusb = libusb1; libusb = libusb1;
libcanberra = libcanberra_kde; libcanberra = libcanberra_kde;
boost = boost156; boost = boost155;
kdelibs = kdeApps_stable.kdelibs; kdelibs = kdeApps_stable.kdelibs;
} }
../desktops/kde-4.14; ../desktops/kde-4.14;
@ -13895,7 +13893,7 @@ let
kdevelop = callPackage ../applications/editors/kdevelop { }; kdevelop = callPackage ../applications/editors/kdevelop { };
kdevplatform = callPackage ../development/libraries/kdevplatform { kdevplatform = callPackage ../development/libraries/kdevplatform {
boost = boost156; boost = boost155;
}; };
kdiff3 = callPackage ../tools/text/kdiff3 { }; kdiff3 = callPackage ../tools/text/kdiff3 { };
@ -13927,7 +13925,7 @@ let
libalkimia = callPackage ../development/libraries/libalkimia { }; libalkimia = callPackage ../development/libraries/libalkimia { };
libktorrent = callPackage ../development/libraries/libktorrent { libktorrent = callPackage ../development/libraries/libktorrent {
boost = boost156; boost = boost155;
}; };
libkvkontakte = callPackage ../development/libraries/libkvkontakte { }; libkvkontakte = callPackage ../development/libraries/libkvkontakte { };