diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-06-25 10:58:39 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-06-25 10:58:39 +0200 |
commit | df587c7f2ec2ab6c81ba30f33d4c1ea17c4fc921 (patch) | |
tree | 95261474169bdc4f6ec708508d1ed3076b12eaab /pkgs/misc/emulators | |
parent | 1dd0109c8c8ef61bd3fa985d4fe817e0c3d3c948 (diff) | |
parent | 7c9d95fef59e2bc80fbde535df235a93d6690cc3 (diff) | |
download | nixpkgs-df587c7f2ec2ab6c81ba30f33d4c1ea17c4fc921.tar nixpkgs-df587c7f2ec2ab6c81ba30f33d4c1ea17c4fc921.tar.gz nixpkgs-df587c7f2ec2ab6c81ba30f33d4c1ea17c4fc921.tar.bz2 nixpkgs-df587c7f2ec2ab6c81ba30f33d4c1ea17c4fc921.tar.lz nixpkgs-df587c7f2ec2ab6c81ba30f33d4c1ea17c4fc921.tar.xz nixpkgs-df587c7f2ec2ab6c81ba30f33d4c1ea17c4fc921.tar.zst nixpkgs-df587c7f2ec2ab6c81ba30f33d4c1ea17c4fc921.zip |
Merge master into staging
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r-- | pkgs/misc/emulators/fs-uae/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/emulators/pcsx2/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 6d462c0e379..9856c93eda2 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { create customized Amigas. ''; license = licenses.gpl2Plus; - homepage = http://fs-uae.net; + homepage = https://fs-uae.net; maintainers = with stdenv.lib; [ maintainers.AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 2e28fd297ec..95e94eeaff5 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { states and PS2 system memory. This allows you to play PS2 games on your PC, with many additional features and benefits. ''; - homepage = http://pcsx2.net; + homepage = https://pcsx2.net; maintainers = with maintainers; [ hrdinka ]; # PCSX2's source code is released under LGPLv3+. It However ships |