Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nix: replace local derivation with nixpkgs derivation #572

Merged
merged 1 commit into from
Oct 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 1 addition & 7 deletions nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,13 @@ python310Packages.buildPythonPackage rec {
pname = "auto-cpufreq";
inherit version;

# src = fetchFromGitHub {
# owner = "AdnanHodzic";
# repo = pname;
# rev = "v${version}";
# sha256 = "sha256-ElYzVteBnoz7BevA6j/730BMG0RsmhBQ4PNl9+0Kw4k=";
# };
src = ../.;

nativeBuildInputs = with pkgs; [ wrapGAppsHook gobject-introspection ];

buildInputs = with pkgs; [ gtk3 ];

propagatedBuildInputs = with python310Packages; [ requests pygobject3 click distro psutil setuptools (callPackage ./pkgs/setuptools-git-versioning.nix {})];
propagatedBuildInputs = with python310Packages; [ requests pygobject3 click distro psutil setuptools setuptools-git-versioning ];

doCheck = false;
pythonImportsCheck = [ "auto_cpufreq" ];
Expand Down
11 changes: 0 additions & 11 deletions nix/pkgs/setuptools-git-versioning.nix

This file was deleted.