From 1aa3efba39b9bd393fdbcf93da97333470af40d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 26 Jan 2018 04:05:32 +0100 Subject: [PATCH] you-get: 0.4.390 -> 0.4.1011 --- pkgs/tools/misc/you-get/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++-- pkgs/top-level/python-packages.nix | 23 ----------------------- 3 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 pkgs/tools/misc/you-get/default.nix diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix new file mode 100644 index 000000000000..3a917040863e --- /dev/null +++ b/pkgs/tools/misc/you-get/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonApplication, fetchPypi }: + +buildPythonApplication rec { + pname = "you-get"; + version = "0.4.1011"; + + # Tests aren't packaged, but they all hit the real network so + # probably aren't suitable for a build environment anyway. + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "0h6aspnfic30s89xsv6qss1jfka9px4ll60bqrjbds4y0k3h818g"; + }; + + meta = with stdenv.lib; { + description = "A tiny command line utility to download media contents from the web"; + homepage = https://you-get.org; + license = licenses.mit; + maintainers = with maintainers; [ ryneeverett ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a48f43fc9ffe..ed55d30b6f38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5460,6 +5460,8 @@ with pkgs; yle-dl = callPackage ../tools/misc/yle-dl {}; + you-get = python3Packages.callPackage ../tools/misc/you-get { }; + zbackup = callPackage ../tools/backup/zbackup {}; zbar = callPackage ../tools/graphics/zbar { }; @@ -18030,8 +18032,6 @@ with pkgs; yoshimi = callPackage ../applications/audio/yoshimi { }; - inherit (python3Packages) you-get; - inherit (pythonPackages) youtube-dl; youtube-viewer = perlPackages.WWWYoutubeViewer; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e45418fba46d..b9b0a61d884c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18730,29 +18730,6 @@ EOF }; }; - you-get = buildPythonApplication rec { - version = "0.4.390"; - name = "you-get-${version}"; - disabled = !isPy3k; - - # Tests aren't packaged, but they all hit the real network so - # probably aren't suitable for a build environment anyway. - doCheck = false; - - src = pkgs.fetchurl { - url = "mirror://pypi/y/you-get/${name}.tar.gz"; - sha256 = "17hs0g9yvgvkmr7p1cz39mbbvb40q65qkc31j3ixc2f873gahagw"; - }; - - meta = { - description = "A tiny command line utility to download media contents from the web"; - homepage = https://you-get.org; - license = licenses.mit; - maintainers = with maintainers; [ ryneeverett ]; - platforms = platforms.all; - }; - }; - zetup = callPackage ../development/python-modules/zetup { }; zope_broken = buildPythonPackage rec {