Fix apollo build
This commit is contained in:
parent
d51cd77253
commit
bd3186e144
|
@ -17,7 +17,7 @@ in {
|
||||||
nom_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args)
|
nom_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args)
|
||||||
setEnv "WITH_SECRETS" "true"
|
setEnv "WITH_SECRETS" "true"
|
||||||
oldSystem <- readlink "-f" "/run/current-system" |> captureTrim
|
oldSystem <- readlink "-f" "/run/current-system" |> captureTrim
|
||||||
nixos_rebuild (paths ++ ["switch"] ++ fmap toString args) &!> StdOut |> nom
|
nixos_rebuild (paths ++ ["switch", "--no-flake"] ++ fmap toString args) &!> StdOut |> nom
|
||||||
newSystem <- readlink "-f" "/run/current-system" |> captureTrim
|
newSystem <- readlink "-f" "/run/current-system" |> captureTrim
|
||||||
nvd "diff" oldSystem newSystem
|
nvd "diff" oldSystem newSystem
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -82,5 +82,5 @@
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/6c8644fc37b6e141cbfa6c7dc8d98846c4ff0c2e.tar.gz",
|
"url": "https://github.com/NixOS/nixpkgs/archive/6c8644fc37b6e141cbfa6c7dc8d98846c4ff0c2e.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
final: prev: let
|
final: prev: let
|
||||||
haskellPackages = prev.haskellPackages.extend (self: super: {
|
haskellPackages = prev.haskellPackages.extend (self: super: {
|
||||||
kassandra = self.callCabal2nix "kassandra" ../apps/kassandra/kassandra {};
|
kassandra = self.callCabal2nix "kassandra" ../../apps/kassandra/kassandra {};
|
||||||
standalone = self.callCabal2nix "standalone" ../apps/kassandra/standalone {};
|
standalone = self.callCabal2nix "standalone" ../../apps/kassandra/standalone {};
|
||||||
});
|
});
|
||||||
in {
|
in {
|
||||||
kassandra = haskellPackages.standalone;
|
kassandra = haskellPackages.standalone;
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
final: prev: {
|
final: prev: {
|
||||||
logfeed = prev.haskellPackages.callCabal2nix "logfeed" ../apps/logfeed {};
|
logfeed = prev.haskellPackages.callCabal2nix "logfeed" ../../apps/logfeed {};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
_: prev: {
|
_: prev: {
|
||||||
wizards-dialog = prev.haskellPackages.callCabal2nix "wizards-dialog" ../apps/wizard-dialog {};
|
wizards-dialog = prev.haskellPackages.callCabal2nix "wizards-dialog" ../../apps/wizards-dialog {};
|
||||||
}
|
}
|
Loading…
Reference in a new issue