diff --git a/pkgs/by-name/li/libetonyek/package.nix b/pkgs/by-name/li/libetonyek/package.nix index 393f542a9ea9..ec7b9b4a82d1 100644 --- a/pkgs/by-name/li/libetonyek/package.nix +++ b/pkgs/by-name/li/libetonyek/package.nix @@ -3,8 +3,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config -# fails on older Boost due to https://github.com/boostorg/phoenix/issues/111 -, boost184 +, boost , cppunit , glm , gperf @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost184 + boost cppunit glm gperf diff --git a/pkgs/by-name/li/liblangtag/package.nix b/pkgs/by-name/li/liblangtag/package.nix index 38f1cc03cac4..5684c18ae009 100644 --- a/pkgs/by-name/li/liblangtag/package.nix +++ b/pkgs/by-name/li/liblangtag/package.nix @@ -1,42 +1,28 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, gtk-doc, gettext +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, autoconf-archive, gtk-doc, gettext , pkg-config, glib, libxml2, gobject-introspection, gnome-common, unzip }: stdenv.mkDerivation rec { pname = "liblangtag"; - version = "0.6.3"; + version = "0.6.7"; # Artifact tarball contains lt-localealias.h needed for darwin src = fetchurl { url = "https://bitbucket.org/tagoh/liblangtag/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-HxKiCgLsOo0i5U3tuLaDpDycFgvaG6M3vxBgYHrnM70="; + hash = "sha256-Xta81K4/PAXJEuYvIWzRpEEjhGFH9ymkn7VmjaUeAw4="; }; core_zip = fetchurl { # please update if an update is available - url = "http://www.unicode.org/Public/cldr/37/core.zip"; - sha256 = "0myswkvvaxvrz9zwq4zh65sygfd9n72cd5rk4pwacqba4nxgb4xs"; + url = "http://www.unicode.org/Public/cldr/46/core.zip"; + hash = "sha256-+86cInWGKtJmaPs0eD/mwznz2S3f61oQoXdftYGBoV0="; }; language_subtag_registry = fetchurl { - url = "http://www.iana.org/assignments/language-subtag-registry"; - sha256 = "0y9x5gra6jri4sk16f0dp69p06almnsl48rs85605f035kf539qm"; + url = "https://web.archive.org/web/20241120202537id_/https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry"; + hash = "sha256-xy94jbBKP0Ig7yOPutSviCA6uryx7PW2b1lBIPk2+6Q="; }; - patches = [ - # Pull upstream fix for gcc-13 build compatibility - (fetchpatch { - name = "gcc-13-p1.patch"; - url = "https://bitbucket.org/tagoh/liblangtag/commits/0b6e9f4616a34146e7443c4e9a7197153645e40b/raw"; - hash = "sha256-69wJDVwDCP5OPHKoRn9WZNrvfCvmlX3SwtRmcpJHn2o="; - }) - (fetchpatch { - name = "gcc-13-p1.patch"; - url = "https://bitbucket.org/tagoh/liblangtag/commits/1497c4477d0fa0b7df1886951b953dd3cea54427/raw"; - hash = "sha256-k0Uaeg6YLxVze4fgf0kiyuiZJ5wh2Jq3h7cFPQPtwyo="; - }) - ]; - postPatch = '' gtkdocize cp "${core_zip}" data/core.zip @@ -50,7 +36,7 @@ stdenv.mkDerivation rec { "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"; buildInputs = [ gettext glib libxml2 gnome-common ]; - nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip gobject-introspection ]; + nativeBuildInputs = [ autoreconfHook autoconf-archive gtk-doc gettext pkg-config unzip gobject-introspection ]; meta = with lib; { description = "Interface library to access tags for identifying languages"; diff --git a/pkgs/by-name/os/ossia-score/package.nix b/pkgs/by-name/os/ossia-score/package.nix index ee8e0a99a948..bce8a7b33fd4 100644 --- a/pkgs/by-name/os/ossia-score/package.nix +++ b/pkgs/by-name/os/ossia-score/package.nix @@ -8,7 +8,7 @@ , avahi , avahi-compat , bluez -, boost185 +, boost , fmt , ffmpeg , fftw @@ -43,13 +43,13 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "ossia-score"; - version = "3.2.4"; + version = "3.3.2"; src = fetchFromGitHub { owner = "ossia"; repo = "score"; rev = "v${finalAttrs.version}"; - hash = "sha256-O9v7hhBHVi4OuuCebG3bvjp/MOYu1iPv+lji/wS4O7o="; + hash = "sha256-RMPsZIUZNWnnezxdZhW9oA0Cprb89NQhpwX9THHYN4M="; fetchSubmodules = true; }; @@ -57,7 +57,7 @@ clangStdenv.mkDerivation (finalAttrs: { buildInputs = [ alsa-lib - boost185 + boost avahi avahi-compat bluez diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix index 5484724d886e..58477d157638 100644 --- a/pkgs/by-name/sh/shadps4/package.nix +++ b/pkgs/by-name/sh/shadps4/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchpatch, alsa-lib, - boost184, + boost, cmake, cryptopp, glslang, @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ alsa-lib - boost184 + boost cryptopp glslang ffmpeg diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix index 8525a66e4092..860ea03f7a2d 100644 --- a/pkgs/by-name/ve/vectorscan/package.nix +++ b/pkgs/by-name/ve/vectorscan/package.nix @@ -6,7 +6,7 @@ , ragel , util-linux , python3 -, boost184 +, boost , sqlite , pcre , enableShared ? !stdenv.hostPlatform.isStatic @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.hostPlatform.isLinux util-linux; buildInputs = [ - boost184 + boost sqlite pcre ]; diff --git a/pkgs/development/libraries/boost/1.84.nix b/pkgs/development/libraries/boost/1.84.nix deleted file mode 100644 index bfcfdfbfd7cf..000000000000 --- a/pkgs/development/libraries/boost/1.84.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.84.0"; - - src = fetchurl { - urls = [ - "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - ]; - # SHA256 from http://www.boost.org/users/history/version_1_84_0.html - sha256 = "cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454"; - }; -}) diff --git a/pkgs/development/libraries/boost/1.85.nix b/pkgs/development/libraries/boost/1.85.nix deleted file mode 100644 index a95789800e1b..000000000000 --- a/pkgs/development/libraries/boost/1.85.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.85.0"; - - src = fetchurl { - urls = [ - "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" - ]; - # SHA256 from http://www.boost.org/users/history/version_1_85_0.html - sha256 = "7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617"; - }; -}) diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix index fed5dbe834c3..c1f041e41f29 100644 --- a/pkgs/development/libraries/boost/default.nix +++ b/pkgs/development/libraries/boost/default.nix @@ -24,7 +24,5 @@ in { boost181 = makeBoost ./1.81.nix; boost182 = makeBoost ./1.82.nix; boost183 = makeBoost ./1.83.nix; - boost184 = makeBoost ./1.84.nix; - boost185 = makeBoost ./1.85.nix; boost186 = makeBoost ./1.86.nix; } diff --git a/pkgs/development/python-modules/graph-tool/default.nix b/pkgs/development/python-modules/graph-tool/default.nix index ff0ab4f62787..eefa3ea7a5e0 100644 --- a/pkgs/development/python-modules/graph-tool/default.nix +++ b/pkgs/development/python-modules/graph-tool/default.nix @@ -5,7 +5,7 @@ stdenv, autoreconfHook, - boost185, + boost, cairomm, cgal, expat, @@ -26,8 +26,7 @@ }: let - # graph-tool doesn't build against boost181 on Darwin - boost = boost185.override { + boost' = boost.override { enablePython = true; inherit python; }; @@ -58,7 +57,7 @@ buildPythonPackage rec { configureFlags = [ "--with-python-module-path=$(out)/${python.sitePackages}" - "--with-boost-libdir=${boost}/lib" + "--with-boost-libdir=${boost'}/lib" "--with-cgal=${cgal}" ]; @@ -71,7 +70,7 @@ buildPythonPackage rec { # https://graph-tool.skewed.de/installation.html#manual-compilation dependencies = [ - boost + boost' cairomm cgal expat diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index db4f50bf465e..d16cad84d4b6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -156,6 +156,8 @@ mapAliases { blockbench-electron = blockbench; # Added 2024-03-16 bloom = throw "'bloom' has been removed because it was unmaintained upstream."; # Added 2024-11-02 bmap-tools = bmaptool; # Added 2024-08-05 + boost184 = throw "Boost 1.84 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24 + boost185 = throw "Boost 1.85 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24 boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01 bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 373a3729fb00..9751d70b0aa5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1513,10 +1513,6 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - saunafs = callPackage ../by-name/sa/saunafs/package.nix { - boost = boost185; - }; - vifm-full = vifm.override { mediaSupport = true; inherit lib udisks2 python3; @@ -8855,8 +8851,6 @@ with pkgs; boost181 boost182 boost183 - boost184 - boost185 boost186 ;