From 5d482336b9d724364b95cc21b050c55bcfbe21b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Jan 2016 12:36:33 +0100 Subject: [PATCH 1/2] doc/meta.xml: don't encourage users to add a meta.version attribute That attribute is completely redundant since it just duplicates information from "name". Cc: @7c6f434c who added that section in e39b1f4ec8740e7dd34185c38464db5ac814eed5. --- doc/meta.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/doc/meta.xml b/doc/meta.xml index ea8a363f0fd3..5266d83aea68 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -112,11 +112,6 @@ meta-attributes package. - - version - Package version. - - branch Release branch. Used to specify that a package is not From 41a91a5495b7c6153b7f113ffba69a4be2a58a31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Jan 2016 12:46:01 +0100 Subject: [PATCH 2/2] youtube-dl: remove meta.version --- pkgs/tools/misc/youtube-dl/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index cdd213b0eba5..76db7b2ae4f4 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -10,10 +10,10 @@ buildPythonPackage rec { - name = "youtube-dl-${meta.version}"; + name = "youtube-dl-2016.01.01"; src = fetchurl { - url = "http://yt-dl.org/downloads/${meta.version}/${name}.tar.gz"; + url = "http://yt-dl.org/downloads/${(builtins.parseDrvName name).version}/${name}.tar.gz"; sha256 = "0b0pk8h2iswdiyf65c0zcwcad9dm2hid67fnfafj7d3ikp4kfbvk"; }; @@ -24,7 +24,6 @@ buildPythonPackage rec { ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"''; meta = with stdenv.lib; { - version = "2016.01.01"; homepage = http://rg3.github.io/youtube-dl/; repositories.git = https://github.com/rg3/youtube-dl.git; description = "Command-line tool to download videos from YouTube.com and other sites";