Skip to content

Commit b0638ec

Browse files
committed
update flakes
1 parent cafbc94 commit b0638ec

File tree

3 files changed

+30
-23
lines changed

3 files changed

+30
-23
lines changed

nix/shells/game2text.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ let
1717
packageOverrides = pyself: pysuper: {
1818
# Disable tk tests in Pillow
1919
pillow = (
20-
pysuper.pillow.overridePythonAttrs (old: rec {
20+
pysuper.pillow.overridePythonAttrs (old: {
2121
postPatch = ''
2222
${old.postPatch}
2323
rm Tests/test_imagetk.py
@@ -26,7 +26,7 @@ let
2626
);
2727
# For some reason, twisted tests trigger a trap
2828
twisted = (
29-
pysuper.twisted.overridePythonAttrs (old: rec {
29+
pysuper.twisted.overridePythonAttrs (old: {
3030
doCheck = false;
3131
})
3232
);

nix/shells/nix.nix

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
{ pkgs }:
22
with pkgs;
3+
4+
let
5+
nodejs = nodejs_22;
6+
in
37
mkShell {
48
nativeBuildInputs = [
59
git
610
coreutils-full
711
nixfmt-rfc-style
812
shfmt
13+
(pnpm.override {
14+
inherit nodejs;
15+
})
16+
nodejs
917
(yarn.override {
10-
nodejs = nodejs_22;
18+
inherit nodejs;
1119
})
12-
nodejs_22
1320
];
1421
}

scripts/igm-helpers.sh

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@
22

33
# Gets the path of the configuration flake.
44
flake_path() {
5-
FLAKE_PATH=''
6-
if $(uname -a | grep -q "Darwin"); then
7-
FLAKE_PATH="$HOME/dotfiles-darwin"
8-
elif $(uname -a | grep -q "NixOS"); then
9-
FLAKE_PATH="./private/flakes/nixos"
10-
else
11-
echo "No system flake found for this platform."
12-
exit 1
13-
fi
14-
echo $FLAKE_PATH
5+
FLAKE_PATH=''
6+
if $(uname -a | grep -q "Darwin"); then
7+
FLAKE_PATH="$HOME/dotfiles-darwin"
8+
elif $(uname -a | grep -q "NixOS"); then
9+
FLAKE_PATH="./private/flakes/nixos"
10+
else
11+
echo "No system flake found for this platform."
12+
exit 1
13+
fi
14+
echo $FLAKE_PATH
1515
}
1616

1717
# Gets the attribute of the flake to build for the system configuration.
1818
system_config_attribute() {
19-
if $(uname -a | grep -q "Darwin"); then
20-
echo "darwinConfigurations.$(hostname).system"
21-
elif $(uname -a | grep -q "NixOS"); then
22-
hostname
23-
else
24-
echo "No system flake found for this platform."
25-
exit 1
26-
fi
19+
if $(uname -a | grep -q "Darwin"); then
20+
echo "darwinConfigurations.$(hostname).system"
21+
elif $(uname -a | grep -q "NixOS"); then
22+
hostname
23+
else
24+
echo "No system flake found for this platform."
25+
exit 1
26+
fi
2727
}
2828

2929
# Runs the Nix command without requiring flakes to be enabled.
3030
nix_cmd() {
31-
nix --extra-experimental-features flakes --extra-experimental-features nix-command $@
31+
nix --extra-experimental-features flakes --extra-experimental-features nix-command $@
3232
}

0 commit comments

Comments
 (0)