Migrate to nom-build
This commit is contained in:
parent
4fdf6476aa
commit
8524db6577
|
@ -37,9 +37,9 @@ in {
|
||||||
say "Building ~/.modes for apollo"
|
say "Building ~/.modes for apollo"
|
||||||
nixPath <- myNixPath "${configPath}"
|
nixPath <- myNixPath "${configPath}"
|
||||||
setEnv "WITH_SECRETS" "false"
|
setEnv "WITH_SECRETS" "false"
|
||||||
nix_build nixPath (params ++ remoteBuildParams) &!> StdOut |> nom
|
nom_build nixPath (params ++ remoteBuildParams)
|
||||||
setEnv "WITH_SECRETS" "true"
|
setEnv "WITH_SECRETS" "true"
|
||||||
nix_build nixPath params &!> StdOut |> nom
|
nom_build nixPath params
|
||||||
activate_mode
|
activate_mode
|
||||||
'';
|
'';
|
||||||
quickUpdateMode = pkgs.writeHaskellScript {
|
quickUpdateMode = pkgs.writeHaskellScript {
|
||||||
|
|
|
@ -9,7 +9,7 @@ mkdir -p /var/run/user/$UID/tmp/downloads
|
||||||
setopt prompt_subst
|
setopt prompt_subst
|
||||||
autoload -U colors && colors # Enable colors in prompt
|
autoload -U colors && colors # Enable colors in prompt
|
||||||
|
|
||||||
alias nix-build-remote="nix-build --builders '@/etc/nix/machines' --max-jobs 0"
|
alias nom-build-remote="nom-build --builders '@/etc/nix/machines' --max-jobs 0"
|
||||||
alias nixpkgs-review-pr-remote='nixpkgs-review pr --build-args "--builders @/etc/nix/machines --max-jobs 0"'
|
alias nixpkgs-review-pr-remote='nixpkgs-review pr --build-args "--builders @/etc/nix/machines --max-jobs 0"'
|
||||||
alias nixpkgs-review-rev-remote='nixpkgs-review rev --build-args "--builders @/etc/nix/machines --max-jobs 0"'
|
alias nixpkgs-review-rev-remote='nixpkgs-review rev --build-args "--builders @/etc/nix/machines --max-jobs 0"'
|
||||||
alias cat=bat
|
alias cat=bat
|
||||||
|
|
|
@ -9,7 +9,7 @@ in {
|
||||||
paths <- myNixPath "${configPath}"
|
paths <- myNixPath "${configPath}"
|
||||||
args <- getArgs
|
args <- getArgs
|
||||||
setEnv "WITH_SECRETS" "false"
|
setEnv "WITH_SECRETS" "false"
|
||||||
nix_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args) &!> StdOut |> nom
|
nom_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args)
|
||||||
setEnv "WITH_SECRETS" "true"
|
setEnv "WITH_SECRETS" "true"
|
||||||
nixos_rebuild (paths ++ ["switch"] ++ fmap toString args) &!> StdOut |> nom
|
nixos_rebuild (paths ++ ["switch"] ++ fmap toString args) &!> StdOut |> nom
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -93,10 +93,10 @@
|
||||||
"homepage": null,
|
"homepage": null,
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e9f8cddbcd2167cf8eecb7ee6637d1e078018b4f",
|
"rev": "a2b0ea6865b2346ceb015259c76e111dcca039c5",
|
||||||
"sha256": "0cmgzih3qgh9zkwzqznbljhglr767b41psjjhyk4a8nva4sc59sq",
|
"sha256": "12dgwajv3w94p13scj68c24v01p055k9hcpcsn7w9i8fys72s99d",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/e9f8cddbcd2167cf8eecb7ee6637d1e078018b4f.tar.gz",
|
"url": "https://github.com/NixOS/nixpkgs/archive/a2b0ea6865b2346ceb015259c76e111dcca039c5.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"obelisk": {
|
"obelisk": {
|
||||||
|
|
Loading…
Reference in a new issue