diff --git a/home/home/pkgs.nix b/home/home/pkgs.nix index 4838ba2..9b06407 100644 --- a/home/home/pkgs.nix +++ b/home/home/pkgs.nix @@ -1,6 +1,5 @@ { pkgs }: with pkgs; [ - androidStudioPackages.stable anki aspell aspellDicts.de @@ -72,7 +71,6 @@ with pkgs; [ python3 python38Packages.dateutil python38Packages.managesieve - recipemd ripgrep rust-analyzer rustup diff --git a/home/nixpkgs-config.nix b/home/nixpkgs-config.nix index 1bf42a9..24650fe 100644 --- a/home/nixpkgs-config.nix +++ b/home/nixpkgs-config.nix @@ -1,6 +1,7 @@ { pkgs }: { allowUnfree = true; + allowUnfreePredicate = (pkg: true); allowBroken = false; android_sdk.accept_license = true; } diff --git a/nixos/configurations.nix b/nixos/configurations.nix index 71be4c7..649b882 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -9,6 +9,7 @@ , recipemd }: let adapterModule = system: { + nixpkgs.config.allowUnfreePredicate = (pkg: true); nixpkgs.overlays = (nixpkgs.lib.attrValues self.overlays) ++ [ (final: prev: { homePage = homePage.defaultPackage.${system}; }) (final: prev: { s = scripts; }) diff --git a/outputs.nix b/outputs.nix index 9e67dfb..acc8464 100644 --- a/outputs.nix +++ b/outputs.nix @@ -15,9 +15,6 @@ let pkgs = nixpkgs.legacyPackages.${system}; selfPkgs = self.packages.${system}; - pythonPackages = import ./pkgs/python-pkgs; - python3Packages = pythonPackages { callPackage = pkgs.python3Packages.callPackage; }; - #lib = import ./lib; in { apps.deploy = { @@ -48,7 +45,7 @@ devShell = pkgs.callPackage ./shell.nix { }; })) // { hmConfigurations = import ./home/configurations.nix { - inherit self nixpkgs home-manager recipemd; + inherit self nixpkgs home-manager; }; hmModules = import ./home/modules inputs; nixosConfigurations = import ./nixos/configurations.nix { @@ -57,7 +54,6 @@ }; nixosModules = import ./nixos/modules inputs; overlays = import ./overlays; - pythonPackages = import ./pkgs/python-pkgs; keys = ./keys; hydraJobs = ( diff --git a/pkgs/python-pkgs/default.nix b/pkgs/python-pkgs/default.nix index 7c10127..b9e7043 100644 --- a/pkgs/python-pkgs/default.nix +++ b/pkgs/python-pkgs/default.nix @@ -1,4 +1,3 @@ { callPackage }: { - recipemd = callPackage ./recipemd { }; } diff --git a/pkgs/python-pkgs/recipemd/default.nix b/pkgs/python-pkgs/recipemd/default.nix deleted file mode 100644 index a604e9a..0000000 --- a/pkgs/python-pkgs/recipemd/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonPackages -, installShellFiles -, isPy36 -, isPy27 -}: - -buildPythonPackage rec { - pname = "recipemd"; - version = "4.0.7"; - - disabled = isPy36 || isPy27; - - src = fetchFromGitHub { - owner = "tstehr"; - repo = "recipemd"; - rev = "v4.0.7"; - sha256 = "sha256-P65CxTaROfvx9kNSJWa5CiCUHCurTMZx8uUH9W9uK1U="; - }; - - propagatedBuildInputs = with pythonPackages; [ - CommonMark - argcomplete - dataclasses-json - pyparsing - yarl - ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - ${pythonPackages.argcomplete}/bin/register-python-argcomplete -s bash ${pname} > $out/completions.bash - installShellCompletion --bash --name recipemd.bash $out/completions.bash - - ${pythonPackages.argcomplete}/bin/register-python-argcomplete -s fish ${pname} > $out/completions.fish - installShellCompletion --fish --name recipemd.fish $out/completions.fish - - # The version of argcomplete in nixpkgs-stable does not have support for zsh - #${pythonPackages.argcomplete}/bin/register-python-argcomplete -s zsh ${pname} > $out/completions.zsh - #installShellCompletion --zsh --name _recipemd $out/completions.zsh - ''; - - checkInputs = [ - pytestCheckHook - pythonPackages.pytestcov - ]; - - doCheck = true; - - meta = with lib; { - description = "Markdown recipe manager, reference implementation of RecipeMD"; - homepage = https://recipemd.org; - license = [ licenses.lgpl3Only ]; - maintainers = [ maintainers.dadada ]; - }; -}