diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-19 00:02:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 00:02:18 +0000 |
| commit | dde34afc632005a61b65b95f269dbc8b828c2f05 (patch) | |
| tree | 44460faaa77e88a8b4da97a9ff694145be425851 /pkgs/top-level | |
| parent | d0f62aae75499e2584b4ffff1585605352e26e8f (diff) | |
| parent | dc802b2e196f95ce42daa7591e475bba34047331 (diff) | |
| download | nixpkgs-dde34afc632005a61b65b95f269dbc8b828c2f05.tar nixpkgs-dde34afc632005a61b65b95f269dbc8b828c2f05.tar.gz nixpkgs-dde34afc632005a61b65b95f269dbc8b828c2f05.tar.bz2 nixpkgs-dde34afc632005a61b65b95f269dbc8b828c2f05.tar.lz nixpkgs-dde34afc632005a61b65b95f269dbc8b828c2f05.tar.xz nixpkgs-dde34afc632005a61b65b95f269dbc8b828c2f05.tar.zst nixpkgs-dde34afc632005a61b65b95f269dbc8b828c2f05.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 347c0fd946a..a96cc6068c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31496,6 +31496,10 @@ in fsuae = callPackage ../misc/emulators/fs-uae { }; + fsuae-launcher = callPackage ../misc/emulators/fs-uae-launcher { + inherit (python3Packages) pyqt5 setuptools requests; + }; + putty = callPackage ../applications/networking/remote/putty { gtk2 = gtk2-x11; }; |