Commit graph

60 commits

Author SHA1 Message Date
jade 71df0f4a4a update flake.lock 2024-05-04 16:21:24 -07:00
jade 792119f425 Merge pull request 'Drop boehm-gc patch, now included in nixpkgs' (#20) from k900/nixos-module:drop-patch into main
Reviewed-on: lix-project/nixos-module#20
2024-05-04 20:56:27 +00:00
Ilya K 2148106d19 Conditionally drop boehm-gc patch, now included in nixpkgs
Not actually included yet
2024-05-04 10:33:25 +03:00
jade cf119933da nix flake check should work on mac probably 2024-05-03 17:18:19 -07:00
jade 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
jade 7267c72d32 Remove flake-compat, add readme
flake-compat is a kind of unhelpful thing to add here since it makes it
impossible to update lix separately from its module when not using
flakes. We would like non-flakes users to not use the flake by using
module.nix directly.
2024-05-02 20:02:34 -07:00
jade 0428921238 update lix 2024-05-02 00:36:53 -07:00
jade ddefc70e3d update lix 2024-04-22 15:11:54 -07:00
jade 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: lix-project/nixos-module#18
2024-04-22 14:59:54 -07:00
Qyriad d47d5dca07 Merge pull request 'callPackage Lix instead of overriding Nixpkgs' Nix' (#17) from qyriad/nixos-module:call-package into main
Reviewed-on: lix-project/nixos-module#17
2024-04-22 03:57:44 +00:00
Qyriad 8c2d5ca8bc callPackage Lix instead of overriding Nixpkgs' Nix 2024-04-18 14:56:07 -06:00
eldritch horrors 532c44fa43 bump nix-eval-jobs to fix eval with broken attrs 2024-04-18 18:24:40 +02:00
eldritch horrors 23da6e1d0a fix nix-eval-jobs repo url
this moved? we might want ci perhaps.
2024-04-17 21:32:57 +02:00
Qyriad 262c2b479d Merge pull request 'nix-eval-jobs: use lix' (#15) from jade/nix-eval-jobs-lix into main
Reviewed-on: lix-project/nixos-module#15
2024-04-16 09:33:50 +00:00
jade d66013efdf nix-eval-jobs: use lix 2024-04-15 20:06:52 -07:00
jade 9f7a36f023 bump lix 2024-04-15 20:06:05 -07:00
Qyriad a681f1cd49 flake.lock: update lix 2024-04-10 12:59:27 -06:00
Qyriad 061640f9b2 Merge pull request 'Rename nix-doc to lix-doc here too' (#14) from k900/nixos-module:main into main
Reviewed-on: lix-project/nixos-module#14
2024-04-08 18:40:50 +00:00
Ilya K 3e61e2aa24 Rename nix-doc to lix-doc here too
Fixes build
2024-04-08 11:15:34 +03:00
jade 8890cba994 Merge pull request 'overlay: fix builds of Lix after c21d11ac0' (#12) from qyriad/nixos-module:fixes/python-dep into main
Reviewed-on: lix-project/nixos-module#12
2024-04-06 04:30:25 +00:00
Qyriad 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
jade 8937cebb4f Merge pull request 'overlay: support nix-doc integration into Lix' (#11) from feature/nix-doc into main
Reviewed-on: lix-project/nixos-module#11
2024-04-03 22:48:05 +00:00
Lunaphied d1d43e601c overlay: support nix-doc integration into Lix 2024-04-03 15:55:27 -06:00
jade 4c47db0949 Merge pull request 'Add LICENSE' (#10) from jade/license into main
Reviewed-on: lix-project/nixos-module#10
2024-04-03 20:08:18 +00:00
jade 49fcc127f8 Add LICENSE 2024-04-02 13:21:56 -07:00
jade cccea113fe probably fix cross compilation 2024-04-02 00:41:06 -07:00
jade 1fee9f0e1f Merge pull request 'fix: pin nurl to upstream nix' (#9) from mweinelt/nixos-module:nurl-pin into main
Reviewed-on: lix-project/nixos-module#9
2024-03-29 07:16:53 +00:00
hexa 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
eldritch horrors 10fd7b4135 flake.lock: update 2024-03-28 18:32:40 +01:00
eldritch horrors 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
jade b6e09b8191 Merge pull request 'fix: pin nix-init to upstream nix' (#8) from mweinelt/nixos-module:nix-init-pin into main
Reviewed-on: lix-project/nixos-module#8
2024-03-27 08:07:07 +00:00
hexa 43eeb747b1 fix: pin nix-init to upstream nix 2024-03-27 05:54:26 +01:00
jade 007b27add8 flake.lock: Update
Flake lock file updates:

• Updated input 'lix':
    'git+ssh://git@git.lix.systems/lix-project/lix.git?ref=refs/heads/main&rev=66ccc93eeded1ab77281600bd41d6b0d8d8bf43a' (2024-03-25)
  → 'git+ssh://git@git.lix.systems/lix-project/lix.git?ref=refs/heads/main&rev=0be766c12de6badbbfa4fb9f76b6688b04d81059' (2024-03-25)
2024-03-25 13:45:09 -07:00
jade 4a532feadb Add version suffix in nixos module 2024-03-25 13:44:56 -07:00
jade f2d3bb0802 flake.lock: Update
Flake lock file updates:

• Updated input 'lix':
    'git+ssh://git@git.lix.systems/lix-project/lix.git?ref=refs/heads/main&rev=d26eccebfc1f0d3f5b77e781ffc6455f05f8f90c' (2024-03-24)
  → 'git+ssh://git@git.lix.systems/lix-project/lix.git?ref=refs/heads/main&rev=66ccc93eeded1ab77281600bd41d6b0d8d8bf43a' (2024-03-25)
2024-03-24 21:32:14 -07:00
Qyriad ceec87bc48 Merge pull request 'Add gitignore' (#6) from emilytrau/nixos-module:emilytrau/gitignore into main
Reviewed-on: lix-project/nixos-module#6
2024-03-25 03:03:56 +00:00
Emily Trau e47e4c60f5 Add gitignore 2024-03-25 13:57:03 +11:00
jade 214f6ea5fc Update lix and add system profile 2024-03-24 17:17:53 -07:00
jade d28160f571 Add system profile 2024-03-24 17:14:18 -07:00
jade 9b5adef52d put prerelease info in the version 2024-03-18 14:26:45 -07:00
jade 057c652b5d bump lix to a non bork version 2024-03-18 13:18:23 -07:00
jade cf5507a03d fix: make the boehm patch content addressed to avoid rebuilds 2024-03-18 13:16:48 -07:00
jade 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
jade b2b26d073e Merge pull request 'Switch to the replicated forgejo, and bump lix to head' (#2) from ktemkin/nixos-module:change_url into main
Reviewed-on: lix-project/nixos-module#2
2024-03-09 00:30:16 -07:00
Kate Temkin 31b491ddef flake.lock: Update
Flake lock file updates:

• Updated input 'lix':
    'git+ssh://gerrit.lix.systems:2022/lix?ref=refs/heads/main&rev=eac76dbe90ad1ceade863744739246e9b6abaa90' (2024-03-08)
  → 'git+ssh://git@git.lix.systems/lix-project/lix.git?ref=refs/heads/main&rev=896e525681bbf696c330af4e51c5e161d3818350' (2024-03-09)
2024-03-09 00:24:17 -07:00
Kate Temkin baafefa6e4 lix: switch to forgejo (replicated) clone addr 2024-03-09 00:23:44 -07:00
raito a50986cfc7 fix: pin nixos-option to upstream
Signed-off-by: Raito Bezarius <raito@lix.systems>
2024-03-09 02:27:21 +01:00
jade 0ccb82f2b0 Merge pull request 'feat: introduce our own flake-compat' (#1) from flake-compat into main
Reviewed-on: lix-project/nixos-module#1
2024-03-08 18:11:31 -07:00
raito 3ddd6e5e79 feat: introduce our own flake-compat
Signed-off-by: Raito Bezarius <raito@lix.systems>
2024-03-09 01:48:11 +01:00
jade 3fe47ad3f3 fake version 2024-03-08 00:10:56 -08:00