diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-07 06:01:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-07 06:01:00 +0000 |
| commit | 32d842483f3773ec1cde181507bd77b405af046e (patch) | |
| tree | 351a44c8193a79dff8e8c8ae6db284c21d17844b /pkgs/top-level | |
| parent | fd7a8aedb05d043f27206beaf915d1f9397396cf (diff) | |
| parent | 26a318452796c13502a1b3ec4aa2c352e8d15bbf (diff) | |
| download | nixlib-32d842483f3773ec1cde181507bd77b405af046e.tar nixlib-32d842483f3773ec1cde181507bd77b405af046e.tar.gz nixlib-32d842483f3773ec1cde181507bd77b405af046e.tar.bz2 nixlib-32d842483f3773ec1cde181507bd77b405af046e.tar.lz nixlib-32d842483f3773ec1cde181507bd77b405af046e.tar.xz nixlib-32d842483f3773ec1cde181507bd77b405af046e.tar.zst nixlib-32d842483f3773ec1cde181507bd77b405af046e.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/python-aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca76fb12ba4e..67cb6dd1483f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6324,6 +6324,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + rblake3sum = callPackage ../tools/security/rblake3sum { + inherit (darwin.apple_sdk.frameworks) Security; + }; + reg = callPackage ../tools/virtualization/reg { }; retool = callPackage ../applications/misc/retool { }; @@ -18034,8 +18038,8 @@ with pkgs; smiley-sans = callPackage ../data/fonts/smiley-sans { }; inherit (callPackages ../applications/networking/cluster/spark { }) - spark_3_4 spark_3_3 spark_3_2; - spark3 = spark_3_4; + spark_3_5 spark_3_4 spark_3_3; + spark3 = spark_3_5; spark = spark3; sparkleshare = callPackage ../applications/version-management/sparkleshare { }; @@ -27143,6 +27147,7 @@ with pkgs; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-artifactory-exporter = callPackage ../servers/monitoring/prometheus/artifactory-exporter.nix { }; + prometheus-atlas-exporter = callPackage ../servers/monitoring/prometheus/atlas-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; prometheus-bird-exporter = callPackage ../servers/monitoring/prometheus/bird-exporter.nix { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 39ba30a93b7d..c2bd5f390409 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -225,6 +225,8 @@ mapAliases ({ lazy_imports = lazy-imports; # added 2023-10-13 lektor = throw "lektor has been promoted to a top-level attribute"; # added 2023-08-01 line_profiler = line-profiler; # added 2023-11-04 + livestreamer = throw "'livestreamer' has been removed, as it unmaintained. A currently maintained fork is 'streamlink'."; # added 2023-11-14 + livestreamer-curses = throw "'livestreamer-curses' has been removed as it, and livestreamer itself are unmaintained."; # added 2023-11-14 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c17c171bf40f..9ace4959843c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6481,10 +6481,6 @@ self: super: with self; { livereload = callPackage ../development/python-modules/livereload { }; - livestreamer = callPackage ../development/python-modules/livestreamer { }; - - livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; - lizard = callPackage ../development/python-modules/lizard { }; llfuse = callPackage ../development/python-modules/llfuse { |