diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/applications/networking/feedreaders | |
parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
download | nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.zip |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/applications/networking/feedreaders')
-rw-r--r-- | pkgs/applications/networking/feedreaders/rawdog/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/networking/feedreaders/rsstail/default.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index 749e1864fda9..e5e8f823d277 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pythonPackages }: -let version = "2.21"; in pythonPackages.buildPythonPackage rec { name = "rawdog-${version}"; + version = "2.21"; src = fetchurl { url = "http://offog.org/files/${name}.tar.gz"; @@ -14,7 +14,6 @@ pythonPackages.buildPythonPackage rec { namePrefix = ""; meta = with stdenv.lib; { - inherit version; homepage = "http://offog.org/code/rawdog/"; description = "RSS Aggregator Without Delusions Of Grandeur"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index 40c165c2540c..fd349b320d28 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, cppcheck, libmrss }: -let version = "2.1"; in stdenv.mkDerivation rec { name = "rsstail-${version}"; + version = "2.1"; src = fetchFromGitHub { sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6"; @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - inherit version; description = "Monitor RSS feeds for new entries"; longDescription = '' RSSTail is more or less an RSS reader: it monitors an RSS feed and if it |