Skip to content

Commit

Permalink
flake: bump inputs
Browse files Browse the repository at this point in the history
Flake lock file updates:

• Updated input 'master':
    'github:nixos/nixpkgs/69661586d1c9d85e859887d95285f6fc92521657?narHash=sha256-BWzlDJpfcE7DgxtAkeXHnU69Iz6cU64yCgE6b%2Bhqds8%3D' (2024-11-26)
  → 'github:nixos/nixpkgs/d3f007d0398bd3ac480e05d1a4fb872ee8a95743?narHash=sha256-eW4UBX1MFETfKy%2B2t9JlDkgUc2Pb%2BNCxVKomkbqVKGI%3D' (2024-11-27)
• Updated input 'nix-minecraft':
    'github:Infinidoge/nix-minecraft/eb1c9ac4398dcc55d644003548c64964c854fac1?narHash=sha256-qZk3i/Kk3JL4roSeXlrD2rqjsowBVzoBkXHIzxBGyPs%3D' (2024-11-26)
  → 'github:Infinidoge/nix-minecraft/6adec7f87f6c1d455f89f57bd697740bd6dc88fa?narHash=sha256-SQBVnfTAhVmNs5mKjoe942GykhAh9RQbcqScK9XlsWM%3D' (2024-11-27)
• Updated input 'stable':
    'github:nixos/nixpkgs/39a79978d602450db1b11a0b8c1c76877db226c6?narHash=sha256-Nd9xoMG0z/eGp87hShCEup3tDwzA2SFjlLVRaEV2ROQ%3D' (2024-11-26)
  → 'github:nixos/nixpkgs/f1f029e5cb5ff2d181552406a5d0a51177f5599d?narHash=sha256-EAOMYlOltx993ZzkHwKvFfZcKyxt1q%2Bn39riqsZkWuM%3D' (2024-11-27)
  • Loading branch information
moni-dz committed Nov 27, 2024
1 parent 258d950 commit 2a85d57
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 49 deletions.
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions modules/parts/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
lib,
pkgs,
system,
self',
inputs',
...
}:
Expand All @@ -35,11 +36,7 @@
};

hostPlatform = system;

overlays = lib.mkForce [
inputs.nixpkgs-f2k.overlays.stdenvs
self.overlays.default
];
overlays = [ self.overlays.default ];
};

# Extra arguments passed to the module system for nix-darwin, NixOS, and home-manager
Expand Down Expand Up @@ -87,7 +84,7 @@
home-manager = inputs'.home.packages.home-manager.override { path = "${inputs.home}"; };

man-pages =
if pkgs.stdenv.isLinux then pkgs.man-pages else inputs'.nixpkgs-f2k.packages.man-pages-xnu;
if pkgs.stdenv.isLinux then pkgs.man-pages else self'.packages.man-pages-xnu;

gnu-coreutils = if pkgs.stdenv.isLinux then pkgs.coreutils else pkgs.coreutils-prefixed;
};
Expand Down
3 changes: 1 addition & 2 deletions modules/parts/nix-darwin.nix
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ let
(
{ pkgs, ... }:
{
inherit (ctx) nix;
nixpkgs = removeAttrs ctx.nixpkgs [ "hostPlatform" ];
inherit (ctx) nix nixpkgs;
_module.args = ctx.extraModuleArgs;
networking.hostName = name;
system.stateVersion = config.stateVersion;
Expand Down
14 changes: 1 addition & 13 deletions modules/parts/nix-settings.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
inputs',
}:

# Nix daemon settings that can't be put in `nixConfig`.
{
buildMachines = __attrValues {
mistral = {
Expand All @@ -29,17 +28,6 @@
distributedBuilds = true;
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];

/*
package = inputs'.nix-parallel.packages.default.override {
pname = "nix-parallel";
doCheck = false;
doInstallCheck = false;
installUnitTests = false;
};
*/

# package = inputs'.lix.packages.default.overrideAttrs { doCheck = false; };

registry = {
system.flake = inputs.self;
nixpkgs.flake = inputs.nixpkgs;
Expand Down Expand Up @@ -69,7 +57,6 @@
"dynamic-derivations"
"flakes"
"nix-command"
# "pipe-operator"
];

max-jobs = "auto";
Expand Down Expand Up @@ -119,5 +106,6 @@
}

(lib.mkIf (stdenv.isDarwin && stdenv.isAarch64) { extra-platforms = "x86_64-darwin"; })
(lib.mkIf stdenv.isDarwin { sandbox = "relaxed"; })
];
}
36 changes: 18 additions & 18 deletions packages/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/overlays.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
default =
final: prev:
{
iosevkaft = prev.iosevka.override {
iosevka-ft = prev.iosevka.override {
privateBuildPlan = __readFile ./patches/iosevka-ft-build-plan.toml;
set = "Ft";
};
Expand Down

0 comments on commit 2a85d57

Please sign in to comment.