diff --git a/flake.lock b/flake.lock index fbf4af2e..115cb855 100644 --- a/flake.lock +++ b/flake.lock @@ -716,22 +716,6 @@ "type": "github" } }, - "nixpkgs-small": { - "locked": { - "lastModified": 1790297907, - "narHash": "sha256-3tsHNGgWZoi3D5Fbi6xvkjN97qHC92zpJAweyzPju2M=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a5e02ba8b823f3846c2336c7baad299a36a47cdf", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1789654592, @@ -925,7 +909,6 @@ "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-master": "nixpkgs-master", "nixpkgs-patched": "nixpkgs-patched", - "nixpkgs-small": "nixpkgs-small", "nixpkgs-stable": "nixpkgs-stable", "nixvim": "nixvim", "nu_scripts": "nu_scripts", diff --git a/flake.nix b/flake.nix index 8a370778..09efa40d 100644 --- a/flake.nix +++ b/flake.nix @@ -49,11 +49,6 @@ nixpkgs-patched.url = "github:ryan4yin/nixpkgs/nixos-unstable-patched"; # get some latest packages from the master branch nixpkgs-master.url = "github:nixos/nixpkgs/master"; - # only for rustfs: nixos-unstable-small ships 1.0.0 (with the web console), - # while the default unstable nixpkgs is still on 1.0.0-rc.6. Using a separate - # input keeps rustfs current without bumping the whole system nixpkgs. - nixpkgs-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; - # NixOS MicroVMs -- run the VMs directly on the hosts, replacing the former KubeVirt microvm = { url = "github:microvm-nix/microvm.nix"; diff --git a/hosts/12kingdoms-youko/homelab-services/rustfs.nix b/hosts/12kingdoms-youko/homelab-services/rustfs.nix index 55795f72..c137e1ee 100644 --- a/hosts/12kingdoms-youko/homelab-services/rustfs.nix +++ b/hosts/12kingdoms-youko/homelab-services/rustfs.nix @@ -1,16 +1,13 @@ { config, - pkgs-small, ... }: { - # The service module comes from the default nixpkgs (services.rustfs); - # pkgs-small (instantiated in outputs/default.nix) only supplies the newer - # package. The module creates the rustfs user/group, the data volume via - # tmpfiles, and a hardened systemd unit. + # The service module comes from the default nixpkgs (services.rustfs); it + # creates the rustfs user/group, the data volume via tmpfiles, and a hardened + # systemd unit. services.rustfs = { enable = true; - package = pkgs-small.rustfs; settings = { # New directory; the old MinIO tree at /data/apps/minio is kept as a # rollback snapshot and was carried over via an S3-level copy. diff --git a/outputs/default.nix b/outputs/default.nix index b7f856eb..4b66723b 100644 --- a/outputs/default.nix +++ b/outputs/default.nix @@ -44,12 +44,6 @@ let # to use chrome, we need to allow the installation of non-free software config.allowUnfree = true; }; - # only for rustfs: nixos-unstable-small ships rustfs 1.0.0 (with the web - # console), while the default unstable nixpkgs is still 1.0.0-rc.6. - pkgs-small = import inputs.nixpkgs-small { - inherit system; - config.allowUnfree = true; - }; pkgs-blender = import inputs.nixpkgs-blender { inherit system; config = lib.optionalAttrs (system == "x86_64-linux") {