pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

Merge pull request 'flake: Use nixos-23.05 for erpnext input' (#243) from momo/erpnext-nixpkgs-23.05 into momo/main
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source 
Reviewed-on: #243
This commit is contained in:
teutat3s 2023-07-18 02:47:46 +02:00
parent 874c687fe2 2f0b24b3a9
commit 04a21183bc
Signed by: pub.solar gitea
GPG key ID: F0332B04B7054873
3 changed files with 11 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
flake.lock
View file

@ -160,15 +160,17 @@
"agenix" "agenix"
], ],
"devshell": "devshell_2", "devshell": "devshell_2",
"nixpkgs": "nixpkgs", "nixpkgs": [
"nixos"
],
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1689638083, "lastModified": 1689640230,
"narHash": "sha256-ZOrCGKlC8QM1AYSU15QnUAfNuDbmCDYpE1u8pxsLDoo=", "narHash": "sha256-jJLw5Ppk05SxkHy+/aVRsD1gyShNaRbXIoms+yG2e5g=",
"ref": "main", "ref": "main",
"rev": "9c8a36de8b9c1a379528ed35365f69fdca14677c", "rev": "5519e0d6fecc3ea76d51b45d5ca6cb28324fc31c",
"revCount": 31, "revCount": 32,
"type": "git", "type": "git",
"url": "https://git.pub.solar/axeman/erpnext-nix" "url": "https://git.pub.solar/axeman/erpnext-nix"
}, },
@ -332,22 +334,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs": {
"locked": {
"lastModified": 1689534811,
"narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1672791794, "lastModified": 1672791794,

10
flake.nix
View file

@ -40,6 +40,7 @@
nvfetcher.inputs.flake-compat.follows = "flake-compat"; nvfetcher.inputs.flake-compat.follows = "flake-compat";
erpnext.url = "git+https://git.pub.solar/axeman/erpnext-nix?ref=main"; erpnext.url = "git+https://git.pub.solar/axeman/erpnext-nix?ref=main";
erpnext.inputs.nixpkgs.follows = "nixos";
erpnext.inputs.agenix.follows = "agenix"; erpnext.inputs.agenix.follows = "agenix";
}; };
@ -77,12 +78,7 @@
}) })
]; ];
}; };
latest = { latest = {};
overlays = [
erpnext.overlays.default
erpnext.overlays.pythonOverlay
];
};
}; };
lib = import ./lib {lib = digga.lib // nixos.lib;}; lib = import ./lib {lib = digga.lib // nixos.lib;};
@ -95,6 +91,8 @@
}); });
}) })
agenix.overlays.default agenix.overlays.default
erpnext.overlays.default
erpnext.overlays.pythonOverlay
nvfetcher.overlays.default nvfetcher.overlays.default
(import ./pkgs) (import ./pkgs)

9
overlays/overrides.nix
View file

@ -4,9 +4,6 @@ channels: final: prev: {
inherit inherit
(channels.latest) (channels.latest)
nixd nixd
erpnext-app
frappe-app
frappe-erpnext-assets
; ;
haskellPackages = haskellPackages =
@ -24,10 +21,4 @@ channels: final: prev: {
}); });
vimPlugins = prev.vimPlugins // {inherit (channels.latest.vimPlugins) nvim-lspconfig;}; vimPlugins = prev.vimPlugins // {inherit (channels.latest.vimPlugins) nvim-lspconfig;};
python3 = prev.python3.override {
packageOverrides = pyfinal: pyprev: {
inherit (channels.latest.python3.pkgs) bench erpnext frappe;
};
};
} }