diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-11-15 07:33:10 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-11-15 07:33:10 +0100 |
| commit | c46eae0f3572fbe7af42e5d40648b7b4a1d1317b (patch) | |
| tree | 84e748e6477734c4826b4d6b34152b1958e5627a /pkgs/top-level/all-packages.nix | |
| parent | 9297b620bb86624e6cf4b6ae54fc4ae1da98bb83 (diff) | |
| parent | e8ad54f562b4621c7c080b4a3ddbafe4735bcb86 (diff) | |
| download | nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.gz nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.bz2 nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.lz nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.xz nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.zst nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec8129a9aaed..a74bd1912088 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13920,8 +13920,6 @@ with pkgs; tinycbor = callPackage ../development/libraries/tinycbor { }; - tinycompress = callPackage ../development/libraries/tinycompress { }; - tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { }; tinyobjloader = callPackage ../development/libraries/tinyobjloader { }; @@ -24660,7 +24658,7 @@ with pkgs; }); libsForQt5 = recurseIntoAttrs (import ./qt5-packages.nix { - inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsBuildHost; + inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget; }); # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop @@ -26627,7 +26625,10 @@ with pkgs; maker-panel = callPackage ../tools/misc/maker-panel { }; - mastodon = callPackage ../servers/mastodon { }; + mastodon = callPackage ../servers/mastodon { + nodejs-slim = nodejs-slim_20; + ruby = ruby_3_2; + }; gotosocial = callPackage ../servers/gotosocial { }; @@ -27614,19 +27615,9 @@ with pkgs; alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { }; - tinyalsa = callPackage ../os-specific/linux/tinyalsa { }; - - alsa-project = callPackage ../os-specific/linux/alsa-project { }; - inherit (alsa-project) - alsa-firmware - alsa-lib - alsa-oss - alsa-plugins - alsa-plugins-wrapper - alsa-tools - alsa-topology-conf - alsa-ucm-conf - alsa-utils; + alsa-utils = callPackage ../by-name/al/alsa-utils/package.nix { + fftw = fftwFloat; + }; apparency = callPackage ../os-specific/darwin/apparency { }; |