diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-07 13:16:26 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-07 13:16:26 +0200 |
commit | 95b828de42adaa2f825e5588d1cccb0d6398b20a (patch) | |
tree | abfa4798c91b9932173212e7fbc6e5f7bd85f5d6 /pkgs/games | |
parent | 421ce6439c2e685065fe9c256b751225de51e0b3 (diff) | |
parent | 1ecae5c2c123c0ca615d011b9ce32f501198e7c4 (diff) | |
download | nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.gz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.bz2 nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.lz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.xz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.zst nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.zip |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/atanks/default.nix | 14 | ||||
-rw-r--r-- | pkgs/games/atanks/default.upstream | 5 |
2 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix index 7669c4433219..587fefe600b2 100644 --- a/pkgs/games/atanks/default.nix +++ b/pkgs/games/atanks/default.nix @@ -11,17 +11,17 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="atanks"; - version="4.9"; + version = "6.0"; name="${baseName}-${version}"; project="${baseName}"; url="mirror://sourceforge/project/${project}/${baseName}/${name}/${name}.tar.gz"; - hash="015nwh8jk4k24ci6ilihii8idkyf6g266r4vl50csvykc82slrvd"; + sha256 = "0460zwzd800vcgsmd1dzb7j5wcy3lf9hsdw152f6p2mbd0nq5pds"; }; in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = sourceInfo.sha256; }; inherit (sourceInfo) name version; @@ -35,6 +35,7 @@ rec { fixInstall = a.fullDepEntry ('' sed -e "s@INSTALL=.*bin/install @INSTALL=install @" -i Makefile sed -e "s@-g 0 -m ... -o 0@@" -i Makefile + sed -e 's@/usr/@'"$out"'@g' -i Makefile '') ["doUnpack" "minInit"]; meta = { @@ -45,11 +46,8 @@ rec { ]; platforms = with a.lib.platforms; linux; - }; - passthru = { - updateInfo = { - downloadPage = "http://sourceforge.net/projects/atanks/files/atanks/"; - }; + downloadPage = "http://sourceforge.net/projects/atanks/files/atanks/"; + inherit version; }; }) x diff --git a/pkgs/games/atanks/default.upstream b/pkgs/games/atanks/default.upstream new file mode 100644 index 000000000000..f52364b3427f --- /dev/null +++ b/pkgs/games/atanks/default.upstream @@ -0,0 +1,5 @@ +url http://sourceforge.net/projects/atanks/files/atanks/ +version_link 'atanks[-][0-9.]+/$' +version_link '[.]tar[.][a-z0-9]+/download' +SF_redirect +do_overwrite () { do_overwrite_just_version; } |