From 0b8ab3c52cef42f3684103fd0a4b2d1e60f1135d Mon Sep 17 00:00:00 2001 From: notgne2 Date: Mon, 26 Sep 2022 16:16:29 -0700 Subject: [PATCH] s/runCommandNoCC/runCommand/g --- home-manager/modules/colors.nix | 4 ++-- home-manager/users/notgne2.nix | 2 +- modules/ezwg.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/modules/colors.nix b/home-manager/modules/colors.nix index 3d88c48..253adb8 100644 --- a/home-manager/modules/colors.nix +++ b/home-manager/modules/colors.nix @@ -128,7 +128,7 @@ in config = let colorsJson = builtins.toFile "colors.json" (builtins.toJSON cfg.base16); - themeHashOut = pkgs.runCommandNoCC "theme-hash" { } '' + themeHashOut = pkgs.runCommand "theme-hash" { } '' cat ${colorsJson} | ${pkgs.coreutils}/bin/sha256sum | ${pkgs.coreutils}/bin/head -c 8 > $out ''; themeHash = builtins.readFile themeHashOut; @@ -239,7 +239,7 @@ in show_labs_settings = true; }; - base16FromImageSrc = pkgs.runCommandNoCC "auto-image-base16" { } '' + base16FromImageSrc = pkgs.runCommand "auto-image-base16" { } '' ${schemer2}/bin/schemer2 -format img::colors -in ${cfg.baseColors} -out colors.txt && ${pkgs.python3}/bin/python3 ${inputs.auto-base16-theme}/AutoBase16Theme.py ${inputs.auto-base16-theme}/templates/base16-template.yaml auto-image-base16.yaml ${pkgs.yaml2json}/bin/yaml2json < auto-image-base16.yaml > $out ''; diff --git a/home-manager/users/notgne2.nix b/home-manager/users/notgne2.nix index 39e6896..512eb14 100644 --- a/home-manager/users/notgne2.nix +++ b/home-manager/users/notgne2.nix @@ -178,7 +178,7 @@ in pname = "firenvim"; src = inputs.firenvim; # yes im stupid - version = builtins.readFile (pkgs.runCommandNoCC "firenvim-version" { } '' + version = builtins.readFile (pkgs.runCommand "firenvim-version" { } '' ${pkgs.jq}/bin/jq -j .version < ${inputs.firenvim}/package.json > $out ''); }) diff --git a/modules/ezwg.nix b/modules/ezwg.nix index 829f10f..1d97d5e 100644 --- a/modules/ezwg.nix +++ b/modules/ezwg.nix @@ -22,7 +22,7 @@ let ranges = map(lambda r: list(r.address_exclude(serverNetwork)), ranges) print(':'.join(ranges)) ''; - rangesOutput = pkgs.runCommandNoCC "exclusionary-wildcard-ranges" { } '' + rangesOutput = pkgs.runCommand "exclusionary-wildcard-ranges" { } '' ${pkgs.python3}/bin/python3 ${generateRangesScript} > $out ''; in @@ -36,7 +36,7 @@ let n1 = ipaddress.ip_network('${vlanIP}/${toString vlanSize}', False) print(n1, end="") ''; - subnetOutput = pkgs.runCommandNoCC "subnet-without-host-bits" { } '' + subnetOutput = pkgs.runCommand "subnet-without-host-bits" { } '' ${pkgs.python3}/bin/python3 ${generateSubnetScript} > $out ''; in