From d32ca38911379e527a6f9990a221a4c88e41ef56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 10 Feb 2024 12:43:54 +0100 Subject: [PATCH] Rename package to moebot due to conflicting package name in nixpkgs --- flake.nix | 4 ++-- nix/module.nix | 2 +- nix/package.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 1e194b4..a07af82 100644 --- a/flake.nix +++ b/flake.nix @@ -13,8 +13,8 @@ version = builtins.substring 0 8 self.lastModifiedDate or "dirty"; in { - packages.moe = pkgs.callPackage ./nix/package.nix { inherit version; }; - defaultPackage = self.packages.${system}.moe; + packages.moebot = pkgs.callPackage ./nix/package.nix { inherit version; }; + defaultPackage = self.packages.${system}.moebot; } ) // { nixosModule = import ./nix/module.nix; diff --git a/nix/module.nix b/nix/module.nix index a76d37f..f735a25 100644 --- a/nix/module.nix +++ b/nix/module.nix @@ -10,7 +10,7 @@ in enable = mkEnableOption "Enable the moe service"; package = mkOption { type = package; - default = pkgs.moe; + default = pkgs.moebot; }; group = mkOption { type = str; diff --git a/nix/package.nix b/nix/package.nix index fc960c4..c7ef686 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -8,7 +8,7 @@ # $ pkgs/tools/moebot/update.sh # copy pkgs/tools/moebot/deps.nix to this directory buildDotnetModule { - pname = "moe"; + pname = "moebot"; inherit version; src = ../.;