From 6a0f2aedc14d38cc2ad184f6c9a448729de8f8a5 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 6 Nov 2023 17:21:47 +0000 Subject: [PATCH] nix-required-mounts: fix: add missing metadata --- .../{main.py => nix_required_mounts.py} | 0 .../ni/nix-required-mounts/package.nix | 35 ++++++++++++------- .../ni/nix-required-mounts/pyproject.toml | 18 ++++++++++ 3 files changed, 41 insertions(+), 12 deletions(-) rename pkgs/by-name/ni/nix-required-mounts/{main.py => nix_required_mounts.py} (100%) diff --git a/pkgs/by-name/ni/nix-required-mounts/main.py b/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py similarity index 100% rename from pkgs/by-name/ni/nix-required-mounts/main.py rename to pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix index dbb35356b7af..c1411a6d2a80 100644 --- a/pkgs/by-name/ni/nix-required-mounts/package.nix +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -28,27 +28,38 @@ let inherit allowedPatterns; nixExe = lib.getExe nix; }; - pname = "nix-required-mounts"; + attrs = builtins.fromTOML (builtins.readFile ./pyproject.toml); + pname = attrs.project.name; + inherit (attrs.project) version; in -runCommand pname +python3Packages.buildPythonApplication { + inherit pname version; + pyproject = true; + + src = lib.cleanSource ./.; + nativeBuildInputs = [ makeWrapper - python3Packages.wrapPython + python3Packages.setuptools ]; + + postFixup = '' + wrapProgram $out/bin/${pname} --add-flags "--config ${confPath}" + ''; + passthru = { inherit allowedPatterns; tests = { inherit (nixosTests) nix-required-mounts; }; }; - meta.mainProgram = pname; -} '' - ${lib.getExe buildPackages.python3.pkgs.flake8} ${./main.py} - - mkdir -p $out/bin - install ${./main.py} $out/bin/${pname} - wrapProgram $out/bin/${pname} --add-flags "--config ${confPath}" - wrapPythonPrograms -'' + meta = { + inherit (attrs.project) description; + homepage = attrs.project.urls.Homepage; + license = lib.licenses.mit; + mainProgram = attrs.project.name; + maintainers = with lib.maintainers; [ SomeoneSerge ]; + }; +} diff --git a/pkgs/by-name/ni/nix-required-mounts/pyproject.toml b/pkgs/by-name/ni/nix-required-mounts/pyproject.toml index a8f43fefdf14..bb754e08ab1d 100644 --- a/pkgs/by-name/ni/nix-required-mounts/pyproject.toml +++ b/pkgs/by-name/ni/nix-required-mounts/pyproject.toml @@ -1,2 +1,20 @@ +[build-system] +build-backend = "setuptools.build_meta" +requires = [ "setuptools" ] + +[project] +name = "nix-required-mounts" +version = "0.0.1" +description = """ +A --pre-build-hook for Nix, \ +that allows to expose extra paths in the build sandbox \ +based on derivations' requiredSystemFeatrues""" + +[project.urls] +Homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/ni/nix-required-mounts" + +[project.scripts] +nix-required-mounts = "nix_required_mounts:entrypoint" + [tool.black] line-length = 79