From 10d1fd04576b212814eb66fb94689aaad0bc9dd4 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Jun 2014 12:16:20 +0000 Subject: [PATCH] crafty: simplify expression --- pkgs/games/crafty/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix index 65cdd14539bd..e0eb49b53cb8 100644 --- a/pkgs/games/crafty/default.nix +++ b/pkgs/games/crafty/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, unzip, fullVariant }: +{ stdenv, fetchurl, unzip, fullVariant ? false }: stdenv.mkDerivation rec { - name = "crafty-23.4"; + name = "crafty-${version}"; + version = "23.4"; src = fetchurl { - url = http://www.craftychess.com/crafty-23.4.zip; + url = "http://www.craftychess.com/crafty-${version}.zip"; sha256 = "0rhf4pfxcwj8hqd7bqj98fpdd80v6ss1jnc9kgwx2fw4ksdi37pl"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5285ccf73e5..e785945815dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9952,7 +9952,7 @@ let crack_attack = callPackage ../games/crack-attack { }; - crafty = callPackage ../games/crafty { fullVariant = false; }; + crafty = callPackage ../games/crafty { }; craftyFull = appendToName "full" (crafty.override { fullVariant = true; }); crrcsim = callPackage ../games/crrcsim {};