1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 21:01:16 +02:00

Merge pull request #12540 from xokdvium/fix/devshell

packaging: Fix devShell
This commit is contained in:
Eelco Dolstra 2025-02-20 21:53:46 +01:00 committed by GitHub
commit 0da6a4a0ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions

View file

@ -403,7 +403,7 @@
devShells = devShells =
let let
makeShell = import ./packaging/dev-shell.nix { inherit inputs lib devFlake; }; makeShell = import ./packaging/dev-shell.nix { inherit lib devFlake; };
prefixAttrs = prefix: lib.concatMapAttrs (k: v: { "${prefix}-${k}" = v; }); prefixAttrs = prefix: lib.concatMapAttrs (k: v: { "${prefix}-${k}" = v; });
in in
forAllSystems ( forAllSystems (

View file

@ -1,6 +1,5 @@
{ {
lib, lib,
inputs,
devFlake, devFlake,
}: }:
@ -117,7 +116,7 @@ pkgs.nixComponents.nix-util.overrideAttrs (
pkgs.buildPackages.changelog-d pkgs.buildPackages.changelog-d
modular.pre-commit.settings.package modular.pre-commit.settings.package
(pkgs.writeScriptBin "pre-commit-hooks-install" modular.pre-commit.settings.installationScript) (pkgs.writeScriptBin "pre-commit-hooks-install" modular.pre-commit.settings.installationScript)
inputs.nixfmt.packages.${pkgs.hostPlatform.system}.default pkgs.buildPackages.nixfmt-rfc-style
] ]
# TODO: Remove the darwin check once # TODO: Remove the darwin check once
# https://github.com/NixOS/nixpkgs/pull/291814 is available # https://github.com/NixOS/nixpkgs/pull/291814 is available