38e2631a98
nix-doc hacks: remove
...
Not required anymore :3
2024-11-18 13:05:43 -08:00
2bbdcd73b9
overlay: fix bug where prev should have been final
...
(cherry picked from commit 81d9ff97c9
)
2024-10-19 10:54:02 -07:00
31f4f25f6a
Merge pull request #37 into main
...
Closes #37
(cherry picked from commit ca0cc16273
)
2024-10-18 18:55:39 -07:00
30e488a7d5
overlay: clean up 2.18 stuff
...
Since Nix 2.24 is now the default in nixpkgs, we should remove the stuff
that assumes it's 2.18. Nothing breaks with this change, unless someone
is specifically depending on nixVersions.nix_2_18 being Lix.
(cherry-picked from commit b0e6f35950
)
2024-10-18 18:55:39 -07:00
1c291723b9
fix: use the official-release bit from the Lix sources to skip versionSuffix
...
I wrote that json file intending to use it for this and then forgot. lol
oops.
2024-08-12 18:01:18 -07:00
e350380d72
flake: delete officialRelease
...
officialRelease no longer needs to be in here because
lix-project/lix#406 was fixed, so we can
delete it.
2024-07-31 21:03:44 -07:00
550352df73
Revert "add pegtl to overlay for 2.91-dev"
...
This is no longer required since nixpkgs now has a pegtl of the exact
version seen here on both 24.05 and unstable.
Fixes : #33
This reverts commit f6e6871f38
.
2024-07-30 15:18:44 -07:00
8d462dfd9d
overlay: don't default lix to coming from nixpkgs if no arguments given
...
Although it is cute to not require args to be given, I can see that
implicitly using a lix from nixpkgs could confuse people. It is more
clear to require it to be explicitly set to null.
2024-07-30 15:13:25 -07:00
de3c854615
Warn on mismatched Lix module version
...
Especially with nixpkgs being an extremely uncontrolled variable, we
cannot guarantee that the module is always the right version. This will
cause support burden, so let's automatically diagnose it.
2024-07-30 15:13:24 -07:00
03d62d5a74
overlay: correct n-e-j version
2024-07-30 15:12:30 -07:00
05c6934e6b
Allow use of lix from nixpkgs
...
Change behaviour of module. Allow not specifying LixSrc
and provide fallback to nixpkgs.pkgs.lix
2024-07-30 15:12:30 -07:00
587812bdb5
Delete prefetch-npm-deps hack since we dropped 23.11
...
The fix upstream is in 24.05 at release, so no need for the hack
anymore.
ddb94deafa
2024-06-27 13:33:12 -07:00
f6e6871f38
add pegtl to overlay for 2.91-dev
2024-06-25 22:00:47 +02:00
376ecb8038
restore back to dev state
2024-06-18 23:31:00 -07:00
b64814c8c1
Make a working 2.90.0-rc1 overlay
2024-06-18 23:29:08 -07:00
4e25f1ab68
Fix including the overlay twice exploding nixos-option by making it idempotent
2024-06-05 21:15:44 -07:00
12b457c433
Show revision of n-e-j better
2024-05-27 13:03:12 -06:00
53d713eb48
feat: add devenv to override list
...
Devenv overrides the Nix source with its own version of Nix 2.21, which
conflicts with the changes made to the package, especially the build
system.
2024-05-16 18:47:30 +00:00
36dbb9dbfb
Fix build-release-notes being required
...
This allows using versions of Lix earlier from before
8822fd7dd5254e781660704858f2eca386bdf5a2 again.
2024-05-16 12:43:22 +00:00
0c38126b49
Don't pass in 'false' as the value of build-release-notes (a drv)
...
7cfaf057e35b7bb329ffff344e30fdfc850566c3 in lix-project changed the
default there to always build the release notes anyway, so this
caused failures to build, as false is not a derivation.
2024-05-16 11:28:12 +10:00
7e8a5498db
Fix prefetch-npm-deps override when functionArgs is not supported
2024-05-15 19:35:30 +00:00
c8ab1e79ba
Merge pull request 'cherrypick: "boehmgc: disable tests on aarch64-linux"' ( #21 ) from ckiee/nixos-module:cherry-boehm-check into main
...
Reviewed-on: #21
2024-05-09 18:11:51 +00:00
5ef5fe6a67
feat: add reported broken packages
2024-05-08 07:58:24 -07:00
e09758962c
refactor: move simple overrides to a function
2024-05-08 07:50:20 -07:00
9837ede4bd
cherrypick: "boehmgc: disable tests on aarch64-linux"
...
Is a big rebuild for upstream but here it's okay.
2024-05-06 04:28:24 +03:00
491e0f076f
Delete npins
...
This fixes a bug where nixos-rebuild as root cannot build a nixos
configuration since it cannot fetch the sources of our fork of
nix-eval-jobs for lack of ssh key. It doesn't hit cache *in the store*
for lack of `narHash` being specified, which cannot be specified with
npins since npins doesn't output SRI hashes for git inputs.
Altogether a very silly situation. Clearly we just need another pinning
tool.
2024-05-04 17:03:57 -07:00
2148106d19
Conditionally drop boehm-gc patch, now included in nixpkgs
...
Not actually included yet
2024-05-04 10:33:25 +03:00
1d636fd90a
Fix NixOS system building and add a flake check that it works
...
Problem caused by: https://gerrit.lix.systems/c/lix/+/993
But this is actually nixpkgs doing extremely silly feature detection of
Nix based on version which it should /absolutely not be doing/.
2024-05-03 17:13:57 -07:00
04186bcae3
Fix eval on nixos-unstable following prefetch-npm-deps dep fix
...
See: https://github.com/NixOS/nixpkgs/pull/304913
We want to support older nixpkgs too, so we feature detect if we need to
apply this change.
Closes: #18
2024-04-22 14:59:54 -07:00
8c2d5ca8bc
callPackage Lix instead of overriding Nixpkgs' Nix
2024-04-18 14:56:07 -06:00
d66013efdf
nix-eval-jobs: use lix
2024-04-15 20:06:52 -07:00
3e61e2aa24
Rename nix-doc to lix-doc here too
...
Fixes build
2024-04-08 11:15:34 +03:00
9b208d0d27
overlay: fix builds of Lix after c21d11ac0
...
lix-project/lix/c21d11ac094d4f39215dba6763fcabc62341def4 added a direct
build dependency on Python.
2024-04-05 22:20:24 -06:00
d1d43e601c
overlay: support nix-doc integration into Lix
2024-04-03 15:55:27 -06:00
cccea113fe
probably fix cross compilation
2024-04-02 00:41:06 -07:00
ddb978dcc9
fix: pin nurl to upstream nix
...
nix-init depends on nurl, so they need to use the same nix for nix-init
to not be rebuilt.
2024-03-29 02:27:19 +01:00
49144e91d1
fix: add cmake and toml11 to inputs
...
toml11 is needed anyway, cmake is only needed for meson. meson isn't
needed right now but let's not have this cause problems *again* soon
2024-03-28 18:32:00 +01:00
43eeb747b1
fix: pin nix-init to upstream nix
2024-03-27 05:54:26 +01:00
9b5adef52d
put prerelease info in the version
2024-03-18 14:26:45 -07:00
cf5507a03d
fix: make the boehm patch content addressed to avoid rebuilds
2024-03-18 13:16:48 -07:00
91055a3a46
nix-doc: disable plugin since it is broken by Lix API changes
...
We don't intend to fix the API changes in nix-doc, because we should be
able to kill nix-doc in like a week?
2024-03-16 16:30:31 -07:00
a50986cfc7
fix: pin nixos-option
to upstream
...
Signed-off-by: Raito Bezarius <raito@lix.systems>
2024-03-09 02:27:21 +01:00
3fe47ad3f3
fake version
2024-03-08 00:10:56 -08:00
bfceafae96
fix git-requiring tests
2024-03-08 00:05:25 -08:00
9db8932797
fix version
2024-03-07 23:49:29 -08:00
19fcea3c01
dont build electron please
2024-03-07 12:11:49 -08:00
95c13a16e0
version suffix
2024-03-07 11:49:12 -08:00
be0e76426b
fix nix-doc
2024-03-07 11:45:59 -08:00
d56179fb03
update nix stable
2024-03-07 11:38:40 -08:00
e8bbab27ee
nixos module to catfood it
2024-03-07 11:27:15 -08:00