maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Fix apollo build

Browse source
This commit is contained in:
Malte 2023-01-16 01:57:43 +01:00
parent d51cd77253
commit bd3186e144
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/update-system.nix
View file

@ -17,7 +17,7 @@ in {
nom_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args)
setEnv "WITH_SECRETS" "true"
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
nvd "diff" oldSystem newSystem
'';

2
nix/sources.json
View file

@ -82,5 +82,5 @@
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/6c8644fc37b6e141cbfa6c7dc8d98846c4ff0c2e.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
}
}

4
overlays/kassandra/default.nix
View file

@ -1,7 +1,7 @@
final: prev: let
haskellPackages = prev.haskellPackages.extend (self: super: {
kassandra = self.callCabal2nix "kassandra" ../apps/kassandra/kassandra {};
standalone = self.callCabal2nix "standalone" ../apps/kassandra/standalone {};
kassandra = self.callCabal2nix "kassandra" ../../apps/kassandra/kassandra {};
standalone = self.callCabal2nix "standalone" ../../apps/kassandra/standalone {};
});
in {
kassandra = haskellPackages.standalone;

2
overlays/logfeed/default.nix
View file

@ -1,3 +1,3 @@
final: prev: {
logfeed = prev.haskellPackages.callCabal2nix "logfeed" ../apps/logfeed {};
logfeed = prev.haskellPackages.callCabal2nix "logfeed" ../../apps/logfeed {};
}

2
overlays/haskell-dialog/default.nix → overlays/wizards-dialog/default.nix
View file

@ -1,3 +1,3 @@
_: prev: {
wizards-dialog = prev.haskellPackages.callCabal2nix "wizards-dialog" ../apps/wizard-dialog {};
wizards-dialog = prev.haskellPackages.callCabal2nix "wizards-dialog" ../../apps/wizards-dialog {};
}