Update dependencies

This commit is contained in:
Charlotte Van Petegem 2021-07-26 10:23:28 +02:00
parent 22df63928b
commit 854dfaa19d
No known key found for this signature in database
GPG key ID: 019E764B7184435A
2 changed files with 16 additions and 22 deletions

18
flake.lock generated
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1627100708,
"narHash": "sha256-s/GiZzXildy05Gn21xwaY9nr008v5VMtfvIBtZinYVk=",
"lastModified": 1627215454,
"narHash": "sha256-uAlu5U12E23Cr47YgZHtwdH65+Z/uvli9RMeDbxHHoU=",
"owner": "accentor",
"repo": "flake",
"rev": "c206b8a5c8c41f049cc640cbbd82ff13aca6c2c8",
"rev": "eaaf18db4a7d0732d1bbcbc07ccf2f64e329827e",
"type": "github"
},
"original": {
@ -42,11 +42,11 @@
},
"emacs-overlay": {
"locked": {
"lastModified": 1627205048,
"narHash": "sha256-wlOHxuCHUWgoF4ug9DU0HY6P6+Njtb/ZBsAdE37LRR4=",
"lastModified": 1627263740,
"narHash": "sha256-DqIKo0Sz8uZinhgoe6YS8pmrCpvDvPqa3IPKBnQoA7c=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "f4626ee3cd8fb6081ae30961b86ebac5cc97ed11",
"rev": "a98a260258e34aee6048e9264fdf35dd9b12ce7b",
"type": "github"
},
"original": {
@ -77,11 +77,11 @@
]
},
"locked": {
"lastModified": 1627144340,
"narHash": "sha256-RzJ1fFLQ879J1okpH0WbYFY9qgHcglwVDl2bYqlRvw8=",
"lastModified": 1627267207,
"narHash": "sha256-chP4cF4yV0ZUI9E0zwm5KFmRJJ8sHnGrSaKzRKOMioU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "0423a7b40cd29aec0bb02fa30f61ffe60f5dfc19",
"rev": "addc78bea024c85860d60d9682a1ed2664fdf2f6",
"type": "github"
},
"original": {

View file

@ -15,18 +15,6 @@ in
};
config = lib.mkIf config.chvp.programs.hledger.enable {
nixpkgs.overlays = [
(self: super: {
haskellPackages = super.haskellPackages.override {
overrides = hself: hsuper: rec {
hledger = hsuper.callCabal2nixWithOptions "hledger" hledger-repo "--subpath hledger" { };
hledger-lib = hsuper.callCabal2nixWithOptions "hledger-lib" hledger-repo "--subpath hledger-lib" { };
doctest = hsuper.doctest_0_18_1;
};
};
})
];
chvp.base.emacs.extraConfig = [
''
;; Ledger syntax support
@ -45,7 +33,13 @@ in
];
home-manager.users.charlotte = { ... }: {
home.packages = [ pkgs.hledger ];
home.packages = [ (pkgs.haskell.lib.justStaticExecutables (pkgs.haskellPackages.override {
overrides = hself: hsuper: rec {
hledger = hsuper.callCabal2nixWithOptions "hledger" hledger-repo "--subpath hledger" { };
hledger-lib = hsuper.callCabal2nixWithOptions "hledger-lib" hledger-repo "--subpath hledger-lib" { };
doctest = hsuper.doctest_0_18_1;
};
}).hledger) ];
};
};
}