diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-19 00:01:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 00:01:36 +0000 |
| commit | dc802b2e196f95ce42daa7591e475bba34047331 (patch) | |
| tree | e490c9bceea445e1eff80d7e883b5621e2c29bec /pkgs/top-level | |
| parent | e15af378fb53182b63f645c34e4f01cc5879912c (diff) | |
| parent | d5bd34ebf2c2c2b380b76cb86bc68522bc6af4d7 (diff) | |
| download | nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.gz nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.bz2 nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.lz nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.xz nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.tar.zst nixpkgs-dc802b2e196f95ce42daa7591e475bba34047331.zip | |
Merge master into staging-next
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 355b9e55990..8e909db1480 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31494,6 +31494,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; }; |