fix nix flake check

Also adds a workaround for https://github.com/nix-community/home-manager/issues/2942
This commit is contained in:
Tim Schubert 2022-05-21 20:24:00 +02:00
parent 0655fab820
commit f17c7c67d2
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
6 changed files with 3 additions and 67 deletions

View file

@ -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

View file

@ -1,6 +1,7 @@
{ pkgs }:
{
allowUnfree = true;
allowUnfreePredicate = (pkg: true);
allowBroken = false;
android_sdk.accept_license = true;
}

View file

@ -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; })

View file

@ -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 = (

View file

@ -1,4 +1,3 @@
{ callPackage }:
{
recipemd = callPackage ./recipemd { };
}

View file

@ -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 ];
};
}