diff --git a/common/default.nix b/common/default.nix index 1fe33ee..87d9dad 100644 --- a/common/default.nix +++ b/common/default.nix @@ -80,10 +80,13 @@ home.packages = [ - config.customPkgs.repl nix-melt.packages.${pkgs.system}.default nurl.packages.${pkgs.system}.default ] + ++ (with config.customPkgs; [ + pokemon-colorscripts + repl + ]) ++ (with config.nur.repos.rycee; [ mozilla-addons-to-nix ]) diff --git a/common/nix-on-droid.nix b/common/nix-on-droid.nix index 552cc62..56a88d7 100644 --- a/common/nix-on-droid.nix +++ b/common/nix-on-droid.nix @@ -55,9 +55,10 @@ ]; home.packages = - [ - config.customPkgs.repl - ] + (with config.customPkgs; [ + pokemon-colorscripts + repl + ]) ++ (with pkgs.nodePackages; [ undollar ]) diff --git a/common/pkgs/coloryou/default.nix b/common/pkgs/coloryou/default.nix index 6e19edd..d4bd171 100644 --- a/common/pkgs/coloryou/default.nix +++ b/common/pkgs/coloryou/default.nix @@ -1,5 +1,5 @@ {python3Packages}: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "coloryou"; version = "0.0.1"; diff --git a/common/pkgs/pokemon-colorscripts/default.nix b/common/pkgs/pokemon-colorscripts/default.nix new file mode 100644 index 0000000..ad97967 --- /dev/null +++ b/common/pkgs/pokemon-colorscripts/default.nix @@ -0,0 +1,30 @@ +{ + stdenv, + python3Packages, + fetchFromGitLab, +}: +stdenv.mkDerivation { + name = "pokemon-colorscripts"; + + propagatedBuildInputs = with python3Packages; [ + python + ]; + + src = fetchFromGitLab { + owner = "phoneybadger"; + repo = "pokemon-colorscripts"; + rev = "0483c85b93362637bdd0632056ff986c07f30868"; + hash = "sha256-rj0qKYHCu9SyNsj1PZn1g7arjcHuIDGHwubZg/yJt7A="; + }; + + installPhase = '' + mkdir -p $out/pokemon-colorscripts $out/bin + + cp -rf colorscripts $out/pokemon-colorscripts + cp pokemon.json $out/pokemon-colorscripts + + cp pokemon-colorscripts.py $out/pokemon-colorscripts + + ln -s $out/pokemon-colorscripts/pokemon-colorscripts.py $out/bin/pokemon-colorscripts + ''; +}