lix-project/nixos-module
15
4
Fork 12
Code Issues 2 Pull requests 1 Packages Projects Releases Wiki Activity
104 commits 8 branches 3 tags 278 KiB
Commit graph

104 commits

This branch
This branch
All branches
Author SHA1 Message Date
jade a0427505de Update to the final 2.91.0 release 2024-08-12 18:01:44 -07:00
jade 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
jade 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
jade 624aaf9af1 Clarify readme wording a little 2024-07-31 14:14:21 -07:00
jade 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
jade 533223d8ee Add lixFromNixpkgs, document the module 2024-07-30 15:13:25 -07:00
jade 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
jade 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
jade 03d62d5a74 overlay: correct n-e-j version 2024-07-30 15:12:30 -07:00
crop 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
jade d70318fb94 Merge pull request 'Delete prefetch-npm-deps hack since we dropped 23.11' (#31) from jade/fix-prefetchnpmdeps-hacks into main 
Reviewed-on: #31
 2024-07-11 11:02:55 +00:00
jade 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
eldritch horrors 5d9d94089f update nix-eval-jobs for 2.91-dev 2024-06-26 00:18:57 +02:00
eldritch horrors f6e6871f38 add pegtl to overlay for 2.91-dev 2024-06-25 22:00:47 +02:00
jade 909e593ae9 Return Lix module to main, with fixes from release-2.90 work 2024-06-18 23:32:31 -07:00
jade 376ecb8038 restore back to dev state 2024-06-18 23:31:00 -07:00
jade b64814c8c1 Make a working 2.90.0-rc1 overlay 2024-06-18 23:29:08 -07:00
jade 4e25f1ab68 Fix including the overlay twice exploding nixos-option by making it idempotent 2024-06-05 21:15:44 -07:00
jade 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
jade 38f31ee7c1 Update nix-eval-jobs for fix 2024-05-27 18:40:58 -06:00
jade 12b457c433 Show revision of n-e-j better 2024-05-27 13:03:12 -06:00
jade 18fa4a89e2 update lix and n-e-j in light of lix-project/nix-eval-jobs#5 2024-05-23 16:27:31 -07:00
jade 6cd2d62a21 add dirtyShortRev to make it work better 2024-05-23 16:25:45 -07:00
puck 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
puck 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
jade 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: #28
 2024-05-16 02:03:47 +00:00
julia 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
puck 7e8a5498db Fix prefetch-npm-deps override when functionArgs is not supported 2024-05-15 19:35:30 +00:00
raito 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
jade 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
jade d15ff50703 Merge pull request 'feat: Add overrides for incompatible packages' (#27) from arcuru/nixos-module:override into main 
Reviewed-on: #27
 2024-05-08 21:11:43 +00:00
Patrick Jackson 5ef5fe6a67 feat: add reported broken packages 2024-05-08 07:58:24 -07:00
Patrick Jackson e09758962c refactor: move simple overrides to a function 2024-05-08 07:50:20 -07:00
jade aaf759cd93 Switch to tarball fetching because it is cheaper 2024-05-06 16:43:03 -07:00
jade 72060dfb08 Merge pull request 'fix: allow fetching nix-eval-jobs anonymously' (#23) from nogit-urls into main 
Reviewed-on: #23
 2024-05-06 23:06:29 +00:00
Lunaphied 10e849bdce Merge pull request 'chore(inputs): use git+https://' (#26) from flake-input-with-git into main 
Reviewed-on: #26
 2024-05-06 21:49:58 +00:00
raito 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
raito 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
raito 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
Qyriad 4cf3e403e4 Merge pull request 'fix(inputs): use https://' (#25) from flake-input-https into main 
Reviewed-on: #25
Reviewed-by: Qyriad <qyriad+lix@fastmail.com>
 2024-05-06 21:43:25 +00:00
raito 999cc24eca fix(inputs): use https:// 
Signed-off-by: Raito Bezarius <raito@lix.systems>
 2024-05-06 23:41:53 +02:00
mei (ckie) 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
jade e31baf5768 Name should be source in fetching inputs 2024-05-04 17:14:17 -07:00
jade 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
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: #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