diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-11 12:01:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-11 12:01:14 +0000 |
| commit | e01403d0eb67e90daf452bbf4571957336046355 (patch) | |
| tree | a4a6a94ac9a765d55efb5196fcad14ff7173cf15 /pkgs/top-level | |
| parent | cb2a59dda7b112020c8bbe78f63a7bcd706cdbe4 (diff) | |
| parent | f7f0f81cf615d4b087b9974675b93d5d18236616 (diff) | |
| download | nixlib-e01403d0eb67e90daf452bbf4571957336046355.tar nixlib-e01403d0eb67e90daf452bbf4571957336046355.tar.gz nixlib-e01403d0eb67e90daf452bbf4571957336046355.tar.bz2 nixlib-e01403d0eb67e90daf452bbf4571957336046355.tar.lz nixlib-e01403d0eb67e90daf452bbf4571957336046355.tar.xz nixlib-e01403d0eb67e90daf452bbf4571957336046355.tar.zst nixlib-e01403d0eb67e90daf452bbf4571957336046355.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 02bc197f92ad..e69ad01ab651 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1123,8 +1123,6 @@ mapAliases ({ source-han-serif-korean = source-han-serif; source-han-serif-simplified-chinese = source-han-serif; source-han-serif-traditional-chinese = source-han-serif; - source-sans-pro = source-sans; # Added 2021-10-20 - source-serif-pro = source-serif; # Added 2021-10-20 spaceOrbit = throw "'spaceOrbit' has been renamed to/replaced by 'space-orbit'"; # Converted to throw 2022-02-22 spectral = neochat; # Added 2020-12-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0141dbda7a7..f85b4c130f13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -779,6 +779,8 @@ with pkgs; mkShell = callPackage ../build-support/mkshell { }; mkShellNoCC = mkShell.override { stdenv = stdenvNoCC; }; + mokutil = callPackage ../tools/security/mokutil { }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit lib writeText; inherit (emacs.pkgs) inherit-local; }; nix-gitignore = callPackage ../build-support/nix-gitignore { }; @@ -7001,6 +7003,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; + kakoune-cr = callPackage ../tools/misc/kakoune-cr { }; + kbdd = callPackage ../applications/window-managers/kbdd { }; kbs2 = callPackage ../tools/security/kbs2 { @@ -24286,8 +24290,10 @@ with pkgs; source-code-pro = callPackage ../data/fonts/source-code-pro {}; source-sans = callPackage ../data/fonts/source-sans { }; + source-sans-pro = callPackage ../data/fonts/source-sans-pro { }; source-serif = callPackage ../data/fonts/source-serif { }; + source-serif-pro = callPackage ../data/fonts/source-serif-pro { }; source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { }; |