Update to ghc 8.10.2
This commit is contained in:
parent
1479f3d836
commit
e0e1bdb596
|
@ -20,7 +20,7 @@
|
||||||
"kassandra2": {
|
"kassandra2": {
|
||||||
"ref": "master",
|
"ref": "master",
|
||||||
"repo": "git@hera.m-0.eu:kassandra2",
|
"repo": "git@hera.m-0.eu:kassandra2",
|
||||||
"rev": "2590f2dfa35b6a5a22993c5a79c50a8596febf5d",
|
"rev": "43a24502c71ed78e9fc668f22ffd9a45718d34df",
|
||||||
"type": "git"
|
"type": "git"
|
||||||
},
|
},
|
||||||
"nix-output-monitor": {
|
"nix-output-monitor": {
|
||||||
|
@ -44,7 +44,7 @@
|
||||||
"nixos-mailserver": {
|
"nixos-mailserver": {
|
||||||
"ref": "master",
|
"ref": "master",
|
||||||
"repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver",
|
"repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver",
|
||||||
"rev": "7d2020cb362aa4c16fad9d1151820a21a26bd5fe",
|
"rev": "ee1ad50830b479ed8fb46c4c51d3bcdbc2184b8b",
|
||||||
"type": "git"
|
"type": "git"
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
|
@ -65,10 +65,10 @@
|
||||||
"homepage": null,
|
"homepage": null,
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "02f13a4245a391514a9278ed210b8831b07af4c3",
|
"rev": "4f2880ba128a8f254bea5459d3326edea4d3933d",
|
||||||
"sha256": "02yfllf0mwyqcsfzk2hvfgcl8x891afwfp3wzg0c9mzsxzkbbp8m",
|
"sha256": "1dsi1x2z5dqw66jr8b1ydgq1bxg2fybgic3aq6kvjy6qvra2iyrx",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/02f13a4245a391514a9278ed210b8831b07af4c3.tar.gz",
|
"url": "https://github.com/NixOS/nixpkgs/archive/4f2880ba128a8f254bea5459d3326edea4d3933d.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": {
|
||||||
|
|
|
@ -4,10 +4,6 @@ let
|
||||||
master = import super.sources.nixpkgs-master { };
|
master = import super.sources.nixpkgs-master { };
|
||||||
inherit (master.haskell.lib) overrideCabal unmarkBroken;
|
inherit (master.haskell.lib) overrideCabal unmarkBroken;
|
||||||
myOverrides = self: super: {
|
myOverrides = self: super: {
|
||||||
optics = super.optics_0_3;
|
|
||||||
optics-th = super.optics-th_0_3_0_2;
|
|
||||||
optics-core = super.optics-core_0_3_0_1;
|
|
||||||
optics-extra = super.optics-extra_0_3;
|
|
||||||
};
|
};
|
||||||
makeHaskellScriptPackages = p: {
|
makeHaskellScriptPackages = p: {
|
||||||
inherit (p)
|
inherit (p)
|
||||||
|
|
|
@ -33,7 +33,7 @@ self: super: {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
desktop-pkgs = {
|
desktop-pkgs = {
|
||||||
inherit (self) lm_sensors xwayland xdg_utils libnotify kassandra kassandra2 shotcut;
|
inherit (self) lm_sensors xwayland xdg_utils libnotify kassandra shotcut; # kassandra2
|
||||||
inherit (self.gnomeExtensions) appindicator system-monitor;
|
inherit (self.gnomeExtensions) appindicator system-monitor;
|
||||||
inherit (self.gnome3)
|
inherit (self.gnome3)
|
||||||
dconf dconf-editor gnome-tweaks gnome-shell-extensions adwaita-icon-theme
|
dconf dconf-editor gnome-tweaks gnome-shell-extensions adwaita-icon-theme
|
||||||
|
|
|
@ -13,7 +13,7 @@ let
|
||||||
logFile <- mktemp |> captureTrim
|
logFile <- mktemp |> captureTrim
|
||||||
let command = (${commandline}) &!> StdOut &> Append logFile
|
let command = (${commandline}) &!> StdOut &> Append logFile
|
||||||
failHandler = do
|
failHandler = do
|
||||||
say [i|### Build failure for ${name} config for #{hostname} ###|]
|
say [i|--- Build failure for ${name} config for #{hostname} ---|]
|
||||||
cat logFile
|
cat logFile
|
||||||
say [i|Trying to build ${name} config for #{hostname}. Logging to #{logFile}.|]
|
say [i|Trying to build ${name} config for #{hostname}. Logging to #{logFile}.|]
|
||||||
onException command failHandler
|
onException command failHandler
|
||||||
|
|
Loading…
Reference in a new issue