Commit Graph

595 Commits

Author SHA1 Message Date
baf87004c1 Updating nix-straight.el
Resolves: #16
2020-06-22 20:58:04 +02:00
b64e8281b6 updating dependencies 2020-06-22 15:45:19 +02:00
4f34bddc8d Merge branch 'issue/14' 2020-06-22 11:25:14 +02:00
638118e72d override emacsWithPackages instead of wrapping it
This way all conditional outputs e.g. the MacOS App will be present in
the final derivation.

See: https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/emacs/wrapper.nix#L162

Resolves: #14
2020-06-22 11:24:59 +02:00
f01b817c73 Merge branch 'develop' 2020-06-22 11:24:51 +02:00
2ab836b8f4 extracting overrides to its own file
This is the most volatile part of the code base, default.nix should be
fairly stable by now.
2020-06-10 01:26:08 +02:00
67523efcde updating dependencies 2020-06-10 01:18:01 +02:00
9337a8741e Merge branch 'develop' (early part) 2020-06-10 01:17:48 +02:00
4095b104d7 magit: generate version information during build 2020-06-10 01:13:55 +02:00
1c1e3ce4c0 Make it compatible with ocaml module
Fixes: #12
2020-06-02 21:43:03 +02:00
0254193a28 updating dependencies 2020-05-28 22:54:18 +02:00
9df96bd3c5 Updating doom-emacs and compatibility shim 2020-05-28 22:54:18 +02:00
36d80faf06 Merge remote-tracking branch 'origin/develop' 2020-05-28 22:54:08 +02:00
5b4adb7f1f updating dependencies 2020-05-13 21:54:28 +02:00
f07b981b8c Merge branch 'develop' 2020-05-13 21:53:36 +02:00
52431f2155 updating dependencies 2020-05-03 11:24:26 +02:00
b59993bb9d Merge branch 'develop' 2020-05-03 11:23:48 +02:00
fb62b61c27 updating dependencies 2020-05-01 20:48:56 +02:00
0b918c3709 Merge branch 'develop' 2020-05-01 20:46:39 +02:00
1df60486b0 updating dependencies 2020-04-27 01:38:34 +02:00
a0ba041e26 Merge remote-tracking branch 'origin/develop' 2020-04-27 01:08:55 +02:00
c7217357bb updating niv version 2020-04-25 19:32:21 +02:00
64df68fa30 updating dependencies 2020-04-25 19:32:21 +02:00
0a1121331a Merge remote-tracking branch 'origin/develop' 2020-04-25 19:32:12 +02:00
5b619d80fd updating dependencies 2020-04-18 10:09:56 +02:00
384565e461 Merge branch 'develop' 2020-04-18 10:03:47 +02:00
79e293bb94 updating dependencies 2020-04-13 10:45:36 +02:00
9132038a72 updating dependencies 2020-04-06 22:11:53 +02:00
303b511350 Merge pull request #10 from kylesferrazza/fix-racket
fix racket
2020-04-04 17:50:14 +02:00
60f0e9bd16 add ob-racket to sources 2020-04-03 01:38:38 -04:00
46c09a0e23 Merge branch 'develop' (early part) into HEAD 2020-03-24 17:14:41 +01:00
b5d3de560d updating dependencies 2020-03-24 17:09:43 +01:00
a18c36a724 Merge pull request #7 from TheSirC/patch-1
Use recursive flag on `cp` for private directory
2020-03-23 13:53:48 +01:00
28f1da710e Use recursive flag on cp for private directory
If the private directory has multiple folders in it, building the derivation will omit them.
2020-03-22 23:06:24 +01:00
9b13cde0ec Merge branch 'develop' (early part) 2020-03-16 19:16:02 +01:00
4502c27759 Fix git command shim
References: https://github.com/vlaci/nix-doom-emacs/issues/5
2020-03-16 19:15:32 +01:00
7add1505c0 Ensure that doom's customizations to straight.el take effect
`nix-straight.el` used to require `straight.el` on its own before `doom`
itself was loaded. This had an unfortunate side-effect that
`straight-fix-org` was set to nil after it has been loaded so
`org-version` and `org-git-version` functions were already overloaded.
This was no problem for `org-mode` itself as it has its own overload of
the above mentioned functions, but other libraries such as `elfeed` may
also use these which causes problems.

`nix-straight.el` is updated to a version where it does not preload
`straight` and an advice is provided to `doom` so it loads our version
of `straight` when it supposed to.

References: https://github.com/vlaci/nix-doom-emacs/issues/5
2020-03-16 19:15:20 +01:00
845e0847d1 Merge remote-tracking branch 'origin/develop' 2020-03-14 23:21:38 +01:00
697b4c878c updating dependencies 2020-03-08 11:00:54 +01:00
000e26593b Merge remote-tracking branch 'origin/develop' 2020-03-08 11:00:41 +01:00
83f23c2e07 updating dependencies 2020-03-01 08:20:00 +01:00
9518d6ab02 updating dependencies 2020-02-29 16:14:01 +01:00
2143f7f7bb Fix package overriding 2020-02-29 16:13:55 +01:00
7b23e480fe Merge remote-tracking branch 'origin/develop' 2020-02-29 12:56:15 +01:00
48689e30bd Fix doom-etc-dir to contain a trailing slash
as it is needed in order to properly concatenate path parts with this folder
2020-02-25 23:40:11 +01:00
2224e8f2dc updating dependencies 2020-02-25 21:54:20 +01:00
0d69edfadd niv: nixpkgs source is not needed 2020-02-25 21:54:01 +01:00
111c97bdc1 Merge remote-tracking branch 'origin/develop' 2020-02-25 21:53:45 +01:00
f91aebe940 updating dependencies 2020-02-22 10:25:49 +01:00
7f1a9cfa94 Merge commit '8bf10a4' 2020-02-22 10:25:30 +01:00