greg/nixos
1
0
Fork 1
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Attemting to build on Darwin but failing

Browse Source
This commit is contained in:
Greg Hellings
2023-06-19 16:03:16 -05:00
parent ffed0d03c4
commit 3faab8db04
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+6 -6
View File
@@ -113,11 +113,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683813037, "lastModified": 1687204608,
"narHash": "sha256-UMEXfYLVcI4p0JUHQD07UWglqj7XUw6xhdJqqNRu4KY=", "narHash": "sha256-rZ0e0iAIQM7vlsMd2/pcGfymZzNBRawObFgqIpxE94c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d97e8f8861a7ad3cb2f72adf5b2cd14ab302c593", "rev": "f06a43dca05fb7f1aa44742bf861d9c827b45122",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -177,11 +177,11 @@
}, },
"nixunstable": { "nixunstable": {
"locked": { "locked": {
"lastModified": 1683408522, "lastModified": 1686960236,
"narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86",
"type": "github" "type": "github"
}, },
"original": { "original": {
home/vim.nix
+1 -1
View File
@@ -59,7 +59,7 @@ in
#extraConfig = builtins.readFile ./vimrc; #extraConfig = builtins.readFile ./vimrc;
extraLuaConfig = builtins.readFile ./init.lua; extraLuaConfig = builtins.readFile ./init.lua;
coc = { coc = {
enable = false; enable = true;
}; };
}; };
} }
overlays/default.nix
+5 -5
View File
@@ -55,6 +55,8 @@ in rec {
pythonPackagesExtensions = (prev.pythonPackagesExtensions or []) ++ [ pythonPackagesExtensions = (prev.pythonPackagesExtensions or []) ++ [
(python-final: python-prev: { (python-final: python-prev: {
django-rapyd-modernauth = python-final.callPackage ./django-rapyd-modernauth.nix {}; django-rapyd-modernauth = python-final.callPackage ./django-rapyd-modernauth.nix {};
xonsh-apipenv = cp ./xonsh-apipenv.nix {};
xonsh-direnv = cp ./xonsh-direnv.nix {};
}) })
]; ];
@@ -78,8 +80,6 @@ in rec {
inherit molecule; inherit molecule;
}; };
pyyaml-include = cp ./pyyaml-include.nix {}; pyyaml-include = cp ./pyyaml-include.nix {};
xonsh-apipenv = cp ./xonsh-apipenv.nix {};
xonsh-direnv = cp ./xonsh-direnv.nix {};
}; };
#fcitx-engines = if ! prev.stdenv.isDarwin then prev.fcitx5 else prev.fcitx-engines; #fcitx-engines = if ! prev.stdenv.isDarwin then prev.fcitx5 else prev.fcitx-engines;
@@ -95,9 +95,9 @@ in rec {
xonsh = prev.xonsh.overridePythonAttrs (old: rec{ xonsh = prev.xonsh.overridePythonAttrs (old: rec{
python3 = final.gregpy; python3 = final.gregpy;
propagatedBuildInputs = old.propagatedBuildInputs ++ [ propagatedBuildInputs = with final.gregpy.pkgs; old.propagatedBuildInputs ++ [
my-py-addons.xonsh-apipenv xonsh-apipenv
my-py-addons.xonsh-direnv xonsh-direnv
]; ];
}); });