diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-16 18:01:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-16 18:01:34 +0000 |
| commit | c43057cfb654d8f94f3d968aacfd578b5db35712 (patch) | |
| tree | d93e4d6ca4279d7503f4c5327c501ee8c230c133 /pkgs/top-level/all-packages.nix | |
| parent | 57b9e41dcc45bf142129898a44ea5e0e9e23b402 (diff) | |
| parent | 4869546e1b2c134f37aeada28ba4bb6b12ca1a7e (diff) | |
| download | nixpkgs-c43057cfb654d8f94f3d968aacfd578b5db35712.tar nixpkgs-c43057cfb654d8f94f3d968aacfd578b5db35712.tar.gz nixpkgs-c43057cfb654d8f94f3d968aacfd578b5db35712.tar.bz2 nixpkgs-c43057cfb654d8f94f3d968aacfd578b5db35712.tar.lz nixpkgs-c43057cfb654d8f94f3d968aacfd578b5db35712.tar.xz nixpkgs-c43057cfb654d8f94f3d968aacfd578b5db35712.tar.zst nixpkgs-c43057cfb654d8f94f3d968aacfd578b5db35712.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fef5bc1b18f..8fe4aed98ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1291,6 +1291,8 @@ with pkgs; mokutil = callPackage ../tools/security/mokutil { }; + mpsolve = libsForQt5.callPackage ../applications/science/math/mpsolve { }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit lib writeText; inherit (emacs.pkgs) inherit-local; }; nix-gitignore = callPackage ../build-support/nix-gitignore { }; @@ -15512,8 +15514,6 @@ with pkgs; alarm-clock-applet = callPackage ../tools/misc/alarm-clock-applet { }; - algol68g = callPackage ../development/compilers/algol68g { }; - ante = callPackage ../development/compilers/ante { }; armips = callPackage ../development/compilers/armips { |