diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/coq-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/linux-kernels.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/python-aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 6 |
7 files changed, 23 insertions, 11 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bdddfc3176584..d327a66542d6e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -969,6 +969,7 @@ mapAliases { mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21 mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14 + mariadb_110 = throw "mariadb_110 has been removed from nixpkgs, please switch to another version like mariadb_114"; # Added 2024-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20802383bd4c3..757459aa5645a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17125,7 +17125,9 @@ with pkgs; electron_28-bin electron_29-bin electron_30-bin - electron_31-bin; + electron_31-bin + electron_32-bin + ; inherit (callPackages ../development/tools/electron/chromedriver { }) electron-chromedriver_29 @@ -17139,9 +17141,10 @@ with pkgs; electron_29 = electron_29-bin; electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin; electron_31 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_31 then electron-source.electron_31 else electron_31-bin; - electron = electron_31; - electron-bin = electron_31-bin; - electron-chromedriver = electron-chromedriver_31; + electron_32 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_32 then electron-source.electron_32 else electron_32-bin; + electron = electron_32; + electron-bin = electron_32-bin; + electron-chromedriver = electron-chromedriver_32; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -25023,7 +25026,7 @@ with pkgs; mariadb_105 mariadb_106 mariadb_1011 - mariadb_110 + mariadb_114 ; mariadb = mariadb_1011; mariadb-embedded = mariadb.override { withEmbedded = true; }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 8e78e3fe75e79..792a26d97313c 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip +{ lib, stdenv, fetchurl, fetchzip , callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 , ocamlPackages_4_10, ocamlPackages_4_12, ocamlPackages_4_14 , fetchpatch, makeWrapper, coq2html @@ -11,7 +11,7 @@ let coqPackages = self // { __attrsFailEvaluation = true; recurseForDerivations = false; }; metaFetch = import ../build-support/coq/meta-fetch/default.nix - {inherit lib stdenv fetchzip; }; + {inherit lib stdenv fetchzip fetchurl; }; mkCoqDerivation = lib.makeOverridable (callPackage ../build-support/coq {}); contribs = recurseIntoAttrs diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 9ce08e4cdbc0e..3c00a5693a58b 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -26,6 +26,10 @@ let linux = kernel; }; + markBroken = drv: drv.overrideAttrs ({ meta ? {}, ... }: { + meta = meta // { broken = true; }; + }); + # Hardened Linux hardenedKernelFor = kernel': overrides: let @@ -259,10 +263,10 @@ in { linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; - linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { + linux_5_4_hardened = markBroken (hardenedKernelFor kernels.linux_5_4 { stdenv = gcc10Stdenv; buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; - }; + }); linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 058c372bd52b1..3baab5aeb1966 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12136,6 +12136,7 @@ with self; { }; buildInputs = [ ModuleBuildTiny TestNeeds ]; propagatedBuildInputs = [ HTTPMessage ]; + __darwinAllowLocalNetworking = true; meta = { description = "Simple http server class"; homepage = "https://github.com/libwww-perl/HTTP-Daemon"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index cdc723dcb6e42..9fd21df75e73b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -281,6 +281,7 @@ mapAliases ({ jsonschema_3 = throw "jsonschema 3 is neither the latest version nor needed inside nixpkgs anymore"; # added 2023-06-28 jupyter_client = jupyter-client; # added 2021-10-15 jupyter_console = jupyter-console; # added 2023-07-31 + jupyter-contrib-nbextensions = throw "jupyter-contrib-nbextensions has been removed, as it does not work with Jupyter Notebook 7"; # added 2024-09-22 jupyter_core = jupyter-core; # added 2023-01-05 jupyter_server = jupyter-server; # added 2023-01-05 jupyter-server-ydoc = jupyter-collaboration; # added 2023-07-18 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e7816cfd6d7b8..091be094c5b24 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6546,8 +6546,6 @@ self: super: with self; { jupyter-contrib-core = callPackage ../development/python-modules/jupyter-contrib-core { }; - jupyter-contrib-nbextensions = callPackage ../development/python-modules/jupyter-contrib-nbextensions { }; - jupyter-console = callPackage ../development/python-modules/jupyter-console { }; jupyter-core = callPackage ../development/python-modules/jupyter-core { }; @@ -6880,6 +6878,8 @@ self: super: with self; { latexify-py = callPackage ../development/python-modules/latexify-py { }; + latexrestricted = callPackage ../development/python-modules/latexrestricted { }; + launchpadlib = callPackage ../development/python-modules/launchpadlib { }; laundrify-aio = callPackage ../development/python-modules/laundrify-aio { }; @@ -7812,6 +7812,8 @@ self: super: with self; { meteofrance-api = callPackage ../development/python-modules/meteofrance-api { }; + meteoswiss-async = callPackage ../development/python-modules/meteoswiss-async { }; + methodtools = callPackage ../development/python-modules/methodtools { }; mezzanine = callPackage ../development/python-modules/mezzanine { }; |