Author: raskin
Date: 2010-06-17 05:19:26 +0000 (Thu, 17 Jun 2010)
New Revision: 22303

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22303&view=rev

Modified:
   nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix

Log:
Support renamed downloads for autoupdatable packages

Changes:

Modified: nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
===================================================================
--- nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix      
2010-06-17 04:23:11 UTC (rev 22302)
+++ nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix      
2010-06-17 05:19:26 UTC (rev 22303)
@@ -541,10 +541,11 @@
      export PYTHONPATH=$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath $out)
    '') ["minInit" "addInputs" "defEnsureDir"];
 
-   fetchUrlFromSrcInfo = srcInfo: fetchurl {
+   fetchUrlFromSrcInfo = srcInfo: fetchurl ({
      url = srcInfo.url;
      sha256 = srcInfo.hash;
-   };
+   } // 
+   (if (srcInfo ? downloadName) then {name = srcInfo.downloadName;} else {}));
 
    fetchGitFromSrcInfo = srcInfo: fetchgit {
      url = srcInfo.url;

_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to