diff --git a/machines/compute01/satosa/module.nix b/machines/compute01/satosa/module.nix index f9738da..ec61e3e 100644 --- a/machines/compute01/satosa/module.nix +++ b/machines/compute01/satosa/module.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, sources, ... }: +{ config, lib, pkgs, ... }: let inherit (lib) mkDefault mkEnableOption mkIf mkOption types; @@ -20,11 +20,7 @@ in { package = mkOption { type = types.package; - default = let pkgs = import sources.nixos-unstable { }; - in import ./package { - inherit pkgs; - inherit (pkgs) lib; - }; + default = import ./package { inherit pkgs; }; }; port = mkOption { diff --git a/machines/compute01/satosa/package/default.nix b/machines/compute01/satosa/package/default.nix index 481d056..32b043e 100644 --- a/machines/compute01/satosa/package/default.nix +++ b/machines/compute01/satosa/package/default.nix @@ -1,7 +1,7 @@ -{ lib, pkgs, ... }: +{ pkgs }: let - callPackage = lib.callPackageWith (pkgs // self); + callPackage = pkgs.lib.callPackageWith (pkgs // self); self = { satosa = callPackage ./satosa.nix { }; diff --git a/npins/sources.json b/npins/sources.json index 319509b..6cb0fd3 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -120,12 +120,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/b89d6c95e443b1114034ac65c974b2c91fb33db1.tar.gz", "hash": "106iz6i7b4pppwmhy9xn8ap403vvms0vhbr4z8siz0hffdqildl8" }, - "nixos-unstable": { - "type": "Channel", - "name": "nixos-unstable", - "url": "https://releases.nixos.org/nixos/unstable/nixos-24.05pre553283.8cfef6986adf/nixexprs.tar.xz", - "hash": "0wj0nxz9ymz6jglvszvlnwgdahiyvkp7yggr12j9cpxbai72h4dn" - }, "nixpkgs": { "type": "Channel", "name": "nixpkgs-unstable",