From 2f0b24b3a96ae5dd92ffba64afd00f1594d4c403 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 18 Jul 2023 02:38:00 +0200
Subject: [PATCH] flake: Use nixos-23.05 for erpnext input
The override did not work and the resulting python penv was
broken (e.g. missing the bench, erpnext, frappe packages).
---
flake.lock | 28 +++++++---------------------
flake.nix | 10 ++++------
overlays/overrides.nix | 9 ---------
3 files changed, 11 insertions(+), 36 deletions(-)
diff --git a/flake.lock b/flake.lock
index 039239e2..e9771ef1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -160,15 +160,17 @@
"agenix"
],
"devshell": "devshell_2",
- "nixpkgs": "nixpkgs",
+ "nixpkgs": [
+ "nixos"
+ ],
"systems": "systems"
},
"locked": {
- "lastModified": 1689638083,
- "narHash": "sha256-ZOrCGKlC8QM1AYSU15QnUAfNuDbmCDYpE1u8pxsLDoo=",
+ "lastModified": 1689640230,
+ "narHash": "sha256-jJLw5Ppk05SxkHy+/aVRsD1gyShNaRbXIoms+yG2e5g=",
"ref": "main",
- "rev": "9c8a36de8b9c1a379528ed35365f69fdca14677c",
- "revCount": 31,
+ "rev": "5519e0d6fecc3ea76d51b45d5ca6cb28324fc31c",
+ "revCount": 32,
"type": "git",
"url": "https://git.pub.solar/axeman/erpnext-nix"
},
@@ -332,22 +334,6 @@
"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": {
"locked": {
"lastModified": 1672791794,
diff --git a/flake.nix b/flake.nix
index 3b6ea490..5bc1a8fa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -40,6 +40,7 @@
nvfetcher.inputs.flake-compat.follows = "flake-compat";
erpnext.url = "git+https://git.pub.solar/axeman/erpnext-nix?ref=main";
+ erpnext.inputs.nixpkgs.follows = "nixos";
erpnext.inputs.agenix.follows = "agenix";
};
@@ -77,12 +78,7 @@
})
];
};
- latest = {
- overlays = [
- erpnext.overlays.default
- erpnext.overlays.pythonOverlay
- ];
- };
+ latest = {};
};
lib = import ./lib {lib = digga.lib // nixos.lib;};
@@ -95,6 +91,8 @@
});
})
agenix.overlays.default
+ erpnext.overlays.default
+ erpnext.overlays.pythonOverlay
nvfetcher.overlays.default
(import ./pkgs)
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index 04c53003..37a8e0e8 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -4,9 +4,6 @@ channels: final: prev: {
inherit
(channels.latest)
nixd
- erpnext-app
- frappe-app
- frappe-erpnext-assets
;
haskellPackages =
@@ -24,10 +21,4 @@ channels: final: prev: {
});
vimPlugins = prev.vimPlugins // {inherit (channels.latest.vimPlugins) nvim-lspconfig;};
-
- python3 = prev.python3.override {
- packageOverrides = pyfinal: pyprev: {
- inherit (channels.latest.python3.pkgs) bench erpnext frappe;
- };
- };
}