diff options
| author | Vincent Ambo <mail@tazj.in> | 2023-10-04T20·39+0300 |
|---|---|---|
| committer | tazjin <tazjin@tvl.su> | 2023-10-08T20·56+0000 |
| commit | e778a33710c01d1320e2cd36c0ebcf668ea0fcc4 (patch) | |
| tree | e95318f2b65c71d0e92e95bfe43cb88daa8bfccc /users/sterni | |
| parent | f4787355a4a7e172c4ba77d160d7a21a5b8032e6 (diff) | |
chore(3p/sources): bump channels & overlays (2023-10-04) r/6734
nixpkgs changed something in how it deals with configuration of the package set itself when that is externally instantiated (like in depot) It seems like we can work around this mostly by just ... deleting some code, as all instances of this were for allowing unfree code, which we've already set on the top-level anyways. * //users/sterni: fix nixpkgs config assertion to point at pkgs.config * //users/wpcarro: disable locate service, which is broken in nixpkgs Change-Id: Iacf6f1c8fd5b5289e7265e155d74f8269a858ceb Reviewed-on: https://cl.tvl.fyi/c/depot/+/9541 Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: grfn <grfn@gws.fyi> Tested-by: BuildkiteCI Autosubmit: tazjin <tazjin@tvl.su> Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'users/sterni')
| -rw-r--r-- | users/sterni/machines/edwin/default.nix | 1 | ||||
| -rw-r--r-- | users/sterni/modules/minecraft-fabric.nix | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/users/sterni/machines/edwin/default.nix b/users/sterni/machines/edwin/default.nix index de34aa78af..c1b267526e 100644 --- a/users/sterni/machines/edwin/default.nix +++ b/users/sterni/machines/edwin/default.nix @@ -20,7 +20,6 @@ config = { time.timeZone = "Europe/Berlin"; - nixpkgs.config.allowUnfreeRedistributable = true; nix = { package = pkgs.nix_2_3; settings = { diff --git a/users/sterni/modules/minecraft-fabric.nix b/users/sterni/modules/minecraft-fabric.nix index 7c04aae725..daca54b6d1 100644 --- a/users/sterni/modules/minecraft-fabric.nix +++ b/users/sterni/modules/minecraft-fabric.nix @@ -447,8 +447,8 @@ in assertions = [ { assertion = builtins.all (instance: !instance.enable) (builtins.attrValues cfg) - || config.nixpkgs.config.allowUnfreeRedistributable or false - || config.nixpkgs.config.allowUnfree or false; + || pkgs.config.allowUnfreeRedistributable or false + || pkgs.config.allowUnfree or false; message = lib.concatStringsSep " " [ "You need to allow unfree software for minecraft," "as you'll implicitly agree to Mojang's EULA." |