diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
commit | a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e (patch) | |
tree | 47950e79183035018882419c4eff5047d1537b99 /nixpkgs/pkgs/games/alephone | |
parent | 5b00523fb58512232b819a301c4309f579c7f09c (diff) | |
parent | 22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff) | |
download | nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.gz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.bz2 nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.lz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.xz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.zst nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.zip |
Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'
Diffstat (limited to 'nixpkgs/pkgs/games/alephone')
-rw-r--r-- | nixpkgs/pkgs/games/alephone/default.nix | 11 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/alephone/infinity/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/alephone/marathon/default.nix | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/games/alephone/default.nix b/nixpkgs/pkgs/games/alephone/default.nix index 1936c93ab843..879571df7a13 100644 --- a/nixpkgs/pkgs/games/alephone/default.nix +++ b/nixpkgs/pkgs/games/alephone/default.nix @@ -90,10 +90,9 @@ in self // { --add-flags $out/data/$pname ''; - meta = with stdenv.lib; - { - maintainers = with maintainers; [ ehmry ]; - inherit (alephone.meta) platforms; - } // meta; - } // extraArgs); + meta = alephone.meta // { + license = stdenv.lib.licenses.free; + hydraPlatforms = [ ]; + } // meta; + }); } diff --git a/nixpkgs/pkgs/games/alephone/infinity/default.nix b/nixpkgs/pkgs/games/alephone/infinity/default.nix index f4cea6c73435..fc3500d0eb94 100644 --- a/nixpkgs/pkgs/games/alephone/infinity/default.nix +++ b/nixpkgs/pkgs/games/alephone/infinity/default.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon-infinity"; desktopName = "Marathon-Infinity"; - version = "20150620"; + version = "20190331"; icon = alephone.icons + "/marathon-infinity.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip"; - sha256 = "0sgfahppanp9c0p115dg0makrdzghzmbz3iggl6x28fh62j03q64"; + sha256 = "03vn91arnsm71dakbfzrdfwpwh5vkwildl7i16xqi1apinmvvh86"; }; meta = { diff --git a/nixpkgs/pkgs/games/alephone/marathon/default.nix b/nixpkgs/pkgs/games/alephone/marathon/default.nix index 84831b6a2691..1d0787067afc 100644 --- a/nixpkgs/pkgs/games/alephone/marathon/default.nix +++ b/nixpkgs/pkgs/games/alephone/marathon/default.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon"; desktopName = "Marathon"; - version = "20150620"; + version = "20190331"; icon = alephone.icons + "/marathon.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip"; - sha256 = "0cagsigsjlsr8jqfaqjdxv8fs0f079cjzs26679aacyykc6b8k3p"; + sha256 = "1d18a7hn8s50rqcs9i72ak5fq5a76hwk7nylfinrxjb134c9vlpz"; }; meta = { |