diff --git a/flake.nix b/flake.nix index 52f8ef2..60ec1bc 100644 --- a/flake.nix +++ b/flake.nix @@ -72,7 +72,7 @@ }; }; in { - "python3.asyncio" = pkgs.python3Packages.buildPythonPackage rec { + py3-asyncio = pkgs.python3Packages.buildPythonPackage rec { pname = "asyncio"; version = "3.4.3"; src = pkgs.python3Packages.fetchPypi { @@ -80,7 +80,7 @@ sha256 = "sha256-gzYP+LyXmA5P8lyWTHvTkj0zPRd6pPf7c2sBnybHy0E="; }; }; - "python3.cryptomus" = pkgs.python3Packages.buildPythonPackage rec { + py3-cryptomus = pkgs.python3Packages.buildPythonPackage rec { pname = "cryptomus"; version = "1.1"; src = pkgs.python3Packages.fetchPypi { @@ -88,7 +88,7 @@ sha256 = "sha256-f0BBGfemKxMdz+LMvawWqqRfmF+TrCpMwgtJEYt+fgU="; }; }; - "python3.modulegraph" = pkgs.python3Packages.buildPythonPackage rec { + py3-modulegraph = pkgs.python3Packages.buildPythonPackage rec { pname = "modulegraph"; version = "0.19.6"; src = pkgs.python3Packages.fetchPypi { @@ -96,7 +96,7 @@ sha256 = "sha256-yRTIyVoOEP6IUF1OnCKEtOPbxwlD4wbMZWfjbMVBv0s="; }; }; - "python3.swifter" = pkgs.python3Packages.buildPythonPackage rec { + py3-swifter = pkgs.python3Packages.buildPythonPackage rec { pname = "swifter"; version = "1.4.0"; src = pkgs.python3Packages.fetchPypi { @@ -104,7 +104,7 @@ sha256 = "sha256-4bt0R2ohs/B6F6oYyX/cuoWZcmvRfacy8J2rzFDia6A="; }; }; - "python3.aiogram-newsletter" = pkgs.python3Packages.buildPythonPackage rec { + py3-aiogram-newsletter = pkgs.python3Packages.buildPythonPackage rec { pname = "aiogram-newsletter"; version = "0.0.10"; @@ -129,7 +129,7 @@ pg-from = pkgs.callPackage ./package/postgres/pg-from/default.nix rust.commonArgs; pg-schema = pkgs.callPackage ./package/postgres/pg-schema/default.nix rust.commonArgs; pg-migration = pkgs.callPackage ./package/postgres/pg-migration/default.nix rust.commonArgs; - "c.hectic" = pkgs.callPackage ./package/c/hectic/default.nix {}; + c-hectic = pkgs.callPackage ./package/c/hectic/default.nix {}; watch = pkgs.callPackage ./package/c/watch/default.nix {}; hmpl = pkgs.callPackage ./package/c/hmpl/default.nix { hectic = self.packages.${system}.hectic; diff --git a/package/c/hmpl/default.nix b/package/c/hmpl/default.nix index 3f39c5e..4f1ed44 100644 --- a/package/c/hmpl/default.nix +++ b/package/c/hmpl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gcc, lib, hectic, bash }: +{ stdenv, gcc, lib, c-hectic, bash }: stdenv.mkDerivation { pname = "hmpl"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = ./.; doCheck = true; - buildInputs = [ hectic ]; + buildInputs = [ c-hectic ]; nativeBuildInputs = [ gcc ]; buildPhase = '' diff --git a/package/c/prettify/default.nix b/package/c/prettify/default.nix index 808bb83..725a702 100644 --- a/package/c/prettify/default.nix +++ b/package/c/prettify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gcc, lib, bash, inotify-tools }: +{ stdenv, gcc, lib, bash, c-hectic }: stdenv.mkDerivation { pname = "prettify"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = ./.; doCheck = false; - nativeBuildInputs = [ gcc ]; + nativeBuildInputs = [ gcc c-hectic ]; buildPhase = '' ls diff --git a/package/c/prettify/make.sh b/package/c/prettify/make.sh index 38f5ef9..8c5a75e 100644 --- a/package/c/prettify/make.sh +++ b/package/c/prettify/make.sh @@ -102,4 +102,4 @@ case "$MODE" in print_help exit 1 ;; -esac \ No newline at end of file +esac