Commit graph

90 commits

Author SHA1 Message Date
909e593ae9 Return Lix module to main, with fixes from release-2.90 work 2024-06-18 23:32:31 -07: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
b4b38e6b5f Update nix-eval-jobs for exploding the C++ API again
lix-project/nix-eval-jobs#7
https://gerrit.lix.systems/c/lix/+/1241/5
2024-05-29 19:39:36 -07:00
38f31ee7c1 Update nix-eval-jobs for fix 2024-05-27 18:40:58 -06:00
12b457c433 Show revision of n-e-j better 2024-05-27 13:03:12 -06:00
18fa4a89e2 update lix and n-e-j in light of lix-project/nix-eval-jobs#5 2024-05-23 16:27:31 -07:00
6cd2d62a21 add dirtyShortRev to make it work better 2024-05-23 16:25:45 -07: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
fbc1c1c4da Merge pull request 'Don't pass in 'false' as the value of build-release-notes (a drv)' (#28) from midnightveil/nixos-module:build-release-notes-is-a-drv into main
Reviewed-on: lix-project/nixos-module#28
2024-05-16 02:03:47 +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
87b7b7e4bd pins: update nix-eval-jobs
To obtain lix-project/nix-eval-jobs#3
fix.

Signed-off-by: Raito Bezarius <raito@lix.systems>
2024-05-11 17:52:03 +02:00
c8ab1e79ba Merge pull request 'cherrypick: "boehmgc: disable tests on aarch64-linux"' (#21) from ckiee/nixos-module:cherry-boehm-check into main
Reviewed-on: lix-project/nixos-module#21
2024-05-09 18:11:51 +00:00
d15ff50703 Merge pull request 'feat: Add overrides for incompatible packages' (#27) from arcuru/nixos-module:override into main
Reviewed-on: lix-project/nixos-module#27
2024-05-08 21:11:43 +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
aaf759cd93 Switch to tarball fetching because it is cheaper 2024-05-06 16:43:03 -07:00
72060dfb08 Merge pull request 'fix: allow fetching nix-eval-jobs anonymously' (#23) from nogit-urls into main
Reviewed-on: lix-project/nixos-module#23
2024-05-06 23:06:29 +00:00
10e849bdce Merge pull request 'chore(inputs): use git+https://' (#26) from flake-input-with-git into main
Reviewed-on: lix-project/nixos-module#26
2024-05-06 21:49:58 +00:00
d4587ea6a6 chore(inputs): use git+https://
Seems better in the context.

Signed-off-by: Raito Bezarius <raito@lix.systems>
2024-05-06 23:47:38 +02:00
ef84a1e4b3 fix: allow fetching nix-eval-jobs anonymously
Use HTTPS URL. Fixes #22.

Signed-off-by: Raito Bezarius <raito@lix.systems>
2024-05-06 23:46:37 +02:00
0bb33a2305 feat: make the script autonomous in its python dependencies
Let's use a nix-shell shebang!

Signed-off-by: Raito Bezarius <raito@lix.systems>
2024-05-06 23:46:37 +02:00
4cf3e403e4 Merge pull request 'fix(inputs): use https://' (#25) from flake-input-https into main
Reviewed-on: lix-project/nixos-module#25
Reviewed-by: Qyriad <qyriad+lix@fastmail.com>
2024-05-06 21:43:25 +00:00
999cc24eca fix(inputs): use https://
Signed-off-by: Raito Bezarius <raito@lix.systems>
2024-05-06 23:41:53 +02: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
e31baf5768 Name should be source in fetching inputs 2024-05-04 17:14:17 -07: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
71df0f4a4a update flake.lock 2024-05-04 16:21:24 -07:00
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
2148106d19 Conditionally drop boehm-gc patch, now included in nixpkgs
Not actually included yet
2024-05-04 10:33:25 +03:00
cf119933da nix flake check should work on mac probably 2024-05-03 17:18:19 -07: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
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
0428921238 update lix 2024-05-02 00:36:53 -07:00
ddefc70e3d update lix 2024-04-22 15:11:54 -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: lix-project/nixos-module#18
2024-04-22 14:59:54 -07:00
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
8c2d5ca8bc callPackage Lix instead of overriding Nixpkgs' Nix 2024-04-18 14:56:07 -06:00
532c44fa43 bump nix-eval-jobs to fix eval with broken attrs 2024-04-18 18:24:40 +02:00
23da6e1d0a fix nix-eval-jobs repo url
this moved? we might want ci perhaps.
2024-04-17 21:32:57 +02:00
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
d66013efdf nix-eval-jobs: use lix 2024-04-15 20:06:52 -07:00
9f7a36f023 bump lix 2024-04-15 20:06:05 -07:00
a681f1cd49 flake.lock: update lix 2024-04-10 12:59:27 -06:00
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
3e61e2aa24 Rename nix-doc to lix-doc here too
Fixes build
2024-04-08 11:15:34 +03:00
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