diff --git a/main/packages.nix b/main/packages.nix index 442eb6d..d237d9c 100644 --- a/main/packages.nix +++ b/main/packages.nix @@ -171,11 +171,10 @@ python39Packages.black python39Packages.ipython python39Packages.pip + python39Packages.poetry python39Packages.setuptools python39Packages.virtualenv - python38Packages.poetry # 3.9 doesn't work yet - # ruby rbenv diff --git a/overlays/rfd/default.nix b/overlays/rfd/default.nix index 3b56218..07aa998 100644 --- a/overlays/rfd/default.nix +++ b/overlays/rfd/default.nix @@ -1,27 +1,25 @@ -{ lib, fetchFromGitHub, python3, }: +{ lib, fetchFromGitHub, python3 }: let py = python3.override { }; in with py.pkgs; buildPythonApplication rec { pname = "rfd"; - version = "v0.6.0"; + version = "v0.7.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "davegallant"; repo = "rfd"; rev = version; - hash = "sha256:0cllhbca4dykl6j8snmml4kk6kzamlzhcrdf49f5v0zk7zljgkl1"; + hash = "sha256-imFSkCFeSMLW7QYYF3cXp7tKEruLt8a6W3JDPblKHHU="; }; - postPatch = '' - substituteInPlace requirements.txt --replace "soupsieve<=2.0" "soupsieve" - substituteInPlace requirements.txt --replace "beautifulsoup4<=4.8.2" "beautifulsoup4" - ''; - # No tests included doCheck = false; + nativeBuildInputs = [ poetry ]; + propagatedBuildInputs = with py.pkgs; [ beautifulsoup4 click @@ -35,7 +33,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://www.redflagdeals.com/"; description = "View RedFlagDeals from the command line"; - license = licenses.asl20; - maintainers = [ ]; + license = licenses.gpl3; + maintainers = [ davegallant ]; }; } diff --git a/overlays/srv/default.nix b/overlays/srv/default.nix index 77e6d1c..82ed3f9 100644 --- a/overlays/srv/default.nix +++ b/overlays/srv/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { meta = with lib; { description = "a simple rss viewer"; - license = licenses.unlicense; + license = licenses.gpl3; maintainers = with maintainers; [ davegallant ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/overlays/vpngate/default.nix b/overlays/vpngate/default.nix index 89b6807..320012b 100644 --- a/overlays/vpngate/default.nix +++ b/overlays/vpngate/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://www.vpngate.net"; description = "a client for vpngate.net"; - license = licenses.asl20; + license = licenses.gpl3; maintainers = with maintainers; [ davegallant ]; platforms = platforms.linux ++ platforms.darwin; };