diff --git a/home/hosts/ivr/default.nix b/home/hosts/ivr/default.nix index 8c9f4f8..44009bb 100644 --- a/home/hosts/ivr/default.nix +++ b/home/hosts/ivr/default.nix @@ -11,11 +11,6 @@ let }; py = nix23.python311.withPackages ( p: with p; [ - django - djangorestframework - django-rapyd-modernauth - environs - mysqlclient pyyaml ruamel-yaml tox diff --git a/overlays/default.nix b/overlays/default.nix index 86f0952..24e5592 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -31,9 +31,6 @@ rec { cp = python-final.callPackage; in { - django-rapyd-modernauth = cp ./django-rapyd-modernauth.nix { }; - graypy = cp ./graypy.nix { }; - itg-django-utils = cp ./itg-django-utils.nix { }; xonsh-apipenv = cp ./xonsh-apipenv.nix { }; } ) @@ -43,7 +40,6 @@ rec { enwiki-dump = prev.callPackage ./enwiki-dump.nix { }; # Overrides of packages - brew = prev.callPackage ./homebrew.nix { }; copier = ( if is2405 then prev.copier.overridePythonAttrs (_: { diff --git a/overlays/django-rapyd-modernauth.nix b/overlays/django-rapyd-modernauth.nix deleted file mode 100644 index b9f2151..0000000 --- a/overlays/django-rapyd-modernauth.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, click -, django -, python-dotenv -, pytz -, setuptools -, sqlparse -, zipp -}: - -buildPythonPackage rec { - pname = "django-rapyd-modernauth"; - version = "0.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-kDZjI32LcKsmLI38ruINKOUfi6lWTIqXF5qIQHi0LeQ="; - }; - - meta = with lib; { - description = "A Django application that provides a custom User model where the username is the email address."; - homepage = "https://github.com/karthicraghupathi/django_rapyd_modernauth"; - license = licenses.afl20; - maintainers = [ ]; - }; - - doCheck = false; - - buildInputs = [ - click - django - python-dotenv - pytz - setuptools - sqlparse - zipp - ]; - - nativeBuildInputs = [ - ]; -} diff --git a/overlays/graypy.nix b/overlays/graypy.nix deleted file mode 100644 index 44faaa9..0000000 --- a/overlays/graypy.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, amqplib -, mock -, pytestCheckHook -, requests -, -}: - -buildPythonPackage rec { - pname = "graypy"; - version = "2.1.0"; - - src = fetchFromGitHub { - owner = "severb"; - repo = "graypy"; - rev = "2.1.0"; - hash = "sha256-y1HbJEpqnAgOeB+zXKy3iUT6Lpv0bufjL7+jWUSAjFs="; - }; - - nativeCheckInputs = [ - amqplib - mock - pytestCheckHook - requests - ]; - - meta = with lib; { - description = "Python logging handlers that send messages in the Graylog Extended Log Format (GELF)."; - homepage = "https://github.com/severb/graypy"; - license = licenses.bsd3; - }; -} diff --git a/overlays/itg-django-utils.nix b/overlays/itg-django-utils.nix deleted file mode 100644 index a54929b..0000000 --- a/overlays/itg-django-utils.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildPythonPackage -, fetchurl -, django -, djangorestframework -, graypy -, setuptools -, -}: - -buildPythonPackage rec { - pname = "itg-django-utils"; - version = "0.1.11"; - - src = fetchurl { - url = "https://pypi.ivrtechnology.com/packages/itg-django-utils-0.1.12.tar.gz"; - hash = "sha256-LbOl4L4UZbRTlLuBL4L3ser6+WDuP3R5a03EIh1xSK8="; - }; - - propagatedBuildInputs = [ - django - djangorestframework - graypy - setuptools - ]; - - meta = with lib; { - description = "ITG specific stuff"; - homepage = "http://www.ivrtechnology.com"; - maintainers = [ ]; - }; - - doCheck = false; -} diff --git a/pkgs/default.nix b/pkgs/default.nix index ba581c7..89c9d73 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -9,6 +9,7 @@ in #iso = top.self.nixosConfigurations.iso.config.system.build.isoImage; #iso-beta = self.nixosConfigurations.iso-beta.config.system.build.isoImage; aacs = c ./aacs.nix { }; + brew = c ./homebrew.nix { }; create_ssl = c ./create_ssl.nix { }; inject-darwin = c ./inject-darwin.nix { }; inject = c ./inject.nix { }; diff --git a/overlays/homebrew.nix b/pkgs/homebrew.nix similarity index 60% rename from overlays/homebrew.nix rename to pkgs/homebrew.nix index ffcd099..2cb63b6 100644 --- a/overlays/homebrew.nix +++ b/pkgs/homebrew.nix @@ -1,18 +1,19 @@ -{ lib -, pkgs -, stdenv -, bash -, curl -, git -, ruby -, ... +{ + lib, + fetchFromGitHub, + stdenv, + bash, + curl, + git, + ruby, + ... }: stdenv.mkDerivation rec { pname = "homebrew-installer"; version = "20230531"; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "Homebrew"; repo = "install"; rev = "716a1d024f32890ef75ea82c18a769abc24e9475"; @@ -27,16 +28,21 @@ stdenv.mkDerivation rec { ]; installPhase = '' - mkdir -p $out/bin/ - cp ${src}/install.sh $out/bin/install-homebrew.sh - cp ${src}/uninstall.sh $out/bin/uninstall-homebrew.sh - ''; + mkdir -p $out/bin/ + cp ${src}/install.sh $out/bin/install-homebrew.sh + cp ${src}/uninstall.sh $out/bin/uninstall-homebrew.sh + ''; meta = with lib; { description = "Runs the homebrew installer"; homepage = "https://github.com/Homebrew/"; license = licenses.bsd2; - platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" "aarch64-linux" ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "x86_64-linux" + "aarch64-linux" + ]; maintainers = [ maintainers.greg ]; }; }