Update kassandra
This commit is contained in:
parent
9c5664170e
commit
72c866ceff
|
@ -58,7 +58,7 @@ let
|
||||||
let
|
let
|
||||||
all = extra ++ on-my-machines ++ [
|
all = extra ++ on-my-machines ++ [
|
||||||
(import ./roles/firefox.nix "http://localhost:8842")
|
(import ./roles/firefox.nix "http://localhost:8842")
|
||||||
(makeAutostart "kassandra2")
|
(makeAutostart "kassandra")
|
||||||
(makeAutostart "unlock-ssh")
|
(makeAutostart "unlock-ssh")
|
||||||
./roles/beets.nix
|
./roles/beets.nix
|
||||||
./roles/daily-driver-programs.nix
|
./roles/daily-driver-programs.nix
|
||||||
|
|
|
@ -18,14 +18,5 @@ let
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
home.packages = map superSimpleDesktopItem [ "kassandra2" "gw2" "chat" ]
|
home.packages = map superSimpleDesktopItem [ "kassandra" ] ++ map terminalDesktopItem [ "unlock-ssh" ];
|
||||||
++ map terminalDesktopItem [
|
|
||||||
"maintenance"
|
|
||||||
"ncmpcpp"
|
|
||||||
"kassandra"
|
|
||||||
"hotkeys"
|
|
||||||
"vim"
|
|
||||||
"select-mode"
|
|
||||||
"unlock-ssh"
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@ in
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
Orga = [
|
Orga = [
|
||||||
{ Kassandra = fork "kassandra2"; }
|
{ Kassandra = fork "kassandra"; }
|
||||||
{ Kalendar = "ikhal"; }
|
{ Kalendar = "ikhal"; }
|
||||||
{ Habitica = fork "firefox https://habitica.com"; }
|
{ Habitica = fork "firefox https://habitica.com"; }
|
||||||
{ Tasks = "tasksh"; }
|
{ Tasks = "tasksh"; }
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
let
|
let
|
||||||
dhallFiles = pkgs.runCommand "kassandra-config-src" { } ''
|
dhallFiles = pkgs.runCommand "kassandra-config-src" { } ''
|
||||||
mkdir $out
|
mkdir $out
|
||||||
${pkgs.kassandra2}/bin/kassandra2 print-types > $out/types.dhall
|
${pkgs.kassandra}/bin/kassandra print-types > $out/types.dhall
|
||||||
ln -s ${./kassandra}/{config,backend}.dhall $out
|
ln -s ${./kassandra}/{config,backend}.dhall $out
|
||||||
ln -s ${pkgs.privateFile "kassandra-uiConfig.dhall"} $out/uiConfig.dhall
|
ln -s ${pkgs.privateFile "kassandra-uiConfig.dhall"} $out/uiConfig.dhall
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -42,13 +42,6 @@
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"kassandra": {
|
"kassandra": {
|
||||||
"branch": "main",
|
|
||||||
"ref": "main",
|
|
||||||
"repo": "git@hera.m-0.eu:kassandra",
|
|
||||||
"rev": "62231410301e4735c28c0dcde877fe288430e7cd",
|
|
||||||
"type": "git"
|
|
||||||
},
|
|
||||||
"kassandra2": {
|
|
||||||
"branch": "master",
|
"branch": "master",
|
||||||
"ref": "master",
|
"ref": "master",
|
||||||
"repo": "git@hera.m-0.eu:kassandra2",
|
"repo": "git@hera.m-0.eu:kassandra2",
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
final: prev:
|
final: prev:
|
||||||
let
|
let
|
||||||
haskellPackages = prev.haskellPackages.extend (self: super: {
|
haskellPackages = prev.haskellPackages.extend (self: super: {
|
||||||
kassandra = self.callCabal2nix "kassandra" (prev.sources.kassandra2 + "/kassandra") { };
|
kassandra = self.callCabal2nix "kassandra" (prev.sources.kassandra + "/kassandra") { };
|
||||||
standalone = self.callCabal2nix "standalone" (prev.sources.kassandra2 + "/standalone") { };
|
standalone = self.callCabal2nix "standalone" (prev.sources.kassandra + "/standalone") { };
|
||||||
taskwarrior = self.callHackageDirect { pkg = "taskwarrior"; ver = "0.3.1.0"; sha256 = "sha256-XUoa+xWUHfr080za07/4Xxcic6jgfljrTIXbLaXzoqQ="; } { };
|
taskwarrior = self.callHackageDirect { pkg = "taskwarrior"; ver = "0.3.1.0"; sha256 = "sha256-XUoa+xWUHfr080za07/4Xxcic6jgfljrTIXbLaXzoqQ="; } { };
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
|
|
Loading…
Reference in a new issue