Created non-working derivation for Stata.
Created derivation for kakmerge and installed it.
This commit is contained in:
parent
464e53fe61
commit
d0db3fd883
|
|
@ -47,6 +47,7 @@ in {
|
||||||
archivo = callPackage ../../pkgs/archivo/archivo.nix { };
|
archivo = callPackage ../../pkgs/archivo/archivo.nix { };
|
||||||
highway-gothic = callPackage ../../pkgs/highway-gothic/highway-gothic.nix { };
|
highway-gothic = callPackage ../../pkgs/highway-gothic/highway-gothic.nix { };
|
||||||
olympus = callPackage ../../pkgs/olympus/olympus.nix { };
|
olympus = callPackage ../../pkgs/olympus/olympus.nix { };
|
||||||
|
kakmerge = callPackage ../../pkgs/kakmerge/kakmerge.nix { };
|
||||||
in [ gcc tree-sitter ] ++ # Basic dev tools
|
in [ gcc tree-sitter ] ++ # Basic dev tools
|
||||||
[ marksman nil ] ++ # Language servers except those installed through package sections
|
[ marksman nil ] ++ # Language servers except those installed through package sections
|
||||||
[ texliveFull texlab ] ++ # LaTeX
|
[ texliveFull texlab ] ++ # LaTeX
|
||||||
|
|
@ -120,7 +121,7 @@ in {
|
||||||
] ++ # Fonts
|
] ++ # Fonts
|
||||||
# [ papirus-icon-theme ] ++ # Icons
|
# [ papirus-icon-theme ] ++ # Icons
|
||||||
# [ vanilla-dmz ] ++ # Cursor
|
# [ vanilla-dmz ] ++ # Cursor
|
||||||
[ ] ++ # Temp
|
[ kakmerge ] ++ # Temp
|
||||||
[ ];
|
[ ];
|
||||||
|
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
|
|
|
||||||
17
pkgs/kakmerge/kakmerge.nix
Normal file
17
pkgs/kakmerge/kakmerge.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
{ pkgs }:
|
||||||
|
with pkgs;
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "kakmerge";
|
||||||
|
version = "860b686";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "lenormf";
|
||||||
|
repo = "kakmerge";
|
||||||
|
rev = version;
|
||||||
|
hash = "sha256-DkZaa9qQhxfjuIJYY0MDWhfh8NAsoy7P7f04FK3FGWM=";
|
||||||
|
};
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
install -Dm755 kakmerge $out/bin/kakmerge
|
||||||
|
'';
|
||||||
|
}
|
||||||
17
pkgs/stata/stata.nix
Normal file
17
pkgs/stata/stata.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
{ pkgs }:
|
||||||
|
with pkgs;
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "stata-${version}";
|
||||||
|
version = "18";
|
||||||
|
src = requireFile {
|
||||||
|
name = "StataNow18Linux64.tar.gz";
|
||||||
|
url = "";
|
||||||
|
sha256 = "cfc1b872ecf345b2d0b3223ea8529b945b49cf1c0a1be8bd972f1d84fed37511";
|
||||||
|
};
|
||||||
|
installPhase = ''
|
||||||
|
mkdir $out
|
||||||
|
tar -xvf $src -C $out
|
||||||
|
cd $out
|
||||||
|
yes | ./install
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
|
@ -7,6 +7,9 @@
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
core.editor = "kak";
|
core.editor = "kak";
|
||||||
|
merge.tool = "kakmerge";
|
||||||
|
mergetool.kakmerge.trustExitCode = true;
|
||||||
|
mergetool.kakmerge.cmd = "env LOCAL=\"\${LOCAL}\" BASE=\"\${BASE}\" REMOTE=\"\${REMOTE}\" MERGED=\"\${MERGED}\" kakmerge";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue